Aaron Schulz has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372219 )
Change subject: Rename "memCache" to "memStash" in LBFactory
......................................................................
Rename "memCache" to "memStash" in LBFactory
This needs to be cross DC, so fix the name and comments.
Also update the one MWLBFactory reference to it.
Change-Id: I5ef10000276c300299fd1ece35ada0d78388bef7
---
M includes/db/MWLBFactory.php
M includes/libs/rdbms/lbfactory/ILBFactory.php
M includes/libs/rdbms/lbfactory/LBFactory.php
3 files changed, 5 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/19/372219/1
diff --git a/includes/db/MWLBFactory.php b/includes/db/MWLBFactory.php
index 464a918..5196ac2 100644
--- a/includes/db/MWLBFactory.php
+++ b/includes/db/MWLBFactory.php
@@ -149,7 +149,7 @@
}
$cCache = ObjectCache::getLocalClusterInstance();
if ( $cCache->getQoS( $cCache::ATTR_EMULATION ) >
$cCache::QOS_EMULATION_SQL ) {
- $lbConf['memCache'] = $cCache;
+ $lbConf['memStash'] = $cCache;
}
$wCache =
MediaWikiServices::getInstance()->getMainWANObjectCache();
if ( $wCache->getQoS( $wCache::ATTR_EMULATION ) >
$wCache::QOS_EMULATION_SQL ) {
diff --git a/includes/libs/rdbms/lbfactory/ILBFactory.php
b/includes/libs/rdbms/lbfactory/ILBFactory.php
index 117df68..ff6635d 100644
--- a/includes/libs/rdbms/lbfactory/ILBFactory.php
+++ b/includes/libs/rdbms/lbfactory/ILBFactory.php
@@ -44,7 +44,7 @@
* - localDomain: A DatabaseDomain or domain ID string.
* - readOnlyReason : Reason the master DB is read-only if so
[optional]
* - srvCache : BagOStuff object for server cache [optional]
- * - memCache : BagOStuff object for cluster memory cache [optional]
+ * - memStash : BagOStuff object for cross-datacenter memory storage
[optional]
* - wanCache : WANObjectCache object [optional]
* - hostname : The name of the current server [optional]
* - cliMode: Whether the execution context is a CLI script. [optional]
diff --git a/includes/libs/rdbms/lbfactory/LBFactory.php
b/includes/libs/rdbms/lbfactory/LBFactory.php
index 919f103..c891fb6 100644
--- a/includes/libs/rdbms/lbfactory/LBFactory.php
+++ b/includes/libs/rdbms/lbfactory/LBFactory.php
@@ -55,7 +55,7 @@
/** @var BagOStuff */
protected $srvCache;
/** @var BagOStuff */
- protected $memCache;
+ protected $memStash;
/** @var WANObjectCache */
protected $wanCache;
@@ -93,7 +93,7 @@
}
$this->srvCache = isset( $conf['srvCache'] ) ?
$conf['srvCache'] : new EmptyBagOStuff();
- $this->memCache = isset( $conf['memCache'] ) ?
$conf['memCache'] : new EmptyBagOStuff();
+ $this->memStash = isset( $conf['memStash'] ) ?
$conf['memStash'] : new EmptyBagOStuff();
$this->wanCache = isset( $conf['wanCache'] )
? $conf['wanCache']
: WANObjectCache::newEmpty();
@@ -435,7 +435,7 @@
}
$this->chronProt = new ChronologyProtector(
- $this->memCache,
+ $this->memStash,
[
'ip' => $this->requestInfo['IPAddress'],
'agent' => $this->requestInfo['UserAgent'],
--
To view, visit https://gerrit.wikimedia.org/r/372219
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5ef10000276c300299fd1ece35ada0d78388bef7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
