summaryrefslogtreecommitdiff
path: root/maintenance
diff options
context:
space:
mode:
authorPierre Schmitz <pierre@archlinux.de>2009-02-09 23:10:10 +0100
committerPierre Schmitz <pierre@archlinux.de>2009-02-09 23:10:10 +0100
commit4fe7385a8edd62dd7d36fedb157f296e5a57002a (patch)
treed9aef11439d0044d8d8e76ebf3898858bfce789f /maintenance
parentde5fed526fb1bc218abe51b166691ebc3bd113b6 (diff)
updated to 1.13.4
Diffstat (limited to 'maintenance')
-rw-r--r--maintenance/convertLinks.inc52
-rw-r--r--maintenance/initStats.inc22
-rw-r--r--maintenance/populateCategory.inc12
-rw-r--r--maintenance/populateParentId.inc18
-rw-r--r--maintenance/postgres/tables.sql2
-rw-r--r--maintenance/updaters.inc430
-rw-r--r--maintenance/userDupes.inc46
7 files changed, 290 insertions, 292 deletions
diff --git a/maintenance/convertLinks.inc b/maintenance/convertLinks.inc
index e4deb22b..4aff81ed 100644
--- a/maintenance/convertLinks.inc
+++ b/maintenance/convertLinks.inc
@@ -9,11 +9,11 @@
function convertLinks() {
global $wgDBtype;
if( $wgDBtype == 'postgres' ) {
- print "Links table already ok on Postgres.\n";
+ wfOut( "Links table already ok on Postgres.\n" );
return;
}
- print "Converting links table to ID-ID...\n";
+ wfOut( "Converting links table to ID-ID...\n" );
global $wgLang, $wgDBserver, $wgDBadminuser, $wgDBadminpassword, $wgDBname;
global $noKeys, $logPerformance, $fh;
@@ -48,7 +48,7 @@ function convertLinks() {
$res = $dbw->query( "SELECT l_from FROM $links LIMIT 1" );
if ( $dbw->fieldType( $res, 0 ) == "int" ) {
- print "Schema already converted\n";
+ wfOut( "Schema already converted\n" );
return;
}
@@ -58,13 +58,13 @@ function convertLinks() {
$dbw->freeResult( $res );
if ( $numRows == 0 ) {
- print "Updating schema (no rows to convert)...\n";
+ wfOut( "Updating schema (no rows to convert)...\n" );
createTempTable();
} else {
if ( $logPerformance ) { $fh = fopen ( $perfLogFilename, "w" ); }
$baseTime = $startTime = getMicroTime();
# Create a title -> cur_id map
- print "Loading IDs from $cur table...\n";
+ wfOut( "Loading IDs from $cur table...\n" );
performanceLog ( "Reading $numRows rows from cur table...\n" );
performanceLog ( "rows read vs seconds elapsed:\n" );
@@ -82,13 +82,13 @@ function convertLinks() {
if ($reportCurReadProgress) {
if (($curRowsRead % $curReadReportInterval) == 0) {
performanceLog( $curRowsRead . " " . (getMicroTime() - $baseTime) . "\n" );
- print "\t$curRowsRead rows of $cur table read.\n";
+ wfOut( "\t$curRowsRead rows of $cur table read.\n" );
}
}
}
$dbw->freeResult( $res );
$dbw->bufferResults( true );
- print "Finished loading IDs.\n\n";
+ wfOut( "Finished loading IDs.\n\n" );
performanceLog( "Took " . (getMicroTime() - $baseTime) . " seconds to load IDs.\n\n" );
#--------------------------------------------------------------------
@@ -97,7 +97,7 @@ function convertLinks() {
createTempTable();
performanceLog( "Resetting timer.\n\n" );
$baseTime = getMicroTime();
- print "Processing $numRows rows from $links table...\n";
+ wfOut( "Processing $numRows rows from $links table...\n" );
performanceLog( "Processing $numRows rows from $links table...\n" );
performanceLog( "rows inserted vs seconds elapsed:\n" );
@@ -127,19 +127,19 @@ function convertLinks() {
}
}
$dbw->freeResult($res);
- #print "rowOffset: $rowOffset\ttuplesAdded: $tuplesAdded\tnumBadLinks: $numBadLinks\n";
+ #wfOut( "rowOffset: $rowOffset\ttuplesAdded: $tuplesAdded\tnumBadLinks: $numBadLinks\n" );
if ( $tuplesAdded != 0 ) {
if ($reportLinksConvProgress) {
- print "Inserting $tuplesAdded tuples into $links_temp...";
+ wfOut( "Inserting $tuplesAdded tuples into $links_temp..." );
}
$dbw->query( implode("",$sqlWrite) );
$totalTuplesInserted += $tuplesAdded;
if ($reportLinksConvProgress)
- print " done. Total $totalTuplesInserted tuples inserted.\n";
+ wfOut( " done. Total $totalTuplesInserted tuples inserted.\n" );
performanceLog( $totalTuplesInserted . " " . (getMicroTime() - $baseTime) . "\n" );
}
}
- print "$totalTuplesInserted valid titles and $numBadLinks invalid titles were processed.\n\n";
+ wfOut( "$totalTuplesInserted valid titles and $numBadLinks invalid titles were processed.\n\n" );
performanceLog( "$totalTuplesInserted valid titles and $numBadLinks invalid titles were processed.\n" );
performanceLog( "Total execution time: " . (getMicroTime() - $startTime) . " seconds.\n" );
if ( $logPerformance ) { fclose ( $fh ); }
@@ -149,25 +149,25 @@ function convertLinks() {
if ( $overwriteLinksTable ) {
$dbConn = Database::newFromParams( $wgDBserver, $wgDBadminuser, $wgDBadminpassword, $wgDBname );
if (!($dbConn->isOpen())) {
- print "Opening connection to database failed.\n";
+ wfOut( "Opening connection to database failed.\n" );
return;
}
# Check for existing links_backup, and delete it if it exists.
- print "Dropping backup links table if it exists...";
+ wfOut( "Dropping backup links table if it exists..." );
$dbConn->query( "DROP TABLE IF EXISTS $links_backup", DB_MASTER);
- print " done.\n";
+ wfOut( " done.\n" );
# Swap in the new table, and move old links table to links_backup
- print "Swapping tables '$links' to '$links_backup'; '$links_temp' to '$links'...";
+ wfOut( "Swapping tables '$links' to '$links_backup'; '$links_temp' to '$links'..." );
$dbConn->query( "RENAME TABLE links TO $links_backup, $links_temp TO $links", DB_MASTER );
- print " done.\n\n";
+ wfOut( " done.\n\n" );
$dbConn->close();
- print "Conversion complete. The old table remains at $links_backup;\n";
- print "delete at your leisure.\n";
+ wfOut( "Conversion complete. The old table remains at $links_backup;\n" );
+ wfOut( "delete at your leisure.\n" );
} else {
- print "Conversion complete. The converted table is at $links_temp;\n";
- print "the original links table is unchanged.\n";
+ wfOut( "Conversion complete. The converted table is at $links_temp;\n" );
+ wfOut( "the original links table is unchanged.\n" );
}
}
@@ -179,16 +179,16 @@ function createTempTable() {
$dbConn = Database::newFromParams( $wgDBserver, $wgDBadminuser, $wgDBadminpassword, $wgDBname );
if (!($dbConn->isOpen())) {
- print "Opening connection to database failed.\n";
+ wfOut( "Opening connection to database failed.\n" );
return;
}
$links_temp = $dbConn->tableName( 'links_temp' );
- print "Dropping temporary links table if it exists...";
+ wfOut( "Dropping temporary links table if it exists..." );
$dbConn->query( "DROP TABLE IF EXISTS $links_temp");
- print " done.\n";
+ wfOut( " done.\n" );
- print "Creating temporary links table...";
+ wfOut( "Creating temporary links table..." );
if ( $noKeys ) {
$dbConn->query( "CREATE TABLE $links_temp ( " .
"l_from int(8) unsigned NOT NULL default '0', " .
@@ -200,7 +200,7 @@ function createTempTable() {
"UNIQUE KEY l_from(l_from,l_to), " .
"KEY (l_to))");
}
- print " done.\n\n";
+ wfOut( " done.\n\n" );
}
function performanceLog( $text ) {
diff --git a/maintenance/initStats.inc b/maintenance/initStats.inc
index d098bc36..b1660ce2 100644
--- a/maintenance/initStats.inc
+++ b/maintenance/initStats.inc
@@ -7,34 +7,34 @@
function wfInitStats( $options=array() ) {
$dbr = wfGetDB( DB_SLAVE );
- echo "Counting total edits...";
+ wfOut( "Counting total edits..." );
$edits = $dbr->selectField( 'revision', 'COUNT(*)', '', __METHOD__ );
$edits += $dbr->selectField( 'archive', 'COUNT(*)', '', __METHOD__ );
- echo "{$edits}\nCounting number of articles...";
+ wfOut( "{$edits}\nCounting number of articles..." );
global $wgContentNamespaces;
$good = $dbr->selectField( 'page', 'COUNT(*)', array( 'page_namespace' => $wgContentNamespaces, 'page_is_redirect' => 0, 'page_len > 0' ), __METHOD__ );
- echo "{$good}\nCounting total pages...";
+ wfOut( "{$good}\nCounting total pages..." );
$pages = $dbr->selectField( 'page', 'COUNT(*)', '', __METHOD__ );
- echo "{$pages}\nCounting number of users...";
+ wfOut( "{$pages}\nCounting number of users..." );
$users = $dbr->selectField( 'user', 'COUNT(*)', '', __METHOD__ );
- echo "{$users}\nCounting number of admins...";
+ wfOut( "{$users}\nCounting number of admins..." );
$admin = $dbr->selectField( 'user_groups', 'COUNT(*)', array( 'ug_group' => 'sysop' ), __METHOD__ );
- echo "{$admin}\nCounting number of images...";
+ wfOut( "{$admin}\nCounting number of images..." );
$image = $dbr->selectField( 'image', 'COUNT(*)', '', __METHOD__ );
- echo "{$image}\n";
+ wfOut( "{$image}\n" );
if( !isset( $options['noviews'] ) ) {
- echo "Counting total page views...";
+ wfOut( "Counting total page views..." );
$views = $dbr->selectField( 'page', 'SUM(page_counter)', '', __METHOD__ );
- echo "{$views}\n";
+ wfOut( "{$views}\n" );
}
- echo "\nUpdating site statistics...";
+ wfOut( "\nUpdating site statistics..." );
$dbw = wfGetDB( DB_MASTER );
$values = array( 'ss_total_edits' => $edits,
@@ -53,5 +53,5 @@ function wfInitStats( $options=array() ) {
$dbw->insert( 'site_stats', array_merge( $values, $conds, $views ), __METHOD__ );
}
- echo( "done.\n" );
+ wfOut( "done.\n" );
}
diff --git a/maintenance/populateCategory.inc b/maintenance/populateCategory.inc
index 3d04a30b..deca4530 100644
--- a/maintenance/populateCategory.inc
+++ b/maintenance/populateCategory.inc
@@ -18,9 +18,9 @@ function populateCategory( $begin, $maxlag, $throttle, $force ) {
__FUNCTION__
);
if( $row ) {
- echo "Category table already populated. Use php ".
+ wfOut( "Category table already populated. Use php ".
"maintenance/populateCategory.php\n--force from the command line ".
- "to override.\n";
+ "to override.\n" );
return true;
}
}
@@ -56,14 +56,14 @@ function populateCategory( $begin, $maxlag, $throttle, $force ) {
# Use the row to update the category count
$cat = Category::newFromName( $name );
if( !is_object( $cat ) ) {
- echo "The category named $name is not valid?!\n";
+ wfOut( "The category named $name is not valid?!\n" );
} else {
$cat->refreshCounts();
}
++$i;
if( !($i % REPORTING_INTERVAL) ) {
- echo "$name\n";
+ wfOut( "$name\n" );
wfWaitForSlaves( $maxlag );
}
usleep( $throttle*1000 );
@@ -76,10 +76,10 @@ function populateCategory( $begin, $maxlag, $throttle, $force ) {
'IGNORE'
)
) {
- echo "Category population complete.\n";
+ wfOut( "Category population complete.\n" );
return true;
} else {
- echo "Could not insert category population row.\n";
+ wfOut( "Could not insert category population row.\n" );
return false;
}
}
diff --git a/maintenance/populateParentId.inc b/maintenance/populateParentId.inc
index 3fecc63b..7b1ae3e8 100644
--- a/maintenance/populateParentId.inc
+++ b/maintenance/populateParentId.inc
@@ -3,11 +3,11 @@
define( 'BATCH_SIZE', 200 );
function populate_rev_parent_id( $db ) {
- echo "Populating rev_parent_id column\n";
+ wfOut( "Populating rev_parent_id column\n" );
$start = $db->selectField( 'revision', 'MIN(rev_id)', false, __FUNCTION__ );
$end = $db->selectField( 'revision', 'MAX(rev_id)', false, __FUNCTION__ );
if( is_null( $start ) || is_null( $end ) ){
- echo "...revision table seems to be empty.\n";
+ wfOut( "...revision table seems to be empty.\n" );
$db->insert( 'updatelog',
array( 'ul_key' => 'populate rev_parent_id' ),
__FUNCTION__,
@@ -16,12 +16,12 @@ function populate_rev_parent_id( $db ) {
}
# Do remaining chunk
$end += BATCH_SIZE - 1;
- $blockStart = $start;
- $blockEnd = $start + BATCH_SIZE - 1;
+ $blockStart = intval( $start );
+ $blockEnd = intval( $start ) + BATCH_SIZE - 1;
$count = 0;
$changed = 0;
while( $blockEnd <= $end ) {
- echo "...doing rev_id from $blockStart to $blockEnd\n";
+ wfOut( "...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'),
@@ -36,14 +36,14 @@ function populate_rev_parent_id( $db ) {
# 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 < {$row->rev_id}" ),
+ "rev_id < " . intval( $row->rev_id ) ),
__FUNCTION__,
array( 'ORDER BY' => 'rev_id DESC' ) );
# If there are none, check the 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 < '{$row->rev_timestamp}'" ),
+ array( 'rev_page' => $row->rev_page, "rev_timestamp < " . $db->addQuotes( $row->rev_timestamp ) ),
__FUNCTION__,
array( 'ORDER BY' => 'rev_timestamp DESC' ) );
# If there is one, let the highest rev ID win
@@ -73,10 +73,10 @@ function populate_rev_parent_id( $db ) {
__FUNCTION__,
'IGNORE' );
if( $logged ) {
- echo "rev_parent_id population complete ... {$count} rows [{$changed} changed]\n";
+ wfOut( "rev_parent_id population complete ... {$count} rows [{$changed} changed]\n" );
return true;
} else {
- echo "Could not insert rev_parent_id population row.\n";
+ wfOut( "Could not insert rev_parent_id population row.\n" );
return false;
}
}
diff --git a/maintenance/postgres/tables.sql b/maintenance/postgres/tables.sql
index 2f96c052..cd8dd8a7 100644
--- a/maintenance/postgres/tables.sql
+++ b/maintenance/postgres/tables.sql
@@ -568,5 +568,5 @@ CREATE TABLE mediawiki_version (
);
INSERT INTO mediawiki_version (type,mw_version,sql_version,sql_date)
- VALUES ('Creation','??','$LastChangedRevision: 40517 $','$LastChangedDate: 2008-09-06 17:14:20 +1000 (Sat, 06 Sep 2008) $');
+ VALUES ('Creation','??','$LastChangedRevision: 40517 $','$LastChangedDate: 2008-09-06 02:14:20 -0500 (Sat, 06 Sep 2008) $');
diff --git a/maintenance/updaters.inc b/maintenance/updaters.inc
index 42ef7b68..13cdc4c8 100644
--- a/maintenance/updaters.inc
+++ b/maintenance/updaters.inc
@@ -171,11 +171,11 @@ function rename_table( $from, $to, $patch ) {
global $wgDatabase;
if ( $wgDatabase->tableExists( $from ) ) {
if ( $wgDatabase->tableExists( $to ) ) {
- echo "...can't move table $from to $to, $to already exists.\n";
+ wfOut( "...can't move table $from to $to, $to already exists.\n" );
} else {
- echo "Moving table $from to $to...";
+ wfOut( "Moving table $from to $to..." );
dbsource( archive($patch), $wgDatabase );
- echo "ok\n";
+ wfOut( "ok\n" );
}
} else {
// Source table does not exist
@@ -187,47 +187,47 @@ function rename_table( $from, $to, $patch ) {
function add_table( $name, $patch, $fullpath=false ) {
global $wgDatabase;
if ( $wgDatabase->tableExists( $name ) ) {
- echo "...$name table already exists.\n";
+ wfOut( "...$name table already exists.\n" );
} else {
- echo "Creating $name table...";
+ wfOut( "Creating $name table..." );
if( $fullpath ) {
dbsource( $patch, $wgDatabase );
} else {
dbsource( archive($patch), $wgDatabase );
}
- echo "ok\n";
+ wfOut( "ok\n" );
}
}
function add_field( $table, $field, $patch, $fullpath=false ) {
global $wgDatabase;
if ( !$wgDatabase->tableExists( $table ) ) {
- echo "...$table table does not exist, skipping new field patch\n";
+ wfOut( "...$table table does not exist, skipping new field patch\n" );
} elseif ( $wgDatabase->fieldExists( $table, $field ) ) {
- echo "...have $field field in $table table.\n";
+ wfOut( "...have $field field in $table table.\n" );
} else {
- echo "Adding $field field to table $table...";
+ wfOut( "Adding $field field to table $table..." );
if( $fullpath ) {
dbsource( $patch, $wgDatabase );
} else {
dbsource( archive($patch), $wgDatabase );
}
- echo "ok\n";
+ wfOut( "ok\n" );
}
}
function add_index( $table, $index, $patch, $fullpath=false ) {
global $wgDatabase;
if( $wgDatabase->indexExists( $table, $index ) ) {
- echo "...$index key already set on $table table.\n";
+ wfOut( "...$index key already set on $table table.\n" );
} else {
- echo "Adding $index key to table $table... ";
+ wfOut( "Adding $index key to table $table... " );
if( $fullpath ) {
dbsource( $patch, $wgDatabase );
} else {
dbsource( archive($patch), $wgDatabase );
}
- echo "ok\n";
+ wfOut( "ok\n" );
}
}
@@ -243,11 +243,11 @@ function update_passwords() {
global $wgDatabase;
$fname = "Update script: update_passwords()";
- print "\nIt appears that you need to update the user passwords in your\n" .
+ wfOut( "\nIt appears that you need to update the user passwords in your\n" .
"database. If you have already done this (if you've run this update\n" .
"script once before, for example), doing so again will make all your\n" .
"user accounts inaccessible, so be sure you only do this once.\n" .
- "Update user passwords? (yes/no)";
+ "Update user passwords? (yes/no)" );
$resp = readconsole();
if ( ! ( "Y" == $resp{0} || "y" == $resp{0} ) ) { return; }
@@ -270,15 +270,15 @@ function do_interwiki_update() {
# Check that interwiki table exists; if it doesn't source it
global $wgDatabase, $IP;
if( $wgDatabase->tableExists( "interwiki" ) ) {
- echo "...already have interwiki table\n";
+ wfOut( "...already have interwiki table\n" );
return true;
}
- echo "Creating interwiki table: ";
+ wfOut( "Creating interwiki table: " );
dbsource( archive("patch-interwiki.sql") );
- echo "ok\n";
- echo "Adding default interwiki definitions: ";
+ wfOut( "ok\n" );
+ wfOut( "Adding default interwiki definitions: " );
dbsource( "$IP/maintenance/interwiki.sql" );
- echo "ok\n";
+ wfOut( "ok\n" );
}
function do_index_update() {
@@ -286,12 +286,12 @@ function do_index_update() {
global $wgDatabase;
$meta = $wgDatabase->fieldInfo( "recentchanges", "rc_timestamp" );
if( !$meta->isMultipleKey() ) {
- echo "Updating indexes to 20031107: ";
+ wfOut( "Updating indexes to 20031107: " );
dbsource( archive("patch-indexes.sql") );
- echo "ok\n";
+ wfOut( "ok\n" );
return true;
}
- echo "...indexes seem up to 20031107 standards\n";
+ wfOut( "...indexes seem up to 20031107 standards\n" );
return false;
}
@@ -300,67 +300,67 @@ function do_image_index_update() {
$meta = $wgDatabase->fieldInfo( "image", "img_major_mime" );
if( !$meta->isMultipleKey() ) {
- echo "Updating indexes to 20050912: ";
+ wfOut( "Updating indexes to 20050912: " );
dbsource( archive("patch-mimesearch-indexes.sql") );
- echo "ok\n";
+ wfOut( "ok\n" );
return true;
}
- echo "...indexes seem up to 20050912 standards\n";
+ wfOut( "...indexes seem up to 20050912 standards\n" );
return false;
}
function do_image_name_unique_update() {
global $wgDatabase;
if( $wgDatabase->indexExists( 'image', 'PRIMARY' ) ) {
- echo "...image primary key already set.\n";
+ wfOut( "...image primary key already set.\n" );
} else {
- echo "Making img_name the primary key... ";
+ wfOut( "Making img_name the primary key... " );
dbsource( archive("patch-image_name_primary.sql"), $wgDatabase );
- echo "ok\n";
+ wfOut( "ok\n" );
}
}
function do_logging_timestamp_index() {
global $wgDatabase;
if( $wgDatabase->indexExists( 'logging', 'times' ) ) {
- echo "...timestamp key on logging already exists.\n";
+ wfOut( "...timestamp key on logging already exists.\n" );
} else {
- echo "Adding timestamp key on logging table... ";
+ wfOut( "Adding timestamp key on logging table... " );
dbsource( archive("patch-logging-times-index.sql"), $wgDatabase );
- echo "ok\n";
+ wfOut( "ok\n" );
}
}
function do_archive_user_index() {
global $wgDatabase;
if( $wgDatabase->indexExists( 'archive', 'usertext_timestamp' ) ) {
- echo "...usertext,timestamp key on archive already exists.\n";
+ wfOut( "...usertext,timestamp key on archive already exists.\n" );
} else {
- echo "Adding usertext,timestamp key on archive table... ";
+ wfOut( "Adding usertext,timestamp key on archive table... " );
dbsource( archive("patch-archive-user-index.sql"), $wgDatabase );
- echo "ok\n";
+ wfOut( "ok\n" );
}
}
function do_image_user_index() {
global $wgDatabase;
if( $wgDatabase->indexExists( 'image', 'img_usertext_timestamp' ) ) {
- echo "...usertext,timestamp key on image already exists.\n";
+ wfOut( "...usertext,timestamp key on image already exists.\n" );
} else {
- echo "Adding usertext,timestamp key on image table... ";
+ wfOut( "Adding usertext,timestamp key on image table... " );
dbsource( archive("patch-image-user-index.sql"), $wgDatabase );
- echo "ok\n";
+ wfOut( "ok\n" );
}
}
function do_oldimage_user_index() {
global $wgDatabase;
if( $wgDatabase->indexExists( 'oldimage', 'oi_usertext_timestamp' ) ) {
- echo "...usertext,timestamp key on oldimage already exists.\n";
+ wfOut( "...usertext,timestamp key on oldimage already exists.\n" );
} else {
- echo "Adding usertext,timestamp key on oldimage table... ";
+ wfOut( "Adding usertext,timestamp key on oldimage table... " );
dbsource( archive("patch-oldimage-user-index.sql"), $wgDatabase );
- echo "ok\n";
+ wfOut( "ok\n" );
}
}
@@ -368,18 +368,18 @@ function do_watchlist_update() {
global $wgDatabase;
$fname = 'do_watchlist_update';
if( $wgDatabase->fieldExists( 'watchlist', 'wl_notificationtimestamp' ) ) {
- echo "The watchlist table is already set up for email notification.\n";
+ wfOut( "The watchlist table is already set up for email notification.\n" );
} else {
- echo "Adding wl_notificationtimestamp field for email notification management.";
+ wfOut( "Adding wl_notificationtimestamp field for email notification management." );
/* ALTER TABLE watchlist ADD (wl_notificationtimestamp varchar(14) binary NOT NULL default '0'); */
dbsource( archive( 'patch-email-notification.sql' ), $wgDatabase );
- echo "ok\n";
+ wfOut( "ok\n" );
}
# Check if we need to add talk page rows to the watchlist
$talk = $wgDatabase->selectField( 'watchlist', 'count(*)', 'wl_namespace & 1', $fname );
$nontalk = $wgDatabase->selectField( 'watchlist', 'count(*)', 'NOT (wl_namespace & 1)', $fname );
if ( $talk != $nontalk ) {
- echo "Adding missing watchlist talk page rows... ";
+ wfOut( "Adding missing watchlist talk page rows... " );
flush();
$wgDatabase->insertSelect( 'watchlist', 'watchlist',
@@ -389,9 +389,9 @@ function do_watchlist_update() {
'wl_title' => 'wl_title',
'wl_notificationtimestamp' => 'wl_notificationtimestamp'
), array( 'NOT (wl_namespace & 1)' ), $fname, 'IGNORE' );
- echo "ok\n";
+ wfOut( "ok\n" );
} else {
- echo "...watchlist talk page rows already present\n";
+ wfOut( "...watchlist talk page rows already present\n" );
}
}
@@ -402,7 +402,7 @@ function do_copy_newtalk_to_watchlist() {
$res = $wgDatabase->safeQuery( 'SELECT user_id, user_ip FROM !',
$wgDatabase->tableName( 'user_newtalk' ) );
$num_newtalks=$wgDatabase->numRows($res);
- echo "Now converting ".$num_newtalks." user_newtalk entries to watchlist table entries ... \n";
+ wfOut( "Now converting $num_newtalks user_newtalk entries to watchlist table entries ... \n" );
$user = new User();
for ( $i = 1; $i <= $num_newtalks; $i++ ) {
@@ -430,18 +430,18 @@ function do_copy_newtalk_to_watchlist() {
);
}
}
- echo "Done.\n";
+ wfOut( "Done.\n" );
}
function do_user_update() {
global $wgDatabase;
if( $wgDatabase->fieldExists( 'user', 'user_emailauthenticationtimestamp' ) ) {
- echo "User table contains old email authentication field. Dropping... ";
+ wfOut( "User table contains old email authentication field. Dropping... " );
dbsource( archive( 'patch-email-authentication.sql' ), $wgDatabase );
- echo "ok\n";
+ wfOut( "ok\n" );
} else {
- echo "...user table does not contain old email authentication field.\n";
+ wfOut( "...user table does not contain old email authentication field.\n" );
}
}
@@ -459,11 +459,11 @@ function check_bin( $table, $field, $patchFile ) {
$wgDatabase->freeResult( $res );
if( in_array( 'binary', $flags ) ) {
- echo "$table table has correct $field encoding.\n";
+ wfOut( "$table table has correct $field encoding.\n" );
} else {
- echo "Fixing $field encoding on $table table... ";
+ wfOut( "Fixing $field encoding on $table table... " );
dbsource( archive( $patchFile ), $wgDatabase );
- echo "ok\n";
+ wfOut( "ok\n" );
}
}
@@ -471,11 +471,11 @@ function do_schema_restructuring() {
global $wgDatabase;
$fname="do_schema_restructuring";
if ( $wgDatabase->tableExists( 'page' ) ) {
- echo "...page table already exists.\n";
+ wfOut( "...page table already exists.\n" );
} else {
- echo "...converting from cur/old to page/revision/text DB structure.\n"; flush();
- echo wfTimestamp( TS_DB );
- echo "......checking for duplicate entries.\n"; flush();
+ wfOut( "...converting from cur/old to page/revision/text DB structure.\n" );
+ wfOut( wfTimestamp( TS_DB ) );
+ wfOut( "......checking for duplicate entries.\n" );
list ($cur, $old, $page, $revision, $text) = $wgDatabase->tableNamesN( 'cur', 'old', 'page', 'revision', 'text' );
@@ -483,15 +483,15 @@ function do_schema_restructuring() {
FROM $cur GROUP BY cur_title, cur_namespace HAVING c>1", $fname );
if ( $wgDatabase->numRows( $rows ) > 0 ) {
- echo wfTimestamp( TS_DB );
- echo "......<b>Found duplicate entries</b>\n";
- echo ( sprintf( "<b> %-60s %3s %5s</b>\n", 'Title', 'NS', 'Count' ) );
+ wfOut( wfTimestamp( TS_DB ) );
+ wfOut( "......<b>Found duplicate entries</b>\n" );
+ wfOut( sprintf( "<b> %-60s %3s %5s</b>\n", 'Title', 'NS', 'Count' ) );
while ( $row = $wgDatabase->fetchObject( $rows ) ) {
if ( ! isset( $duplicate[$row->cur_namespace] ) ) {
$duplicate[$row->cur_namespace] = array();
}
$duplicate[$row->cur_namespace][] = $row->cur_title;
- echo ( sprintf( " %-60s %3s %5s\n", $row->cur_title, $row->cur_namespace, $row->c ) );
+ wfOut( sprintf( " %-60s %3s %5s\n", $row->cur_title, $row->cur_namespace, $row->c ) );
}
$sql = "SELECT cur_title, cur_namespace, cur_id, cur_timestamp FROM $cur WHERE ";
$firstCond = true;
@@ -531,13 +531,13 @@ function do_schema_restructuring() {
}
$sql = "DELETE FROM $cur WHERE cur_id IN ( " . join( ',', $deleteId ) . ')';
$rows = $wgDatabase->query( $sql, $fname );
- echo wfTimestamp( TS_DB );
- echo "......<b>Deleted</b> ".$wgDatabase->affectedRows()." records.\n";
+ wfOut( wfTimestamp( TS_DB ) );
+ wfOut( "......<b>Deleted</b> ".$wgDatabase->affectedRows()." records.\n" );
}
- echo wfTimestamp( TS_DB );
- echo "......Creating tables.\n";
+ wfOut( wfTimestamp( TS_DB ) );
+ wfOut( "......Creating tables.\n" );
$wgDatabase->query("CREATE TABLE $page (
page_id int(8) unsigned NOT NULL auto_increment,
page_namespace int NOT NULL,
@@ -575,26 +575,26 @@ function do_schema_restructuring() {
INDEX usertext_timestamp (rev_user_text,rev_timestamp)
) ENGINE=InnoDB", $fname );
- echo wfTimestamp( TS_DB );
- echo "......Locking tables.\n";
+ wfOut( wfTimestamp( TS_DB ) );
+ wfOut( "......Locking tables.\n" );
$wgDatabase->query( "LOCK TABLES $page WRITE, $revision WRITE, $old WRITE, $cur WRITE", $fname );
$maxold = intval( $wgDatabase->selectField( 'old', 'max(old_id)', '', $fname ) );
- echo wfTimestamp( TS_DB );
- echo "......maxold is {$maxold}\n";
+ wfOut( wfTimestamp( TS_DB ) );
+ wfOut( "......maxold is {$maxold}\n" );
- echo wfTimestamp( TS_DB );
+ wfOut( wfTimestamp( TS_DB ) );
global $wgLegacySchemaConversion;
if( $wgLegacySchemaConversion ) {
// Create HistoryBlobCurStub entries.
// Text will be pulled from the leftover 'cur' table at runtime.
- echo "......Moving metadata from cur; using blob references to text in cur table.\n";
+ wfOut( "......Moving metadata from cur; using blob references to text in cur table.\n" );
$cur_text = "concat('O:18:\"historyblobcurstub\":1:{s:6:\"mCurId\";i:',cur_id,';}')";
$cur_flags = "'object'";
} else {
// Copy all cur text in immediately: this may take longer but avoids
// having to keep an extra table around.
- echo "......Moving text from cur.\n";
+ wfOut( "......Moving text from cur.\n" );
$cur_text = 'cur_text';
$cur_flags = "''";
}
@@ -603,16 +603,16 @@ function do_schema_restructuring() {
SELECT cur_namespace, cur_title, $cur_text, cur_comment, cur_user, cur_user_text, cur_timestamp, cur_minor_edit, $cur_flags
FROM $cur", $fname );
- echo wfTimestamp( TS_DB );
- echo "......Setting up revision table.\n";
+ wfOut( wfTimestamp( TS_DB ) );
+ wfOut( "......Setting up revision table.\n" );
$wgDatabase->query( "INSERT INTO $revision (rev_id, rev_page, rev_comment, rev_user, rev_user_text, rev_timestamp,
rev_minor_edit)
SELECT old_id, cur_id, old_comment, old_user, old_user_text,
old_timestamp, old_minor_edit
FROM $old,$cur WHERE old_namespace=cur_namespace AND old_title=cur_title", $fname );
- echo wfTimestamp( TS_DB );
- echo "......Setting up page table.\n";
+ wfOut( wfTimestamp( TS_DB ) );
+ wfOut( "......Setting up page table.\n" );
$wgDatabase->query( "INSERT INTO $page (page_id, page_namespace, page_title, page_restrictions, page_counter,
page_is_redirect, page_is_new, page_random, page_touched, page_latest, page_len)
SELECT cur_id, cur_namespace, cur_title, cur_restrictions, cur_counter, cur_is_redirect, cur_is_new,
@@ -620,38 +620,38 @@ function do_schema_restructuring() {
FROM $cur,$revision
WHERE cur_id=rev_page AND rev_timestamp=cur_timestamp AND rev_id > {$maxold}", $fname );
- echo wfTimestamp( TS_DB );
- echo "......Unlocking tables.\n";
+ wfOut( wfTimestamp( TS_DB ) );
+ wfOut( "......Unlocking tables.\n" );
$wgDatabase->query( "UNLOCK TABLES", $fname );
- echo wfTimestamp( TS_DB );
- echo "......Renaming old.\n";
+ wfOut( wfTimestamp( TS_DB ) );
+ wfOut( "......Renaming old.\n" );
$wgDatabase->query( "ALTER TABLE $old RENAME TO $text", $fname );
- echo wfTimestamp( TS_DB );
- echo "...done.\n";
+ wfOut( wfTimestamp( TS_DB ) );
+ wfOut( "...done.\n" );
}
}
function do_inverse_timestamp() {
global $wgDatabase;
if( $wgDatabase->fieldExists( 'revision', 'inverse_timestamp' ) ) {
- echo "Removing revision.inverse_timestamp and fixing indexes... ";
+ wfOut( "Removing revision.inverse_timestamp and fixing indexes... " );
dbsource( archive( 'patch-inverse_timestamp.sql' ), $wgDatabase );
- echo "ok\n";
+ wfOut( "ok\n" );
} else {
- echo "revision timestamp indexes already up to 2005-03-13\n";
+ wfOut( "revision timestamp indexes already up to 2005-03-13\n" );
}
}
function do_text_id() {
global $wgDatabase;
if( $wgDatabase->fieldExists( 'revision', 'rev_text_id' ) ) {
- echo "...rev_text_id already in place.\n";
+ wfOut( "...rev_text_id already in place.\n" );
} else {
- echo "Adding rev_text_id field... ";
+ wfOut( "Adding rev_text_id field... " );
dbsource( archive( 'patch-rev_text_id.sql' ), $wgDatabase );
- echo "ok\n";
+ wfOut( "ok\n" );
}
}
@@ -682,25 +682,25 @@ function do_namespace_size_on( $table, $prefix ) {
$wgDatabase->freeResult( $result );
if( substr( $info->Type, 0, 3 ) == 'int' ) {
- echo "...$field is already a full int ($info->Type).\n";
+ wfOut( "...$field is already a full int ($info->Type).\n" );
} else {
- echo "Promoting $field from $info->Type to int... ";
+ wfOut( "Promoting $field from $info->Type to int... " );
$sql = "ALTER TABLE $tablename MODIFY $field int NOT NULL";
$wgDatabase->query( $sql );
- echo "ok\n";
+ wfOut( "ok\n" );
}
}
function do_pagelinks_update() {
global $wgDatabase;
if( $wgDatabase->tableExists( 'pagelinks' ) ) {
- echo "...already have pagelinks table.\n";
+ wfOut( "...already have pagelinks table.\n" );
} else {
- echo "Converting links and brokenlinks tables to pagelinks... ";
+ wfOut( "Converting links and brokenlinks tables to pagelinks... " );
dbsource( archive( 'patch-pagelinks.sql' ), $wgDatabase );
- echo "ok\n";
+ wfOut( "ok\n" );
flush();
global $wgCanonicalNamespaceNames;
@@ -716,7 +716,7 @@ function do_pagelinks_namespace( $namespace ) {
global $wgDatabase, $wgContLang;
$ns = intval( $namespace );
- echo "Cleaning up broken links for namespace $ns... ";
+ wfOut( "Cleaning up broken links for namespace $ns... " );
$pagelinks = $wgDatabase->tableName( 'pagelinks' );
$name = $wgContLang->getNsText( $ns );
@@ -730,25 +730,25 @@ function do_pagelinks_namespace( $namespace ) {
AND pl_title LIKE '$likeprefix:%'";
$wgDatabase->query( $sql, 'do_pagelinks_namespace' );
- echo "ok\n";
+ wfOut( "ok\n" );
}
function do_drop_img_type() {
global $wgDatabase;
if( $wgDatabase->fieldExists( 'image', 'img_type' ) ) {
- echo "Dropping unused img_type field in image table... ";
+ wfOut( "Dropping unused img_type field in image table... " );
dbsource( archive( 'patch-drop_img_type.sql' ), $wgDatabase );
- echo "ok\n";
+ wfOut( "ok\n" );
} else {
- echo "No img_type field in image table; Good.\n";
+ wfOut( "No img_type field in image table; Good.\n" );
}
}
function do_old_links_update() {
global $wgDatabase;
if( $wgDatabase->tableExists( 'pagelinks' ) ) {
- echo "Already have pagelinks; skipping old links table updates.\n";
+ wfOut( "Already have pagelinks; skipping old links table updates.\n" );
} else {
convertLinks(); flush();
}
@@ -758,14 +758,14 @@ function do_user_unique_update() {
global $wgDatabase;
$duper = new UserDupes( $wgDatabase );
if( $duper->hasUniqueIndex() ) {
- echo "Already have unique user_name index.\n";
+ wfOut( "Already have unique user_name index.\n" );
} else {
if( !$duper->clearDupes() ) {
- echo "WARNING: This next step will probably fail due to unfixed duplicates...\n";
+ wfOut( "WARNING: This next step will probably fail due to unfixed duplicates...\n" );
}
- echo "Adding unique index on user_name... ";
+ wfOut( "Adding unique index on user_name... " );
dbsource( archive( 'patch-user_nameindex.sql' ), $wgDatabase );
- echo "ok\n";
+ wfOut( "ok\n" );
}
}
@@ -774,28 +774,28 @@ function do_user_groups_update() {
global $wgDatabase;
if( $wgDatabase->tableExists( 'user_groups' ) ) {
- echo "...user_groups table already exists.\n";
+ wfOut( "...user_groups table already exists.\n" );
return do_user_groups_reformat();
}
- echo "Adding user_groups table... ";
+ wfOut( "Adding user_groups table... " );
dbsource( archive( 'patch-user_groups.sql' ), $wgDatabase );
- echo "ok\n";
+ wfOut( "ok\n" );
if( !$wgDatabase->tableExists( 'user_rights' ) ) {
if( $wgDatabase->fieldExists( 'user', 'user_rights' ) ) {
- echo "Upgrading from a 1.3 or older database? Breaking out user_rights for conversion...";
+ wfOut( "Upgrading from a 1.3 or older database? Breaking out user_rights for conversion..." );
dbsource( archive( 'patch-user_rights.sql' ), $wgDatabase );
- echo "ok\n";
+ wfOut( "ok\n" );
} else {
- echo "*** WARNING: couldn't locate user_rights table or field for upgrade.\n";
- echo "*** You may need to manually configure some sysops by manipulating\n";
- echo "*** the user_groups table.\n";
+ wfOut( "*** WARNING: couldn't locate user_rights table or field for upgrade.\n" );
+ wfOut( "*** You may need to manually configure some sysops by manipulating\n" );
+ wfOut( "*** the user_groups table.\n" );
return;
}
}
- echo "Converting user_rights table to user_groups... ";
+ wfOut( "Converting user_rights table to user_groups... " );
$result = $wgDatabase->select( 'user_rights',
array( 'ur_user', 'ur_rights' ),
array( "ur_rights != ''" ),
@@ -815,7 +815,7 @@ function do_user_groups_update() {
}
}
$wgDatabase->freeResult( $result );
- echo "ok\n";
+ wfOut( "ok\n" );
}
function do_user_groups_reformat() {
@@ -826,20 +826,20 @@ function do_user_groups_reformat() {
if( $info->type() == 'int' ) {
$oldug = $wgDatabase->tableName( 'user_groups' );
$newug = $wgDatabase->tableName( 'user_groups_bogus' );
- echo "user_groups is in bogus intermediate format. Renaming to $newug... ";
+ wfOut( "user_groups is in bogus intermediate format. Renaming to $newug... " );
$wgDatabase->query( "ALTER TABLE $oldug RENAME TO $newug" );
- echo "ok\n";
+ wfOut( "ok\n" );
- echo "Re-adding fresh user_groups table... ";
+ wfOut( "Re-adding fresh user_groups table... " );
dbsource( archive( 'patch-user_groups.sql' ), $wgDatabase );
- echo "ok\n";
+ wfOut( "ok\n" );
- echo "***\n";
- echo "*** WARNING: You will need to manually fix up user permissions in the user_groups\n";
- echo "*** table. Old 1.5 alpha versions did some pretty funky stuff...\n";
- echo "***\n";
+ wfOut( "***\n" );
+ wfOut( "*** WARNING: You will need to manually fix up user permissions in the user_groups\n" );
+ wfOut( "*** table. Old 1.5 alpha versions did some pretty funky stuff...\n" );
+ wfOut( "***\n" );
} else {
- echo "...user_groups is in current format.\n";
+ wfOut( "...user_groups is in current format.\n" );
}
}
@@ -851,11 +851,11 @@ function do_watchlist_null() {
$info = $wgDatabase->fieldInfo( 'watchlist', 'wl_notificationtimestamp' );
if( !$info->nullable() ) {
- echo "Making wl_notificationtimestamp nullable... ";
+ wfOut( "Making wl_notificationtimestamp nullable... " );
dbsource( archive( 'patch-watchlist-null.sql' ), $wgDatabase );
- echo "ok\n";
+ wfOut( "ok\n" );
} else {
- echo "...wl_notificationtimestamp is already nullable.\n";
+ wfOut( "...wl_notificationtimestamp is already nullable.\n" );
}
}
@@ -866,13 +866,13 @@ function do_watchlist_null() {
function do_page_random_update() {
global $wgDatabase;
- echo "Setting page_random to a random value on rows where it equals 0...";
+ wfOut( "Setting page_random to a random value on rows where it equals 0..." );
$page = $wgDatabase->tableName( 'page' );
$wgDatabase->query( "UPDATE $page SET page_random = RAND() WHERE page_random = 0", 'do_page_random_update' );
$rows = $wgDatabase->affectedRows();
- echo "changed $rows rows\n";
+ wfOut( "changed $rows rows\n" );
}
function do_templatelinks_update() {
@@ -880,12 +880,12 @@ function do_templatelinks_update() {
$fname = 'do_templatelinks_update';
if ( $wgDatabase->tableExists( 'templatelinks' ) ) {
- echo "...templatelinks table already exists\n";
+ wfOut( "...templatelinks table already exists\n" );
return;
}
- echo "Creating templatelinks table...\n";
+ wfOut( "Creating templatelinks table...\n" );
dbsource( archive('patch-templatelinks.sql'), $wgDatabase );
- echo "Populating...\n";
+ wfOut( "Populating...\n" );
if ( isset( $wgLoadBalancer ) && $wgLoadBalancer->getServerCount() > 1 ) {
// Slow, replication-friendly update
$res = $wgDatabase->select( 'pagelinks', array( 'pl_from', 'pl_namespace', 'pl_title' ),
@@ -922,14 +922,14 @@ function do_templatelinks_update() {
), $fname
);
}
- echo "Done. Please run maintenance/refreshLinks.php for a more thorough templatelinks update.\n";
+ wfOut( "Done. Please run maintenance/refreshLinks.php for a more thorough templatelinks update.\n" );
}
// Add index on ( rc_namespace, rc_user_text ) [Jul. 2006]
// Add index on ( rc_user_text, rc_timestamp ) [Nov. 2006]
function do_rc_indices_update() {
global $wgDatabase;
- echo( "Checking for additional recent changes indices...\n" );
+ wfOut( "Checking for additional recent changes indices...\n" );
$indexes = array(
'rc_ns_usertext' => 'patch-recentchanges-utindex.sql',
@@ -939,59 +939,59 @@ function do_rc_indices_update() {
foreach( $indexes as $index => $patch ) {
$info = $wgDatabase->indexInfo( 'recentchanges', $index, __METHOD__ );
if( !$info ) {
- echo( "...index `{$index}` not found; adding..." );
+ wfOut( "...index `{$index}` not found; adding..." );
dbsource( archive( $patch ) );
- echo( "done.\n" );
+ wfOut( "done.\n" );
} else {
- echo( "...index `{$index}` seems ok.\n" );
+ wfOut( "...index `{$index}` seems ok.\n" );
}
}
}
function index_has_field($table, $index, $field) {
global $wgDatabase;
- echo( "Checking if $table index $index includes field $field...\n" );
+ wfOut( "Checking if $table index $index includes field $field...\n" );
$info = $wgDatabase->indexInfo( $table, $index, __METHOD__ );
if( $info ) {
foreach($info as $row) {
if($row->Column_name == $field) {
- echo( "...index $index on table $table seems to be ok\n" );
+ wfOut( "...index $index on table $table seems to be ok\n" );
return true;
}
}
}
- echo( "...index $index on table $table has no field $field; adding\n" );
+ wfOut( "...index $index on table $table has no field $field; adding\n" );
return false;
}
function do_backlinking_indices_update() {
- echo( "Checking for backlinking indices...\n" );
+ wfOut( "Checking for backlinking indices...\n" );
if (!index_has_field('pagelinks', 'pl_namespace', 'pl_from') ||
!index_has_field('templatelinks', 'tl_namespace', 'tl_from') ||
!index_has_field('imagelinks', 'il_to', 'il_from'))
{
dbsource( archive( 'patch-backlinkindexes.sql' ) );
- echo( "...backlinking indices updated\n" );
+ wfOut( "...backlinking indices updated\n" );
}
}
function do_categorylinks_indices_update() {
- echo( "Checking for categorylinks indices...\n" );
+ wfOut( "Checking for categorylinks indices...\n" );
if (!index_has_field('categorylinks', 'cl_sortkey', 'cl_from'))
{
dbsource( archive( 'patch-categorylinksindex.sql' ) );
- echo( "...categorylinks indices updated\n" );
+ wfOut( "...categorylinks indices updated\n" );
}
}
function do_filearchive_indices_update() {
global $wgDatabase;
- echo( "Checking filearchive indices...\n" );
+ wfOut( "Checking filearchive indices...\n" );
$info = $wgDatabase->indexInfo( 'filearchive', 'fa_user_timestamp', __METHOD__ );
if ( !$info )
{
dbsource( archive( 'patch-filearhive-user-index.sql' ) );
- echo( "...filearchive indices updated\n" );
+ wfOut( "...filearchive indices updated\n" );
}
}
@@ -1000,27 +1000,26 @@ function maybe_do_profiling_memory_update() {
if ( !$wgDatabase->tableExists( 'profiling' ) ) {
// Simply ignore
} elseif ( $wgDatabase->fieldExists( 'profiling', 'pf_memory' ) ) {
- echo "profiling table has pf_memory field.\n";
+ wfOut( "profiling table has pf_memory field.\n" );
} else {
- echo "Adding pf_memory field to table profiling...";
+ wfOut( "Adding pf_memory field to table profiling..." );
dbsource( archive( 'patch-profiling-memory.sql' ), $wgDatabase );
- echo "ok\n";
+ wfOut( "ok\n" );
}
}
function do_stats_init() {
// Sometimes site_stats table is not properly populated.
global $wgDatabase;
- echo "Checking site_stats row...";
+ wfOut( "Checking site_stats row..." );
$row = $wgDatabase->selectRow( 'site_stats', '*', array( 'ss_row_id' => 1 ), __METHOD__ );
if( $row === false ) {
- echo "data is missing! rebuilding...\n";
-
+ wfOut( "data is missing! rebuilding...\n" );
global $IP;
require_once "$IP/maintenance/initStats.inc";
wfInitStats();
} else {
- echo "ok.\n";
+ wfOut( "ok.\n" );
}
}
@@ -1028,9 +1027,9 @@ function purge_cache() {
global $wgDatabase;
# We can't guarantee that the user will be able to use TRUNCATE,
# but we know that DELETE is available to us
- echo( "Purging caches..." );
+ wfOut( "Purging caches..." );
$wgDatabase->delete( 'objectcache', '*', __METHOD__ );
- echo( "done.\n" );
+ wfOut( "done.\n" );
}
function do_all_updates( $shared = false, $purge = true ) {
@@ -1074,15 +1073,14 @@ function do_all_updates( $shared = false, $purge = true ) {
}
- echo "Deleting old default messages (this may take a long time!)..."; flush();
+ wfOut( "Deleting old default messages (this may take a long time!)..." );
deleteDefaultMessages();
- echo "Done\n"; flush();
+ wfOut( "Done\n" );
- do_stats_init(); flush();
+ do_stats_init();
if( $purge ) {
purge_cache();
- flush();
}
}
@@ -1108,14 +1106,14 @@ function do_restrictions_update() {
$patch2 = 'patch-page_restrictions_sortkey.sql';
if ( $wgDatabase->tableExists( $name ) ) {
- echo "...$name table already exists.\n";
+ wfOut( "...$name table already exists.\n" );
} else {
- echo "Creating $name table...";
+ wfOut( "Creating $name table..." );
dbsource( archive($patch), $wgDatabase );
dbsource( archive($patch2), $wgDatabase );
- echo "ok\n";
+ wfOut( "ok\n" );
- echo "Migrating old restrictions to new table...";
+ wfOut( "Migrating old restrictions to new table..." );
$res = $wgDatabase->select( 'page', array( 'page_id', 'page_restrictions' ), array("page_restrictions!=''", "page_restrictions!='edit=:move='"), __METHOD__ );
@@ -1167,27 +1165,27 @@ function do_restrictions_update() {
__METHOD__ );
}
}
- print "ok\n";
+ wfOut( "ok\n" );
}
}
function do_category_population() {
if( update_row_exists( 'populate category' ) ) {
- echo "...category table already populated.\n";
+ wfOut( "...category table already populated.\n" );
return;
}
require_once( 'populateCategory.inc' );
- echo "Populating category table, printing progress markers. ".
+ wfOut( "Populating category table, printing progress markers. " ).
"For large databases, you\n".
"may want to hit Ctrl-C and do this manually with maintenance/\n".
"populateCategory.php.\n";
populateCategory( '', 10, 0, true );
- echo "Done populating category table.\n";
+ wfOut( "Done populating category table.\n" );
}
function do_populate_parent_id() {
if( update_row_exists( 'populate rev_parent_id' ) ) {
- echo "...rev_parent_id column already populated.\n";
+ wfOut( "...rev_parent_id column already populated.\n" );
return;
}
require_once( 'populateParentId.inc' );
@@ -1198,11 +1196,11 @@ function do_populate_parent_id() {
function update_password_format() {
if ( update_row_exists( 'password format' ) ) {
- echo "...password hash format already changed\n";
+ wfOut( "...password hash format already changed\n" );
return;
}
- echo "Updating password hash format...";
+ wfOut( "Updating password hash format..." );
global $wgDatabase, $wgPasswordSalt;
$user = $wgDatabase->tableName( 'user' );
@@ -1216,7 +1214,7 @@ function update_password_format() {
$wgDatabase->query( $sql, __METHOD__ );
$wgDatabase->insert( 'updatelog', array( 'ul_key' => 'password format' ), __METHOD__ );
- echo "done\n";
+ wfOut( "done\n" );
}
function
@@ -1376,11 +1374,11 @@ function do_postgres_updates() {
$search_path = $conf['search_path'];
}
if( strpos( $search_path, $wgDBmwschema ) === false ) {
- echo "Adding in schema \"$wgDBmwschema\" to search_path for user \"$wgDBuser\"\n";
+ wfOut( "Adding in schema \"$wgDBmwschema\" to search_path for user \"$wgDBuser\"\n" );
$search_path = "$wgDBmwschema, $search_path";
}
if( strpos( $search_path, $wgDBts2schema ) === false ) {
- echo "Adding in schema \"$wgDBts2schema\" to search_path for user \"$wgDBuser\"\n";
+ wfOut( "Adding in schema \"$wgDBts2schema\" to search_path for user \"$wgDBuser\"\n" );
$search_path = "$search_path, $wgDBts2schema";
}
if( array_key_exists( 'search_path', $conf ) === false || $search_path != $conf['search_path'] ) {
@@ -1389,7 +1387,7 @@ function do_postgres_updates() {
}
else {
$path = $conf['search_path'];
- echo "... search_path for user \"$wgDBuser\" looks correct ($path)\n";
+ wfOut( "... search_path for user \"$wgDBuser\" looks correct ($path)\n" );
}
$goodconf = array(
'client_min_messages' => 'error',
@@ -1399,12 +1397,12 @@ function do_postgres_updates() {
foreach( array_keys( $goodconf ) AS $key ) {
$value = $goodconf[$key];
if( !array_key_exists( $key, $conf ) or $conf[$key] !== $value ) {
- echo "Setting $key to '$value' for user \"$wgDBuser\"\n";
+ wfOut( "Setting $key to '$value' for user \"$wgDBuser\"\n" );
$wgDatabase->doQuery( "ALTER USER $wgDBuser SET $key = '$value'" );
$wgDatabase->doQuery( "SET $key = '$value'" );
}
else {
- echo "... default value of \"$key\" is correctly set to \"$value\" for user \"$wgDBuser\"\n";
+ wfOut( "... default value of \"$key\" is correctly set to \"$value\" for user \"$wgDBuser\"\n" );
}
}
@@ -1526,62 +1524,62 @@ function do_postgres_updates() {
foreach ($newsequences as $ns) {
if ($wgDatabase->sequenceExists($ns)) {
- echo "... sequence \"$ns\" already exists\n";
+ wfOut( "... sequence \"$ns\" already exists\n" );
continue;
}
- echo "Creating sequence \"$ns\"\n";
+ wfOut( "Creating sequence \"$ns\"\n" );
$wgDatabase->query("CREATE SEQUENCE $ns");
}
foreach ($newtables as $nt) {
if ($wgDatabase->tableExists($nt[0])) {
- echo "... table \"$nt[0]\" already exists\n";
+ wfOut( "... table \"$nt[0]\" already exists\n" );
continue;
}
- echo "Creating table \"$nt[0]\"\n";
+ wfOut( "Creating table \"$nt[0]\"\n" );
dbsource(archive($nt[1]));
}
## Needed before newcols
if ($wgDatabase->tableExists("archive2")) {
- echo "Converting \"archive2\" back to normal archive table\n";
+ wfOut( "Converting \"archive2\" back to normal archive table\n" );
if ($wgDatabase->ruleExists("archive", "archive_insert")) {
- echo "Dropping rule \"archive_insert\"\n";
+ wfOut( "Dropping rule \"archive_insert\"\n" );
$wgDatabase->query("DROP RULE archive_insert ON archive");
}
if ($wgDatabase->ruleExists("archive", "archive_delete")) {
- echo "Dropping rule \"archive_delete\"\n";
+ wfOut( "Dropping rule \"archive_delete\"\n" );
$wgDatabase->query("DROP RULE archive_delete ON archive");
}
dbsource(archive("patch-remove-archive2.sql"));
}
else
- echo "... obsolete table \"archive2\" does not exist\n";
+ wfOut( "... obsolete table \"archive2\" does not exist\n" );
foreach ($newcols as $nc) {
$fi = $wgDatabase->fieldInfo($nc[0], $nc[1]);
if (!is_null($fi)) {
- echo "... column \"$nc[0].$nc[1]\" already exists\n";
+ wfOut( "... column \"$nc[0].$nc[1]\" already exists\n" );
continue;
}
- echo "Adding column \"$nc[0].$nc[1]\"\n";
+ wfOut( "Adding column \"$nc[0].$nc[1]\"\n" );
$wgDatabase->query("ALTER TABLE $nc[0] ADD $nc[1] $nc[2]");
}
foreach ($typechanges as $tc) {
$fi = $wgDatabase->fieldInfo($tc[0], $tc[1]);
if (is_null($fi)) {
- echo "... error: expected column $tc[0].$tc[1] to exist\n";
+ wfOut( "... error: expected column $tc[0].$tc[1] to exist\n" );
exit(1);
}
if ($fi->type() === $tc[2])
- echo "... column \"$tc[0].$tc[1]\" is already of type \"$tc[2]\"\n";
+ wfOut( "... column \"$tc[0].$tc[1]\" is already of type \"$tc[2]\"\n" );
else {
- echo "Changing column type of \"$tc[0].$tc[1]\" from \"{$fi->type()}\" to \"$tc[2]\"\n";
+ wfOut( "Changing column type of \"$tc[0].$tc[1]\" from \"{$fi->type()}\" to \"$tc[2]\"\n" );
$sql = "ALTER TABLE $tc[0] ALTER $tc[1] TYPE $tc[2]";
if (strlen($tc[3])) {
$default = array();
@@ -1598,86 +1596,86 @@ function do_postgres_updates() {
}
if ($wgDatabase->fieldInfo('oldimage','oi_deleted')->type() !== 'smallint') {
- echo "Changing \"oldimage.oi_deleted\" to type \"smallint\"\n";
+ wfOut( "Changing \"oldimage.oi_deleted\" to type \"smallint\"\n" );
$wgDatabase->query( "ALTER TABLE oldimage ALTER oi_deleted DROP DEFAULT" );
$wgDatabase->query( "ALTER TABLE oldimage ALTER oi_deleted TYPE SMALLINT USING (oi_deleted::smallint)" );
$wgDatabase->query( "ALTER TABLE oldimage ALTER oi_deleted SET DEFAULT 0" );
}
else
- echo "... column \"oldimage.oi_deleted\" is already of type \"smallint\"\n";
+ wfOut( "... column \"oldimage.oi_deleted\" is already of type \"smallint\"\n" );
foreach ($newindexes as $ni) {
if (pg_index_exists($ni[0], $ni[1])) {
- echo "... index \"$ni[1]\" on table \"$ni[0]\" already exists\n";
+ wfOut( "... index \"$ni[1]\" on table \"$ni[0]\" already exists\n" );
continue;
}
- echo "Creating index \"$ni[1]\" on table \"$ni[0]\" $ni[2]\n";
+ wfOut( "Creating index \"$ni[1]\" on table \"$ni[0]\" $ni[2]\n" );
$wgDatabase->query( "CREATE INDEX $ni[1] ON $ni[0] $ni[2]" );
}
foreach ($newrules as $nr) {
if ($wgDatabase->ruleExists($nr[0], $nr[1])) {
- echo "... rule \"$nr[1]\" on table \"$nr[0]\" already exists\n";
+ wfOut( "... rule \"$nr[1]\" on table \"$nr[0]\" already exists\n" );
continue;
}
- echo "Adding rule \"$nr[1]\" to table \"$nr[0]\"\n";
+ wfOut( "Adding rule \"$nr[1]\" to table \"$nr[0]\"\n" );
dbsource(archive($nr[2]));
}
if ($wgDatabase->hasConstraint("oldimage_oi_name_fkey")) {
- echo "Making foriegn key on table \"oldimage\" (to image) a cascade delete\n";
+ wfOut( "Making foriegn key on table \"oldimage\" (to image) a cascade delete\n" );
$wgDatabase->query( "ALTER TABLE oldimage DROP CONSTRAINT oldimage_oi_name_fkey" );
$wgDatabase->query( "ALTER TABLE oldimage ADD CONSTRAINT oldimage_oi_name_fkey_cascade ".
"FOREIGN KEY (oi_name) REFERENCES image(img_name) ON DELETE CASCADE" );
}
else
- echo "... table \"oldimage\" has correct cascade delete foreign key to image\n";
+ wfOut( "... table \"oldimage\" has correct cascade delete foreign key to image\n" );
if (!$wgDatabase->triggerExists("page", "page_deleted")) {
- echo "Adding function and trigger \"page_deleted\" to table \"page\"\n";
+ wfOut( "Adding function and trigger \"page_deleted\" to table \"page\"\n" );
dbsource(archive('patch-page_deleted.sql'));
}
else
- echo "... table \"page\" has \"page_deleted\" trigger\n";
+ wfOut( "... table \"page\" has \"page_deleted\" trigger\n" );
$fi = $wgDatabase->fieldInfo("recentchanges", "rc_cur_id");
if (!$fi->nullable()) {
- echo "Removing NOT NULL constraint from \"recentchanges.rc_cur_id\"\n";
+ wfOut( "Removing NOT NULL constraint from \"recentchanges.rc_cur_id\"\n" );
dbsource(archive('patch-rc_cur_id-not-null.sql'));
}
else
- echo "... column \"recentchanges.rc_cur_id\" has a NOT NULL constraint\n";
+ wfOut( "... column \"recentchanges.rc_cur_id\" has a NOT NULL constraint\n" );
$pu = pg_describe_index("pagelink_unique");
if (!is_null($pu) && ($pu[0] != "pl_from" || $pu[1] != "pl_namespace" || $pu[2] != "pl_title")) {
- echo "Dropping obsolete version of index \"pagelink_unique index\"\n";
+ wfOut( "Dropping obsolete version of index \"pagelink_unique index\"\n" );
$wgDatabase->query("DROP INDEX pagelink_unique");
$pu = null;
}
else
- echo "... obsolete version of index \"pagelink_unique index\" does not exist\n";
+ wfOut( "... obsolete version of index \"pagelink_unique index\" does not exist\n" );
if (is_null($pu)) {
- echo "Creating index \"pagelink_unique index\"\n";
+ wfOut( "Creating index \"pagelink_unique index\"\n" );
$wgDatabase->query("CREATE UNIQUE INDEX pagelink_unique ON pagelinks (pl_from,pl_namespace,pl_title)");
}
else
- echo "... index \"pagelink_unique_index\" already exists\n";
+ wfOut( "... index \"pagelink_unique_index\" already exists\n" );
if (pg_fkey_deltype("revision_rev_user_fkey") == 'r') {
- echo "... constraint \"revision_rev_user_fkey\" is ON DELETE RESTRICT\n";
+ wfOut( "... constraint \"revision_rev_user_fkey\" is ON DELETE RESTRICT\n" );
}
else {
- echo "Changing constraint \"revision_rev_user_fkey\" to ON DELETE RESTRICT\n";
+ wfOut( "Changing constraint \"revision_rev_user_fkey\" to ON DELETE RESTRICT\n" );
dbsource(archive('patch-revision_rev_user_fkey.sql'));
}
# Fix ipb_address index
if (pg_index_exists('ipblocks', 'ipb_address_unique' )) {
- echo "... have ipb_address_unique\n";
+ wfOut( "... have ipb_address_unique\n" );
} else {
- echo "Adding ipb_address_unique index\n";
+ wfOut( "Adding ipb_address_unique index\n" );
dbsource(archive('patch-ipb_address_unique.sql'));
}
@@ -1685,29 +1683,29 @@ function do_postgres_updates() {
# Add missing extension tables
foreach ( $wgExtNewTables as $nt ) {
if ($wgDatabase->tableExists($nt[0])) {
- echo "... table \"$nt[0]\" already exists\n";
+ wfOut( "... table \"$nt[0]\" already exists\n" );
continue;
}
- echo "Creating table \"$nt[0]\"\n";
+ wfOut( "Creating table \"$nt[0]\"\n" );
dbsource($nt[1]);
}
# Add missing extension fields
foreach ( $wgExtPGNewFields as $nc ) {
$fi = $wgDatabase->fieldInfo($nc[0], $nc[1]);
if (!is_null($fi)) {
- echo "... column \"$nc[0].$nc[1]\" already exists\n";
+ wfOut( "... column \"$nc[0].$nc[1]\" already exists\n" );
continue;
}
- echo "Adding column \"$nc[0].$nc[1]\"\n";
+ wfOut( "Adding column \"$nc[0].$nc[1]\"\n" );
$wgDatabase->query( "ALTER TABLE $nc[0] ADD $nc[1] $nc[2]" );
}
# Add missing extension indexes
foreach ( $wgExtNewIndexes as $ni ) {
if (pg_index_exists($ni[0], $ni[1])) {
- echo "... index \"$ni[1]\" on table \"$ni[0]\" already exists\n";
+ wfOut( "... index \"$ni[1]\" on table \"$ni[0]\" already exists\n" );
continue;
}
- echo "Creating index \"$ni[1]\" on table \"$ni[0]\"\n";
+ wfOut( "Creating index \"$ni[1]\" on table \"$ni[0]\"\n" );
dbsource($ni[2]);
}
diff --git a/maintenance/userDupes.inc b/maintenance/userDupes.inc
index 86b70e3b..2f224c3d 100644
--- a/maintenance/userDupes.inc
+++ b/maintenance/userDupes.inc
@@ -45,7 +45,7 @@ class UserDupes {
$fname = 'UserDupes::hasUniqueIndex';
$info = $this->db->indexInfo( 'user', 'user_name', $fname );
if( !$info ) {
- echo "WARNING: doesn't seem to have user_name index at all!\n";
+ wfOut( "WARNING: doesn't seem to have user_name index at all!\n" );
return false;
}
@@ -92,11 +92,11 @@ class UserDupes {
$this->lock();
- echo "Checking for duplicate accounts...\n";
+ wfOut( "Checking for duplicate accounts...\n" );
$dupes = $this->getDupes();
$count = count( $dupes );
- echo "Found $count accounts with duplicate records on ".wfWikiID().".\n";
+ wfOut( "Found $count accounts with duplicate records on ".wfWikiID().".\n" );
$this->trimmed = 0;
$this->reassigned = 0;
$this->failed = 0;
@@ -106,34 +106,34 @@ class UserDupes {
$this->unlock();
- echo "\n";
+ wfOut( "\n" );
if( $this->reassigned > 0 ) {
if( $doDelete ) {
- echo "$this->reassigned duplicate accounts had edits reassigned to a canonical record id.\n";
+ wfOut( "$this->reassigned duplicate accounts had edits reassigned to a canonical record id.\n" );
} else {
- echo "$this->reassigned duplicate accounts need to have edits reassigned.\n";
+ wfOut( "$this->reassigned duplicate accounts need to have edits reassigned.\n" );
}
}
if( $this->trimmed > 0 ) {
if( $doDelete ) {
- echo "$this->trimmed duplicate user records were deleted from ".wfWikiID().".\n";
+ wfOut( "$this->trimmed duplicate user records were deleted from ".wfWikiID().".\n" );
} else {
- echo "$this->trimmed duplicate user accounts were found on ".wfWikiID()." which can be removed safely.\n";
+ wfOut( "$this->trimmed duplicate user accounts were found on ".wfWikiID()." which can be removed safely.\n" );
}
}
if( $this->failed > 0 ) {
- echo "Something terribly awry; $this->failed duplicate accounts were not removed.\n";
+ wfOut( "Something terribly awry; $this->failed duplicate accounts were not removed.\n" );
return false;
}
if( $this->trimmed == 0 || $doDelete ) {
- echo "It is now safe to apply the unique index on user_name.\n";
+ wfOut( "It is now safe to apply the unique index on user_name.\n" );
return true;
} else {
- echo "Run this script again with the --fix option to automatically delete them.\n";
+ wfOut( "Run this script again with the --fix option to automatically delete them.\n" );
return false;
}
}
@@ -215,36 +215,36 @@ class UserDupes {
$firstRow = $this->db->fetchObject( $result );
$firstId = $firstRow->user_id;
- echo "Record that will be used for '$name' is user_id=$firstId\n";
+ wfOut( "Record that will be used for '$name' is user_id=$firstId\n" );
while( $row = $this->db->fetchObject( $result ) ) {
$dupeId = $row->user_id;
- echo "... dupe id $dupeId: ";
+ wfOut( "... dupe id $dupeId: " );
$edits = $this->editCount( $dupeId );
if( $edits > 0 ) {
$this->reassigned++;
- echo "has $edits edits! ";
+ wfOut( "has $edits edits! " );
if( $doDelete ) {
$this->reassignEdits( $dupeId, $firstId );
$newEdits = $this->editCount( $dupeId );
if( $newEdits == 0 ) {
- echo "confirmed cleaned. ";
+ wfOut( "confirmed cleaned. " );
} else {
$this->failed++;
- echo "WARNING! $newEdits remaining edits for $dupeId; NOT deleting user.\n";
+ wfOut( "WARNING! $newEdits remaining edits for $dupeId; NOT deleting user.\n" );
continue;
}
} else {
- echo "(will need to reassign edits on fix)";
+ wfOut( "(will need to reassign edits on fix)" );
}
} else {
- echo "ok, no edits. ";
+ wfOut( "ok, no edits. " );
}
$this->trimmed++;
if( $doDelete ) {
$this->trimAccount( $dupeId );
}
- echo "\n";
+ wfOut( "\n" );
}
$this->db->freeResult( $result );
}
@@ -306,12 +306,12 @@ class UserDupes {
*/
function reassignEditsOn( $table, $field, $from, $to ) {
$fname = 'UserDupes::reassignEditsOn';
- echo "reassigning on $table... ";
+ wfOut( "reassigning on $table... " );
$this->db->update( $table,
array( $field => $to ),
array( $field => $from ),
$fname );
- echo "ok. ";
+ wfOut( "ok. " );
}
/**
@@ -321,9 +321,9 @@ class UserDupes {
*/
function trimAccount( $userid ) {
$fname = 'UserDupes::trimAccount';
- echo "deleting...";
+ wfOut( "deleting..." );
$this->db->delete( 'user', array( 'user_id' => $userid ), $fname );
- echo " ok";
+ wfOut( " ok" );
}
}