From: Aaron Schulz <aschulz@wikimedia.org>
Date: Tue, 20 Nov 2018 23:34:11 +0000 (-0800)
Subject: rdbms: rename setDomainPrefix to setLocalDomainPrefix in ILoadBalancer
X-Git-Tag: 1.34.0-rc.0~3435^2
X-Git-Url: https://git.cyclocoop.org/%20%27.%28%24debut%20%20%20%24par_page%29.%27?a=commitdiff_plain;h=d2e1734390fb19fb0f76c2de995811dabf2ac1dd;p=lhc%2Fweb%2Fwiklou.git

rdbms: rename setDomainPrefix to setLocalDomainPrefix in ILoadBalancer

Update CloneDatabase and unit test callers, which are the only things
that are likely to call it.

Change-Id: Idbc6d2965cd3828c2c6d23012319bbf0fc3ffa4a
---

diff --git a/includes/db/CloneDatabase.php b/includes/db/CloneDatabase.php
index 5f09555e7a..d4277245c1 100644
--- a/includes/db/CloneDatabase.php
+++ b/includes/db/CloneDatabase.php
@@ -137,7 +137,7 @@ class CloneDatabase {
 		global $wgDBprefix;
 
 		$lbFactory = MediaWikiServices::getInstance()->getDBLoadBalancerFactory();
-		$lbFactory->setDomainPrefix( $prefix );
+		$lbFactory->setLocalDomainPrefix( $prefix );
 		$wgDBprefix = $prefix;
 	}
 }
diff --git a/includes/libs/rdbms/lbfactory/ILBFactory.php b/includes/libs/rdbms/lbfactory/ILBFactory.php
index 8c95c165ca..7987052206 100644
--- a/includes/libs/rdbms/lbfactory/ILBFactory.php
+++ b/includes/libs/rdbms/lbfactory/ILBFactory.php
@@ -330,8 +330,9 @@ interface ILBFactory {
 	 * Set a new table prefix for the existing local domain ID for testing
 	 *
 	 * @param string $prefix
+	 * @since 1.33
 	 */
-	public function setDomainPrefix( $prefix );
+	public function setLocalDomainPrefix( $prefix );
 
 	/**
 	 * Close all open database connections on all open load balancers.
diff --git a/includes/libs/rdbms/lbfactory/LBFactory.php b/includes/libs/rdbms/lbfactory/LBFactory.php
index b60dd429cb..9a6c224051 100644
--- a/includes/libs/rdbms/lbfactory/LBFactory.php
+++ b/includes/libs/rdbms/lbfactory/LBFactory.php
@@ -618,7 +618,15 @@ abstract class LBFactory implements ILBFactory {
 		$this->indexAliases = $aliases;
 	}
 
+	/**
+	 * @param string $prefix
+	 * @deprecated Since 1.33
+	 */
 	public function setDomainPrefix( $prefix ) {
+		$this->setLocalDomainPrefix( $prefix );
+	}
+
+	public function setLocalDomainPrefix( $prefix ) {
 		$this->localDomain = new DatabaseDomain(
 			$this->localDomain->getDatabase(),
 			null,
@@ -626,7 +634,7 @@ abstract class LBFactory implements ILBFactory {
 		);
 
 		$this->forEachLB( function ( ILoadBalancer $lb ) use ( $prefix ) {
-			$lb->setDomainPrefix( $prefix );
+			$lb->setLocalDomainPrefix( $prefix );
 		} );
 	}
 
diff --git a/includes/libs/rdbms/loadbalancer/ILoadBalancer.php b/includes/libs/rdbms/loadbalancer/ILoadBalancer.php
index 661c184973..e1a3162cf6 100644
--- a/includes/libs/rdbms/loadbalancer/ILoadBalancer.php
+++ b/includes/libs/rdbms/loadbalancer/ILoadBalancer.php
@@ -652,8 +652,9 @@ interface ILoadBalancer {
 	 * Set a new table prefix for the existing local domain ID for testing
 	 *
 	 * @param string $prefix
+	 * @since 1.33
 	 */
-	public function setDomainPrefix( $prefix );
+	public function setLocalDomainPrefix( $prefix );
 
 	/**
 	 * Make certain table names use their own database, schema, and table prefix
diff --git a/includes/libs/rdbms/loadbalancer/LoadBalancer.php b/includes/libs/rdbms/loadbalancer/LoadBalancer.php
index 8d95276981..bc51726c45 100644
--- a/includes/libs/rdbms/loadbalancer/LoadBalancer.php
+++ b/includes/libs/rdbms/loadbalancer/LoadBalancer.php
@@ -1918,7 +1918,15 @@ class LoadBalancer implements ILoadBalancer {
 		$this->indexAliases = $aliases;
 	}
 
+	/**
+	 * @param string $prefix
+	 * @deprecated Since 1.33
+	 */
 	public function setDomainPrefix( $prefix ) {
+		$this->setLocalDomainPrefix( $prefix );
+	}
+
+	public function setLocalDomainPrefix( $prefix ) {
 		// Find connections to explicit foreign domains still marked as in-use...
 		$domainsInUse = [];
 		$this->forEachOpenConnection( function ( IDatabase $conn ) use ( &$domainsInUse ) {
diff --git a/tests/phpunit/includes/db/LBFactoryTest.php b/tests/phpunit/includes/db/LBFactoryTest.php
index ba02dd94e8..58f96546cd 100644
--- a/tests/phpunit/includes/db/LBFactoryTest.php
+++ b/tests/phpunit/includes/db/LBFactoryTest.php
@@ -493,7 +493,7 @@ class LBFactoryTest extends MediaWikiTestCase {
 		$lb->reuseConnection( $db ); // don't care
 
 		$db = $lb->getConnection( DB_MASTER ); // local domain connection
-		$factory->setDomainPrefix( 'my_' );
+		$factory->setLocalDomainPrefix( 'my_' );
 
 		$this->assertEquals( $wgDBname, $db->getDBname() );
 		$this->assertEquals(
@@ -556,7 +556,7 @@ class LBFactoryTest extends MediaWikiTestCase {
 
 		$lb->reuseConnection( $db ); // don't care
 
-		$factory->setDomainPrefix( 'my_' );
+		$factory->setLocalDomainPrefix( 'my_' );
 		$db = $lb->getConnection( DB_MASTER, [], "$wgDBname-my_" );
 
 		$this->assertEquals(