Tim Starling has submitted this change and it was merged.
Change subject: Allow first letter data to be invalidated
......................................................................
Allow first letter data to be invalidated
Just a class constant for now, but that should suffice to deal with the
current emergency. Proper dependency tracking via the CacheDependency
hierarchy would be pretty cool in the long term.
Change-Id: Ibbe7fa2814434d4869aba20f628bd43269e611fa
---
M includes/Collation.php
1 file changed, 7 insertions(+), 2 deletions(-)
Approvals:
Tim Starling: Verified; Looks good to me, approved
jenkins-bot: Checked
diff --git a/includes/Collation.php b/includes/Collation.php
index 2734871..a0e1d2d 100644
--- a/includes/Collation.php
+++ b/includes/Collation.php
@@ -149,6 +149,8 @@
}
class IcuCollation extends Collation {
+ const FIRST_LETTER_VERSION = 1;
+
var $primaryCollator, $mainCollator, $locale;
var $firstLetterData;
@@ -347,7 +349,9 @@
$cacheKey = wfMemcKey( 'first-letters', $this->locale );
$cacheEntry = $cache->get( $cacheKey );
- if ( $cacheEntry ) {
+ if ( $cacheEntry && isset( $cacheEntry['version'] )
+ && $cacheEntry['version'] == self::FIRST_LETTER_VERSION
)
+ {
$this->firstLetterData = $cacheEntry;
return $this->firstLetterData;
}
@@ -394,7 +398,8 @@
ksort( $letterMap, SORT_STRING );
$data = array(
'chars' => array_values( $letterMap ),
- 'keys' => array_keys( $letterMap )
+ 'keys' => array_keys( $letterMap ),
+ 'version' => self::FIRST_LETTER_VERSION,
);
// Reduce memory usage before caching
--
To view, visit https://gerrit.wikimedia.org/r/53510
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibbe7fa2814434d4869aba20f628bd43269e611fa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Tim Starling <tstarl...@wikimedia.org>
Gerrit-Reviewer: Tim Starling <tstarl...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
