Mark ForeignDBFile as unmovable

[lhc/web/wiklou.git] / includes / filerepo / LocalRepo.php

diff --git a/includes/filerepo/LocalRepo.php b/includes/filerepo/LocalRepo.php
index ae56aa9..1e08268 100644 (file)
--- a/includes/filerepo/LocalRepo.php
+++ b/includes/filerepo/LocalRepo.php
@@ -24,15 +24,15 @@ class LocalRepo extends FSRepo {
                        throw new MWException( __METHOD__.': invalid row' );
                }
        }
-       
+
        function newFromArchiveName( $title, $archiveName ) {
                return OldLocalFile::newFromArchiveName( $title, $this, $archiveName );
        }
 
        /**
-        * Delete files in the deleted directory if they are not referenced in the 
-        * filearchive table. This needs to be done in the repo because it needs to 
-        * interleave database locks with file operations, which is potentially a 
+        * Delete files in the deleted directory if they are not referenced in the
+        * 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.
         * @return FileRepoStatus
         */
@@ -40,13 +40,24 @@ class LocalRepo extends FSRepo {
                $root = $this->getZonePath( 'deleted' );
                $dbw = $this->getMasterDB();
                $status = $this->newGood();
+               $storageKeys = array_unique($storageKeys);
                foreach ( $storageKeys as $key ) {
                        $hashPath = $this->getDeletedHashPath( $key );
                        $path = "$root/$hashPath$key";
                        $dbw->begin();
-                       $inuse = $dbw->selectField( 'filearchive', '1', 
+                       $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 ) {
                                wfDebug( __METHOD__ . ": deleting $key\n" );
                                if ( !@unlink( $path ) ) {
@@ -61,4 +72,70 @@ class LocalRepo extends FSRepo {
                }
                return $status;
        }
+
+       /**
+        * Function link Title::getArticleID().
+        * We can't say Title object, what database it should use, so we duplicate that function here.
+        */
+       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;
+       }
+
+       function checkRedirect( $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() );
+               }
+
+               $memcKey = wfMemcKey( "image_redirect:" . md5( $title->getPrefixedDBkey() ) );
+               $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
+                       return false;
+               }
+
+               $id = $this->getArticleID( $title );
+               if( !$id ) {
+                       $wgMemc->set( $memcKey, " ", 9000 );
+                       return false;
+               }
+               $dbr = $this->getSlaveDB();
+               $row = $dbr->selectRow(
+                       'redirect',
+                       array( 'rd_title', 'rd_namespace' ),
+                       array( 'rd_from' => $id ),
+                       __METHOD__
+               );
+
+               if( $row ) $targetTitle = Title::makeTitle( $row->rd_namespace, $row->rd_title );
+               $wgMemc->set( $memcKey, ($row ? $targetTitle->getPrefixedDBkey() : " "), 9000 );
+               if( !$row ) {
+                       return false;
+               }
+               return $targetTitle;
+       }
+
+       function invalidateImageRedirect( $title ) {
+               global $wgMemc;
+               $memcKey = wfMemcKey( "image_redirect:" . md5( $title->getPrefixedDBkey() ) );
+               $wgMemc->delete( $memcKey );
+       }
 }