1 files changed, 7 insertions, 61 deletions

diff --git a/maintenance/cleanupCaps.php b/maintenance/cleanupCaps.php
index e959d4b7..46ca18d6 100644
--- a/maintenance/cleanupCaps.php
+++ b/maintenance/cleanupCaps.php
@@ -29,20 +29,17 @@
  * @ingroup maintenance
  */
 
-$options = array( 'dry-run' );
+$optionsWithArgs = array( 'namespace' );
 
 require_once( 'commandLine.inc' );
-require_once( 'FiveUpgrade.inc' );
+require_once( 'cleanupTable.inc' );
 
 /**
  * @ingroup Maintenance
  */
-class CapsCleanup extends FiveUpgrade {
-	function CapsCleanup( $dryrun = false, $namespace=0 ) {
-		parent::FiveUpgrade();
-
-		$this->maxLag = 10; # if slaves are lagged more than 10 secs, wait
-		$this->dryrun = $dryrun;
+class CapsCleanup extends TableCleanup {
+	function __construct( $dryrun = false, $namespace = 0 ) {
+		parent::__construct( 'page', $dryrun );
 		$this->namespace = intval( $namespace );
 	}
 
@@ -53,62 +50,11 @@ class CapsCleanup extends FiveUpgrade {
 			return false;
 		}
 
-		$this->runTable( 'page', 'WHERE page_namespace=' . $this->namespace,
+		$this->runTable( $this->targetTable,
+			'WHERE page_namespace=' . $this->namespace,
 			array( &$this, 'processPage' ) );
 	}
 
-	function init( $count, $table ) {
-		$this->processed = 0;
-		$this->updated = 0;
-		$this->count = $count;
-		$this->startTime = wfTime();
-		$this->table = $table;
-	}
-
-	function progress( $updated ) {
-		$this->updated += $updated;
-		$this->processed++;
-		if( $this->processed % 100 != 0 ) {
-			return;
-		}
-		$portion = $this->processed / $this->count;
-		$updateRate = $this->updated / $this->processed;
-
-		$now = wfTime();
-		$delta = $now - $this->startTime;
-		$estimatedTotalTime = $delta / $portion;
-		$eta = $this->startTime + $estimatedTotalTime;
-
-		printf( "%s: %6.2f%% done on %s; ETA %s [%d/%d] %.2f/sec <%.2f%% updated>\n",
-			wfTimestamp( TS_DB, intval( $now ) ),
-			$portion * 100.0,
-			$this->table,
-			wfTimestamp( TS_DB, intval( $eta ) ),
-			$this->processed,
-			$this->count,
-			$this->processed / $delta,
-			$updateRate * 100.0 );
-		flush();
-	}
-
-	function runTable( $table, $where, $callback ) {
-		$fname = 'CapsCleanup::buildTable';
-
-		$count = $this->dbw->selectField( $table, 'count(*)', '', $fname );
-		$this->init( $count, 'page' );
-		$this->log( "Processing $table..." );
-
-		$tableName = $this->dbr->tableName( $table );
-		$sql = "SELECT * FROM $tableName $where";
-		$result = $this->dbr->query( $sql, $fname );
-
-		while( $row = $this->dbr->fetchObject( $result ) ) {
-			call_user_func( $callback, $row );
-		}
-		$this->log( "Finished $table... $this->updated of $this->processed rows updated" );
-		$this->dbr->freeResult( $result );
-	}
-
 	function processPage( $row ) {
 		global $wgContLang;