File tree Expand file tree Collapse file tree 4 files changed +15
-5
lines changed
Expand file tree Collapse file tree 4 files changed +15
-5
lines changed Original file line number Diff line number Diff line change 55namespace Wikibase \Lib \Rdbms ;
66
77use Wikimedia \Rdbms \ConnectionManager ;
8+ use Wikimedia \Rdbms \IDatabase ;
89use Wikimedia \Rdbms \ILBFactory ;
910use Wikimedia \Rdbms \ILoadBalancer ;
1011use Wikimedia \Rdbms \SessionConsistentConnectionManager ;
@@ -78,6 +79,10 @@ public function connections(): ConnectionManager {
7879 return $ this ->connectionManager ;
7980 }
8081
82+ public function getAutoCommitPrimaryConnection (): IDatabase {
83+ return $ this ->lbFactory ->getAutoCommitPrimaryConnection ( $ this ->domainId );
84+ }
85+
8186 public function replication (): ReplicationWaiter {
8287 return $ this ->replicationWaiter ;
8388 }
Original file line number Diff line number Diff line change @@ -21,8 +21,12 @@ public function __construct( RepoDomainDb $repoDb ) {
2121 $ this ->repoDb = $ repoDb ;
2222 }
2323
24- public function getWriteConnection ( int $ flags = 0 ): IDatabase {
25- return $ this ->repoDb ->connections ()->getWriteConnection ( $ flags );
24+ public function getWriteConnection (): IDatabase {
25+ return $ this ->repoDb ->connections ()->getWriteConnection ();
26+ }
27+
28+ public function getAutoCommitPrimaryConnection (): IDatabase {
29+ return $ this ->repoDb ->getAutoCommitPrimaryConnection ();
2630 }
2731
2832 public function getReadConnection ( ?array $ groups = null ): IReadableDatabase {
Original file line number Diff line number Diff line change 1818 */
1919interface TermsDomainDb {
2020
21- public function getWriteConnection ( int $ flags = 0 ): IDatabase ;
21+ public function getWriteConnection (): IDatabase ;
22+
23+ public function getAutoCommitPrimaryConnection (): IDatabase ;
2224
2325 public function getReadConnection ( ?array $ groups = null ): IReadableDatabase ;
2426
Original file line number Diff line number Diff line change 77use LogicException ;
88use Wikibase \Lib \Rdbms \TermsDomainDb ;
99use Wikimedia \Rdbms \IDatabase ;
10- use Wikimedia \Rdbms \ILoadBalancer ;
1110use Wikimedia \Rdbms \IReadableDatabase ;
1211
1312/**
@@ -169,7 +168,7 @@ private function insertNonExistingRecords(
169168 // gets stuck in an infinite loop. To avoid this, we read it with CONN_TRX_AUTOCOMMIT
170169 // Surprisingly it's not too rare not to happen in production: T247553
171170
172- $ dbw = $ this ->termsDb ->getWriteConnection ( ILoadBalancer:: CONN_TRX_AUTOCOMMIT );
171+ $ dbw = $ this ->termsDb ->getAutoCommitPrimaryConnection ( );
173172
174173 $ insertedRecords = array_merge (
175174 $ insertedRecords ,
You can’t perform that action at this time.
0 commit comments