From 4c7e4575f59a6d4b1ef2e9b06d84f5a6b7514c90 Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Thu, 27 Jun 2019 01:13:13 -0700 Subject: [PATCH] rdbms: remove various deprecated methods Change-Id: I5ae923065a08078225b7df080cb92edca799ebaf --- RELEASE-NOTES-1.34 | 11 ++++++++ includes/db/DatabaseOracle.php | 4 --- includes/libs/rdbms/database/DBConnRef.php | 15 ----------- includes/libs/rdbms/database/Database.php | 21 ---------------- .../libs/rdbms/database/DatabaseMssql.php | 4 --- .../libs/rdbms/database/DatabasePostgres.php | 4 --- .../libs/rdbms/database/DatabaseSqlite.php | 9 ------- includes/libs/rdbms/database/IDatabase.php | 25 ------------------- includes/libs/rdbms/lbfactory/LBFactory.php | 8 ------ .../libs/rdbms/loadbalancer/LoadBalancer.php | 17 ------------- 10 files changed, 11 insertions(+), 107 deletions(-) diff --git a/RELEASE-NOTES-1.34 b/RELEASE-NOTES-1.34 index 368d2a4731..3e2c744d20 100644 --- a/RELEASE-NOTES-1.34 +++ b/RELEASE-NOTES-1.34 @@ -316,6 +316,17 @@ because of Phabricator reports. * UploadBase:: and UploadFromChunks::stashFileGetKey() and stashSession(), deprecated in 1.28, have been removed. Instead, please use the getFileKey() method on the response from doStashFile(). +* LBFactory::setDomainPrefix() and LoadBalancer::setDomainPrefix(), deprecated + in 1.33, have been removed. Use setLocalDomainPrefix() instead. +* IDatabase::implicitGroupby(), deprecated in 1.30, has been removed. +* IDatabase::doneWrites(), deprecated in 1.31, has been removed. + Use IDatabase::lastDoneWrites() instead. +* Database::reportConnectionError(), deprecated in 1.32, has been removed. +* LoadBalancer::laggedSlaveUsed(), deprecated in 1.28, has been removed. + Use LoadBalancer::laggedReplicaUsed() instead. +* Database::getProperty(), deprecated in 1.28, has been removed. +* IDatabase::getWikiId(), deprecated in 1.30, has been removed. + Use IDatabase::getDomainID() instead. * … === Deprecations in 1.34 === diff --git a/includes/db/DatabaseOracle.php b/includes/db/DatabaseOracle.php index 501f01a3e9..9221716494 100644 --- a/includes/db/DatabaseOracle.php +++ b/includes/db/DatabaseOracle.php @@ -80,10 +80,6 @@ class DatabaseOracle extends Database { return 'oracle'; } - function implicitGroupby() { - return false; - } - function implicitOrderby() { return false; } diff --git a/includes/libs/rdbms/database/DBConnRef.php b/includes/libs/rdbms/database/DBConnRef.php index 2c9858add5..f27d042ca9 100644 --- a/includes/libs/rdbms/database/DBConnRef.php +++ b/includes/libs/rdbms/database/DBConnRef.php @@ -140,10 +140,6 @@ class DBConnRef implements IDatabase { throw new DBUnexpectedError( $this, "Database injection is disallowed to enable reuse." ); } - public function implicitGroupby() { - return $this->__call( __FUNCTION__, func_get_args() ); - } - public function implicitOrderby() { return $this->__call( __FUNCTION__, func_get_args() ); } @@ -152,10 +148,6 @@ class DBConnRef implements IDatabase { return $this->__call( __FUNCTION__, func_get_args() ); } - public function doneWrites() { - return $this->__call( __FUNCTION__, func_get_args() ); - } - public function lastDoneWrites() { return $this->__call( __FUNCTION__, func_get_args() ); } @@ -218,13 +210,6 @@ class DBConnRef implements IDatabase { return $this->__call( __FUNCTION__, func_get_args() ); } - /** - * @codeCoverageIgnore - */ - public function getWikiID() { - return $this->getDomainID(); - } - public function getType() { if ( $this->conn === null ) { // Avoid triggering a database connection diff --git a/includes/libs/rdbms/database/Database.php b/includes/libs/rdbms/database/Database.php index 60062fbc13..b1af7c3dd9 100644 --- a/includes/libs/rdbms/database/Database.php +++ b/includes/libs/rdbms/database/Database.php @@ -613,10 +613,6 @@ abstract class Database implements IDatabase, IMaintainableDatabase, LoggerAware return $this->lazyMasterHandle; } - public function implicitGroupby() { - return true; - } - public function implicitOrderby() { return true; } @@ -625,10 +621,6 @@ abstract class Database implements IDatabase, IMaintainableDatabase, LoggerAware return $this->lastQuery; } - public function doneWrites() { - return (bool)$this->lastWriteTime; - } - public function lastDoneWrites() { return $this->lastWriteTime ?: false; } @@ -779,23 +771,10 @@ abstract class Database implements IDatabase, IMaintainableDatabase, LoggerAware return (bool)( $this->flags & $flag ); } - /** - * @param string $name Class field name - * @return mixed - * @deprecated Since 1.28 - */ - public function getProperty( $name ) { - return $this->$name; - } - public function getDomainID() { return $this->currentDomain->getId(); } - final public function getWikiID() { - return $this->getDomainID(); - } - /** * Get information about an index into an object * @param string $table Table name diff --git a/includes/libs/rdbms/database/DatabaseMssql.php b/includes/libs/rdbms/database/DatabaseMssql.php index d06bcb9274..54a15d87f2 100644 --- a/includes/libs/rdbms/database/DatabaseMssql.php +++ b/includes/libs/rdbms/database/DatabaseMssql.php @@ -59,10 +59,6 @@ class DatabaseMssql extends Database { /** @var string[] */ protected $ignoreErrors = []; - public function implicitGroupby() { - return false; - } - public function implicitOrderby() { return false; } diff --git a/includes/libs/rdbms/database/DatabasePostgres.php b/includes/libs/rdbms/database/DatabasePostgres.php index 840b4280b6..4dff5de3e5 100644 --- a/includes/libs/rdbms/database/DatabasePostgres.php +++ b/includes/libs/rdbms/database/DatabasePostgres.php @@ -64,10 +64,6 @@ class DatabasePostgres extends Database { return 'postgres'; } - public function implicitGroupby() { - return false; - } - public function implicitOrderby() { return false; } diff --git a/includes/libs/rdbms/database/DatabaseSqlite.php b/includes/libs/rdbms/database/DatabaseSqlite.php index 11dda2fb39..dc9c531d15 100644 --- a/includes/libs/rdbms/database/DatabaseSqlite.php +++ b/includes/libs/rdbms/database/DatabaseSqlite.php @@ -123,15 +123,6 @@ class DatabaseSqlite extends Database { return 'sqlite'; } - /** - * @todo Check if it should be true like parent class - * - * @return bool - */ - public function implicitGroupby() { - return false; - } - protected function open( $server, $user, $pass, $dbName, $schema, $tablePrefix ) { $this->close(); diff --git a/includes/libs/rdbms/database/IDatabase.php b/includes/libs/rdbms/database/IDatabase.php index ef7f1e24f6..11bc67b2e2 100644 --- a/includes/libs/rdbms/database/IDatabase.php +++ b/includes/libs/rdbms/database/IDatabase.php @@ -238,14 +238,6 @@ interface IDatabase { */ public function setLazyMasterHandle( IDatabase $conn ); - /** - * Returns true if this database does an implicit sort when doing GROUP BY - * - * @return bool - * @deprecated Since 1.30; only use grouped or aggregated fields in the SELECT - */ - public function implicitGroupby(); - /** * Returns true if this database does an implicit order by when the column has an index * For example: SELECT page_title FROM page LIMIT 1 @@ -260,15 +252,6 @@ interface IDatabase { */ public function lastQuery(); - /** - * Returns true if the connection may have been used for write queries. - * Should return true if unsure. - * - * @return bool - * @deprecated Since 1.31; use lastDoneWrites() - */ - public function doneWrites(); - /** * Returns the last time the connection may have been used for write queries. * Should return a timestamp if unsure. @@ -390,14 +373,6 @@ interface IDatabase { */ public function getDomainID(); - /** - * Alias for getDomainID() - * - * @return string - * @deprecated 1.30 - */ - public function getWikiID(); - /** * Get the type of the DBMS, as it appears in $wgDBtype. * diff --git a/includes/libs/rdbms/lbfactory/LBFactory.php b/includes/libs/rdbms/lbfactory/LBFactory.php index a85e1e544f..4426654ca2 100644 --- a/includes/libs/rdbms/lbfactory/LBFactory.php +++ b/includes/libs/rdbms/lbfactory/LBFactory.php @@ -651,14 +651,6 @@ 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(), diff --git a/includes/libs/rdbms/loadbalancer/LoadBalancer.php b/includes/libs/rdbms/loadbalancer/LoadBalancer.php index 1ef1d09b5f..14c17c13c2 100644 --- a/includes/libs/rdbms/loadbalancer/LoadBalancer.php +++ b/includes/libs/rdbms/loadbalancer/LoadBalancer.php @@ -1922,15 +1922,6 @@ class LoadBalancer implements ILoadBalancer { return $this->laggedReplicaMode; } - /** - * @return bool - * @since 1.27 - * @deprecated Since 1.28; use laggedReplicaUsed() - */ - public function laggedSlaveUsed() { - return $this->laggedReplicaUsed(); - } - public function getReadOnlyReason( $domain = false, IDatabase $conn = null ) { if ( $this->readOnlyReason !== false ) { return $this->readOnlyReason; @@ -2203,14 +2194,6 @@ 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 = []; -- 2.20.1