From: Aaron Schulz <aschulz@wikimedia.org>
Date: Thu, 4 Jan 2018 18:28:31 +0000 (-0800)
Subject: rdbms: Remove unused setServerInfo/getServerInfo methods from LoadBalancer
X-Git-Tag: 1.31.0-rc.0~993^2
X-Git-Url: https://git.heureux-cyclage.org/?a=commitdiff_plain;h=f8248c24c6c9a7a4dbf9be0a3dcc87b0c5da7fa5;p=lhc%2Fweb%2Fwiklou.git

rdbms: Remove unused setServerInfo/getServerInfo methods from LoadBalancer

Change-Id: Iffb99c96ca77957a81f1cb8d1e6ae5b1c198e3f5
---

diff --git a/includes/libs/rdbms/loadbalancer/ILoadBalancer.php b/includes/libs/rdbms/loadbalancer/ILoadBalancer.php
index 86c43350a0..e246b79f80 100644
--- a/includes/libs/rdbms/loadbalancer/ILoadBalancer.php
+++ b/includes/libs/rdbms/loadbalancer/ILoadBalancer.php
@@ -309,25 +309,6 @@ interface ILoadBalancer {
 	 */
 	public function getServerType( $i );
 
-	/**
-	 * Return the server info structure for a given index, or false if the index is invalid.
-	 * @param int $i
-	 * @return array|bool
-	 *
-	 * @deprecated Since 1.30, no alternative
-	 */
-	public function getServerInfo( $i );
-
-	/**
-	 * Sets the server info structure for the given index. Entry at index $i
-	 * is created if it doesn't exist
-	 * @param int $i
-	 * @param array $serverInfo
-	 *
-	 * @deprecated Since 1.30, construct new object
-	 */
-	public function setServerInfo( $i, array $serverInfo );
-
 	/**
 	 * Get the current master position for chronology control purposes
 	 * @return DBMasterPos|bool Returns false if not applicable
diff --git a/includes/libs/rdbms/loadbalancer/LoadBalancer.php b/includes/libs/rdbms/loadbalancer/LoadBalancer.php
index 591e287e0a..deacc422d5 100644
--- a/includes/libs/rdbms/loadbalancer/LoadBalancer.php
+++ b/includes/libs/rdbms/loadbalancer/LoadBalancer.php
@@ -1080,26 +1080,6 @@ class LoadBalancer implements ILoadBalancer {
 		return isset( $this->mServers[$i]['type'] ) ? $this->mServers[$i]['type'] : 'unknown';
 	}
 
-	/**
-	 * @deprecated Since 1.30, no alternative
-	 */
-	public function getServerInfo( $i ) {
-		wfDeprecated( __METHOD__, '1.30' );
-		if ( isset( $this->mServers[$i] ) ) {
-			return $this->mServers[$i];
-		} else {
-			return false;
-		}
-	}
-
-	/**
-	 * @deprecated Since 1.30, construct new object
-	 */
-	public function setServerInfo( $i, array $serverInfo ) {
-		wfDeprecated( __METHOD__, '1.30' );
-		$this->mServers[$i] = $serverInfo;
-	}
-
 	public function getMasterPos() {
 		# If this entire request was served from a replica DB without opening a connection to the
 		# master (however unlikely that may be), then we can fetch the position from the replica DB.