jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/379351 )

Change subject: Improve populateIpChanges.php reporting
......................................................................


Improve populateIpChanges.php reporting

Instead of just the rows we attempted to insert, also count
actually inserted ones.

Change-Id: Ie747cb41873640776281794a90dbe3b6b8e3fa84
(cherry picked from commit 06913b853ddb971e400c2bf3829fa4b40c260afa)
---
M maintenance/populateIpChanges.php
1 file changed, 6 insertions(+), 3 deletions(-)

Approvals:
  Legoktm: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/maintenance/populateIpChanges.php 
b/maintenance/populateIpChanges.php
index f7bcc12..2b2a2b4 100644
--- a/maintenance/populateIpChanges.php
+++ b/maintenance/populateIpChanges.php
@@ -72,7 +72,8 @@
                        ? $maxRevId
                        : $dbw->selectField( 'revision', 'MAX(rev_id)', false, 
__METHOD__ );
                $blockStart = $start;
-               $revCount = 0;
+               $attempted = 0;
+               $inserted = 0;
 
                $this->output( "Copying IP revisions to ip_changes, from rev_id 
$start to rev_id $end\n" );
 
@@ -105,7 +106,7 @@
                                                'ipc_hex' => IP::toHex( 
$row->rev_user_text ),
                                        ];
 
-                                       $revCount++;
+                                       $attempted++;
                                }
                        }
 
@@ -116,13 +117,15 @@
                                'IGNORE'
                        );
 
+                       $inserted += $dbw->affectedRows();
+
                        $lbFactory->waitForReplication();
                        usleep( $throttle * 1000 );
 
                        $blockStart = $blockEnd + 1;
                }
 
-               $this->output( "$revCount IP revisions copied.\n" );
+               $this->output( "Attempted to insert $attempted IP revisions, 
$inserted actually done.\n" );
 
                return true;
        }

-- 
To view, visit https://gerrit.wikimedia.org/r/379351
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie747cb41873640776281794a90dbe3b6b8e3fa84
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_30
Gerrit-Owner: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: Legoktm <lego...@member.fsf.org>
Gerrit-Reviewer: MaxSem <maxsem.w...@gmail.com>
Gerrit-Reviewer: Parent5446 <tylerro...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to