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 diff --git a/includes/Collation.php b/includes/Collation.php index c839a1b..77ea22f 100644 --- a/includes/Collation.php +++ b/includes/Collation.php @@ -150,6 +150,8 @@ class IcuCollation extends Collation { + const FIRST_LETTER_VERSION = 1; + var $primaryCollator, $mainCollator, $locale; var $firstLetterData; @@ -341,7 +343,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; } @@ -388,7 +392,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/53512 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibbe7fa2814434d4869aba20f628bd43269e611fa Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.21wmf11 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