MediaWiki 1.16.0

[autoinstalls/mediawiki.git] / includes / filerepo / LocalRepo.php

diff --git a/includes/filerepo/LocalRepo.php b/includes/filerepo/LocalRepo.php
index c679dd98cd17aa9061edeadf3a03180f90de6f7c..6c4d21a26ccd8853853d1e079f9d7fa3dcfefd6b 100644 (file)
--- a/includes/filerepo/LocalRepo.php
+++ b/includes/filerepo/LocalRepo.php
@@ -49,8 +49,8 @@ class LocalRepo extends FSRepo {
                                $ext = File::normalizeExtension($ext);
                                $inuse = $dbw->selectField( 'oldimage', '1',
                                        array( 'oi_sha1' => $sha1,
-                                               "oi_archive_name LIKE '%.{$ext}'",
-                                               'oi_deleted & '.File::DELETED_FILE => File::DELETED_FILE ),
+                                               'oi_archive_name ' . $dbw->buildLike( $dbw->anyString(), ".$ext" ),
+                                               $dbw->bitAnd('oi_deleted', File::DELETED_FILE) => File::DELETED_FILE ),
                                        __METHOD__, array( 'FOR UPDATE' ) );
                        }
                        if ( !$inuse ) {
@@ -83,17 +83,24 @@ class LocalRepo extends FSRepo {
                        $title = Title::makeTitle( NS_FILE, $title->getText() );
                }
 
-               $memcKey = $this->getMemcKey( "image_redirect:" . md5( $title->getPrefixedDBkey() ) );
+               $memcKey = $this->getSharedCacheKey( 'image_redirect', md5( $title->getDBkey() ) );
+               if ( $memcKey === false ) {
+                       $memcKey = $this->getLocalCacheKey( 'image_redirect', md5( $title->getDBkey() ) );
+                       $expiry = 300; // no invalidation, 5 minutes
+               } else {
+                       $expiry = 86400; // has invalidation, 1 day
+               }
                $cachedValue = $wgMemc->get( $memcKey );
-               if( $cachedValue ) {
-                       return Title::newFromDbKey( $cachedValue );
-               } elseif( $cachedValue == ' ' ) { # FIXME: ugly hack, but BagOStuff caching seems to be weird and return false if !cachedValue, not only if it doesn't exist
+               if ( $cachedValue === ' '  || $cachedValue === '' ) {
+                       // Does not exist
                        return false;
-               }
+               } elseif ( strval( $cachedValue ) !== '' ) {
+                       return Title::newFromText( $cachedValue, NS_FILE );
+               } // else $cachedValue is false or null: cache miss
 
                $id = $this->getArticleID( $title );
                if( !$id ) {
-                       $wgMemc->set( $memcKey, " ", 9000 );
+                       $wgMemc->set( $memcKey, " ", $expiry );
                        return false;
                }
                $dbr = $this->getSlaveDB();
@@ -104,12 +111,14 @@ class LocalRepo extends FSRepo {
                        __METHOD__
                );
 
-               if( $row ) $targetTitle = Title::makeTitle( $row->rd_namespace, $row->rd_title );
-               $wgMemc->set( $memcKey, ($row ? $targetTitle->getPrefixedDBkey() : " "), 9000 );
-               if( !$row ) {
+               if( $row && $row->rd_namespace == NS_FILE ) {
+                       $targetTitle = Title::makeTitle( $row->rd_namespace, $row->rd_title );
+                       $wgMemc->set( $memcKey, $targetTitle->getDBkey(), $expiry );
+                       return $targetTitle;
+               } else {
+                       $wgMemc->set( $memcKey, '', $expiry );
                        return false;
                }
-               return $targetTitle;
        }
 
 
@@ -127,15 +136,17 @@ class LocalRepo extends FSRepo {
                        'page_id',      //Field
                        array(  //Conditions
                                'page_namespace' => $title->getNamespace(),
-                               'page_title' => $title->getDBKey(),
+                               'page_title' => $title->getDBkey(),
                        ),
                        __METHOD__      //Function name
                );
                return $id;
        }
 
-
-       
+       /**
+        * Get an array or iterator of file objects for files that have a given 
+        * SHA-1 content hash.
+        */
        function findBySha1( $hash ) {
                $dbr = $this->getSlaveDB();
                $res = $dbr->select(
@@ -150,28 +161,42 @@ class LocalRepo extends FSRepo {
                $res->free();
                return $result;
        }
-       
-       /*
-        * Find many files using one query
+
+       /**
+        * Get a connection to the slave DB
         */
-       function findFiles( $titles ) {
-               // FIXME: Only accepts a $titles array where the keys are the sanitized
-               // file names.
-                
-               if ( count( $titles ) == 0 ) return array();            
-       
-               $dbr = $this->getSlaveDB();
-               $res = $dbr->select(
-                       'image',
-                       LocalFile::selectFields(),
-                       array( 'img_name' => array_keys( $titles ) )            
-               );
-               
-               $result = array();
-               while ( $row = $res->fetchObject() ) {
-                       $result[$row->img_name] = $this->newFileFromRow( $row );
+       function getSlaveDB() {
+               return wfGetDB( DB_SLAVE );
+       }
+
+       /**
+        * Get a connection to the master DB
+        */
+       function getMasterDB() {
+               return wfGetDB( DB_MASTER );
+       }
+
+       /**
+        * Get a key on the primary cache for this repository.
+        * Returns false if the repository's cache is not accessible at this site. 
+        * The parameters are the parts of the key, as for wfMemcKey().
+        */
+       function getSharedCacheKey( /*...*/ ) {
+               $args = func_get_args();
+               return call_user_func_array( 'wfMemcKey', $args );
+       }
+
+       /**
+        * Invalidates image redirect cache related to that image
+        *
+        * @param Title $title Title of image
+        */     
+       function invalidateImageRedirect( $title ) {
+               global $wgMemc;
+               $memcKey = $this->getSharedCacheKey( 'image_redirect', md5( $title->getDBkey() ) );
+               if ( $memcKey ) {
+                       $wgMemc->delete( $memcKey );
                }
-               $res->free();
-               return $result;
        }
 }
+