dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "In ParserCache, respect $useOutdated"
[lhc/web/wiklou.git]
/
includes
/
parser
/
ParserCache.php
diff --git
a/includes/parser/ParserCache.php
b/includes/parser/ParserCache.php
index
bd5afaf
..
21486ff
100644
(file)
--- a/
includes/parser/ParserCache.php
+++ b/
includes/parser/ParserCache.php
@@
-64,7
+64,7
@@
class ParserCache {
global $wgRequest;
// idhash seem to mean 'page id' + 'rendering hash' (r3710)
global $wgRequest;
// idhash seem to mean 'page id' + 'rendering hash' (r3710)
- $pageid = $article->getI
D
();
+ $pageid = $article->getI
d
();
$renderkey = (int)( $wgRequest->getVal( 'action' ) == 'render' );
$key = wfMemcKey( 'pcache', 'idhash', "{$pageid}-{$renderkey}!{$hash}" );
$renderkey = (int)( $wgRequest->getVal( 'action' ) == 'render' );
$key = wfMemcKey( 'pcache', 'idhash', "{$pageid}-{$renderkey}!{$hash}" );
@@
-76,7
+76,7
@@
class ParserCache {
* @return mixed|string
*/
protected function getOptionsKey( $article ) {
* @return mixed|string
*/
protected function getOptionsKey( $article ) {
- $pageid = $article->getI
D
();
+ $pageid = $article->getI
d
();
return wfMemcKey( 'pcache', 'idoptions', "{$pageid}" );
}
return wfMemcKey( 'pcache', 'idoptions', "{$pageid}" );
}
@@
-146,14
+146,17
@@
class ParserCache {
if ( !$useOutdated && $optionsKey->expired( $article->getTouched() ) ) {
wfIncrStats( "pcache.miss.expired" );
$cacheTime = $optionsKey->getCacheTime();
if ( !$useOutdated && $optionsKey->expired( $article->getTouched() ) ) {
wfIncrStats( "pcache.miss.expired" );
$cacheTime = $optionsKey->getCacheTime();
- wfDebug( "Parser options key expired, touched " . $article->getTouched()
+ wfDebugLog( "ParserCache",
+ "Parser options key expired, touched " . $article->getTouched()
. ", epoch $wgCacheEpoch, cached $cacheTime\n" );
return false;
. ", epoch $wgCacheEpoch, cached $cacheTime\n" );
return false;
- } elseif ( $optionsKey->isDifferentRevision( $article->getLatest() ) ) {
+ } elseif (
!$useOutdated &&
$optionsKey->isDifferentRevision( $article->getLatest() ) ) {
wfIncrStats( "pcache.miss.revid" );
$revId = $article->getLatest();
$cachedRevId = $optionsKey->getCacheRevisionId();
wfIncrStats( "pcache.miss.revid" );
$revId = $article->getLatest();
$cachedRevId = $optionsKey->getCacheRevisionId();
- wfDebug( "ParserOutput key is for an old revision, latest $revId, cached $cachedRevId\n" );
+ wfDebugLog( "ParserCache",
+ "ParserOutput key is for an old revision, latest $revId, cached $cachedRevId\n"
+ );
return false;
}
return false;
}
@@
-201,6
+204,7
@@
class ParserCache {
}
$casToken = null;
}
$casToken = null;
+ /** @var ParserOutput $value */
$value = $this->mMemc->get( $parserOutputKey, $casToken, BagOStuff::READ_VERIFIED );
if ( !$value ) {
wfDebug( "ParserOutput cache miss.\n" );
$value = $this->mMemc->get( $parserOutputKey, $casToken, BagOStuff::READ_VERIFIED );
if ( !$value ) {
wfDebug( "ParserOutput cache miss.\n" );
@@
-222,14
+226,15
@@
class ParserCache {
if ( !$useOutdated && $value->expired( $touched ) ) {
wfIncrStats( "pcache.miss.expired" );
$cacheTime = $value->getCacheTime();
if ( !$useOutdated && $value->expired( $touched ) ) {
wfIncrStats( "pcache.miss.expired" );
$cacheTime = $value->getCacheTime();
- wfDebug( "ParserOutput key expired, touched $touched, "
+ wfDebugLog( "ParserCache",
+ "ParserOutput key expired, touched $touched, "
. "epoch $wgCacheEpoch, cached $cacheTime\n" );
$value = false;
. "epoch $wgCacheEpoch, cached $cacheTime\n" );
$value = false;
- } elseif ( $value->isDifferentRevision( $article->getLatest() ) ) {
+ } elseif (
!$useOutdated &&
$value->isDifferentRevision( $article->getLatest() ) ) {
wfIncrStats( "pcache.miss.revid" );
$revId = $article->getLatest();
$cachedRevId = $value->getCacheRevisionId();
wfIncrStats( "pcache.miss.revid" );
$revId = $article->getLatest();
$cachedRevId = $value->getCacheRevisionId();
- wfDebug
(
+ wfDebug
Log( "ParserCache",
"ParserOutput key is for an old revision, latest $revId, cached $cachedRevId\n"
);
$value = false;
"ParserOutput key is for an old revision, latest $revId, cached $cachedRevId\n"
);
$value = false;
@@
-237,7
+242,7
@@
class ParserCache {
Hooks::run( 'RejectParserCacheValue', [ $value, $wikiPage, $popts ] ) === false
) {
wfIncrStats( 'pcache.miss.rejected' );
Hooks::run( 'RejectParserCacheValue', [ $value, $wikiPage, $popts ] ) === false
) {
wfIncrStats( 'pcache.miss.rejected' );
- wfDebug
(
+ wfDebug
Log( "ParserCache",
"ParserOutput key valid, but rejected by RejectParserCacheValue hook handler.\n"
);
$value = false;
"ParserOutput key valid, but rejected by RejectParserCacheValue hook handler.\n"
);
$value = false;