From: Aaron Schulz Date: Thu, 4 Jul 2019 07:31:06 +0000 (-0700) Subject: Migrate various callers away from wfWikiId() to WikiMap X-Git-Tag: 1.34.0-rc.0~1037^2 X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=7710afe5690b76a4161b9c040f81be340384e8c6 Migrate various callers away from wfWikiId() to WikiMap Change-Id: Idc2980c05873c428fb5ffa6ab89f723d33217a8e --- diff --git a/includes/Storage/DerivedPageDataUpdater.php b/includes/Storage/DerivedPageDataUpdater.php index b4d6f052f6..53c6d99dca 100644 --- a/includes/Storage/DerivedPageDataUpdater.php +++ b/includes/Storage/DerivedPageDataUpdater.php @@ -343,14 +343,6 @@ class DerivedPageDataUpdater implements IDBAccessObject, LoggerAwareInterface { } } - /** - * @return bool|string - */ - private function getWikiId() { - // TODO: get from RevisionStore - return false; - } - /** * Checks whether this DerivedPageDataUpdater can be re-used for running updates targeting * the given revision. @@ -1574,7 +1566,10 @@ class DerivedPageDataUpdater implements IDBAccessObject, LoggerAwareInterface { // TODO: In the wiring, register a listener for this on the new PageEventEmitter ResourceLoaderWikiModule::invalidateModuleCache( - $title, $oldLegacyRevision, $legacyRevision, $this->getWikiId() ?: wfWikiID() + $title, + $oldLegacyRevision, + $legacyRevision, + $this->loadbalancerFactory->getLocalDomainID() ); $this->doTransition( 'done' ); diff --git a/maintenance/attachLatest.php b/maintenance/attachLatest.php index 4da09018c4..e1d7fca7e7 100644 --- a/maintenance/attachLatest.php +++ b/maintenance/attachLatest.php @@ -56,6 +56,8 @@ class AttachLatest extends Maintenance { __METHOD__ ); $lbFactory = MediaWikiServices::getInstance()->getDBLoadBalancerFactory(); + $dbDomain = $lbFactory->getLocalDomainID(); + $n = 0; foreach ( $result as $row ) { $pageId = intval( $row->page_id ); @@ -66,18 +68,19 @@ class AttachLatest extends Maintenance { [ 'rev_page' => $pageId ], __METHOD__ ); if ( !$latestTime ) { - $this->output( wfWikiID() . " $pageId [[$name]] can't find latest rev time?!\n" ); + $this->output( "$dbDomain $pageId [[$name]] can't find latest rev time?!\n" ); continue; } $revision = Revision::loadFromTimestamp( $dbw, $title, $latestTime ); if ( is_null( $revision ) ) { - $this->output( wfWikiID() - . " $pageId [[$name]] latest time $latestTime, can't find revision id\n" ); + $this->output( + "$dbDomain $pageId [[$name]] latest time $latestTime, can't find revision id\n" + ); continue; } $id = $revision->getId(); - $this->output( wfWikiID() . " $pageId [[$name]] latest time $latestTime, rev id $id\n" ); + $this->output( "$dbDomain $pageId [[$name]] latest time $latestTime, rev id $id\n" ); if ( $this->hasOption( 'fix' ) ) { $page = WikiPage::factory( $title ); $page->updateRevisionOn( $dbw, $revision ); diff --git a/maintenance/cleanupInvalidDbKeys.php b/maintenance/cleanupInvalidDbKeys.php index eb45cfcce8..536e6dbe10 100644 --- a/maintenance/cleanupInvalidDbKeys.php +++ b/maintenance/cleanupInvalidDbKeys.php @@ -87,7 +87,8 @@ TEXT $this->outputStatus( 'Done!' ); if ( $this->hasOption( 'fix' ) ) { - $this->outputStatus( ' Cleaned up invalid DB keys on ' . wfWikiID() . "!\n" ); + $dbDomain = WikiMap::getCurrentWikiDbDomain()->getId(); + $this->outputStatus( " Cleaned up invalid DB keys on $dbDomain!\n" ); } } diff --git a/maintenance/createAndPromote.php b/maintenance/createAndPromote.php index 93614e0a77..acc28173d6 100644 --- a/maintenance/createAndPromote.php +++ b/maintenance/createAndPromote.php @@ -103,11 +103,12 @@ class CreateAndPromote extends Maintenance { return; } elseif ( count( $promotions ) !== 0 ) { + $dbDomain = WikiMap::getCurrentWikiDbDomain()->getId(); $promoText = "User:{$username} into " . implode( ', ', $promotions ) . "...\n"; if ( $exists ) { - $this->output( wfWikiID() . ": Promoting $promoText" ); + $this->output( "$dbDomain: Promoting $promoText" ); } else { - $this->output( wfWikiID() . ": Creating and promoting $promoText" ); + $this->output( "$dbDomain: Creating and promoting $promoText" ); } } diff --git a/maintenance/includes/BackupDumper.php b/maintenance/includes/BackupDumper.php index 0118c9438b..df3b4a1805 100644 --- a/maintenance/includes/BackupDumper.php +++ b/maintenance/includes/BackupDumper.php @@ -412,10 +412,12 @@ abstract class BackupDumper extends Maintenance { $pageRatePart = '-'; $revRatePart = '-'; } + + $dbDomain = WikiMap::getCurrentWikiDbDomain()->getId(); $this->progress( sprintf( "%s: %s (ID %d) %d pages (%0.1f|%0.1f/sec all|curr), " . "%d revs (%0.1f|%0.1f/sec all|curr), ETA %s [max %d]", - $now, wfWikiID(), $this->ID, $this->pageCount, $pageRate, + $now, $dbDomain, $this->ID, $this->pageCount, $pageRate, $pageRatePart, $this->revCount, $revRate, $revRatePart, $etats, $this->maxCount ) ); diff --git a/maintenance/includes/TextPassDumper.php b/maintenance/includes/TextPassDumper.php index b37fec188e..c6738bc7ae 100644 --- a/maintenance/includes/TextPassDumper.php +++ b/maintenance/includes/TextPassDumper.php @@ -373,11 +373,13 @@ TEXT $pageRatePart = '-'; $revRatePart = '-'; } + + $dbDomain = WikiMap::getCurrentWikiDbDomain()->getId(); $this->progress( sprintf( "%s: %s (ID %d) %d pages (%0.1f|%0.1f/sec all|curr), " . "%d revs (%0.1f|%0.1f/sec all|curr), %0.1f%%|%0.1f%% " . "prefetched (all|curr), ETA %s [max %d]", - $now, wfWikiID(), $this->ID, $this->pageCount, $pageRate, + $now, $dbDomain, $this->ID, $this->pageCount, $pageRate, $pageRatePart, $this->revCount, $revRate, $revRatePart, $fetchRate, $fetchRatePart, $etats, $this->maxCount ) ); diff --git a/maintenance/initEditCount.php b/maintenance/initEditCount.php index 938503c74f..f4cd2d35a2 100644 --- a/maintenance/initEditCount.php +++ b/maintenance/initEditCount.php @@ -87,7 +87,7 @@ in the load balancer, usually indicating a replication environment.' ); $delta = microtime( true ) - $start; $rate = ( $delta == 0.0 ) ? 0.0 : $migrated / $delta; $this->output( sprintf( "%s %d (%0.1f%%) done in %0.1f secs (%0.3f accounts/sec).\n", - wfWikiID(), + WikiMap::getCurrentWikiDbDomain()->getId(), $migrated, min( $max, $lastUser ) / $lastUser * 100.0, $delta, diff --git a/maintenance/storage/recompressTracked.php b/maintenance/storage/recompressTracked.php index e6733a184b..8a8f4d81bf 100644 --- a/maintenance/storage/recompressTracked.php +++ b/maintenance/storage/recompressTracked.php @@ -148,7 +148,7 @@ class RecompressTracked { if ( $this->replicaId !== false ) { $header .= "({$this->replicaId})"; } - $header .= ' ' . wfWikiID(); + $header .= ' ' . WikiMap::getCurrentWikiDbDomain()->getId(); LegacyLogger::emit( sprintf( "%-50s %s\n", $header, $msg ), $file ); } diff --git a/maintenance/syncFileBackend.php b/maintenance/syncFileBackend.php index 76a5721977..7d343b237d 100644 --- a/maintenance/syncFileBackend.php +++ b/maintenance/syncFileBackend.php @@ -49,7 +49,11 @@ class SyncFileBackend extends Maintenance { $src = FileBackendGroup::singleton()->get( $this->getOption( 'src' ) ); $posDir = $this->getOption( 'posdir' ); - $posFile = $posDir ? $posDir . '/' . wfWikiID() : false; + if ( $posDir != '' ) { + $posFile = "$posDir/" . rawurlencode( $src->getDomainId() ); + } else { + $posFile = false; + } if ( $this->hasOption( 'posdump' ) ) { // Just dump the current position into the specified position dir diff --git a/maintenance/update.php b/maintenance/update.php index fe405364c9..bb9ba50750 100755 --- a/maintenance/update.php +++ b/maintenance/update.php @@ -28,6 +28,7 @@ require_once __DIR__ . '/Maintenance.php'; use Wikimedia\Rdbms\IMaintainableDatabase; +use Wikimedia\Rdbms\DatabaseSqlite; /** * Maintenance script to run database schema updates. @@ -160,7 +161,8 @@ class UpdateMediaWiki extends Maintenance { $this->fatalError( $text ); } - $this->output( "Going to run database updates for " . wfWikiID() . "\n" ); + $dbDomain = WikiMap::getCurrentWikiDbDomain()->getId(); + $this->output( "Going to run database updates for $dbDomain\n" ); if ( $db->getType() === 'sqlite' ) { /** @var IMaintainableDatabase|DatabaseSqlite $db */ $this->output( "Using SQLite file: '{$db->getDbFilePath()}'\n" ); diff --git a/maintenance/updateSearchIndex.php b/maintenance/updateSearchIndex.php index af2d8287bd..0216b28c87 100644 --- a/maintenance/updateSearchIndex.php +++ b/maintenance/updateSearchIndex.php @@ -61,7 +61,8 @@ class UpdateSearchIndex extends Maintenance { } public function execute() { - $posFile = $this->getOption( 'p', 'searchUpdate.' . wfWikiID() . '.pos' ); + $dbDomain = WikiMap::getCurrentWikiDbDomain()->getId(); + $posFile = $this->getOption( 'p', 'searchUpdate.' . rawurlencode( $dbDomain ) . '.pos' ); $end = $this->getOption( 'e', wfTimestampNow() ); if ( $this->hasOption( 's' ) ) { $start = $this->getOption( 's' );