From dd629564dfb167d8108025c1e717305cf52e781b Mon Sep 17 00:00:00 2001
From: Timo Tijhof <krinklemail@gmail.com>
Date: Wed, 14 Jun 2017 18:06:46 +0100
Subject: [PATCH] objectcache: Forward MultiWriteBagOStuff::makeKey to primary
 backend

Similar to what WANObjectCache and CachedBagOStuff are already doing.

Also add missing tests for WANObjectCache (similar to those for CachedBagOStuff).

Bug: T167465
Change-Id: I1a0c9324726aa6a1b221def985773b1b819181fd
---
 .../libs/objectcache/MultiWriteBagOStuff.php  |  8 +++++
 .../objectcache/MultiWriteBagOStuffTest.php   | 35 ++++++++++++++++++
 .../libs/objectcache/WANObjectCacheTest.php   | 36 +++++++++++++++++++
 3 files changed, 79 insertions(+)

diff --git a/includes/libs/objectcache/MultiWriteBagOStuff.php b/includes/libs/objectcache/MultiWriteBagOStuff.php
index 9dcfa7c55e..687c67c356 100644
--- a/includes/libs/objectcache/MultiWriteBagOStuff.php
+++ b/includes/libs/objectcache/MultiWriteBagOStuff.php
@@ -226,4 +226,12 @@ class MultiWriteBagOStuff extends BagOStuff {
 
 		return $ret;
 	}
+
+	public function makeKey() {
+		return call_user_func_array( [ $this->caches[0], __FUNCTION__ ], func_get_args() );
+	}
+
+	public function makeGlobalKey() {
+		return call_user_func_array( [ $this->caches[0], __FUNCTION__ ], func_get_args() );
+	}
 }
diff --git a/tests/phpunit/includes/libs/objectcache/MultiWriteBagOStuffTest.php b/tests/phpunit/includes/libs/objectcache/MultiWriteBagOStuffTest.php
index 38d63e341c..775709f241 100644
--- a/tests/phpunit/includes/libs/objectcache/MultiWriteBagOStuffTest.php
+++ b/tests/phpunit/includes/libs/objectcache/MultiWriteBagOStuffTest.php
@@ -98,4 +98,39 @@ class MultiWriteBagOStuffTest extends MediaWikiTestCase {
 		// Set in tier 2
 		$this->assertEquals( $value, $this->cache2->get( $key ), 'Written to tier 2' );
 	}
+
+	/**
+	 * @covers MultiWriteBagOStuff::makeKey
+	 */
+	public function testMakeKey() {
+		$cache1 = $this->getMockBuilder( HashBagOStuff::class )
+			->setMethods( [ 'makeKey' ] )->getMock();
+		$cache1->expects( $this->once() )->method( 'makeKey' )
+			->willReturn( 'special' );
+
+		$cache2 = $this->getMockBuilder( HashBagOStuff::class )
+			->setMethods( [ 'makeKey' ] )->getMock();
+		$cache2->expects( $this->never() )->method( 'makeKey' );
+
+		$cache = new MultiWriteBagOStuff( [ 'caches' => [ $cache1, $cache2 ] ] );
+		$this->assertSame( 'special', $cache->makeKey( 'a', 'b' ) );
+	}
+
+	/**
+	 * @covers MultiWriteBagOStuff::makeGlobalKey
+	 */
+	public function testMakeGlobalKey() {
+		$cache1 = $this->getMockBuilder( HashBagOStuff::class )
+			->setMethods( [ 'makeGlobalKey' ] )->getMock();
+		$cache1->expects( $this->once() )->method( 'makeGlobalKey' )
+			->willReturn( 'special' );
+
+		$cache2 = $this->getMockBuilder( HashBagOStuff::class )
+			->setMethods( [ 'makeGlobalKey' ] )->getMock();
+		$cache2->expects( $this->never() )->method( 'makeGlobalKey' );
+
+		$cache = new MultiWriteBagOStuff( [ 'caches' => [ $cache1, $cache2 ] ] );
+
+		$this->assertSame( 'special', $cache->makeGlobalKey( 'a', 'b' ) );
+	}
 }
diff --git a/tests/phpunit/includes/libs/objectcache/WANObjectCacheTest.php b/tests/phpunit/includes/libs/objectcache/WANObjectCacheTest.php
index 728e6717d2..2b0436614e 100644
--- a/tests/phpunit/includes/libs/objectcache/WANObjectCacheTest.php
+++ b/tests/phpunit/includes/libs/objectcache/WANObjectCacheTest.php
@@ -1191,4 +1191,40 @@ class WANObjectCacheTest extends PHPUnit_Framework_TestCase  {
 			[ null, 86400, 800, .2, 800 ]
 		];
 	}
+
+	/**
+	 * @covers WANObjectCache::makeKey
+	 */
+	public function testMakeKey() {
+		$backend = $this->getMockBuilder( HashBagOStuff::class )
+			->setMethods( [ 'makeKey' ] )->getMock();
+		$backend->expects( $this->once() )->method( 'makeKey' )
+			->willReturn( 'special' );
+
+		$wanCache = new WANObjectCache( [
+			'cache' => $backend,
+			'pool' => 'testcache-hash',
+			'relayer' => new EventRelayerNull( [] )
+		] );
+
+		$this->assertSame( 'special', $wanCache->makeKey( 'a', 'b' ) );
+	}
+
+	/**
+	 * @covers WANObjectCache::makeGlobalKey
+	 */
+	public function testMakeGlobalKey() {
+		$backend = $this->getMockBuilder( HashBagOStuff::class )
+			->setMethods( [ 'makeGlobalKey' ] )->getMock();
+		$backend->expects( $this->once() )->method( 'makeGlobalKey' )
+			->willReturn( 'special' );
+
+		$wanCache = new WANObjectCache( [
+			'cache' => $backend,
+			'pool' => 'testcache-hash',
+			'relayer' => new EventRelayerNull( [] )
+		] );
+
+		$this->assertSame( 'special', $wanCache->makeGlobalKey( 'a', 'b' ) );
+	}
 }
-- 
2.20.1