From d322031d528f111a619e9e77459f0f5a4d87d95d Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Thu, 11 Jul 2019 02:32:27 -0700 Subject: [PATCH] rdbms: switch to AtEast warning suppression in Database classes Change-Id: Ia32f1ba048a540438f78b11a1e94f80acfc7bf50 --- includes/libs/rdbms/database/Database.php | 12 +++++----- .../libs/rdbms/database/DatabaseMysqlBase.php | 22 +++++++++---------- .../libs/rdbms/database/DatabasePostgres.php | 18 +++++++-------- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/includes/libs/rdbms/database/Database.php b/includes/libs/rdbms/database/Database.php index 294cd0c555..3024b00e98 100644 --- a/includes/libs/rdbms/database/Database.php +++ b/includes/libs/rdbms/database/Database.php @@ -30,7 +30,7 @@ use Psr\Log\LoggerInterface; use Psr\Log\NullLogger; use Wikimedia\ScopedCallback; use Wikimedia\Timestamp\ConvertibleTimestamp; -use Wikimedia; +use Wikimedia\AtEase\AtEase; use BagOStuff; use HashBagOStuff; use LogicException; @@ -4439,9 +4439,9 @@ abstract class Database implements IDatabase, IMaintainableDatabase, LoggerAware $fname = false, callable $inputCallback = null ) { - Wikimedia\suppressWarnings(); + AtEase::suppressWarnings(); $fp = fopen( $filename, 'r' ); - Wikimedia\restoreWarnings(); + AtEase::restoreWarnings(); if ( $fp === false ) { throw new RuntimeException( "Could not open \"{$filename}\"" ); @@ -4913,10 +4913,10 @@ abstract class Database implements IDatabase, IMaintainableDatabase, LoggerAware if ( $this->conn ) { // Avoid connection leaks for sanity. Normally, resources close at script completion. // The connection might already be closed in zend/hhvm by now, so suppress warnings. - Wikimedia\suppressWarnings(); + AtEase::suppressWarnings(); $this->closeConnection(); - Wikimedia\restoreWarnings(); - $this->conn = false; + AtEase::restoreWarnings(); + $this->conn = null; } } } diff --git a/includes/libs/rdbms/database/DatabaseMysqlBase.php b/includes/libs/rdbms/database/DatabaseMysqlBase.php index 4774390986..1e3fa845a3 100644 --- a/includes/libs/rdbms/database/DatabaseMysqlBase.php +++ b/includes/libs/rdbms/database/DatabaseMysqlBase.php @@ -24,7 +24,7 @@ namespace Wikimedia\Rdbms; use DateTime; use DateTimeZone; -use Wikimedia; +use Wikimedia\AtEase\AtEase; use InvalidArgumentException; use Exception; use RuntimeException; @@ -244,9 +244,9 @@ abstract class DatabaseMysqlBase extends Database { * @throws DBUnexpectedError */ public function freeResult( $res ) { - Wikimedia\suppressWarnings(); + AtEase::suppressWarnings(); $ok = $this->mysqlFreeResult( ResultWrapper::unwrap( $res ) ); - Wikimedia\restoreWarnings(); + AtEase::restoreWarnings(); if ( !$ok ) { throw new DBUnexpectedError( $this, "Unable to free MySQL result" ); } @@ -266,9 +266,9 @@ abstract class DatabaseMysqlBase extends Database { * @throws DBUnexpectedError */ public function fetchObject( $res ) { - Wikimedia\suppressWarnings(); + AtEase::suppressWarnings(); $row = $this->mysqlFetchObject( ResultWrapper::unwrap( $res ) ); - Wikimedia\restoreWarnings(); + AtEase::restoreWarnings(); $errno = $this->lastErrno(); // Unfortunately, mysql_fetch_object does not reset the last errno. @@ -299,9 +299,9 @@ abstract class DatabaseMysqlBase extends Database { * @throws DBUnexpectedError */ public function fetchRow( $res ) { - Wikimedia\suppressWarnings(); + AtEase::suppressWarnings(); $row = $this->mysqlFetchArray( ResultWrapper::unwrap( $res ) ); - Wikimedia\restoreWarnings(); + AtEase::restoreWarnings(); $errno = $this->lastErrno(); // Unfortunately, mysql_fetch_array does not reset the last errno. @@ -335,9 +335,9 @@ abstract class DatabaseMysqlBase extends Database { if ( is_bool( $res ) ) { $n = 0; } else { - Wikimedia\suppressWarnings(); + AtEase::suppressWarnings(); $n = $this->mysqlNumRows( ResultWrapper::unwrap( $res ) ); - Wikimedia\restoreWarnings(); + AtEase::restoreWarnings(); } // Unfortunately, mysql_num_rows does not reset the last errno. @@ -433,12 +433,12 @@ abstract class DatabaseMysqlBase extends Database { public function lastError() { if ( $this->conn ) { # Even if it's non-zero, it can still be invalid - Wikimedia\suppressWarnings(); + AtEase::suppressWarnings(); $error = $this->mysqlError( $this->conn ); if ( !$error ) { $error = $this->mysqlError(); } - Wikimedia\restoreWarnings(); + AtEase::restoreWarnings(); } else { $error = $this->mysqlError(); } diff --git a/includes/libs/rdbms/database/DatabasePostgres.php b/includes/libs/rdbms/database/DatabasePostgres.php index 954d400cf0..cef3922b11 100644 --- a/includes/libs/rdbms/database/DatabasePostgres.php +++ b/includes/libs/rdbms/database/DatabasePostgres.php @@ -24,7 +24,7 @@ namespace Wikimedia\Rdbms; use Wikimedia\Timestamp\ConvertibleTimestamp; use Wikimedia\WaitConditionLoop; -use Wikimedia; +use Wikimedia\AtEase\AtEase; use Exception; /** @@ -274,18 +274,18 @@ class DatabasePostgres extends Database { } public function freeResult( $res ) { - Wikimedia\suppressWarnings(); + AtEase::suppressWarnings(); $ok = pg_free_result( ResultWrapper::unwrap( $res ) ); - Wikimedia\restoreWarnings(); + AtEase::restoreWarnings(); if ( !$ok ) { throw new DBUnexpectedError( $this, "Unable to free Postgres result\n" ); } } public function fetchObject( $res ) { - Wikimedia\suppressWarnings(); + AtEase::suppressWarnings(); $row = pg_fetch_object( ResultWrapper::unwrap( $res ) ); - Wikimedia\restoreWarnings(); + AtEase::restoreWarnings(); # @todo FIXME: HACK HACK HACK HACK debug # @todo hashar: not sure if the following test really trigger if the object @@ -302,9 +302,9 @@ class DatabasePostgres extends Database { } public function fetchRow( $res ) { - Wikimedia\suppressWarnings(); + AtEase::suppressWarnings(); $row = pg_fetch_array( ResultWrapper::unwrap( $res ) ); - Wikimedia\restoreWarnings(); + AtEase::restoreWarnings(); $conn = $this->getBindingHandle(); if ( pg_last_error( $conn ) ) { @@ -322,9 +322,9 @@ class DatabasePostgres extends Database { return 0; } - Wikimedia\suppressWarnings(); + AtEase::suppressWarnings(); $n = pg_num_rows( ResultWrapper::unwrap( $res ) ); - Wikimedia\restoreWarnings(); + AtEase::restoreWarnings(); $conn = $this->getBindingHandle(); if ( pg_last_error( $conn ) ) { -- 2.20.1