dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Collapse some else statements and nested if statements"
[lhc/web/wiklou.git]
/
maintenance
/
compareParserCache.php
diff --git
a/maintenance/compareParserCache.php
b/maintenance/compareParserCache.php
index
8bd060f
..
2cafc1b
100644
(file)
--- a/
maintenance/compareParserCache.php
+++ b/
maintenance/compareParserCache.php
@@
-21,6
+21,8
@@
require_once __DIR__ . '/Maintenance.php';
require_once __DIR__ . '/Maintenance.php';
+use MediaWiki\MediaWikiServices;
+
/**
* @ingroup Maintenance
*/
/**
* @ingroup Maintenance
*/
@@
-41,8
+43,15
@@
class CompareParserCache extends Maintenance {
$scanned = 0;
$withcache = 0;
$withdiff = 0;
$scanned = 0;
$withcache = 0;
$withdiff = 0;
+ $parserCache = MediaWikiServices::getInstance()->getParserCache();
+ $renderer = MediaWikiServices::getInstance()->getRevisionRenderer();
while ( $pages-- > 0 ) {
while ( $pages-- > 0 ) {
- $row = $dbr->selectRow( 'page', '*',
+ $row = $dbr->selectRow( 'page',
+ // @todo Title::selectFields() or Title::getQueryInfo() or something
+ [
+ 'page_namespace', 'page_title', 'page_id',
+ 'page_len', 'page_is_redirect', 'page_latest',
+ ],
[
'page_namespace' => $this->getOption( 'namespace' ),
'page_is_redirect' => 0,
[
'page_namespace' => $this->getOption( 'namespace' ),
'page_is_redirect' => 0,
@@
-61,17
+70,16
@@
class CompareParserCache extends Maintenance {
$title = Title::newFromRow( $row );
$page = WikiPage::factory( $title );
$title = Title::newFromRow( $row );
$page = WikiPage::factory( $title );
- $revision = $page->getRevision();
- $content = $revision->getContent( Revision::RAW );
-
+ $revision = $page->getRevision()->getRevisionRecord();
$parserOptions = $page->makeParserOptions( 'canonical' );
$parserOptions = $page->makeParserOptions( 'canonical' );
- $parserOutputOld =
ParserCache::singleton()
->get( $page, $parserOptions );
+ $parserOutputOld =
$parserCache
->get( $page, $parserOptions );
if ( $parserOutputOld ) {
$t1 = microtime( true );
if ( $parserOutputOld ) {
$t1 = microtime( true );
- $parserOutputNew = $content->getParserOutput(
- $title, $revision->getId(), $parserOptions, false );
+ $parserOutputNew = $renderer->getRenderedRevision( $revision, $parserOptions )
+ ->getRevisionParserOutput();
+
$sec = microtime( true ) - $t1;
$totalsec += $sec;
$sec = microtime( true ) - $t1;
$totalsec += $sec;
@@
-100,5
+108,5
@@
class CompareParserCache extends Maintenance {
}
}
}
}
-$maintClass =
"CompareParserCache"
;
+$maintClass =
CompareParserCache::class
;
require_once RUN_MAINTENANCE_IF_MAIN;
require_once RUN_MAINTENANCE_IF_MAIN;