jenkins-bot has submitted this change and it was merged.
Change subject: rebuildrecentchanges: Allow rebuilding specified time range only
......................................................................
rebuildrecentchanges: Allow rebuilding specified time range only
Bug: T133053
Change-Id: I8eef6e72f1105352116248548ab077fef818a8f9
---
M maintenance/rebuildrecentchanges.php
1 file changed, 58 insertions(+), 19 deletions(-)
Approvals:
Aaron Schulz: Looks good to me, approved
jenkins-bot: Verified
diff --git a/maintenance/rebuildrecentchanges.php
b/maintenance/rebuildrecentchanges.php
index b50825a..24e5b78 100644
--- a/maintenance/rebuildrecentchanges.php
+++ b/maintenance/rebuildrecentchanges.php
@@ -34,15 +34,37 @@
public function __construct() {
parent::__construct();
$this->addDescription( 'Rebuild recent changes' );
+
+ $this->addOption(
+ 'from',
+ "Don't empty the table, only insert rows in requested
time range (in YYYYMMDDHHMMSS format)",
+ false,
+ true
+ );
+ $this->addOption(
+ 'to',
+ "Don't empty the table, only insert rows in requested
time range (in YYYYMMDDHHMMSS format)",
+ false,
+ true
+ );
}
public function execute() {
+ if (
+ ( $this->hasOption( 'from' ) && !$this->hasOption( 'to'
) ) ||
+ ( !$this->hasOption( 'from' ) && $this->hasOption( 'to'
) )
+ ) {
+ $this->error( "Both 'from' and 'to' must be given, or
neither", 1 );
+ }
+
$this->rebuildRecentChangesTablePass1();
$this->rebuildRecentChangesTablePass2();
$this->rebuildRecentChangesTablePass3();
$this->rebuildRecentChangesTablePass4();
$this->rebuildRecentChangesTablePass5();
- $this->purgeFeeds();
+ if ( !( $this->hasOption( 'from' ) && $this->hasOption( 'to' )
) ) {
+ $this->purgeFeeds();
+ }
$this->output( "Done.\n" );
}
@@ -52,21 +74,29 @@
private function rebuildRecentChangesTablePass1() {
$dbw = $this->getDB( DB_MASTER );
- $dbw->delete( 'recentchanges', '*' );
+ if ( $this->hasOption( 'from' ) && $this->hasOption( 'to' ) ) {
+ $this->cutoffFrom = wfTimestamp( TS_UNIX,
$this->getOption( 'from' ) );
+ $this->cutoffTo = wfTimestamp( TS_UNIX,
$this->getOption( 'to' ) );
+
+ $sec = $this->cutoffTo - $this->cutoffFrom;
+ $days = $sec / 24 / 3600;
+ $this->output( "Rebuilding range of $sec seconds ($days
days)\n" );
+
+ } else {
+ global $wgRCMaxAge;
+
+ $days = $wgRCMaxAge / 24 / 3600;
+ $this->output( "Rebuilding \$wgRCMaxAge=$wgRCMaxAge
seconds ($days days)\n" );
+
+ $this->cutoffFrom = time() - $wgRCMaxAge;
+ $this->cutoffTo = time();
+
+ $this->output( "Clearing recentchanges table...\n" );
+ $dbw->delete( 'recentchanges', '*' );
+ }
$this->output( "Loading from page and revision tables...\n" );
- global $wgRCMaxAge;
-
- $this->output( '$wgRCMaxAge=' . $wgRCMaxAge );
- $days = $wgRCMaxAge / 24 / 3600;
- if ( intval( $days ) == $days ) {
- $this->output( " (" . $days . " days)\n" );
- } else {
- $this->output( " (approx. " . intval( $days ) . "
days)\n" );
- }
-
- $cutoff = time() - $wgRCMaxAge;
$dbw->insertSelect( 'recentchanges', [ 'page', 'revision' ],
[
'rc_timestamp' => 'rev_timestamp',
@@ -90,7 +120,8 @@
'rc_deleted' => 'rev_deleted'
],
[
- 'rev_timestamp > ' . $dbw->addQuotes(
$dbw->timestamp( $cutoff ) ),
+ 'rev_timestamp > ' . $dbw->addQuotes(
$dbw->timestamp( $this->cutoffFrom ) ),
+ 'rev_timestamp < ' . $dbw->addQuotes(
$dbw->timestamp( $this->cutoffTo ) ),
'rev_page=page_id'
],
__METHOD__,
@@ -111,6 +142,8 @@
# Fill in the rc_last_oldid field, which points to the previous
edit
$sql = "SELECT rc_cur_id,rc_this_oldid,rc_timestamp FROM
$recentchanges " .
+ "WHERE rc_timestamp > " . $dbw->addQuotes(
$dbw->timestamp( $this->cutoffFrom ) ) . ' ' .
+ "AND rc_timestamp < " . $dbw->addQuotes(
$dbw->timestamp( $this->cutoffTo ) ) . ' ' .
"ORDER BY rc_cur_id,rc_timestamp";
$res = $dbw->query( $sql, DB_MASTER );
@@ -174,11 +207,10 @@
$this->output( "Loading from user, page, and logging
tables...\n" );
- global $wgRCMaxAge, $wgLogTypes, $wgLogRestrictions;
+ global $wgLogTypes, $wgLogRestrictions;
// Some logs don't go in RC. This should check for that
$basicRCLogs = array_diff( $wgLogTypes, array_keys(
$wgLogRestrictions ) );
- $cutoff = time() - $wgRCMaxAge;
list( $logging, $page ) = $dbw->tableNamesN( 'logging', 'page'
);
$dbw->insertSelect(
'recentchanges',
@@ -209,7 +241,8 @@
'rc_deleted' => 'log_deleted'
],
[
- 'log_timestamp > ' . $dbw->addQuotes(
$dbw->timestamp( $cutoff ) ),
+ 'log_timestamp > ' . $dbw->addQuotes(
$dbw->timestamp( $this->cutoffFrom ) ),
+ 'log_timestamp < ' . $dbw->addQuotes(
$dbw->timestamp( $this->cutoffTo ) ),
'log_user=user_id',
'log_type' => $basicRCLogs,
],
@@ -251,7 +284,9 @@
if ( !empty( $botusers ) ) {
$botwhere = implode( ',', $botusers );
$sql2 = "UPDATE $recentchanges SET rc_bot=1 " .
- "WHERE rc_user_text IN($botwhere)";
+ "WHERE rc_user_text IN($botwhere) " .
+ "AND rc_timestamp > " .
$dbw->addQuotes( $dbw->timestamp( $this->cutoffFrom ) ) . ' ' .
+ "AND rc_timestamp < " .
$dbw->addQuotes( $dbw->timestamp( $this->cutoffTo ) );
$dbw->query( $sql2 );
}
}
@@ -276,7 +311,9 @@
if ( !empty( $patrolusers ) ) {
$patrolwhere = implode( ',', $patrolusers );
$sql2 = "UPDATE $recentchanges SET
rc_patrolled=1 " .
- "WHERE rc_user_text IN($patrolwhere)";
+ "WHERE rc_user_text IN($patrolwhere) " .
+ "AND rc_timestamp > " .
$dbw->addQuotes( $dbw->timestamp( $this->cutoffFrom ) ) . ' ' .
+ "AND rc_timestamp < " .
$dbw->addQuotes( $dbw->timestamp( $this->cutoffTo ) );
$dbw->query( $sql2 );
}
}
@@ -298,6 +335,8 @@
'ls_log_id = log_id',
'ls_field' => 'associated_rev_id',
'log_type' => 'upload',
+ 'log_timestamp > ' . $dbw->addQuotes(
$dbw->timestamp( $this->cutoffFrom ) ),
+ 'log_timestamp < ' . $dbw->addQuotes(
$dbw->timestamp( $this->cutoffTo ) ),
],
__METHOD__
);
--
To view, visit https://gerrit.wikimedia.org/r/284248
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8eef6e72f1105352116248548ab077fef818a8f9
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Jcrespo <[email protected]>
Gerrit-Reviewer: Mark Bergsma <[email protected]>
Gerrit-Reviewer: Parent5446 <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
