From a8a8eb39a863739b835e3da0b0693e1ba4726b9a Mon Sep 17 00:00:00 2001
From: Aaron Schulz <aschulz@wikimedia.org>
Date: Fri, 23 Sep 2016 21:17:32 -0700
Subject: [PATCH] Rename getSlavePos() => getReplicaPos()

All callers updated

Change-Id: Ieb87df1bd134e6b0d8b01be581288e98fe3543ee
---
 includes/libs/rdbms/database/DBConnRef.php         | 2 +-
 includes/libs/rdbms/database/Database.php          | 2 +-
 includes/libs/rdbms/database/DatabaseMysqlBase.php | 4 ++--
 includes/libs/rdbms/database/IDatabase.php         | 2 +-
 includes/libs/rdbms/loadbalancer/LoadBalancer.php  | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/includes/libs/rdbms/database/DBConnRef.php b/includes/libs/rdbms/database/DBConnRef.php
index 1cb8906beb..20198bf14c 100644
--- a/includes/libs/rdbms/database/DBConnRef.php
+++ b/includes/libs/rdbms/database/DBConnRef.php
@@ -445,7 +445,7 @@ class DBConnRef implements IDatabase {
 		return $this->__call( __FUNCTION__, func_get_args() );
 	}
 
-	public function getSlavePos() {
+	public function getReplicaPos() {
 		return $this->__call( __FUNCTION__, func_get_args() );
 	}
 
diff --git a/includes/libs/rdbms/database/Database.php b/includes/libs/rdbms/database/Database.php
index 350194c82c..897e55f915 100644
--- a/includes/libs/rdbms/database/Database.php
+++ b/includes/libs/rdbms/database/Database.php
@@ -2436,7 +2436,7 @@ abstract class Database implements IDatabase, IMaintainableDatabase, LoggerAware
 		return 0;
 	}
 
-	public function getSlavePos() {
+	public function getReplicaPos() {
 		# Stub
 		return false;
 	}
diff --git a/includes/libs/rdbms/database/DatabaseMysqlBase.php b/includes/libs/rdbms/database/DatabaseMysqlBase.php
index 1efc6c8fd8..c31b9f9ed2 100644
--- a/includes/libs/rdbms/database/DatabaseMysqlBase.php
+++ b/includes/libs/rdbms/database/DatabaseMysqlBase.php
@@ -811,7 +811,7 @@ abstract class DatabaseMysqlBase extends DatabaseBase {
 			// with an old master hostname. Such calls make MASTER_POS_WAIT() return null. Try
 			// to detect this and treat the replica DB as having reached the position; a proper master
 			// switchover already requires that the new master be caught up before the switch.
-			$replicationPos = $this->getSlavePos();
+			$replicationPos = $this->getReplicaPos();
 			if ( $replicationPos && !$replicationPos->channelsMatch( $pos ) ) {
 				$this->lastKnownReplicaPos = $replicationPos;
 				$status = 0;
@@ -829,7 +829,7 @@ abstract class DatabaseMysqlBase extends DatabaseBase {
 	 *
 	 * @return MySQLMasterPos|bool
 	 */
-	function getSlavePos() {
+	function getReplicaPos() {
 		$res = $this->query( 'SHOW SLAVE STATUS', __METHOD__ );
 		$row = $this->fetchObject( $res );
 
diff --git a/includes/libs/rdbms/database/IDatabase.php b/includes/libs/rdbms/database/IDatabase.php
index 6423247daf..0396ec8530 100644
--- a/includes/libs/rdbms/database/IDatabase.php
+++ b/includes/libs/rdbms/database/IDatabase.php
@@ -1322,7 +1322,7 @@ interface IDatabase {
 	 *
 	 * @return DBMasterPos|bool False if this is not a replica DB.
 	 */
-	public function getSlavePos();
+	public function getReplicaPos();
 
 	/**
 	 * Get the position of this master
diff --git a/includes/libs/rdbms/loadbalancer/LoadBalancer.php b/includes/libs/rdbms/loadbalancer/LoadBalancer.php
index f1f202e994..36e4c6c662 100644
--- a/includes/libs/rdbms/loadbalancer/LoadBalancer.php
+++ b/includes/libs/rdbms/loadbalancer/LoadBalancer.php
@@ -945,7 +945,7 @@ class LoadBalancer implements ILoadBalancer {
 			for ( $i = 1; $i < $serverCount; $i++ ) {
 				$conn = $this->getAnyOpenConnection( $i );
 				if ( $conn ) {
-					return $conn->getSlavePos();
+					return $conn->getReplicaPos();
 				}
 			}
 		} else {
-- 
2.20.1