From b22063a6f958cb5f1aa113f084c46d77e3143d91 Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Wed, 23 May 2012 12:04:29 -0700 Subject: [PATCH] When file sha1 populator fixes wrong values, make it fix the other metadata. Change-Id: Ie03af8b97dc76d2ab4990108b9189693fcf81697 --- includes/filerepo/file/LocalFile.php | 1 + includes/filerepo/file/OldLocalFile.php | 21 ++++++------ maintenance/populateImageSha1.php | 45 ++++++++++++++++--------- 3 files changed, 41 insertions(+), 26 deletions(-) diff --git a/includes/filerepo/file/LocalFile.php b/includes/filerepo/file/LocalFile.php index 3e95b057ac..336aca9972 100644 --- a/includes/filerepo/file/LocalFile.php +++ b/includes/filerepo/file/LocalFile.php @@ -440,6 +440,7 @@ class LocalFile extends File { $dbw->update( 'image', array( + 'img_size' => $this->size, // sanity 'img_width' => $this->width, 'img_height' => $this->height, 'img_bits' => $this->bits, diff --git a/includes/filerepo/file/OldLocalFile.php b/includes/filerepo/file/OldLocalFile.php index 967cb9f336..40d7dca7bb 100644 --- a/includes/filerepo/file/OldLocalFile.php +++ b/includes/filerepo/file/OldLocalFile.php @@ -94,7 +94,7 @@ class OldLocalFile extends LocalFile { return false; } } - + /** * Fields in the oldimage table * @return array @@ -229,14 +229,15 @@ class OldLocalFile extends LocalFile { wfDebug(__METHOD__.': upgrading '.$this->archive_name." to the current schema\n"); $dbw->update( 'oldimage', array( - 'oi_width' => $this->width, - 'oi_height' => $this->height, - 'oi_bits' => $this->bits, + 'oi_size' => $this->size, // sanity + 'oi_width' => $this->width, + 'oi_height' => $this->height, + 'oi_bits' => $this->bits, 'oi_media_type' => $this->media_type, 'oi_major_mime' => $major, 'oi_minor_mime' => $minor, - 'oi_metadata' => $this->metadata, - 'oi_sha1' => $this->sha1, + 'oi_metadata' => $this->metadata, + 'oi_sha1' => $this->sha1, ), array( 'oi_name' => $this->getName(), 'oi_archive_name' => $this->archive_name ), @@ -292,20 +293,20 @@ class OldLocalFile extends LocalFile { */ function uploadOld( $srcPath, $archiveName, $timestamp, $comment, $user, $flags = 0 ) { $this->lock(); - + $dstRel = 'archive/' . $this->getHashPath() . $archiveName; $status = $this->publishTo( $srcPath, $dstRel, $flags & File::DELETE_SOURCE ? FileRepo::DELETE_SOURCE : 0 ); - + if ( $status->isGood() ) { if ( !$this->recordOldUpload( $srcPath, $archiveName, $timestamp, $comment, $user ) ) { $status->fatal( 'filenotfound', $srcPath ); } } - + $this->unlock(); - + return $status; } diff --git a/maintenance/populateImageSha1.php b/maintenance/populateImageSha1.php index 54ff247f15..0847edf888 100644 --- a/maintenance/populateImageSha1.php +++ b/maintenance/populateImageSha1.php @@ -50,12 +50,13 @@ class PopulateImageSha1 extends LoggedUpdateMaintenance { public function doDBUpdates() { $method = $this->getOption( 'method', 'normal' ); - $file = $this->getOption( 'file' ); + $file = $this->getOption( 'file', '' ); $force = $this->getOption( 'force' ); + $isRegen = ( $force || $file != '' ); // forced recalculation? $t = -microtime( true ); $dbw = wfGetDB( DB_MASTER ); - if ( $file ) { + if ( $file != '' ) { $res = $dbw->select( 'image', array( 'img_name' ), @@ -82,10 +83,10 @@ class PopulateImageSha1 extends LoggedUpdateMaintenance { $oldImageTable = $dbw->tableName( 'oldimage' ); if ( $method == 'pipe' ) { - // Opening a pipe allows the SHA-1 operation to be done in parallel + // Opening a pipe allows the SHA-1 operation to be done in parallel // with the database write operation, because the writes are queued - // in the pipe buffer. This can improve performance by up to a - // factor of 2. + // in the pipe buffer. This can improve performance by up to a + // factor of 2. global $wgDBuser, $wgDBserver, $wgDBpassword, $wgDBname; $cmd = 'mysql -u' . wfEscapeShellArg( $wgDBuser ) . ' -h' . wfEscapeShellArg( $wgDBserver ) . @@ -109,25 +110,37 @@ class PopulateImageSha1 extends LoggedUpdateMaintenance { // Upgrade the current file version... $sha1 = $file->getRepo()->getFileSha1( $file->getPath() ); if ( strval( $sha1 ) !== '' ) { // file on disk and hashed properly - $sql = "UPDATE $imageTable SET img_sha1=" . $dbw->addQuotes( $sha1 ) . - " WHERE img_name=" . $dbw->addQuotes( $file->getName() ); - if ( $method == 'pipe' ) { - fwrite( $pipe, "$sql;\n" ); + if ( $isRegen && $file->getSha1() !== $sha1 ) { + // The population was probably done already. If the old SHA1 + // does not match, then both fix the SHA1 and the metadata. + $file->upgradeRow(); } else { - $dbw->query( $sql, __METHOD__ ); + $sql = "UPDATE $imageTable SET img_sha1=" . $dbw->addQuotes( $sha1 ) . + " WHERE img_name=" . $dbw->addQuotes( $file->getName() ); + if ( $method == 'pipe' ) { + fwrite( $pipe, "$sql;\n" ); + } else { + $dbw->query( $sql, __METHOD__ ); + } } } // Upgrade the old file versions... foreach ( $file->getHistory() as $oldFile ) { $sha1 = $oldFile->getRepo()->getFileSha1( $oldFile->getPath() ); if ( strval( $sha1 ) !== '' ) { // file on disk and hashed properly - $sql = "UPDATE $oldImageTable SET oi_sha1=" . $dbw->addQuotes( $sha1 ) . - " WHERE (oi_name=" . $dbw->addQuotes( $oldFile->getName() ) . " AND" . - " oi_archive_name=" . $dbw->addQuotes( $oldFile->getArchiveName() ) . ")"; - if ( $method == 'pipe' ) { - fwrite( $pipe, "$sql;\n" ); + if ( $isRegen && $oldFile->getSha1() !== $sha1 ) { + // The population was probably done already. If the old SHA1 + // does not match, then both fix the SHA1 and the metadata. + $oldFile->upgradeRow(); } else { - $dbw->query( $sql, __METHOD__ ); + $sql = "UPDATE $oldImageTable SET oi_sha1=" . $dbw->addQuotes( $sha1 ) . + " WHERE (oi_name=" . $dbw->addQuotes( $oldFile->getName() ) . " AND" . + " oi_archive_name=" . $dbw->addQuotes( $oldFile->getArchiveName() ) . ")"; + if ( $method == 'pipe' ) { + fwrite( $pipe, "$sql;\n" ); + } else { + $dbw->query( $sql, __METHOD__ ); + } } } } -- 2.20.1