From 5b218daeef55ece3d893de06c1164b6af21b688b Mon Sep 17 00:00:00 2001
From: Aaron Schulz <aschulz@wikimedia.org>
Date: Tue, 26 Mar 2019 19:37:31 -0700
Subject: [PATCH] objectcache: define some missing methods in
 ReplicatedBagOStuff

Also reorder methods to match the base class so it is easier
to compare the classes and see which methods should be defined.

Change-Id: I2b8c2cd63822ce49efd9b4b7e44bde92032b5a98
---
 .../libs/objectcache/ReplicatedBagOStuff.php  | 52 ++++++++++++-------
 1 file changed, 32 insertions(+), 20 deletions(-)

diff --git a/includes/libs/objectcache/ReplicatedBagOStuff.php b/includes/libs/objectcache/ReplicatedBagOStuff.php
index 14e2fefbd9..eb3f6f8555 100644
--- a/includes/libs/objectcache/ReplicatedBagOStuff.php
+++ b/includes/libs/objectcache/ReplicatedBagOStuff.php
@@ -80,38 +80,24 @@ class ReplicatedBagOStuff extends BagOStuff {
 			: $this->readStore->get( $key, $flags );
 	}
 
-	public function getMulti( array $keys, $flags = 0 ) {
-		return ( $flags & self::READ_LATEST )
-			? $this->writeStore->getMulti( $keys, $flags )
-			: $this->readStore->getMulti( $keys, $flags );
-	}
-
 	public function set( $key, $value, $exptime = 0, $flags = 0 ) {
 		return $this->writeStore->set( $key, $value, $exptime, $flags );
 	}
 
-	public function setMulti( array $keys, $exptime = 0, $flags = 0 ) {
-		return $this->writeStore->setMulti( $keys, $exptime, $flags );
-	}
-
 	public function delete( $key, $flags = 0 ) {
 		return $this->writeStore->delete( $key, $flags );
 	}
 
-	public function deleteMulti( array $keys, $flags = 0 ) {
-		return $this->writeStore->deleteMulti( $keys, $flags );
-	}
-
 	public function add( $key, $value, $exptime = 0, $flags = 0 ) {
 		return $this->writeStore->add( $key, $value, $exptime, $flags );
 	}
 
-	public function incr( $key, $value = 1 ) {
-		return $this->writeStore->incr( $key, $value );
+	public function merge( $key, callable $callback, $exptime = 0, $attempts = 10, $flags = 0 ) {
+		return $this->writeStore->merge( $key, $callback, $exptime, $attempts, $flags );
 	}
 
-	public function decr( $key, $value = 1 ) {
-		return $this->writeStore->decr( $key, $value );
+	public function changeTTL( $key, $exptime = 0, $flags = 0 ) {
+		return $this->writeStore->changeTTL( $key, $exptime, $flags );
 	}
 
 	public function lock( $key, $timeout = 6, $expiry = 6, $rclass = '' ) {
@@ -122,8 +108,34 @@ class ReplicatedBagOStuff extends BagOStuff {
 		return $this->writeStore->unlock( $key );
 	}
 
-	public function merge( $key, callable $callback, $exptime = 0, $attempts = 10, $flags = 0 ) {
-		return $this->writeStore->merge( $key, $callback, $exptime, $attempts, $flags );
+	public function deleteObjectsExpiringBefore( $date, $progressCallback = false ) {
+		return $this->writeStore->deleteObjectsExpiringBefore( $date, $progressCallback );
+	}
+
+	public function getMulti( array $keys, $flags = 0 ) {
+		return ( ( $flags & self::READ_LATEST ) == self::READ_LATEST )
+			? $this->writeStore->getMulti( $keys, $flags )
+			: $this->readStore->getMulti( $keys, $flags );
+	}
+
+	public function setMulti( array $data, $exptime = 0, $flags = 0 ) {
+		return $this->writeStore->setMulti( $data, $exptime, $flags );
+	}
+
+	public function deleteMulti( array $keys, $flags = 0 ) {
+		return $this->writeStore->deleteMulti( $keys, $flags );
+	}
+
+	public function incr( $key, $value = 1 ) {
+		return $this->writeStore->incr( $key, $value );
+	}
+
+	public function decr( $key, $value = 1 ) {
+		return $this->writeStore->decr( $key, $value );
+	}
+
+	public function incrWithInit( $key, $ttl, $value = 1, $init = 1 ) {
+		return $this->writeStore->incrWithInit( $key, $ttl, $value, $init );
 	}
 
 	public function getLastError() {
-- 
2.20.1