X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FconvertLinks.inc;h=9f3d03ef8409839ecce197fcd018d934ade14085;hb=7c78c7945ae2dbbcee00a377298b5a39310862ad;hp=a2acf67eb84901c7cdaac7b9b8874effd0df6da1;hpb=aad104e3606aabd61e2eb4bf757c292144c9aac6;p=lhc%2Fweb%2Fwiklou.git diff --git a/maintenance/convertLinks.inc b/maintenance/convertLinks.inc index a2acf67eb8..9f3d03ef84 100644 --- a/maintenance/convertLinks.inc +++ b/maintenance/convertLinks.inc @@ -1,7 +1,22 @@ tableNames( 'cur', 'links', 'links_temp', 'links_backup' ) ); - $res = wfQuery( "SELECT COUNT(*) AS count FROM links", DB_WRITE ); - $row = wfFetchObject($res); + $res = $dbw->query( "SELECT l_from FROM $links LIMIT 1" ); + if ( $dbw->fieldType( $res, 0 ) == "int" ) { + print "Schema already converted\n"; + return; + } + + $res = $dbw->query( "SELECT COUNT(*) AS count FROM $links" ); + $row = $dbw->fetchObject($res); $numRows = $row->count; - wfFreeResult( $res ); + $dbw->freeResult( $res ); if ( $numRows == 0 ) { - print "No rows to convert. Updating schema...\n"; + print "Updating schema (no rows to convert)...\n"; createTempTable(); } else { - $row = wfFetchObject( $res ); - if ( is_numeric( $row->l_from ) ) { - print "Schema already converted\n"; - exit; - } - if ( $logPerformance ) { $fh = fopen ( $perfLogFilename, "w" ); } $baseTime = $startTime = getMicroTime(); # Create a title -> cur_id map - print "Loading IDs from cur table...\n"; + print "Loading IDs from $cur table...\n"; performanceLog ( "Reading $numRows rows from cur table...\n" ); performanceLog ( "rows read vs seconds elapsed:\n" ); - wfBufferSQLResults( false ); - $res = wfQuery( "SELECT cur_namespace,cur_title,cur_id FROM cur", DB_WRITE ); + + $dbw->bufferResults( false ); + $res = $dbw->query( "SELECT cur_namespace,cur_title,cur_id FROM $cur" ); $ids = array(); - while ( $row = wfFetchObject( $res ) ) { + while ( $row = $dbw->fetchObject( $res ) ) { $title = $row->cur_title; if ( $row->cur_namespace ) { $title = $wgLang->getNsText( $row->cur_namespace ) . ":$title"; @@ -63,12 +82,12 @@ function convertLinks() { if ($reportCurReadProgress) { if (($curRowsRead % $curReadReportInterval) == 0) { performanceLog( $curRowsRead . " " . (getMicroTime() - $baseTime) . "\n" ); - print "\t$curRowsRead rows of cur table read.\n"; + print "\t$curRowsRead rows of $cur table read.\n"; } } } - wfFreeResult( $res ); - wfBufferSQLResults( true ); + $dbw->freeResult( $res ); + $dbw->bufferResults( true ); print "Finished loading IDs.\n\n"; performanceLog( "Took " . (getMicroTime() - $baseTime) . " seconds to load IDs.\n\n" ); #-------------------------------------------------------------------- @@ -78,21 +97,22 @@ function convertLinks() { createTempTable(); performanceLog( "Resetting timer.\n\n" ); $baseTime = getMicroTime(); - print "Processing $numRows rows from links table...\n"; - performanceLog( "Processing $numRows rows from links table...\n" ); + print "Processing $numRows rows from $links table...\n"; + performanceLog( "Processing $numRows rows from $links table...\n" ); performanceLog( "rows inserted vs seconds elapsed:\n" ); for ($rowOffset = $initialRowOffset; $rowOffset < $numRows; $rowOffset += $linksConvInsertInterval) { - $sqlRead = "SELECT * FROM links LIMIT $linksConvInsertInterval OFFSET $rowOffset"; - $res = wfQuery($sqlRead, DB_READ); + $sqlRead = "SELECT * FROM $links "; + $sqlRead = $dbw->limitResult($sqlRead, $linksConvInsertInterval,$rowOffset); + $res = $dbw->query($sqlRead); if ( $noKeys ) { - $sqlWrite = array("INSERT INTO links_temp(l_from,l_to) VALUES "); + $sqlWrite = array("INSERT INTO $links_temp (l_from,l_to) VALUES "); } else { - $sqlWrite = array("INSERT IGNORE INTO links_temp(l_from,l_to) VALUES "); + $sqlWrite = array("INSERT IGNORE INTO $links_temp (l_from,l_to) VALUES "); } $tuplesAdded = 0; # no tuples added to INSERT yet - while ( $row = wfFetchObject($res) ) { + while ( $row = $dbw->fetchObject($res) ) { $fromTitle = $row->l_from; if ( array_key_exists( $fromTitle, $ids ) ) { # valid title $from = $ids[$fromTitle]; @@ -106,13 +126,13 @@ function convertLinks() { $numBadLinks++; } } - wfFreeResult($res); + $dbw->freeResult($res); #print "rowOffset: $rowOffset\ttuplesAdded: $tuplesAdded\tnumBadLinks: $numBadLinks\n"; if ( $tuplesAdded != 0 ) { if ($reportLinksConvProgress) { - print "Inserting $tuplesAdded tuples into links_temp..."; + print "Inserting $tuplesAdded tuples into $links_temp..."; } - wfQuery( implode("",$sqlWrite) , DB_WRITE ); + $dbw->query( implode("",$sqlWrite) ); $totalTuplesInserted += $tuplesAdded; if ($reportLinksConvProgress) print " done. Total $totalTuplesInserted tuples inserted.\n"; @@ -130,25 +150,26 @@ function convertLinks() { $dbConn = Database::newFromParams( $wgDBserver, $wgDBadminuser, $wgDBadminpassword, $wgDBname ); if (!($dbConn->isOpen())) { print "Opening connection to database failed.\n"; - exit; + return; } # Check for existing links_backup, and delete it if it exists. print "Dropping backup links table if it exists..."; - $dbConn->query( "DROP TABLE IF EXISTS links_backup", DB_WRITE); + $dbConn->query( "DROP TABLE IF EXISTS $links_backup", DB_MASTER); print " 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'..."; - $dbConn->query( "RENAME TABLE links TO links_backup, links_temp TO links", DB_WRITE ); + print "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"; $dbConn->close(); - print "Conversion complete. The old table remains at links_backup;\n"; + print "Conversion complete. The old table remains at $links_backup;\n"; print "delete at your leisure.\n"; } else { - print "Conversion complete. The converted table is at links_temp;\n"; + print "Conversion complete. The converted table is at $links_temp;\n"; print "the original links table is unchanged.\n"; } +} #-------------------------------------------------------------------- @@ -159,24 +180,25 @@ function createTempTable() { if (!($dbConn->isOpen())) { print "Opening connection to database failed.\n"; - exit; + return; } + $links_temp = $dbConn->tableName( 'links_temp' ); print "Dropping temporary links table if it exists..."; - $dbConn->query( "DROP TABLE IF EXISTS links_temp", DB_WRITE); + $dbConn->query( "DROP TABLE IF EXISTS $links_temp"); print " done.\n"; print "Creating temporary links table..."; if ( $noKeys ) { - $dbConn->query( "CREATE TABLE links_temp ( " . + $dbConn->query( "CREATE TABLE $links_temp ( " . "l_from int(8) unsigned NOT NULL default '0', " . - "l_to int(8) unsigned NOT NULL default '0')", DB_WRITE); + "l_to int(8) unsigned NOT NULL default '0')"); } else { - $dbConn->query( "CREATE TABLE links_temp ( " . + $dbConn->query( "CREATE TABLE $links_temp ( " . "l_from int(8) unsigned NOT NULL default '0', " . "l_to int(8) unsigned NOT NULL default '0', " . "UNIQUE KEY l_from(l_from,l_to), " . - "KEY (l_to))", DB_WRITE); + "KEY (l_to))"); } print " done.\n\n"; }