X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=includes%2Flibs%2Fobjectcache%2FCachedBagOStuff.php;h=0ab26c9520b2fd0c66fe436ec18b6fe6ea115c62;hp=ea434e0c74212663fa5ac9ca1b60a0842723cd02;hb=6cfb2e3d7a2b96d5041312fcec88248bb46573d7;hpb=43914d3f43a39317b08ce56730d86e37be7431c4

diff --git a/includes/libs/objectcache/CachedBagOStuff.php b/includes/libs/objectcache/CachedBagOStuff.php
index ea434e0c74..0ab26c9520 100644
--- a/includes/libs/objectcache/CachedBagOStuff.php
+++ b/includes/libs/objectcache/CachedBagOStuff.php
@@ -44,8 +44,6 @@ class CachedBagOStuff extends BagOStuff {
 	 * @param array $params Parameters for HashBagOStuff
 	 */
 	public function __construct( BagOStuff $backend, $params = [] ) {
-		unset( $params['reportDupes'] ); // useless here
-
 		parent::__construct( $params );
 
 		$this->backend = $backend;
@@ -53,17 +51,41 @@ class CachedBagOStuff extends BagOStuff {
 		$this->attrMap = $backend->attrMap;
 	}
 
-	protected function doGet( $key, $flags = 0, &$casToken = null ) {
-		$ret = $this->procCache->get( $key, $flags );
-		if ( $ret === false && !$this->procCache->hasKey( $key ) ) {
-			$ret = $this->backend->get( $key, $flags );
-			$this->set( $key, $ret, self::TTL_INDEFINITE, self::WRITE_CACHE_ONLY );
+	public function setDebug( $enabled ) {
+		parent::setDebug( $enabled );
+		$this->backend->setDebug( $enabled );
+	}
+
+	public function get( $key, $flags = 0 ) {
+		$value = $this->procCache->get( $key, $flags );
+		if ( $value === false && !$this->procCache->hasKey( $key ) ) {
+			$value = $this->backend->get( $key, $flags );
+			$this->set( $key, $value, self::TTL_INDEFINITE, self::WRITE_CACHE_ONLY );
+		}
+
+		return $value;
+	}
+
+	public function getMulti( array $keys, $flags = 0 ) {
+		$valuesByKeyCached = [];
+
+		$keysMissing = [];
+		foreach ( $keys as $key ) {
+			$value = $this->procCache->get( $key, $flags );
+			if ( $value === false && !$this->procCache->hasKey( $key ) ) {
+				$keysMissing[] = $key;
+			} else {
+				$valuesByKeyCached[$key] = $value;
+			}
 		}
 
-		return $ret;
+		$valuesByKeyFetched = $this->backend->getMulti( $keys, $flags );
+		$this->setMulti( $valuesByKeyFetched, self::TTL_INDEFINITE, self::WRITE_CACHE_ONLY );
+
+		return $valuesByKeyCached + $valuesByKeyFetched;
 	}
 
-	protected function doSet( $key, $value, $exptime = 0, $flags = 0 ) {
+	public function set( $key, $value, $exptime = 0, $flags = 0 ) {
 		$this->procCache->set( $key, $value, $exptime, $flags );
 		if ( ( $flags & self::WRITE_CACHE_ONLY ) != self::WRITE_CACHE_ONLY ) {
 			$this->backend->set( $key, $value, $exptime, $flags );
@@ -72,7 +94,7 @@ class CachedBagOStuff extends BagOStuff {
 		return true;
 	}
 
-	protected function doDelete( $key, $flags = 0 ) {
+	public function delete( $key, $flags = 0 ) {
 		$this->procCache->delete( $key, $flags );
 		if ( ( $flags & self::WRITE_CACHE_ONLY ) != self::WRITE_CACHE_ONLY ) {
 			$this->backend->delete( $key, $flags );
@@ -81,19 +103,6 @@ class CachedBagOStuff extends BagOStuff {
 		return true;
 	}
 
-	public function deleteObjectsExpiringBefore(
-		$timestamp,
-		callable $progress = null,
-		$limit = INF
-	) {
-		$this->procCache->deleteObjectsExpiringBefore( $timestamp, $progress, $limit );
-
-		return $this->backend->deleteObjectsExpiringBefore( $timestamp, $progress, $limit );
-	}
-
-	// These just call the backend (tested elsewhere)
-	// @codeCoverageIgnoreStart
-
 	public function add( $key, $value, $exptime = 0, $flags = 0 ) {
 		if ( $this->get( $key ) === false ) {
 			return $this->set( $key, $value, $exptime, $flags );
@@ -102,12 +111,19 @@ class CachedBagOStuff extends BagOStuff {
 		return false; // key already set
 	}
 
-	public function incr( $key, $value = 1 ) {
-		$n = $this->backend->incr( $key, $value );
+	// These just call the backend (tested elsewhere)
+	// @codeCoverageIgnoreStart
+
+	public function merge( $key, callable $callback, $exptime = 0, $attempts = 10, $flags = 0 ) {
+		$this->procCache->delete( $key );
+
+		return $this->backend->merge( $key, $callback, $exptime, $attempts, $flags );
+	}
 
+	public function changeTTL( $key, $exptime = 0, $flags = 0 ) {
 		$this->procCache->delete( $key );
 
-		return $n;
+		return $this->backend->changeTTL( $key, $exptime, $flags );
 	}
 
 	public function lock( $key, $timeout = 6, $expiry = 6, $rclass = '' ) {
@@ -118,21 +134,26 @@ class CachedBagOStuff extends BagOStuff {
 		return $this->backend->unlock( $key );
 	}
 
-	public function makeKeyInternal( $keyspace, $args ) {
-		return $this->backend->makeKeyInternal( ...func_get_args() );
+	public function deleteObjectsExpiringBefore(
+		$timestamp,
+		callable $progress = null,
+		$limit = INF
+	) {
+		$this->procCache->deleteObjectsExpiringBefore( $timestamp, $progress, $limit );
+
+		return $this->backend->deleteObjectsExpiringBefore( $timestamp, $progress, $limit );
 	}
 
-	public function makeKey( $class, $component = null ) {
-		return $this->backend->makeKey( ...func_get_args() );
+	public function makeKeyInternal( $keyspace, $args ) {
+		return $this->backend->makeKeyInternal( $keyspace, $args );
 	}
 
-	public function makeGlobalKey( $class, $component = null ) {
-		return $this->backend->makeGlobalKey( ...func_get_args() );
+	public function makeKey( $class, ...$components ) {
+		return $this->backend->makeKey( $class, ...$components );
 	}
 
-	public function setDebug( $bool ) {
-		parent::setDebug( $bool );
-		$this->backend->setDebug( $bool );
+	public function makeGlobalKey( $class, ...$components ) {
+		return $this->backend->makeGlobalKey( $class, ...$components );
 	}
 
 	public function getLastError() {
@@ -143,5 +164,60 @@ class CachedBagOStuff extends BagOStuff {
 		return $this->backend->clearLastError();
 	}
 
+	public function setMulti( array $data, $exptime = 0, $flags = 0 ) {
+		$this->procCache->setMulti( $data, $exptime, $flags );
+		if ( ( $flags & self::WRITE_CACHE_ONLY ) != self::WRITE_CACHE_ONLY ) {
+			return $this->backend->setMulti( $data, $exptime, $flags );
+		}
+
+		return true;
+	}
+
+	public function deleteMulti( array $keys, $flags = 0 ) {
+		$this->procCache->deleteMulti( $keys, $flags );
+		if ( ( $flags & self::WRITE_CACHE_ONLY ) != self::WRITE_CACHE_ONLY ) {
+			return $this->backend->deleteMulti( $keys, $flags );
+		}
+
+		return true;
+	}
+
+	public function changeTTLMulti( array $keys, $exptime, $flags = 0 ) {
+		$this->procCache->changeTTLMulti( $keys, $exptime, $flags );
+		if ( ( $flags & self::WRITE_CACHE_ONLY ) != self::WRITE_CACHE_ONLY ) {
+			return $this->backend->changeTTLMulti( $keys, $exptime, $flags );
+		}
+
+		return true;
+	}
+
+	public function incr( $key, $value = 1 ) {
+		$this->procCache->delete( $key );
+
+		return $this->backend->incr( $key, $value );
+	}
+
+	public function decr( $key, $value = 1 ) {
+		$this->procCache->delete( $key );
+
+		return $this->backend->decr( $key, $value );
+	}
+
+	public function incrWithInit( $key, $ttl, $value = 1, $init = 1 ) {
+		$this->procCache->delete( $key );
+
+		return $this->backend->incrWithInit( $key, $ttl, $value, $init );
+	}
+
+	public function addBusyCallback( callable $workCallback ) {
+		$this->backend->addBusyCallback( $workCallback );
+	}
+
+	public function setMockTime( &$time ) {
+		parent::setMockTime( $time );
+		$this->procCache->setMockTime( $time );
+		$this->backend->setMockTime( $time );
+	}
+
 	// @codeCoverageIgnoreEnd
 }