Avoid directly using CONN_TRX_AUTOCOMMIT in TermsDomainDb

This uses the newly added getAutoCommitPrimaryConnection() method instead of directly using the CONN_TRX_AUTOCOMMIT, which also means that we can get rid of the $flags param on the getWriteConnection() method. Bug: T351802 Bug: T383246 Change-Id: I250b8a2ce03ff9ee7c03423a5b16a2cf4d42f0f8
manicki · Jan 9, 2025 · 21aa0c7 · 21aa0c7
1 parent e0aadd5
commit 21aa0c7
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/lib/includes/Rdbms/DomainDb.php b/lib/includes/Rdbms/DomainDb.php
@@ -5,6 +5,7 @@
 namespace Wikibase\Lib\Rdbms;
 
 use Wikimedia\Rdbms\ConnectionManager;
+use Wikimedia\Rdbms\IDatabase;
 use Wikimedia\Rdbms\ILBFactory;
 use Wikimedia\Rdbms\ILoadBalancer;
 use Wikimedia\Rdbms\SessionConsistentConnectionManager;
@@ -78,6 +79,10 @@ public function connections(): ConnectionManager {
 		return $this->connectionManager;
 	}
 
+	public function getAutoCommitPrimaryConnection(): IDatabase {
+		return $this->lbFactory->getAutoCommitPrimaryConnection( $this->domainId );
+	}
+
 	public function replication(): ReplicationWaiter {
 		return $this->replicationWaiter;
 	}

diff --git a/lib/includes/Rdbms/RepoDomainTermsDb.php b/lib/includes/Rdbms/RepoDomainTermsDb.php
@@ -21,8 +21,12 @@ public function __construct( RepoDomainDb $repoDb ) {
 		$this->repoDb = $repoDb;
 	}
 
-	public function getWriteConnection( int $flags = 0 ): IDatabase {
-		return $this->repoDb->connections()->getWriteConnection( $flags );
+	public function getWriteConnection(): IDatabase {
+		return $this->repoDb->connections()->getWriteConnection();
+	}
+
+	public function getAutoCommitPrimaryConnection(): IDatabase {
+		return $this->repoDb->getAutoCommitPrimaryConnection();
 	}
 
 	public function getReadConnection( ?array $groups = null ): IReadableDatabase {

diff --git a/lib/includes/Rdbms/TermsDomainDb.php b/lib/includes/Rdbms/TermsDomainDb.php
@@ -18,7 +18,9 @@
  */
 interface TermsDomainDb {
 
-	public function getWriteConnection( int $flags = 0 ): IDatabase;
+	public function getWriteConnection(): IDatabase;
+
+	public function getAutoCommitPrimaryConnection(): IDatabase;
 
 	public function getReadConnection( ?array $groups = null ): IReadableDatabase;
 

diff --git a/lib/includes/Store/Sql/Terms/Util/ReplicaPrimaryAwareRecordIdsAcquirer.php b/lib/includes/Store/Sql/Terms/Util/ReplicaPrimaryAwareRecordIdsAcquirer.php
@@ -7,7 +7,6 @@
 use LogicException;
 use Wikibase\Lib\Rdbms\TermsDomainDb;
 use Wikimedia\Rdbms\IDatabase;
-use Wikimedia\Rdbms\ILoadBalancer;
 use Wikimedia\Rdbms\IReadableDatabase;
 
 /**
@@ -169,7 +168,7 @@ private function insertNonExistingRecords(
 				// gets stuck in an infinite loop. To avoid this, we read it with CONN_TRX_AUTOCOMMIT
 				// Surprisingly it's not too rare not to happen in production: T247553
 
-				$dbw = $this->termsDb->getWriteConnection( ILoadBalancer::CONN_TRX_AUTOCOMMIT );
+				$dbw = $this->termsDb->getAutoCommitPrimaryConnection();
 
 				$insertedRecords = array_merge(
 					$insertedRecords,