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 );
$mtime1 = $dbr->timestampOrNull( $this->getOption( 'mtimeafter', null ) );
$mtime2 = $dbr->timestampOrNull( $this->getOption( 'mtimebefore', null ) );
- $tables = array( 'image' );
- $logJoinOn = array( 'log_namespace' => NS_FILE, 'log_title = img_name' );
- $logJoinOn['log_type'] = array( 'upload', 'move', 'delete' );
- if ( $mtime1 ) {
- $logJoinOn[] = "log_timestamp > {$dbr->addQuotes($mtime1)}";
- }
- if ( $mtime2 ) {
- $logJoinOn[] = "log_timestamp < {$dbr->addQuotes($mtime2)}";
- }
+ $joinTables = array();
+ $joinConds = array();
if ( $mtime1 || $mtime2 ) {
- $tables[] = 'logging';
+ $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 ) {
+ $on[] = "log_timestamp > {$dbr->addQuotes($mtime1)}";
+ }
+ if ( $mtime2 ) {
+ $on[] = "log_timestamp < {$dbr->addQuotes($mtime2)}";
+ }
+ $joinConds['logging'] = array( 'INNER JOIN', $on );
}
do {
- $res = $dbr->select( $tables,
- array( 'img_name' => 'DISTINCT(img_name)' ),
- array( "img_name >= " . $dbr->addQuotes( $lastName ) ),
+ $res = $dbr->select(
+ array_merge( array( 'image' ), $joinTables ),
+ array( 'name' => 'img_name' ),
+ array( "img_name > " . $dbr->addQuotes( $lastName ) ),
__METHOD__,
- array( 'ORDER BY' => 'img_name', 'LIMIT' => $this->mBatchSize ),
- array( 'logging' => array( 'INNER JOIN', $logJoinOn ) )
+ // DISTINCT causes a pointless filesort
+ array( 'ORDER BY' => 'name', 'GROUP BY' => 'name',
+ 'LIMIT' => $this->mBatchSize ),
+ $joinConds
);
// Check if any of these files are missing...
$pathsByName = array();
foreach ( $res as $row ) {
- $file = $repo->newFile( $row->img_name );
- $pathsByName[$row->img_name] = $file->getPath();
- $lastName = $row->img_name;
+ $file = $repo->newFile( $row->name );
+ $pathsByName[$row->name] = $file->getPath();
+ $lastName = $row->name;
}
$be->preloadFileStat( array( 'srcs' => $pathsByName ) );
foreach ( $pathsByName as $path ) {