Bsitu has uploaded a new change for review.
https://gerrit.wikimedia.org/r/125365
Change subject: Revert "Use merge() to update cache data"
......................................................................
Revert "Use merge() to update cache data"
This reverts commit c60aa68d163f08afa76eb386d1012f5ba5fcd7b7.
I just realize this would cause a problem. The $update is just a partial
update. If there is no data in cache, it should not add the partial update to
cache, I will reimplement this in another patch
Change-Id: Ib31d361f9a7d579200dfaab277cd7d503124864c
---
M includes/ArticleMetadata.php
1 file changed, 5 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageTriage
refs/changes/65/125365/1
diff --git a/includes/ArticleMetadata.php b/includes/ArticleMetadata.php
index 3fa2829..9ba723d 100644
--- a/includes/ArticleMetadata.php
+++ b/includes/ArticleMetadata.php
@@ -57,18 +57,12 @@
$pageId = $this->mPageId;
}
+ // @TODO: use merge() to make this atomic
foreach ( $pageId as $val ) {
- $wgMemc->merge(
- $keyPrefix . '-' . $val,
- function( BagOStuff $cache, $key, $data ) use(
$update ) {
- if ( $data !== false ) {
- return array_merge( $data,
$update );
- } else {
- return $update;
- }
- },
- 86400
- );
+ $data = $wgMemc->get( $keyPrefix . '-' . $val );
+ if ( $data !== false ) {
+ $wgMemc->set( $keyPrefix . '-' . $val,
array_merge( $data, $update ), 86400 );
+ }
}
}
--
To view, visit https://gerrit.wikimedia.org/r/125365
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib31d361f9a7d579200dfaab277cd7d503124864c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageTriage
Gerrit-Branch: master
Gerrit-Owner: Bsitu <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
