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
Merge "rdbms: tweak var names in LoadMonitor::scaleLoads()/getLagTimes()"
[lhc/web/wiklou.git]
/
maintenance
/
populateParentId.php
diff --git
a/maintenance/populateParentId.php
b/maintenance/populateParentId.php
index
beb8cc8
..
39bc733
100644
(file)
--- a/
maintenance/populateParentId.php
+++ b/
maintenance/populateParentId.php
@@
-46,6
+46,7
@@
class PopulateParentId extends LoggedUpdateMaintenance {
}
protected function doDBUpdates() {
}
protected function doDBUpdates() {
+ $batchSize = $this->getBatchSize();
$db = $this->getDB( DB_MASTER );
if ( !$db->tableExists( 'revision' ) ) {
$this->error( "revision table does not exist" );
$db = $this->getDB( DB_MASTER );
if ( !$db->tableExists( 'revision' ) ) {
$this->error( "revision table does not exist" );
@@
-62,15
+63,15
@@
class PopulateParentId extends LoggedUpdateMaintenance {
}
# Do remaining chunk
$blockStart = intval( $start );
}
# Do remaining chunk
$blockStart = intval( $start );
- $blockEnd = intval( $start ) + $
this->mB
atchSize - 1;
+ $blockEnd = intval( $start ) + $
b
atchSize - 1;
$count = 0;
$changed = 0;
while ( $blockStart <= $end ) {
$this->output( "...doing rev_id from $blockStart to $blockEnd\n" );
$cond = "rev_id BETWEEN $blockStart AND $blockEnd";
$res = $db->select( 'revision',
$count = 0;
$changed = 0;
while ( $blockStart <= $end ) {
$this->output( "...doing rev_id from $blockStart to $blockEnd\n" );
$cond = "rev_id BETWEEN $blockStart AND $blockEnd";
$res = $db->select( 'revision',
-
array( 'rev_id', 'rev_page', 'rev_timestamp', 'rev_parent_id' )
,
-
array( $cond, 'rev_parent_id' => null )
, __METHOD__ );
+
[ 'rev_id', 'rev_page', 'rev_timestamp', 'rev_parent_id' ]
,
+
[ $cond, 'rev_parent_id' => null ]
, __METHOD__ );
# Go through and update rev_parent_id from these rows.
# Assume that the previous revision of the title was
# the original previous revision of the title when the
# Go through and update rev_parent_id from these rows.
# Assume that the previous revision of the title was
# the original previous revision of the title when the
@@
-80,29
+81,29
@@
class PopulateParentId extends LoggedUpdateMaintenance {
# with a smaller rev ID. The highest ID "wins". This avoids loops
# as timestamp can only decrease and never loops with IDs (from parent to parent)
$previousID = $db->selectField( 'revision', 'rev_id',
# with a smaller rev ID. The highest ID "wins". This avoids loops
# as timestamp can only decrease and never loops with IDs (from parent to parent)
$previousID = $db->selectField( 'revision', 'rev_id',
-
array(
'rev_page' => $row->rev_page, 'rev_timestamp' => $row->rev_timestamp,
- "rev_id < " . intval( $row->rev_id )
)
,
+
[
'rev_page' => $row->rev_page, 'rev_timestamp' => $row->rev_timestamp,
+ "rev_id < " . intval( $row->rev_id )
]
,
__METHOD__,
__METHOD__,
-
array( 'ORDER BY' => 'rev_id DESC' )
);
+
[ 'ORDER BY' => 'rev_id DESC' ]
);
# If there are none, check the highest ID with a lower timestamp
if ( !$previousID ) {
# Get the highest older timestamp
$lastTimestamp = $db->selectField(
'revision',
'rev_timestamp',
# If there are none, check the highest ID with a lower timestamp
if ( !$previousID ) {
# Get the highest older timestamp
$lastTimestamp = $db->selectField(
'revision',
'rev_timestamp',
- array(
+ [
'rev_page' => $row->rev_page,
"rev_timestamp < " . $db->addQuotes( $row->rev_timestamp )
'rev_page' => $row->rev_page,
"rev_timestamp < " . $db->addQuotes( $row->rev_timestamp )
-
)
,
+
]
,
__METHOD__,
__METHOD__,
- array( 'ORDER BY' => 'rev_timestamp DESC' )
+ [ 'ORDER BY' => 'rev_timestamp DESC' ]
);
# If there is one, let the highest rev ID win
if ( $lastTimestamp ) {
$previousID = $db->selectField( 'revision', 'rev_id',
);
# If there is one, let the highest rev ID win
if ( $lastTimestamp ) {
$previousID = $db->selectField( 'revision', 'rev_id',
-
array( 'rev_page' => $row->rev_page, 'rev_timestamp' => $lastTimestamp )
,
+
[ 'rev_page' => $row->rev_page, 'rev_timestamp' => $lastTimestamp ]
,
__METHOD__,
__METHOD__,
-
array( 'ORDER BY' => 'rev_id DESC' )
);
+
[ 'ORDER BY' => 'rev_id DESC' ]
);
}
}
$previousID = intval( $previousID );
}
}
$previousID = intval( $previousID );
@@
-111,13
+112,13
@@
class PopulateParentId extends LoggedUpdateMaintenance {
}
# Update the row...
$db->update( 'revision',
}
# Update the row...
$db->update( 'revision',
-
array( 'rev_parent_id' => $previousID )
,
-
array( 'rev_id' => $row->rev_id )
,
+
[ 'rev_parent_id' => $previousID ]
,
+
[ 'rev_id' => $row->rev_id ]
,
__METHOD__ );
$count++;
}
__METHOD__ );
$count++;
}
- $blockStart += $
this->mB
atchSize;
- $blockEnd += $
this->mB
atchSize;
+ $blockStart += $
b
atchSize;
+ $blockEnd += $
b
atchSize;
wfWaitForSlaves();
}
$this->output( "rev_parent_id population complete ... {$count} rows [{$changed} changed]\n" );
wfWaitForSlaves();
}
$this->output( "rev_parent_id population complete ... {$count} rows [{$changed} changed]\n" );
@@
-126,5
+127,5
@@
class PopulateParentId extends LoggedUpdateMaintenance {
}
}
}
}
-$maintClass =
"PopulateParentId"
;
+$maintClass =
PopulateParentId::class
;
require_once RUN_MAINTENANCE_IF_MAIN;
require_once RUN_MAINTENANCE_IF_MAIN;