http://www.mediawiki.org/wiki/Special:Code/MediaWiki/72729
Revision: 72729
Author: ialex
Date: 2010-09-10 17:34:06 +0000 (Fri, 10 Sep 2010)
Log Message:
-----------
Copied cleanupDupes.inc in FiveUpgrade.inc since it's only used there
Modified Paths:
--------------
trunk/phase3/maintenance/FiveUpgrade.inc
Removed Paths:
-------------
trunk/phase3/maintenance/cleanupDupes.inc
Modified: trunk/phase3/maintenance/FiveUpgrade.inc
===================================================================
--- trunk/phase3/maintenance/FiveUpgrade.inc 2010-09-10 17:31:40 UTC (rev
72728)
+++ trunk/phase3/maintenance/FiveUpgrade.inc 2010-09-10 17:34:06 UTC (rev
72729)
@@ -4,7 +4,6 @@
* @ingroup Maintenance
*/
-require_once( 'cleanupDupes.inc' );
require_once( 'updaters.inc' );
define( 'MW_UPGRADE_COPY', false );
@@ -350,7 +349,7 @@
}
$this->log( "Checking cur table for unique title index and
applying if necessary" );
- checkDupes( true );
+ $this->checkDupes();
$this->log( "...converting from cur/old to page/revision/text
DB structure." );
@@ -1156,6 +1155,101 @@
}
/**
+ * Check for duplicate rows in "cur" table and move duplicates entries
in
+ * "old" table.
+ *
+ * This was in cleanupDupes.inc before.
+ */
+ function checkDupes() {
+ $dbw = wfGetDB( DB_MASTER );
+ if ( $dbw->indexExists( 'cur', 'name_title' ) &&
+ $dbw->indexUnique( 'cur', 'name_title' ) ) {
+ echo wfWikiID() . ": cur table has the current unique
index; no duplicate entries.\n";
+ return;
+ } elseif ( $dbw->indexExists( 'cur',
'name_title_dup_prevention' ) ) {
+ echo wfWikiID() . ": cur table has a temporary
name_title_dup_prevention unique index; no duplicate entries.\n";
+ return;
+ }
+
+ echo wfWikiID() . ": cur table has the old non-unique index and
may have duplicate entries.\n";
+
+ $dbw = wfGetDB( DB_MASTER );
+ $cur = $dbw->tableName( 'cur' );
+ $old = $dbw->tableName( 'old' );
+ $dbw->query( "LOCK TABLES $cur WRITE, $old WRITE" );
+ echo "Checking for duplicate cur table entries... (this may
take a while on a large wiki)\n";
+ $res = $dbw->query( <<<END
+SELECT cur_namespace,cur_title,count(*) as c,min(cur_id) as id
+ FROM $cur
+ GROUP BY cur_namespace,cur_title
+HAVING c > 1
+END
+ );
+ $n = $dbw->numRows( $res );
+ echo "Found $n titles with duplicate entries.\n";
+ if ( $n > 0 ) {
+ echo "Correcting...\n";
+ while ( $row = $dbw->fetchObject( $res ) ) {
+ $ns = intval( $row->cur_namespace );
+ $title = $dbw->addQuotes( $row->cur_title );
+
+ # Get the first responding ID; that'll be the
one we keep.
+ $id = $dbw->selectField( 'cur', 'cur_id', array(
+ 'cur_namespace' => $row->cur_namespace,
+ 'cur_title' => $row->cur_title ) );
+
+ echo "$ns:$row->cur_title (canonical ID $id)\n";
+ if ( $id != $row->id ) {
+ echo " ** minimum ID $row->id; ";
+ $timeMin = $dbw->selectField( 'cur',
'cur_timestamp', array(
+ 'cur_id' => $row->id ) );
+ $timeFirst = $dbw->selectField( 'cur',
'cur_timestamp', array(
+ 'cur_id' => $id ) );
+ if ( $timeMin == $timeFirst ) {
+ echo "timestamps match at
$timeFirst; ok\n";
+ } else {
+ echo "timestamps don't match!
min: $timeMin, first: $timeFirst; ";
+ if ( $timeMin > $timeFirst ) {
+ $id = $row->id;
+ echo "keeping minimum:
$id\n";
+ } else {
+ echo "keeping first:
$id\n";
+ }
+ }
+ }
+
+ $dbw->query( <<<END
+INSERT
+ INTO $old
+ (old_namespace, old_title, old_text,
+ old_comment, old_user, old_user_text,
+ old_timestamp, old_minor_edit, old_flags,
+ inverse_timestamp)
+SELECT cur_namespace, cur_title, cur_text,
+ cur_comment, cur_user, cur_user_text,
+ cur_timestamp, cur_minor_edit, '',
+ inverse_timestamp
+ FROM $cur
+ WHERE cur_namespace=$ns
+ AND cur_title=$title
+ AND cur_id != $id
+END
+ );
+ $dbw->query( <<<END
+DELETE
+ FROM $cur
+ WHERE cur_namespace=$ns
+ AND cur_title=$title
+ AND cur_id != $id
+END
+ );
+ }
+ }
+ $dbw->query( 'UNLOCK TABLES' );
+ echo "Done.\n";
+ }
+
+ /**
* Rename all our temporary tables into final place.
* We've left things in place so a read-only wiki can continue running
* on the old code during all this.
Deleted: trunk/phase3/maintenance/cleanupDupes.inc
===================================================================
--- trunk/phase3/maintenance/cleanupDupes.inc 2010-09-10 17:31:40 UTC (rev
72728)
+++ trunk/phase3/maintenance/cleanupDupes.inc 2010-09-10 17:34:06 UTC (rev
72729)
@@ -1,128 +0,0 @@
-<?php
-# Copyright (C) 2004 Brion Vibber <[email protected]>
-# http://www.mediawiki.org/
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-# http://www.gnu.org/copyleft/gpl.html
-
-/**
- * If on the old non-unique indexes, check the cur table for duplicate
- * entries and remove them...
- *
- * @file
- * @ingroup Maintenance
- */
-
-function fixDupes( $fixthem = false ) {
- $dbw = wfGetDB( DB_MASTER );
- $cur = $dbw->tableName( 'cur' );
- $old = $dbw->tableName( 'old' );
- $dbw->query( "LOCK TABLES $cur WRITE, $old WRITE" );
- echo "Checking for duplicate cur table entries... (this may take a
while on a large wiki)\n";
- $res = $dbw->query( <<<END
-SELECT cur_namespace,cur_title,count(*) as c,min(cur_id) as id
- FROM $cur
- GROUP BY cur_namespace,cur_title
-HAVING c > 1
-END
- );
- $n = $dbw->numRows( $res );
- echo "Found $n titles with duplicate entries.\n";
- if ( $n > 0 ) {
- if ( $fixthem ) {
- echo "Correcting...\n";
- } else {
- echo "Just a demo...\n";
- }
- while ( $row = $dbw->fetchObject( $res ) ) {
- $ns = intval( $row->cur_namespace );
- $title = $dbw->addQuotes( $row->cur_title );
-
- # Get the first responding ID; that'll be the one we
keep.
- $id = $dbw->selectField( 'cur', 'cur_id', array(
- 'cur_namespace' => $row->cur_namespace,
- 'cur_title' => $row->cur_title ) );
-
- echo "$ns:$row->cur_title (canonical ID $id)\n";
- if ( $id != $row->id ) {
- echo " ** minimum ID $row->id; ";
- $timeMin = $dbw->selectField( 'cur',
'cur_timestamp', array(
- 'cur_id' => $row->id ) );
- $timeFirst = $dbw->selectField( 'cur',
'cur_timestamp', array(
- 'cur_id' => $id ) );
- if ( $timeMin == $timeFirst ) {
- echo "timestamps match at $timeFirst;
ok\n";
- } else {
- echo "timestamps don't match! min:
$timeMin, first: $timeFirst; ";
- if ( $timeMin > $timeFirst ) {
- $id = $row->id;
- echo "keeping minimum: $id\n";
- } else {
- echo "keeping first: $id\n";
- }
- }
- }
-
- if ( $fixthem ) {
- $dbw->query( <<<END
-INSERT
- INTO $old
- (old_namespace, old_title, old_text,
- old_comment, old_user, old_user_text,
- old_timestamp, old_minor_edit, old_flags,
- inverse_timestamp)
-SELECT cur_namespace, cur_title, cur_text,
- cur_comment, cur_user, cur_user_text,
- cur_timestamp, cur_minor_edit, '',
- inverse_timestamp
- FROM $cur
- WHERE cur_namespace=$ns
- AND cur_title=$title
- AND cur_id != $id
-END
- );
- $dbw->query( <<<END
-DELETE
- FROM $cur
- WHERE cur_namespace=$ns
- AND cur_title=$title
- AND cur_id != $id
-END
- );
- }
- }
- }
- $dbw->query( 'UNLOCK TABLES' );
- if ( $fixthem ) {
- echo "Done.\n";
- } else {
- echo "Run again with --fix option to delete the duplicates.\n";
- }
-}
-
-function checkDupes( $fixthem = false, $indexonly = false ) {
- $dbw = wfGetDB( DB_MASTER );
- if ( $dbw->indexExists( 'cur', 'name_title' ) &&
- $dbw->indexUnique( 'cur', 'name_title' ) ) {
- echo wfWikiID() . ": cur table has the current unique index; no
duplicate entries.\n";
- } elseif ( $dbw->indexExists( 'cur', 'name_title_dup_prevention' ) ) {
- echo wfWikiID() . ": cur table has a temporary
name_title_dup_prevention unique index; no duplicate entries.\n";
- } else {
- echo wfWikiID() . ": cur table has the old non-unique index and
may have duplicate entries.\n";
- if ( !$indexonly ) {
- fixDupes( $fixthem );
- }
- }
-}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
