Aaron Schulz has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/402093 )
Change subject: Remove unused setServerInfo/getServerInfo methods from LoadBalancer ...................................................................... Remove unused setServerInfo/getServerInfo methods from LoadBalancer Change-Id: Iffb99c96ca77957a81f1cb8d1e6ae5b1c198e3f5 --- M includes/libs/rdbms/loadbalancer/ILoadBalancer.php M includes/libs/rdbms/loadbalancer/LoadBalancer.php 2 files changed, 0 insertions(+), 39 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/93/402093/1 diff --git a/includes/libs/rdbms/loadbalancer/ILoadBalancer.php b/includes/libs/rdbms/loadbalancer/ILoadBalancer.php index 86c4335..e246b79 100644 --- a/includes/libs/rdbms/loadbalancer/ILoadBalancer.php +++ b/includes/libs/rdbms/loadbalancer/ILoadBalancer.php @@ -310,25 +310,6 @@ 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 591e287..deacc42 100644 --- a/includes/libs/rdbms/loadbalancer/LoadBalancer.php +++ b/includes/libs/rdbms/loadbalancer/LoadBalancer.php @@ -1080,26 +1080,6 @@ 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. -- To view, visit https://gerrit.wikimedia.org/r/402093 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iffb99c96ca77957a81f1cb8d1e6ae5b1c198e3f5 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Aaron Schulz <asch...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits