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 "Remove return value from FormSpecialPage::checkExecutePermissions"
[lhc/web/wiklou.git]
/
maintenance
/
cleanupTable.inc
diff --git
a/maintenance/cleanupTable.inc
b/maintenance/cleanupTable.inc
index
410a55c
..
f6259e9
100644
(file)
--- a/
maintenance/cleanupTable.inc
+++ b/
maintenance/cleanupTable.inc
@@
-37,10
+37,11
@@
class TableCleanup extends Maintenance {
);
protected $dryrun = false;
);
protected $dryrun = false;
- protected $maxLag = 10; # if slaves are lagged more than 10 secs, wait
public $batchSize = 100;
public $reportInterval = 100;
public $batchSize = 100;
public $reportInterval = 100;
+ protected $processed, $updated, $count, $startTime, $table;
+
public function __construct() {
parent::__construct();
$this->addOption( 'dry-run', 'Perform a dry run' );
public function __construct() {
parent::__construct();
$this->addOption( 'dry-run', 'Perform a dry run' );
@@
-66,6
+67,9
@@
class TableCleanup extends Maintenance {
$this->table = $table;
}
$this->table = $table;
}
+ /**
+ * @param int $updated
+ */
protected function progress( $updated ) {
$this->updated += $updated;
$this->processed++;
protected function progress( $updated ) {
$this->updated += $updated;
$this->processed++;
@@
-96,12
+100,16
@@
class TableCleanup extends Maintenance {
flush();
}
flush();
}
+ /**
+ * @param array $params
+ * @throws MWException
+ */
public function runTable( $params ) {
$dbr = wfGetDB( DB_SLAVE );
if ( array_diff( array_keys( $params ),
public function runTable( $params ) {
$dbr = wfGetDB( DB_SLAVE );
if ( array_diff( array_keys( $params ),
- array( 'table', 'conds', 'index', 'callback' ) )
)
- {
+ array( 'table', 'conds', 'index', 'callback' ) )
+
)
{
throw new MWException( __METHOD__ . ': Missing parameter ' . implode( ', ', $params ) );
}
throw new MWException( __METHOD__ . ': Missing parameter ' . implode( ', ', $params ) );
}
@@
-111,7
+119,6
@@
class TableCleanup extends Maintenance {
$this->init( $count, $table );
$this->output( "Processing $table...\n" );
$this->init( $count, $table );
$this->output( "Processing $table...\n" );
-
$index = (array)$params['index'];
$indexConds = array();
$options = array(
$index = (array)$params['index'];
$indexConds = array();
$options = array(
@@
-156,6
+163,10
@@
class TableCleanup extends Maintenance {
$this->output( "Finished $table... $this->updated of $this->processed rows updated\n" );
}
$this->output( "Finished $table... $this->updated of $this->processed rows updated\n" );
}
+ /**
+ * @param array $matches
+ * @return string
+ */
protected function hexChar( $matches ) {
return sprintf( "\\x%02x", ord( $matches[1] ) );
}
protected function hexChar( $matches ) {
return sprintf( "\\x%02x", ord( $matches[1] ) );
}