Add `actor` table and code to start using it

[lhc/web/wiklou.git] / maintenance / populateIpChanges.php

diff --git a/maintenance/populateIpChanges.php b/maintenance/populateIpChanges.php
index 178c49a..5174758 100644 (file)
--- a/maintenance/populateIpChanges.php
+++ b/maintenance/populateIpChanges.php
@@ -62,9 +62,14 @@ TEXT
        }
 
        public function doDBUpdates() {
+               $dbw = $this->getDB( DB_MASTER );
+
+               if ( !$dbw->tableExists( 'ip_changes' ) ) {
+                       $this->fatalError( 'ip_changes table does not exist' );
+               }
+
                $lbFactory = MediaWikiServices::getInstance()->getDBLoadBalancerFactory();
                $dbr = $this->getDB( DB_REPLICA, [ 'vslow' ] );
-               $dbw = $this->getDB( DB_MASTER );
                $throttle = intval( $this->getOption( 'throttle', 0 ) );
                $maxRevId = intval( $this->getOption( 'max-rev-id', 0 ) );
                $start = $this->getOption( 'rev-id', 0 );
@@ -77,13 +82,19 @@ TEXT
 
                $this->output( "Copying IP revisions to ip_changes, from rev_id $start to rev_id $end\n" );
 
+               $actorMigration = ActorMigration::newMigration();
+               $actorQuery = $actorMigration->getJoin( 'rev_user' );
+               $revUserIsAnon = $actorMigration->isAnon( $actorQuery['fields']['rev_user'] );
+
                while ( $blockStart <= $end ) {
                        $blockEnd = min( $blockStart + $this->getBatchSize(), $end );
                        $rows = $dbr->select(
-                               'revision',
-                               [ 'rev_id', 'rev_timestamp', 'rev_user_text' ],
-                               [ "rev_id BETWEEN $blockStart AND $blockEnd", 'rev_user' => 0 ],
-                               __METHOD__
+                               [ 'revision' ] + $actorQuery['tables'],
+                               [ 'rev_id', 'rev_timestamp', 'rev_user_text' => $actorQuery['fields']['rev_user_text'] ],
+                               [ "rev_id BETWEEN " . (int)$blockStart . " AND " . (int)$blockEnd, $revUserIsAnon ],
+                               __METHOD__,
+                               [],
+                               $actorQuery['joins']
                        );
 
                        $numRows = $rows->numRows();
@@ -132,5 +143,5 @@ TEXT
        }
 }
 
-$maintClass = "PopulateIpChanges";
+$maintClass = PopulateIpChanges::class;
 require_once RUN_MAINTENANCE_IF_MAIN;