Merge "objectcache: optimize MemcachedPeclBagOStuff::*Multi() write methods"

diff --cc includes/libs/objectcache/BagOStuff.php
Simple merge

diff --cc includes/libs/objectcache/MemcachedPeclBagOStuff.php
index 221bc82,0c814db..cc7ee2a
--- 1/includes/libs/objectcache/MemcachedPeclBagOStuff.php
--- 2/includes/libs/objectcache/MemcachedPeclBagOStuff.php
+++ b/includes/libs/objectcache/MemcachedPeclBagOStuff.php
@@@ -261,8 -309,9 +309,9 @@@ class MemcachedPeclBagOStuff extends Me
                return $result;
        }
  
 -      public function doGetMulti( array $keys, $flags = 0 ) {
 +      protected function doGetMulti( array $keys, $flags = 0 ) {
                $this->debug( 'getMulti(' . implode( ', ', $keys ) . ')' );
+ 
                foreach ( $keys as $key ) {
                        $this->validateKeyEncoding( $key );
                }
@@@ -270,8 -322,10 +322,10 @@@
                return $this->checkResult( false, $result );
        }
  
 -      public function doSetMulti( array $data, $exptime = 0, $flags = 0 ) {
 +      protected function doSetMulti( array $data, $exptime = 0, $flags = 0 ) {
                $this->debug( 'setMulti(' . implode( ', ', array_keys( $data ) ) . ')' );
+ 
+               $exptime = $this->fixExpiry( $exptime );
                foreach ( array_keys( $data ) as $key ) {
                        $this->validateKeyEncoding( $key );
                }
@@@ -279,8 -343,9 +343,9 @@@
                return $this->checkResult( false, $result );
        }
  
 -      public function doDeleteMulti( array $keys, $flags = 0 ) {
 +      protected function doDeleteMulti( array $keys, $flags = 0 ) {
                $this->debug( 'deleteMulti(' . implode( ', ', $keys ) . ')' );
+ 
                foreach ( $keys as $key ) {
                        $this->validateKeyEncoding( $key );
                }