* Added a versionRequired() function to OutputPage, useful for extension

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

diff --git a/includes/ParserCache.php b/includes/ParserCache.php
index b96bff1..e283367 100644 (file)
--- a/includes/ParserCache.php
+++ b/includes/ParserCache.php
@@ -1,7 +1,25 @@
 <?php
+/**
+ *
+ * @package MediaWiki
+ * @subpackage Cache
+ */
 
-class ParserCache
-{
+/**
+ *
+ * @package MediaWiki
+ */
+class ParserCache {
+       /**
+        * Setup a cache pathway with a given back-end storage mechanism.
+        * May be a memcached client or a BagOStuff derivative.
+        *
+        * @param object $memCached
+        */
+       function ParserCache( &$memCached ) {
+               $this->mMemc =& $memCached;
+       }
+       
        function getKey( &$article, &$user ) {
                global $wgDBname;
                $hash = $user->getPageRenderingHash();
@@ -11,26 +29,39 @@ class ParserCache
        }
        
        function get( &$article, &$user ) {
-               global $wgMemc, $wgCacheEpoch;
-               $fname = "ParserCache::get";
+               global $wgCacheEpoch;
+               $fname = 'ParserCache::get';
                wfProfileIn( $fname );
 
                $hash = $user->getPageRenderingHash();
                $pageid = intval( $article->getID() );
                $key = $this->getKey( $article, $user );
+
                wfDebug( "Trying parser cache $key\n" );
-               $value = $wgMemc->get( $key );
-               if ( $value ) {
+               $value = $this->mMemc->get( $key );
+               if ( is_object( $value ) ) {
                        wfDebug( "Found.\n" );
                        # Delete if article has changed since the cache was made
-                       $touched = $article->getTouched();
+                       $canCache = $article->checkTouched();
                        $cacheTime = $value->getCacheTime();
-                       if ( $value->getCacheTime() <= $touched || $cacheTime < $wgCacheEpoch ) {
-                               wfDebug( "Key expired, touched $touched, epoch $wgCacheEpoch, cached $cacheTime\n" );
-                               $wgMemc->delete( $key );
+                       $touched = $article->mTouched;
+                       if ( !$canCache || $value->expired( $touched ) ) {
+                               if ( !$canCache ) {
+                                       wfIncrStats( "pcache_miss_invalid" );
+                                       wfDebug( "Invalid cached redirect, touched $touched, epoch $wgCacheEpoch, cached $cacheTime\n" );
+                               } else {
+                                       wfIncrStats( "pcache_miss_expired" );
+                                       wfDebug( "Key expired, touched $touched, epoch $wgCacheEpoch, cached $cacheTime\n" );
+                               }
+                               $this->mMemc->delete( $key );
                                $value = false;
+
+                       } else {
+                               wfIncrStats( "pcache_hit" );
                        }
                } else {
+                       wfDebug( "Parser cache miss.\n" );
+                       wfIncrStats( "pcache_miss_absent" );
                        $value = false;
                }
 
@@ -39,19 +70,18 @@ class ParserCache
        }
        
        function save( $parserOutput, &$article, &$user ){
-               global $wgMemc;
                $key = $this->getKey( $article, $user );
                $now = wfTimestampNow();
                $parserOutput->setCacheTime( $now );
                $parserOutput->mText .= "\n<!-- Saved in parser cache with key $key and timestamp $now -->\n";
+               wfDebug( "Saved in parser cache with key $key and timestamp $now\n" );
 
                if( $parserOutput->containsOldMagic() ){
                        $expire = 3600; # 1 hour
                } else {
                        $expire = 86400; # 1 day
                }
-
-               $wgMemc->set( $key, $parserOutput, $expire );
+               $this->mMemc->set( $key, $parserOutput, $expire );
        }
 }