Merge "objectcache: rename getDB() to getConnection() in SqlBagOStuff"

diff --combined includes/objectcache/SqlBagOStuff.php
index b0db53b,fe27b78..db4838f
--- 1/includes/objectcache/SqlBagOStuff.php
--- 2/includes/objectcache/SqlBagOStuff.php
+++ b/includes/objectcache/SqlBagOStuff.php
@@@ -22,7 -22,6 +22,7 @@@
   */
  
  use MediaWiki\MediaWikiServices;
 +use Wikimedia\AtEase\AtEase;
  use Wikimedia\Rdbms\Database;
  use Wikimedia\Rdbms\IDatabase;
  use Wikimedia\Rdbms\DBError;
@@@ -170,7 -169,7 +170,7 @@@ class SqlBagOStuff extends MediumSpecif
         * @return IMaintainableDatabase
         * @throws MWException
         */
-       private function getDB( $shardIndex ) {
+       private function getConnection( $shardIndex ) {
                if ( $shardIndex >= $this->numServerShards ) {
                        throw new MWException( __METHOD__ . ": Invalid server index \"$shardIndex\"" );
                }
@@@ -291,7 -290,7 +291,7 @@@
                $dataRows = [];
                foreach ( $keysByTable as $shardIndex => $serverKeys ) {
                        try {
-                               $db = $this->getDB( $shardIndex );
+                               $db = $this->getConnection( $shardIndex );
                                foreach ( $serverKeys as $tableName => $tableKeys ) {
                                        $res = $db->select( $tableName,
                                                [ 'keyname', 'value', 'exptime' ],
@@@ -322,7 -321,7 +322,7 @@@
                                $this->debug( "get: retrieved data; expiry time is " . $row->exptime );
                                $db = null; // in case of connection failure
                                try {
-                                       $db = $this->getDB( $row->shardIndex );
+                                       $db = $this->getConnection( $row->shardIndex );
                                        if ( $this->isExpired( $db, $row->exptime ) ) { // MISS
                                                $this->debug( "get: key has expired" );
                                        } else { // HIT
@@@ -365,7 -364,7 +365,7 @@@
                foreach ( $keysByTable as $shardIndex => $serverKeys ) {
                        $db = null; // in case of connection failure
                        try {
-                               $db = $this->getDB( $shardIndex );
+                               $db = $this->getConnection( $shardIndex );
                                $this->occasionallyGarbageCollect( $db ); // expire old entries if any
                                $dbExpiry = $exptime ? $db->timestamp( $exptime ) : $this->getMaxDateTime( $db );
                        } catch ( DBError $e ) {
@@@ -480,7 -479,7 +480,7 @@@
                $silenceScope = $this->silenceTransactionProfiler();
                $db = null; // in case of connection failure
                try {
-                       $db = $this->getDB( $shardIndex );
+                       $db = $this->getConnection( $shardIndex );
                        // (T26425) use a replace if the db supports it instead of
                        // delete/insert to avoid clashes with conflicting keynames
                        $db->update(
@@@ -526,7 -525,7 +526,7 @@@
                return $this->modifyMulti( [ $key => null ], 0, $flags, self::$OP_DELETE );
        }
  
 -      public function incr( $key, $step = 1 ) {
 +      public function incr( $key, $step = 1, $flags = 0 ) {
                list( $shardIndex, $tableName ) = $this->getTableByKey( $key );
  
                $newCount = false;
@@@ -534,7 -533,7 +534,7 @@@
                $silenceScope = $this->silenceTransactionProfiler();
                $db = null; // in case of connection failure
                try {
-                       $db = $this->getDB( $shardIndex );
+                       $db = $this->getConnection( $shardIndex );
                        $encTimestamp = $db->addQuotes( $db->timestamp() );
                        $db->update(
                                $tableName,
@@@ -560,10 -559,6 +560,10 @@@
                return $newCount;
        }
  
 +      public function decr( $key, $value = 1, $flags = 0 ) {
 +              return $this->incr( $key, -$value, $flags );
 +      }
 +
        public function changeTTLMulti( array $keys, $exptime, $flags = 0 ) {
                return $this->modifyMulti(
                        array_fill_keys( $keys, null ),
@@@ -652,7 -647,7 +652,7 @@@
                foreach ( $shardIndexes as $numServersDone => $shardIndex ) {
                        $db = null; // in case of connection failure
                        try {
-                               $db = $this->getDB( $shardIndex );
+                               $db = $this->getConnection( $shardIndex );
                                $this->deleteServerObjectsExpiringBefore(
                                        $db,
                                        $timestamp,
@@@ -757,7 -752,7 +757,7 @@@
                for ( $shardIndex = 0; $shardIndex < $this->numServerShards; $shardIndex++ ) {
                        $db = null; // in case of connection failure
                        try {
-                               $db = $this->getDB( $shardIndex );
+                               $db = $this->getConnection( $shardIndex );
                                for ( $i = 0; $i < $this->numTableShards; $i++ ) {
                                        $db->delete( $this->getTableNameByShard( $i ), '*', __METHOD__ );
                                }
@@@ -784,7 -779,7 +784,7 @@@
  
                $db = null; // in case of connection failure
                try {
-                       $db = $this->getDB( $shardIndex );
+                       $db = $this->getConnection( $shardIndex );
                        $ok = $db->lock( $key, __METHOD__, $timeout );
                        if ( $ok ) {
                                $this->locks[$key] = [ 'class' => $rclass, 'depth' => 1 ];
@@@ -816,7 -811,7 +816,7 @@@
  
                        $db = null; // in case of connection failure
                        try {
-                               $db = $this->getDB( $shardIndex );
+                               $db = $this->getConnection( $shardIndex );
                                $ok = $db->unlock( $key, __METHOD__ );
                                if ( !$ok ) {
                                        $this->logger->warning(
@@@ -867,9 -862,9 +867,9 @@@
                }
  
                if ( function_exists( 'gzinflate' ) ) {
 -                      Wikimedia\suppressWarnings();
 +                      AtEase::suppressWarnings();
                        $decomp = gzinflate( $serial );
 -                      Wikimedia\restoreWarnings();
 +                      AtEase::restoreWarnings();
  
                        if ( $decomp !== false ) {
                                $serial = $decomp;
@@@ -952,7 -947,7 +952,7 @@@
         */
        public function createTables() {
                for ( $shardIndex = 0; $shardIndex < $this->numServerShards; $shardIndex++ ) {
-                       $db = $this->getDB( $shardIndex );
+                       $db = $this->getConnection( $shardIndex );
                        if ( $db->getType() !== 'mysql' ) {
                                throw new MWException( __METHOD__ . ' is not supported on this DB server' );
                        }