From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Thu, 18 Jul 2019 15:28:13 +0000 (+0000)
Subject: Merge "objectcache: optimize MemcachedPeclBagOStuff::*Multi() write methods"
X-Git-Tag: 1.34.0-rc.0~959
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=35093297075bb55490b0c24653e0978333bc2fec

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

35093297075bb55490b0c24653e0978333bc2fec
diff --cc includes/libs/objectcache/MemcachedPeclBagOStuff.php
index 221bc82ce3,0c814db4a2..cc7ee2a5f5
--- a/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 );
  		}