dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move wfMakeStaticArrayFile() into a class
[lhc/web/wiklou.git]
/
maintenance
/
updateCollation.php
diff --git
a/maintenance/updateCollation.php
b/maintenance/updateCollation.php
index
63176cb
..
0670454
100644
(file)
--- a/
maintenance/updateCollation.php
+++ b/
maintenance/updateCollation.php
@@
-187,20
+187,18
@@
TEXT
}
# cl_type will be wrong for lots of pages if cl_collation is 0,
# so let's update it while we're here.
}
# cl_type will be wrong for lots of pages if cl_collation is 0,
# so let's update it while we're here.
- if ( $title->getNamespace() == NS_CATEGORY ) {
- $type = 'subcat';
- } elseif ( $title->getNamespace() == NS_FILE ) {
- $type = 'file';
- } else {
- $type = 'page';
- }
+ $type = MWNamespace::getCategoryLinkType( $title->getNamespace() );
$newSortKey = $collation->getSortKey(
$title->getCategorySortkey( $prefix ) );
if ( $verboseStats ) {
$this->updateSortKeySizeHistogram( $newSortKey );
}
$newSortKey = $collation->getSortKey(
$title->getCategorySortkey( $prefix ) );
if ( $verboseStats ) {
$this->updateSortKeySizeHistogram( $newSortKey );
}
- if ( !$dryRun ) {
+ if ( $dryRun ) {
+ // Add 1 to the count if the sortkey was changed. (Note that this doesn't count changes in
+ // other fields, if any, those usually only happen when upgrading old MediaWikis.)
+ $count += ( $row->cl_sortkey !== $newSortKey );
+ } else {
$dbw->update(
'categorylinks',
[
$dbw->update(
'categorylinks',
[
@@
-213,6
+211,7
@@
TEXT
[ 'cl_from' => $row->cl_from, 'cl_to' => $row->cl_to ],
__METHOD__
);
[ 'cl_from' => $row->cl_from, 'cl_to' => $row->cl_to ],
__METHOD__
);
+ $count++;
}
if ( $row ) {
$batchConds = [ $this->getBatchCondition( $row, $dbw ) ];
}
if ( $row ) {
$batchConds = [ $this->getBatchCondition( $row, $dbw ) ];
@@
-222,17
+221,16
@@
TEXT
$this->commitTransaction( $dbw, __METHOD__ );
}
$this->commitTransaction( $dbw, __METHOD__ );
}
- $count += $res->numRows();
- $this->output( "$count done.\n" );
-
- if ( !$dryRun && ++$batchCount % self::SYNC_INTERVAL == 0 ) {
- $this->output( "Waiting for replica DBs ... " );
- wfWaitForSlaves();
- $this->output( "done\n" );
+ if ( $dryRun ) {
+ $this->output( "$count rows would be updated so far.\n" );
+ } else {
+ $this->output( "$count done.\n" );
}
} while ( $res->numRows() == self::BATCH_SIZE );
}
} while ( $res->numRows() == self::BATCH_SIZE );
- $this->output( "$count rows processed\n" );
+ if ( !$dryRun ) {
+ $this->output( "$count rows processed\n" );
+ }
if ( $verboseStats ) {
$this->output( "\n" );
if ( $verboseStats ) {
$this->output( "\n" );