jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/398908 )
Change subject: Use cache set options in SqlBlobStore::getBlob
......................................................................
Use cache set options in SqlBlobStore::getBlob
This is useful for sanity in the case of DB rollback.
Change-Id: I2e50183835a97bc82efee53a407a624f0e35f53f
---
M includes/Storage/SqlBlobStore.php
1 file changed, 5 insertions(+), 1 deletion(-)
Approvals:
Krinkle: Looks good to me, but someone else must approve
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Storage/SqlBlobStore.php
b/includes/Storage/SqlBlobStore.php
index 5ddbd34..ec66431 100644
--- a/includes/Storage/SqlBlobStore.php
+++ b/includes/Storage/SqlBlobStore.php
@@ -35,6 +35,7 @@
use MWException;
use WANObjectCache;
use Wikimedia\Assert\Assert;
+use Wikimedia\Rdbms\Database;
use Wikimedia\Rdbms\IDatabase;
use Wikimedia\Rdbms\LoadBalancer;
@@ -269,7 +270,10 @@
// TODO: change key, since this is not necessarily
revision text!
$this->cache->makeKey( 'revisiontext', 'textid',
$blobAddress ),
$this->getCacheTTL(),
- function () use ( $blobAddress, $queryFlags ) {
+ function ( $unused, &$ttl, &$setOpts ) use (
$blobAddress, $queryFlags ) {
+ list( $index ) =
DBAccessObjectUtils::getDBOptions( $queryFlags );
+ $setOpts += Database::getCacheSetOptions(
$this->getDBConnection( $index ) );
+
return $this->fetchBlob( $blobAddress,
$queryFlags );
},
[ 'pcGroup' => self::TEXT_CACHE_GROUP, 'pcTTL' =>
IExpiringStore::TTL_PROC_LONG ]
--
To view, visit https://gerrit.wikimedia.org/r/398908
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2e50183835a97bc82efee53a407a624f0e35f53f
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Daniel Kinzler <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
