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
Remove leading backslashes from "use \…" tags
[lhc/web/wiklou.git]
/
maintenance
/
populateLogUsertext.php
diff --git
a/maintenance/populateLogUsertext.php
b/maintenance/populateLogUsertext.php
index
dd120fe
..
6e8261a
100644
(file)
--- a/
maintenance/populateLogUsertext.php
+++ b/
maintenance/populateLogUsertext.php
@@
-48,6
+48,7
@@
class PopulateLogUsertext extends LoggedUpdateMaintenance {
}
protected function doDBUpdates() {
}
protected function doDBUpdates() {
+ $batchSize = $this->getBatchSize();
$db = $this->getDB( DB_MASTER );
$start = $db->selectField( 'logging', 'MIN(log_id)', false, __METHOD__ );
if ( !$start ) {
$db = $this->getDB( DB_MASTER );
$start = $db->selectField( 'logging', 'MIN(log_id)', false, __METHOD__ );
if ( !$start ) {
@@
-58,12
+59,13
@@
class PopulateLogUsertext extends LoggedUpdateMaintenance {
$end = $db->selectField( 'logging', 'MAX(log_id)', false, __METHOD__ );
# Do remaining chunk
$end = $db->selectField( 'logging', 'MAX(log_id)', false, __METHOD__ );
# Do remaining chunk
- $end += $
this->mB
atchSize - 1;
+ $end += $
b
atchSize - 1;
$blockStart = $start;
$blockStart = $start;
- $blockEnd = $start + $
this->mB
atchSize - 1;
+ $blockEnd = $start + $
b
atchSize - 1;
while ( $blockEnd <= $end ) {
$this->output( "...doing log_id from $blockStart to $blockEnd\n" );
while ( $blockEnd <= $end ) {
$this->output( "...doing log_id from $blockStart to $blockEnd\n" );
- $cond = "log_id BETWEEN $blockStart AND $blockEnd AND log_user = user_id";
+ $cond = "log_id BETWEEN " . (int)$blockStart . " AND " . (int)$blockEnd .
+ " AND log_user = user_id";
$res = $db->select( [ 'logging', 'user' ],
[ 'log_id', 'user_name' ], $cond, __METHOD__ );
$res = $db->select( [ 'logging', 'user' ],
[ 'log_id', 'user_name' ], $cond, __METHOD__ );
@@
-73,8
+75,8
@@
class PopulateLogUsertext extends LoggedUpdateMaintenance {
[ 'log_id' => $row->log_id ], __METHOD__ );
}
$this->commitTransaction( $db, __METHOD__ );
[ 'log_id' => $row->log_id ], __METHOD__ );
}
$this->commitTransaction( $db, __METHOD__ );
- $blockStart += $
this->mB
atchSize;
- $blockEnd += $
this->mB
atchSize;
+ $blockStart += $
b
atchSize;
+ $blockEnd += $
b
atchSize;
wfWaitForSlaves();
}
$this->output( "Done populating log_user_text field.\n" );
wfWaitForSlaves();
}
$this->output( "Done populating log_user_text field.\n" );