return false;
}
}
-
+
/**
* Fields in the oldimage table
* @return array
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 ),
*/
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;
}
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' ),
$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 ) .
// 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__ );
+ }
}
}
}