Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

objectcache: remove redundant merge() definitions

Browse source 
Change-Id: Ide24dd395b300f8d747b2be307dbbad08f6b221d
This commit is contained in:
Aaron Schulz 2019-03-26 15:56:43 -07:00 committed by Krinkle
parent 17ff732fb7
commit f00df01316
7 changed files with 0 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
includes/libs/objectcache/APCBagOStuff.php
View file

@ -120,10 +120,6 @@ class APCBagOStuff extends BagOStuff {
return apc_dec( $key . self::KEY_SUFFIX, $value );
}
public function merge( $key, callable $callback, $exptime = 0, $attempts = 10, $flags = 0 ) {
return $this->mergeViaCas( $key, $callback, $exptime, $attempts, $flags );
}
protected function serialize( $value ) {
if ( !$this->nativeSerialize && !$this->isInteger( $value ) ) {
$value = serialize( $value );

4
includes/libs/objectcache/APCUBagOStuff.php
View file

@ -104,8 +104,4 @@ class APCUBagOStuff extends APCBagOStuff {
return false;
}
}
public function merge( $key, callable $callback, $exptime = 0, $attempts = 10, $flags = 0 ) {
return $this->mergeViaCas( $key, $callback, $exptime, $attempts, $flags );
}
}

4
includes/libs/objectcache/HashBagOStuff.php
View file

@ -130,10 +130,6 @@ class HashBagOStuff extends BagOStuff {
return false;
}
public function merge( $key, callable $callback, $exptime = 0, $attempts = 10, $flags = 0 ) {
return $this->mergeViaCas( $key, $callback, $exptime, $attempts, $flags );
}
/**
* Clear all values in cache
*/

4
includes/libs/objectcache/MemcachedBagOStuff.php
View file

@ -91,10 +91,6 @@ class MemcachedBagOStuff extends BagOStuff {
return ( $n !== false && $n !== null ) ? $n : false;
}
public function merge( $key, callable $callback, $exptime = 0, $attempts = 10, $flags = 0 ) {
return $this->mergeViaCas( $key, $callback, $exptime, $attempts );
}
public function changeTTL( $key, $exptime = 0, $flags = 0 ) {
return $this->client->touch( $this->validateKeyEncoding( $key ),
$this->fixExpiry( $exptime ) );

4
includes/libs/objectcache/RESTBagOStuff.php
View file

@ -164,10 +164,6 @@ class RESTBagOStuff extends BagOStuff {
return false;
}
public function merge( $key, callable $callback, $exptime = 0, $attempts = 10, $flags = 0 ) {
return $this->mergeViaCas( $key, $callback, $exptime, $attempts, $flags );
}
/**
* Handle storage error
* @param string $msg Error message

4
includes/libs/objectcache/RedisBagOStuff.php
View file

@ -297,10 +297,6 @@ class RedisBagOStuff extends BagOStuff {
return $result;
}
public function merge( $key, callable $callback, $exptime = 0, $attempts = 10, $flags = 0 ) {
return $this->mergeViaCas( $key, $callback, $exptime, $attempts );
}
/**
* Non-atomic implementation of incr().
*

4
includes/libs/objectcache/WinCacheBagOStuff.php
View file

@ -93,10 +93,6 @@ class WinCacheBagOStuff extends BagOStuff {
return true;
}
public function merge( $key, callable $callback, $exptime = 0, $attempts = 10, $flags = 0 ) {
return $this->mergeViaCas( $key, $callback, $exptime, $attempts, $flags );
}
/**
* Construct a cache key.
*