[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.31.0-wmf.7]: objectcache: make sure variant keys are namespaced as keys s...

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/392527 )

Change subject: objectcache: make sure variant keys are namespaced as keys 
should be
..


objectcache: make sure variant keys are namespaced as keys should be

Change-Id: I02597d6dbc2febace25ef6d1981f69dc704efe8d
(cherry picked from commit f23fb835fc49dcb38f9ec898831921a908e8c6e4)
---
M includes/libs/objectcache/WANObjectCache.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Aaron Schulz: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/libs/objectcache/WANObjectCache.php 
b/includes/libs/objectcache/WANObjectCache.php
index e19cf48..f39ac4b 100644
--- a/includes/libs/objectcache/WANObjectCache.php
+++ b/includes/libs/objectcache/WANObjectCache.php
@@ -912,7 +912,7 @@
// Value existed before with a 
different version; use variant key.
// Reflect purges to $key by requiring 
that this key value be newer.
$value = $this->doGetWithSetCallback(
-   'cache-variant:' . md5( $key ) 
. ":$version",
+   $this->makeGlobalKey( 
'WANCache-key-variant', md5( $key ), $version ),
$ttl,
$callback,
// Regenerate value if not 
newer than $key

-- 
To view, visit https://gerrit.wikimedia.org/r/392527
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I02597d6dbc2febace25ef6d1981f69dc704efe8d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.31.0-wmf.7
Gerrit-Owner: Aaron Schulz 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.31.0-wmf.7]: objectcache: make sure variant keys are namespaced as keys s...

[Aaron Schulz (Code Review)]

Aaron Schulz has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/392527 )

Change subject: objectcache: make sure variant keys are namespaced as keys 
should be
..

objectcache: make sure variant keys are namespaced as keys should be

Change-Id: I02597d6dbc2febace25ef6d1981f69dc704efe8d
(cherry picked from commit f23fb835fc49dcb38f9ec898831921a908e8c6e4)
---
M includes/libs/objectcache/WANObjectCache.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/27/392527/1

diff --git a/includes/libs/objectcache/WANObjectCache.php 
b/includes/libs/objectcache/WANObjectCache.php
index e19cf48..f39ac4b 100644
--- a/includes/libs/objectcache/WANObjectCache.php
+++ b/includes/libs/objectcache/WANObjectCache.php
@@ -912,7 +912,7 @@
// Value existed before with a 
different version; use variant key.
// Reflect purges to $key by requiring 
that this key value be newer.
$value = $this->doGetWithSetCallback(
-   'cache-variant:' . md5( $key ) 
. ":$version",
+   $this->makeGlobalKey( 
'WANCache-key-variant', md5( $key ), $version ),
$ttl,
$callback,
// Regenerate value if not 
newer than $key

-- 
To view, visit https://gerrit.wikimedia.org/r/392527
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I02597d6dbc2febace25ef6d1981f69dc704efe8d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.31.0-wmf.7
Gerrit-Owner: Aaron Schulz 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits