Update the change_tag table in rebuildrecentchanges.php

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

diff --git a/maintenance/rebuildrecentchanges.php b/maintenance/rebuildrecentchanges.php
index a259484..03ab64e 100644 (file)
--- a/maintenance/rebuildrecentchanges.php
+++ b/maintenance/rebuildrecentchanges.php
@@ -168,6 +168,15 @@ class RebuildRecentchanges extends Maintenance {
                                        + $actorMigration->getInsertValues( $dbw, 'rc_user', $user ),
                                __METHOD__
                        );
+
+                       $rcid = $dbw->insertId();
+                       $dbw->update(
+                               'change_tag',
+                               [ 'ct_rc_id' => $rcid ],
+                               [ 'ct_rev_id' => $row->rev_id ],
+                               __METHOD__
+                       );
+
                        if ( ( ++$inserted % $this->getBatchSize() ) == 0 ) {
                                $lbFactory->waitForReplication();
                        }
@@ -321,7 +330,7 @@ class RebuildRecentchanges extends Maintenance {
                                        'rc_title' => $row->log_title,
                                        'rc_minor' => 0,
                                        'rc_bot' => 0,
-                                       'rc_patrolled' => 1,
+                                       'rc_patrolled' => $row->log_type == 'upload' ? 0 : 2,
                                        'rc_new' => 0,
                                        'rc_this_oldid' => 0,
                                        'rc_last_oldid' => 0,
@@ -340,6 +349,14 @@ class RebuildRecentchanges extends Maintenance {
                                __METHOD__
                        );
 
+                       $rcid = $dbw->insertId();
+                       $dbw->update(
+                               'change_tag',
+                               [ 'ct_rc_id' => $rcid ],
+                               [ 'ct_log_id' => $row->log_id ],
+                               __METHOD__
+                       );
+
                        if ( ( ++$inserted % $this->getBatchSize() ) == 0 ) {
                                $lbFactory->waitForReplication();
                        }
@@ -373,7 +390,7 @@ class RebuildRecentchanges extends Maintenance {
                                [ 'ug_group' => $botgroups ],
                                __METHOD__,
                                [ 'DISTINCT' ],
-                               [ 'user_group' => [ 'JOIN', 'user_id = ug_user' ] ] + $userQuery['joins']
+                               [ 'user_groups' => [ 'JOIN', 'user_id = ug_user' ] ] + $userQuery['joins']
                        );
 
                        $botusers = [];
@@ -426,7 +443,7 @@ class RebuildRecentchanges extends Maintenance {
                                [ 'ug_group' => $autopatrolgroups ],
                                __METHOD__,
                                [ 'DISTINCT' ],
-                               [ 'user_group' => [ 'JOIN', 'user_id = ug_user' ] ] + $userQuery['joins']
+                               [ 'user_groups' => [ 'JOIN', 'user_id = ug_user' ] ] + $userQuery['joins']
                        );
 
                        foreach ( $res as $obj ) {
@@ -439,11 +456,12 @@ class RebuildRecentchanges extends Maintenance {
                                foreach ( $actorQuery['orconds'] as $cond ) {
                                        $dbw->update(
                                                'recentchanges',
-                                               [ 'rc_patrolled' => 1 ],
+                                               [ 'rc_patrolled' => 2 ],
                                                [
                                                        $cond,
                                                        'rc_timestamp > ' . $dbw->addQuotes( $dbw->timestamp( $this->cutoffFrom ) ),
                                                        'rc_timestamp < ' . $dbw->addQuotes( $dbw->timestamp( $this->cutoffTo ) ),
+                                                       'rc_patrolled' => 0
                                                ],
                                                __METHOD__
                                        );