Merge "Made SqlBagOStuff set() wrap setMulti()"

diff --combined includes/objectcache/SqlBagOStuff.php
index 1ed8ef5,2847485..3b46249
--- 1/includes/objectcache/SqlBagOStuff.php
--- 2/includes/objectcache/SqlBagOStuff.php
+++ b/includes/objectcache/SqlBagOStuff.php
@@@ -30,7 -30,6 +30,7 @@@ class SqlBagOStuff extends BagOStuff 
        /** @var LoadBalancer */
        protected $lb;
  
 +      /** @var array */
        protected $serverInfos;
  
        /** @var array */
@@@ -54,9 -53,6 +54,9 @@@
        /** @var string */
        protected $tableName = 'objectcache';
  
 +      /** @var bool */
 +      protected $slaveOnly = false;
 +
        /** @var array UNIX timestamps */
        protected $connFailureTimes = array();
  
@@@ -88,10 -84,6 +88,10 @@@
         *                  required to hold the largest shard index. Data will be
         *                  distributed across all tables by key hash. This is for
         *                  MySQL bugs 61735 and 61736.
 +       *   - slaveOnly:   Whether to only use slave DBs and avoid triggering
 +       *                  garbage collection logic of expired items. This only
 +       *                  makes sense if the primary DB is used and only if get()
 +       *                  calls will be used. This is used by ReplicatedBagOStuff.
         *
         * @param array $params
         */
@@@ -120,7 -112,6 +120,7 @@@
                if ( isset( $params['shards'] ) ) {
                        $this->shards = intval( $params['shards'] );
                }
 +              $this->slaveOnly = !empty( $params['slaveOnly'] );
        }
  
        /**
@@@ -164,13 -155,12 +164,13 @@@
                                 * However, SQLite has an opposite behavior. And PostgreSQL needs to know
                                 * if we are in transaction or no
                                 */
 -                              if ( wfGetDB( DB_MASTER )->getType() == 'mysql' ) {
 +                              $index = $this->slaveOnly ? DB_SLAVE : DB_MASTER;
 +                              if ( wfGetDB( $index )->getType() == 'mysql' ) {
                                        $this->lb = wfGetLBFactory()->newMainLB();
 -                                      $db = $this->lb->getConnection( DB_MASTER );
 +                                      $db = $this->lb->getConnection( $index );
                                        $db->clearFlag( DBO_TRX ); // auto-commit mode
                                } else {
 -                                      $db = wfGetDB( DB_MASTER );
 +                                      $db = wfGetDB( $index );
                                }
                        }
                        if ( $wgDebugDBTransactions ) {
@@@ -284,7 -274,12 +284,7 @@@
                                try {
                                        $db = $this->getDB( $row->serverIndex );
                                        if ( $this->isExpired( $db, $row->exptime ) ) { // MISS
 -                                              $this->debug( "get: key has expired, deleting" );
 -                                              # Put the expiry time in the WHERE condition to avoid deleting a
 -                                              # newly-inserted value
 -                                              $db->delete( $row->tableName,
 -                                                      array( 'keyname' => $key, 'exptime' => $row->exptime ),
 -                                                      __METHOD__ );
 +                                              $this->debug( "get: key has expired" );
                                        } else { // HIT
                                                $values[$key] = $this->unserialize( $db->decodeBlob( $row->value ) );
                                        }
@@@ -370,37 -365,7 +370,7 @@@
         * @return bool
         */
        public function set( $key, $value, $exptime = 0 ) {
-               list( $serverIndex, $tableName ) = $this->getTableByKey( $key );
-               try {
-                       $db = $this->getDB( $serverIndex );
-                       $exptime = intval( $exptime );
- 
-                       if ( $exptime < 0 ) {
-                               $exptime = 0;
-                       }
- 
-                       if ( $exptime == 0 ) {
-                               $encExpiry = $this->getMaxDateTime( $db );
-                       } else {
-                               $exptime = $this->convertExpiry( $exptime );
-                               $encExpiry = $db->timestamp( $exptime );
-                       }
-                       // (bug 24425) use a replace if the db supports it instead of
-                       // delete/insert to avoid clashes with conflicting keynames
-                       $db->replace(
-                               $tableName,
-                               array( 'keyname' ),
-                               array(
-                                       'keyname' => $key,
-                                       'value' => $db->encodeBlob( $this->serialize( $value ) ),
-                                       'exptime' => $encExpiry
-                               ), __METHOD__ );
-               } catch ( DBError $e ) {
-                       $this->handleWriteError( $e, $serverIndex );
-                       return false;
-               }
- 
-               return true;
+               return $this->setMulti( array( $key => $value ), $exptime );
        }
  
        /**
@@@ -549,7 -514,7 +519,7 @@@
        }
  
        protected function garbageCollect() {
 -              if ( !$this->purgePeriod ) {
 +              if ( !$this->purgePeriod || $this->slaveOnly ) {
                        // Disabled
                        return;
                }
@@@ -761,8 -726,6 +731,8 @@@
         * @param int $serverIndex
         */
        protected function markServerDown( $exception, $serverIndex ) {
 +              unset( $this->conns[$serverIndex] ); // bug T103435
 +
                if ( isset( $this->connFailureTimes[$serverIndex] ) ) {
                        if ( time() - $this->connFailureTimes[$serverIndex] >= 60 ) {
                                unset( $this->connFailureTimes[$serverIndex] );