case

[lhc/web/wiklou.git] / includes / ParserCache.php

diff --git a/includes/ParserCache.php b/includes/ParserCache.php
index b156ccc..b6f5345 100644 (file)
--- a/includes/ParserCache.php
+++ b/includes/ParserCache.php
@@ -19,15 +19,20 @@ class ParserCache {
        function ParserCache( &$memCached ) {
                $this->mMemc =& $memCached;
        }
-       
+
        function getKey( &$article, &$user ) {
-               global $wgDBname;
+               global $wgDBname, $action;
                $hash = $user->getPageRenderingHash();
                $pageid = intval( $article->getID() );
-               $key = "$wgDBname:pcache:idhash:$pageid-$hash";
+               $renderkey = (int)($action == 'render');
+               $key = "$wgDBname:pcache:idhash:$pageid-$renderkey!$hash";
                return $key;
        }
-       
+
+       function getETag( &$article, &$user ) {
+               return 'W/"' . $this->getKey($article, $user) . "--" . $article->mTouched. '"';
+       }
+
        function get( &$article, &$user ) {
                global $wgCacheEpoch;
                $fname = 'ParserCache::get';
@@ -47,28 +52,28 @@ class ParserCache {
                        $touched = $article->mTouched;
                        if ( !$canCache || $value->expired( $touched ) ) {
                                if ( !$canCache ) {
-                                       $this->incrStats( "pcache_miss_invalid" );
+                                       wfIncrStats( "pcache_miss_invalid" );
                                        wfDebug( "Invalid cached redirect, touched $touched, epoch $wgCacheEpoch, cached $cacheTime\n" );
                                } else {
-                                       $this->incrStats( "pcache_miss_expired" );
+                                       wfIncrStats( "pcache_miss_expired" );
                                        wfDebug( "Key expired, touched $touched, epoch $wgCacheEpoch, cached $cacheTime\n" );
                                }
                                $this->mMemc->delete( $key );
                                $value = false;
 
                        } else {
-                               $this->incrStats( "pcache_hit" );
+                               wfIncrStats( "pcache_hit" );
                        }
                } else {
                        wfDebug( "Parser cache miss.\n" );
-                       $this->incrStats( "pcache_miss_absent" );
+                       wfIncrStats( "pcache_miss_absent" );
                        $value = false;
                }
 
                wfProfileOut( $fname );
                return $value;
        }
-       
+
        function save( $parserOutput, &$article, &$user ){
                $key = $this->getKey( $article, $user );
                $now = wfTimestampNow();
@@ -83,14 +88,6 @@ class ParserCache {
                }
                $this->mMemc->set( $key, $parserOutput, $expire );
        }
-
-       function incrStats( $key ) {
-               global $wgDBname, $wgMemc;
-               $key = "$wgDBname:stats:$key";
-               if ( is_null( $wgMemc->incr( $key ) ) ) {
-                       $wgMemc->add( $key, 1 );
-               }
-       }
 }