From 8664804e3892a9cb7f316cb414f063c753f9ee71 Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Tue, 10 Jul 2018 13:25:04 +0100 Subject: [PATCH] Implement makeKeyInternal() for ReplicatedBagOStuff/MultiWriteBagOStuff Make these proxy to the "write"/"main" cache backend like the other key methods. Change-Id: Ie176577d9b52807493d6da9eea963ba440b86330 --- includes/libs/objectcache/MultiWriteBagOStuff.php | 4 ++++ includes/libs/objectcache/ReplicatedBagOStuff.php | 4 ++++ 2 files changed, 8 insertions(+) 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() ); } -- 2.20.1