From 5f38add27111363fccdbd8c862738fdd8216af94 Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Wed, 1 Oct 2014 14:21:26 -0700 Subject: [PATCH] Avoid stupid mariadb filesort in findMissingFiles.php Change-Id: I6267cfaf375fcc0eea8291fd7a2a0f7daa05a941 --- maintenance/findMissingFiles.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/maintenance/findMissingFiles.php b/maintenance/findMissingFiles.php index 67864c54e3..add7108b9b 100644 --- a/maintenance/findMissingFiles.php +++ b/maintenance/findMissingFiles.php @@ -59,11 +59,13 @@ class FindMissingFiles extends Maintenance { do { $res = $dbr->select( array_merge( array( 'page' ), $joinTables ), - array( 'name' => 'DISTINCT(page_title)' ), + array( 'name' => 'img_name' ), array( 'page_namespace' => NS_FILE, "page_title >= " . $dbr->addQuotes( $lastName ) ), __METHOD__, - array( 'ORDER BY' => 'page_title', 'LIMIT' => $this->mBatchSize ), + // DISTINCT causes a pointless filesort + array( 'ORDER BY' => 'name', 'GROUP BY' => 'name', + 'LIMIT' => $this->mBatchSize ), $joinConds ); -- 2.20.1