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
Fix phpcs issues from LanguageConverter patches
[lhc/web/wiklou.git]
/
maintenance
/
migrateUserGroup.php
diff --git
a/maintenance/migrateUserGroup.php
b/maintenance/migrateUserGroup.php
index
df6665a
..
ad82542
100644
(file)
--- a/
maintenance/migrateUserGroup.php
+++ b/
maintenance/migrateUserGroup.php
@@
-42,17
+42,18
@@
class MigrateUserGroup extends Maintenance {
$oldGroup = $this->getArg( 0 );
$newGroup = $this->getArg( 1 );
$dbw = $this->getDB( DB_MASTER );
$oldGroup = $this->getArg( 0 );
$newGroup = $this->getArg( 1 );
$dbw = $this->getDB( DB_MASTER );
+ $batchSize = $this->getBatchSize();
$start = $dbw->selectField( 'user_groups', 'MIN(ug_user)',
$start = $dbw->selectField( 'user_groups', 'MIN(ug_user)',
-
array( 'ug_group' => $oldGroup )
, __FUNCTION__ );
+
[ 'ug_group' => $oldGroup ]
, __FUNCTION__ );
$end = $dbw->selectField( 'user_groups', 'MAX(ug_user)',
$end = $dbw->selectField( 'user_groups', 'MAX(ug_user)',
-
array( 'ug_group' => $oldGroup )
, __FUNCTION__ );
+
[ 'ug_group' => $oldGroup ]
, __FUNCTION__ );
if ( $start === null ) {
$this->error( "Nothing to do - no users in the '$oldGroup' group", true );
}
# Do remaining chunk
if ( $start === null ) {
$this->error( "Nothing to do - no users in the '$oldGroup' group", true );
}
# 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;
// Migrate users over in batches...
while ( $blockEnd <= $end ) {
$affected = 0;
// Migrate users over in batches...
while ( $blockEnd <= $end ) {
$affected = 0;
@@
-60,11
+61,11
@@
class MigrateUserGroup extends Maintenance {
$this->beginTransaction( $dbw, __METHOD__ );
$dbw->update( 'user_groups',
$this->beginTransaction( $dbw, __METHOD__ );
$dbw->update( 'user_groups',
-
array( 'ug_group' => $newGroup )
,
-
array(
'ug_group' => $oldGroup,
- "ug_user BETWEEN $blockStart AND $blockEnd"
)
,
+
[ 'ug_group' => $newGroup ]
,
+
[
'ug_group' => $oldGroup,
+ "ug_user BETWEEN $blockStart AND $blockEnd"
]
,
__METHOD__,
__METHOD__,
- array( 'IGNORE' )
+ [ 'IGNORE' ]
);
$affected += $dbw->affectedRows();
// Delete rows that the UPDATE operation above had to ignore.
);
$affected += $dbw->affectedRows();
// Delete rows that the UPDATE operation above had to ignore.
@@
-72,20
+73,20
@@
class MigrateUserGroup extends Maintenance {
// Updating the row for the old group membership failed since
// user/group is UNIQUE.
$dbw->delete( 'user_groups',
// Updating the row for the old group membership failed since
// user/group is UNIQUE.
$dbw->delete( 'user_groups',
-
array(
'ug_group' => $oldGroup,
- "ug_user BETWEEN $blockStart AND $blockEnd"
)
,
+
[
'ug_group' => $oldGroup,
+ "ug_user BETWEEN $blockStart AND $blockEnd"
]
,
__METHOD__
);
$affected += $dbw->affectedRows();
$this->commitTransaction( $dbw, __METHOD__ );
__METHOD__
);
$affected += $dbw->affectedRows();
$this->commitTransaction( $dbw, __METHOD__ );
- // Clear cache for the affected users (
bug 40
340)
+ // Clear cache for the affected users (
T42
340)
if ( $affected > 0 ) {
// XXX: This also invalidates cache of unaffected users that
// were in the new group and not in the group.
$res = $dbw->select( 'user_groups', 'ug_user',
if ( $affected > 0 ) {
// XXX: This also invalidates cache of unaffected users that
// were in the new group and not in the group.
$res = $dbw->select( 'user_groups', 'ug_user',
-
array(
'ug_group' => $newGroup,
- "ug_user BETWEEN $blockStart AND $blockEnd"
)
,
+
[
'ug_group' => $newGroup,
+ "ug_user BETWEEN $blockStart AND $blockEnd"
]
,
__METHOD__
);
if ( $res !== false ) {
__METHOD__
);
if ( $res !== false ) {
@@
-97,8
+98,8
@@
class MigrateUserGroup extends Maintenance {
}
$count += $affected;
}
$count += $affected;
- $blockStart += $
this->mB
atchSize;
- $blockEnd += $
this->mB
atchSize;
+ $blockStart += $
b
atchSize;
+ $blockEnd += $
b
atchSize;
wfWaitForSlaves();
}
$this->output( "Done! $count users in group '$oldGroup' are now in '$newGroup' instead.\n" );
wfWaitForSlaves();
}
$this->output( "Done! $count users in group '$oldGroup' are now in '$newGroup' instead.\n" );