Aaron Schulz has uploaded a new change for review. https://gerrit.wikimedia.org/r/310695
Change subject: Fix broken select() call in rebuildFileCache.php ...................................................................... Fix broken select() call in rebuildFileCache.php A few other small cleanups Change-Id: Ie62cf93feb5a57f629a893c7ea298ed902b52789 --- M maintenance/rebuildFileCache.php 1 file changed, 6 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/95/310695/1 diff --git a/maintenance/rebuildFileCache.php b/maintenance/rebuildFileCache.php index 649557e..b278e98 100644 --- a/maintenance/rebuildFileCache.php +++ b/maintenance/rebuildFileCache.php @@ -74,10 +74,10 @@ $overwrite = $this->getOption( 'overwrite', false ); $start = ( $start > 0 ) ? $start - : $dbr->selectField( 'page', 'MIN(page_id)', false, __FUNCTION__ ); + : $dbr->selectField( 'page', 'MIN(page_id)', false, __METHOD__ ); $end = ( $end > 0 ) ? $end - : $dbr->selectField( 'page', 'MAX(page_id)', false, __FUNCTION__ ); + : $dbr->selectField( 'page', 'MAX(page_id)', false, __METHOD__ ); if ( !$start ) { $this->error( "Nothing to do.", true ); } @@ -93,9 +93,11 @@ // Go through each page and save the output while ( $blockEnd <= $end ) { // Get the pages - $res = $dbr->select( 'page', [ 'page_namespace', 'page_title', 'page_id' ], + $res = $dbr->select( 'page', + [ 'page_namespace', 'page_title', 'page_id' ], [ 'page_namespace' => MWNamespace::getContentNamespaces(), "page_id BETWEEN $blockStart AND $blockEnd" ], + __METHOD__, [ 'ORDER BY' => 'page_id ASC', 'USE INDEX' => 'PRIMARY' ] ); @@ -119,7 +121,7 @@ // If the article is cacheable, then load it if ( $article->isFileCacheable() ) { - $cache = HTMLFileCache::newFromTitle( $title, 'view' ); + $cache = new HTMLFileCache( $title, 'view' ); if ( $cache->isCacheGood() ) { if ( $overwrite ) { $rebuilt = true; -- To view, visit https://gerrit.wikimedia.org/r/310695 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie62cf93feb5a57f629a893c7ea298ed902b52789 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Aaron Schulz <asch...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits