From: Aaron Schulz <aschulz@wikimedia.org>
Date: Tue, 10 Jul 2018 12:25:04 +0000 (+0100)
Subject: Implement makeKeyInternal() for ReplicatedBagOStuff/MultiWriteBagOStuff
X-Git-Tag: 1.34.0-rc.0~4817^2
X-Git-Url: http://git.cyclocoop.org/%22.htmlspecialchars%28%24url_syndic%29.%22?a=commitdiff_plain;h=8664804e3892a9cb7f316cb414f063c753f9ee71;p=lhc%2Fweb%2Fwiklou.git

Implement makeKeyInternal() for ReplicatedBagOStuff/MultiWriteBagOStuff

Make these proxy to the "write"/"main" cache backend like the other
key methods.

Change-Id: Ie176577d9b52807493d6da9eea963ba440b86330
---

diff --git a/includes/libs/objectcache/MultiWriteBagOStuff.php b/includes/libs/objectcache/MultiWriteBagOStuff.php
index fd450249b9..64bfa95dcf 100644
--- a/includes/libs/objectcache/MultiWriteBagOStuff.php
+++ b/includes/libs/objectcache/MultiWriteBagOStuff.php
@@ -250,6 +250,10 @@ class MultiWriteBagOStuff extends BagOStuff {
 		return $ret;
 	}
 
+	public function makeKeyInternal( $keyspace, $args ) {
+		return $this->caches[0]->makeKeyInternal( ...func_get_args() );
+	}
+
 	public function makeKey( $class, $component = null ) {
 		return $this->caches[0]->makeKey( ...func_get_args() );
 	}
diff --git a/includes/libs/objectcache/ReplicatedBagOStuff.php b/includes/libs/objectcache/ReplicatedBagOStuff.php
index 1c14f7cac1..f2c3732230 100644
--- a/includes/libs/objectcache/ReplicatedBagOStuff.php
+++ b/includes/libs/objectcache/ReplicatedBagOStuff.php
@@ -129,6 +129,10 @@ class ReplicatedBagOStuff extends BagOStuff {
 		$this->readStore->clearLastError();
 	}
 
+	public function makeKeyInternal( $keyspace, $args ) {
+		return $this->writeStore->makeKeyInternal( ...func_get_args() );
+	}
+
 	public function makeKey( $class, $component = null ) {
 		return $this->writeStore->makeKey( ...func_get_args() );
 	}