Merge "Move PrefixSearch classes to own files"

[lhc/web/wiklou.git] / maintenance / findMissingFiles.php

diff --git a/maintenance/findMissingFiles.php b/maintenance/findMissingFiles.php
index 4ce7ca6..5c1d49e 100644 (file)
--- a/maintenance/findMissingFiles.php
+++ b/maintenance/findMissingFiles.php
@@ -37,6 +37,7 @@ class FindMissingFiles extends Maintenance {
                $repo = RepoGroup::singleton()->getLocalRepo();
                $dbr = $repo->getReplicaDB();
                $be = $repo->getBackend();
+               $batchSize = $this->getBatchSize();
 
                $mtime1 = $dbr->timestampOrNull( $this->getOption( 'mtimeafter', null ) );
                $mtime2 = $dbr->timestampOrNull( $this->getOption( 'mtimebefore', null ) );
@@ -45,7 +46,7 @@ class FindMissingFiles extends Maintenance {
                $joinConds = [];
                if ( $mtime1 || $mtime2 ) {
                        $joinTables[] = 'page';
-                       $joinConds['page'] = [ 'INNER JOIN',
+                       $joinConds['page'] = [ 'JOIN',
                                [ 'page_title = img_name', 'page_namespace' => NS_FILE ] ];
                        $joinTables[] = 'logging';
                        $on = [ 'log_page = page_id', 'log_type' => [ 'upload', 'move', 'delete' ] ];
@@ -55,7 +56,7 @@ class FindMissingFiles extends Maintenance {
                        if ( $mtime2 ) {
                                $on[] = "log_timestamp < {$dbr->addQuotes($mtime2)}";
                        }
-                       $joinConds['logging'] = [ 'INNER JOIN', $on ];
+                       $joinConds['logging'] = [ 'JOIN', $on ];
                }
 
                do {
@@ -66,7 +67,7 @@ class FindMissingFiles extends Maintenance {
                                __METHOD__,
                                // DISTINCT causes a pointless filesort
                                [ 'ORDER BY' => 'name', 'GROUP BY' => 'name',
-                                       'LIMIT' => $this->mBatchSize ],
+                                       'LIMIT' => $batchSize ],
                                $joinConds
                        );
 
@@ -101,7 +102,7 @@ class FindMissingFiles extends Maintenance {
                                        $checkPaths[] = $file->getPath();
                                }
 
-                               foreach ( array_chunk( $checkPaths, $this->mBatchSize ) as $paths ) {
+                               foreach ( array_chunk( $checkPaths, $batchSize ) as $paths ) {
                                        $be->preloadFileStat( [ 'srcs' => $paths ] );
                                        foreach ( $paths as $path ) {
                                                if ( $be->fileExists( [ 'src' => $path ] ) === false ) {
@@ -110,9 +111,9 @@ class FindMissingFiles extends Maintenance {
                                        }
                                }
                        }
-               } while ( $res->numRows() >= $this->mBatchSize );
+               } while ( $res->numRows() >= $batchSize );
        }
 }
 
-$maintClass = 'FindMissingFiles';
+$maintClass = FindMissingFiles::class;
 require_once RUN_MAINTENANCE_IF_MAIN;