From e420790f5200568422dce9473ef44d4f7cefe675 Mon Sep 17 00:00:00 2001 From: daniel Date: Mon, 23 Apr 2018 11:07:24 +0200 Subject: [PATCH] Make populateRevisionLength fix rows with ar_len = 0. Due to T192189, some rows in the archive table may have ar_len set to 0 erronously. This can be detected by checking if they have ar_sha1 set to "phoiac9h4m842xq45sp7s6u21eteeq1", which is the hash of the empty string. This patch makes populateRevisionLength.php detect and fix such rows. Bug: T192189 Change-Id: I9b6cd62f4b8c5bf93cd305b56af4352a527e19c9 --- maintenance/populateRevisionLength.php | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/maintenance/populateRevisionLength.php b/maintenance/populateRevisionLength.php index 8895c9f4f7..ffa4ff7efa 100644 --- a/maintenance/populateRevisionLength.php +++ b/maintenance/populateRevisionLength.php @@ -21,6 +21,8 @@ * @ingroup Maintenance */ +use Wikimedia\Rdbms\IDatabase; + require_once __DIR__ . '/Maintenance.php'; /** @@ -97,7 +99,13 @@ class PopulateRevisionLength extends LoggedUpdateMaintenance { [ "$idCol >= $blockStart", "$idCol <= $blockEnd", - "{$prefix}_len IS NULL" + $dbr->makeList( [ + "{$prefix}_len IS NULL", + $dbr->makeList( [ + "{$prefix}_len = 0", + "{$prefix}_sha1 != \"phoiac9h4m842xq45sp7s6u21eteeq1\"", // sha1( "" ) + ], IDatabase::LIST_AND ) + ], IDatabase::LIST_OR ) ], __METHOD__, [], @@ -136,7 +144,7 @@ class PopulateRevisionLength extends LoggedUpdateMaintenance { ? Revision::newFromArchiveRow( $row ) : new Revision( $row ); - $content = $rev->getContent(); + $content = $rev->getContent( Revision::RAW ); if ( !$content ) { # This should not happen, but sometimes does (T22757) $id = $row->$idCol; -- 2.20.1