RELEASE-NOTES-1.19 for r103706, r103708
[lhc/web/wiklou.git] / includes / filerepo / LocalRepo.php
index 950cf25..42aacdf 100644 (file)
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Local repository that stores files in the local filesystem and registers them
+ * in the wiki's own database.
+ *
+ * @file
+ * @ingroup FileRepo
+ */
+
 /**
  * A repository that stores files in the local filesystem and registers them
  * in the wiki's own database. This is the most commonly used repository class.
  */
 class LocalRepo extends FSRepo {
        var $fileFactory = array( 'LocalFile', 'newFromTitle' );
+       var $fileFactoryKey = array( 'LocalFile', 'newFromKey' );
        var $oldFileFactory = array( 'OldLocalFile', 'newFromTitle' );
+       var $oldFileFactoryKey = array( 'OldLocalFile', 'newFromKey' );
+       var $fileFromRowFactory = array( 'LocalFile', 'newFromRow' );
+       var $oldFileFromRowFactory = array( 'OldLocalFile', 'newFromRow' );
 
-       function getSlaveDB() {
-               return wfGetDB( DB_SLAVE );
-       }
-
-       function getMasterDB() {
-               return wfGetDB( DB_MASTER );
-       }
-
-       function getMemcKey( $key ) {
-               return wfWikiID( $this->getSlaveDB() ) . ":{$key}";
-       }
-
+       /**
+        * @throws MWException
+        * @param  $row
+        * @return File
+        */
        function newFileFromRow( $row ) {
                if ( isset( $row->img_name ) ) {
-                       return LocalFile::newFromRow( $row, $this );
+                       return call_user_func( $this->fileFromRowFactory, $row, $this );
                } elseif ( isset( $row->oi_name ) ) {
-                       return OldLocalFile::newFromRow( $row, $this );
+                       return call_user_func( $this->oldFileFromRowFactory, $row, $this );
                } else {
                        throw new MWException( __METHOD__.': invalid row' );
                }
        }
 
+       /**
+        * @param $title
+        * @param $archiveName
+        * @return OldLocalFile
+        */
        function newFromArchiveName( $title, $archiveName ) {
                return OldLocalFile::newFromArchiveName( $title, $this, $archiveName );
        }
@@ -39,33 +49,30 @@ class LocalRepo extends FSRepo {
         * filearchive table. This needs to be done in the repo because it needs to
         * interleave database locks with file operations, which is potentially a
         * remote operation.
+        *
+        * @param $storageKeys array
+        *
         * @return FileRepoStatus
         */
        function cleanupDeletedBatch( $storageKeys ) {
                $root = $this->getZonePath( 'deleted' );
                $dbw = $this->getMasterDB();
                $status = $this->newGood();
-               $storageKeys = array_unique($storageKeys);
+               $storageKeys = array_unique( $storageKeys );
                foreach ( $storageKeys as $key ) {
                        $hashPath = $this->getDeletedHashPath( $key );
                        $path = "$root/$hashPath$key";
                        $dbw->begin();
-                       $inuse = $dbw->selectField( 'filearchive', '1',
-                               array( 'fa_storage_group' => 'deleted', 'fa_storage_key' => $key ),
-                               __METHOD__, array( 'FOR UPDATE' ) );
-                       if( !$inuse ) {
-                               $sha1 = substr( $key, 0, strcspn( $key, '.' ) );
-                               $ext = substr( $key, strcspn($key,'.') + 1 );
-                               $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 ),
-                                       __METHOD__, array( 'FOR UPDATE' ) );
-                       }
-                       if ( !$inuse ) {
+                       // Check for usage in deleted/hidden files and pre-emptively
+                       // lock the key to avoid any future use until we are finished.
+                       $deleted = $this->deletedFileHasKey( $key, 'lock' );
+                       $hidden = $this->hiddenFileHasKey( $key, 'lock' );
+                       if ( !$deleted && !$hidden ) { // not in use now
                                wfDebug( __METHOD__ . ": deleting $key\n" );
-                               if ( !@unlink( $path ) ) {
+                               wfSuppressWarnings();
+                               $unlink = unlink( $path );
+                               wfRestoreWarnings();
+                               if ( !$unlink ) {
                                        $status->error( 'undelete-cleanup-error', $path );
                                        $status->failCount++;
                                }
@@ -79,47 +86,81 @@ class LocalRepo extends FSRepo {
        }
 
        /**
-        * Function link Title::getArticleID().
-        * We can't say Title object, what database it should use, so we duplicate that function here.
+        * Check if a deleted (filearchive) file has this sha1 key
+        * @param $key String File storage key (base-36 sha1 key with file extension)
+        * @param $lock String|null Use "lock" to lock the row via FOR UPDATE
+        * @return bool File with this key is in use
         */
-       protected function getArticleID( $title ) {
-               if( !$title instanceof Title ) {
-                       return 0;
-               }
-               $dbr = $this->getSlaveDB();
-               $id = $dbr->selectField(
-                       'page', // Table
-                       'page_id',      //Field
-                       array(  //Conditions
-                               'page_namespace' => $title->getNamespace(),
-                               'page_title' => $title->getDbKey(),
-                       ),
-                       __METHOD__      //Function name
+       protected function deletedFileHasKey( $key, $lock = null ) {
+               $options = ( $lock === 'lock' ) ? array( 'FOR UPDATE' ) : array();
+
+               $dbw = $this->getMasterDB();
+               return (bool)$dbw->selectField( 'filearchive', '1',
+                       array( 'fa_storage_group' => 'deleted', 'fa_storage_key' => $key ),
+                       __METHOD__, $options
                );
-               return $id;
        }
 
-       function checkRedirect( $title ) {
+       /**
+        * Check if a hidden (revision delete) file has this sha1 key
+        * @param $key String File storage key (base-36 sha1 key with file extension)
+        * @param $lock String|null Use "lock" to lock the row via FOR UPDATE
+        * @return bool File with this key is in use
+        */
+       protected function hiddenFileHasKey( $key, $lock = null ) {
+               $options = ( $lock === 'lock' ) ? array( 'FOR UPDATE' ) : array();
+
+               $sha1 = self::getHashFromKey( $key );
+               $ext = File::normalizeExtension( substr( $key, strcspn( $key, '.' ) + 1 ) );
+
+               $dbw = $this->getMasterDB();
+               return (bool)$dbw->selectField( 'oldimage', '1',
+                       array( 'oi_sha1' => $sha1,
+                               'oi_archive_name ' . $dbw->buildLike( $dbw->anyString(), ".$ext" ),
+                               $dbw->bitAnd( 'oi_deleted', File::DELETED_FILE ) => File::DELETED_FILE ),
+                       __METHOD__, array( 'FOR UPDATE' )
+               );
+       }
+
+       /**
+        * Gets the SHA1 hash from a storage key
+        *
+        * @param string $key
+        * @return string
+        */
+       public static function getHashFromKey( $key ) {
+               return strtok( $key, '.' );
+       }
+       
+       /**
+        * Checks if there is a redirect named as $title
+        *
+        * @param $title Title of file
+        * @return bool
+        */
+       function checkRedirect( Title $title ) {
                global $wgMemc;
 
-               if( is_string( $title ) ) {
-                       $title = Title::newFromTitle( $title );
-               }
-               if( $title instanceof Title && $title->getNamespace() == NS_MEDIA ) {
-                       $title = Title::makeTitle( NS_IMAGE, $title->getText() );
-               }
+               $title = File::normalizeTitle( $title, 'exception' );
 
-               $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();
@@ -130,20 +171,44 @@ 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;
        }
 
-       function invalidateImageRedirect( $title ) {
-               global $wgMemc;
-               $memcKey = $this->getMemcKey( "image_redirect:" . md5( $title->getPrefixedDBkey() ) );
-               $wgMemc->delete( $memcKey );
+
+       /**
+        * Function link Title::getArticleID().
+        * We can't say Title object, what database it should use, so we duplicate that function here.
+        * @param $title Title
+        */
+       protected function getArticleID( $title ) {
+               if( !$title instanceof Title ) {
+                       return 0;
+               }
+               $dbr = $this->getSlaveDB();
+               $id = $dbr->selectField(
+                       'page', // Table
+                       'page_id',      //Field
+                       array(  //Conditions
+                               'page_namespace' => $title->getNamespace(),
+                               '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.
+        * @return Array
+        */
        function findBySha1( $hash ) {
                $dbr = $this->getSlaveDB();
                $res = $dbr->select(
@@ -153,41 +218,51 @@ class LocalRepo extends FSRepo {
                );
                
                $result = array();
-               while ( $row = $res->fetchObject() )
+               foreach ( $res as $row ) {
                        $result[] = $this->newFileFromRow( $row );
+               }
                $res->free();
+
                return $result;
        }
-       
-       function findFiles( &$titles, $time = false, $flags ) {
-               if ( count( $titles ) == 0 ) return array();            
-       
-               $dbKeys = array();
-               $indices = array();
-               
-               foreach ( $titles as $index => $title ) {
-                       if ( !( $title instanceof Title ) )
-                               $title = Title::makeTitleSafe( NS_IMAGE, $title );
-                       if ( is_object( $title ) ) {
-                               $key = $title->getDBkey();
-                               $indices[$key] = $index;
-                               $dbKeys[] = $key;
-                       }
-               }
-       
-               $dbr = $this->getSlaveDB();
-               $res = $dbr->select(
-                       'image',
-                       LocalFile::selectFields(),
-                       array( 'img_name' => $dbKeys )          
-               );
-               
-               $result = array();
-               while ( $row = $res->fetchObject() ) {
-                       $result[$row->img_name] = $this->newFileFromRow( $row );
-                       unset( $titles[$indices[$row->img_name]] );
+
+       /**
+        * Get a connection to the slave DB
+        */
+       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().
+        * @return string
+        */
+       function getSharedCacheKey( /*...*/ ) {
+               $args = func_get_args();
+               return call_user_func_array( 'wfMemcKey', $args );
+       }
+
+       /**
+        * Invalidates image redirect cache related to that image
+        *
+        * @param $title Title of page
+        * @return void
+        */
+       function invalidateImageRedirect( Title $title ) {
+               global $wgMemc;
+               $memcKey = $this->getSharedCacheKey( 'image_redirect', md5( $title->getDBkey() ) );
+               if ( $memcKey ) {
+                       $wgMemc->delete( $memcKey );
                }
-               $res->free();
-               return $result;
        }
 }
+