From 914b408577f918f58e5c4d8fc083d13ed29d7797 Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Thu, 2 Oct 2014 10:22:27 -0700 Subject: [PATCH] Avoid the page join when not really needed * That sometimes triggered a filesorts when the title for the inequality has certain (seemingly long) values. * Also made the continuation queries use > instead of >=. Change-Id: I912df77ad43f025918e52d1494300d487a9deea1 --- maintenance/findMissingFiles.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/maintenance/findMissingFiles.php b/maintenance/findMissingFiles.php index add7108b9b..5818ee25c4 100644 --- a/maintenance/findMissingFiles.php +++ b/maintenance/findMissingFiles.php @@ -26,7 +26,7 @@ class FindMissingFiles extends Maintenance { parent::__construct(); $this->mDescription = 'Find registered files with no corresponding file.'; - $this->addOption( 'start', 'Starting file name', false, true ); + $this->addOption( 'start', 'Start after this file name', false, true ); $this->addOption( 'mtimeafter', 'Only include files changed since this time', false, true ); $this->addOption( 'mtimebefore', 'Only includes files changed before this time', false, true ); $this->setBatchSize( 300 ); @@ -42,9 +42,12 @@ class FindMissingFiles extends Maintenance { $mtime1 = $dbr->timestampOrNull( $this->getOption( 'mtimeafter', null ) ); $mtime2 = $dbr->timestampOrNull( $this->getOption( 'mtimebefore', null ) ); - $joinTables = array( 'image' ); - $joinConds = array( 'image' => array( 'INNER JOIN', 'img_name = page_title' ) ); + $joinTables = array(); + $joinConds = array(); if ( $mtime1 || $mtime2 ) { + $joinTables[] = 'page'; + $joinConds['page'] = array( 'INNER JOIN', + array( 'page_title = img_name', 'page_namespace' => NS_FILE ) ); $joinTables[] = 'logging'; $on = array( 'log_page = page_id', 'log_type' => array( 'upload', 'move', 'delete' ) ); if ( $mtime1 ) { @@ -58,10 +61,9 @@ class FindMissingFiles extends Maintenance { do { $res = $dbr->select( - array_merge( array( 'page' ), $joinTables ), + array_merge( array( 'image' ), $joinTables ), array( 'name' => 'img_name' ), - array( 'page_namespace' => NS_FILE, - "page_title >= " . $dbr->addQuotes( $lastName ) ), + array( "img_name > " . $dbr->addQuotes( $lastName ) ), __METHOD__, // DISTINCT causes a pointless filesort array( 'ORDER BY' => 'name', 'GROUP BY' => 'name', -- 2.20.1