Massively rewrote rebuildrecentchanges to work with new stuff.

diff --git a/maintenance/rebuildrecentchanges.inc b/maintenance/rebuildrecentchanges.inc
index acc82f5..d14a4b9 100644 (file)
--- a/maintenance/rebuildrecentchanges.inc
+++ b/maintenance/rebuildrecentchanges.inc
@@ -5,29 +5,7 @@
 
 function rebuildRecentChangesTablePass1()
 {
-       $sql = "DROP TABLE IF EXISTS recentchanges";
-       wfQuery( $sql, DB_WRITE );
-
-       $sql = "CREATE TABLE recentchanges (
-  rc_timestamp varchar(14) binary NOT NULL default '',
-  rc_cur_time varchar(14) binary NOT NULL default '',
-  rc_user int(10) unsigned NOT NULL default '0',
-  rc_user_text varchar(255) binary NOT NULL default '',
-  rc_namespace tinyint(3) unsigned NOT NULL default '0',
-  rc_title varchar(255) binary NOT NULL default '',
-  rc_comment varchar(255) binary NOT NULL default '',
-  rc_minor tinyint(3) unsigned NOT NULL default '0',
-  rc_bot tinyint(3) unsigned NOT NULL default '0',
-  rc_new tinyint(3) unsigned NOT NULL default '0',
-  rc_cur_id int(10) unsigned NOT NULL default '0',
-  rc_this_oldid int(10) unsigned NOT NULL default '0',
-  rc_last_oldid int(10) unsigned NOT NULL default '0',
-  INDEX rc_cur_id (rc_cur_id),
-  INDEX rc_cur_time (rc_cur_time),
-  INDEX rc_timestamp (rc_timestamp),
-  INDEX rc_namespace (rc_namespace),
-  INDEX rc_title (rc_title)
-) TYPE=MyISAM PACK_KEYS=1;";
+       $sql = "DELETE FROM recentchanges";
        wfQuery( $sql, DB_WRITE );
 
        print( "Loading from CUR table...\n" );
@@ -37,17 +15,18 @@ function rebuildRecentChangesTablePass1()
          "rc_cur_id,rc_this_oldid,rc_last_oldid) SELECT cur_timestamp," .
          "cur_timestamp,cur_user,cur_user_text,cur_namespace,cur_title," .
          "cur_comment,cur_minor_edit,0,cur_is_new,cur_id,0,0 FROM cur " .
-         "ORDER BY cur_timestamp DESC LIMIT 5000";
+         "ORDER BY inverse_timestamp LIMIT 5000";
        wfQuery( $sql, DB_WRITE );
 
        print( "Loading from OLD table...\n" );
 
        $sql = "INSERT INTO recentchanges (rc_timestamp,rc_cur_time,rc_user," .
       "rc_user_text,rc_namespace,rc_title,rc_comment,rc_minor,rc_bot,rc_new," .
-      "rc_cur_id,rc_this_oldid,rc_last_oldid) SELECT old_timestamp,''," .
+      "rc_cur_id,rc_this_oldid,rc_last_oldid) SELECT old_timestamp,cur_timestamp," .
          "old_user,old_user_text,old_namespace,old_title,old_comment," .
-         "old_minor_edit,0,0,0,old_id,0 FROM old ORDER BY old_timestamp " .
-         "DESC LIMIT 5000";
+         "old_minor_edit,0,0,cur_id,old_id,0 FROM old,cur " .
+         "WHERE old_namespace=cur_namespace AND old_title=cur_title ORDER BY old.inverse_timestamp " .
+         "LIMIT 5000";
        wfQuery( $sql, DB_WRITE );
 
        $sql = "SELECT rc_timestamp FROM recentchanges " .
@@ -67,50 +46,42 @@ function rebuildRecentChangesTablePass2()
 
        print( "Updating links...\n" );
 
-       $sql = "SELECT rc_namespace,rc_title,rc_timestamp FROM recentchanges " .
-         "ORDER BY rc_namespace,rc_title,rc_timestamp DESC";
+       # Fill in the rc_last_oldid field, which points to the previous edit
+       #
+       $sql = "SELECT rc_cur_id,rc_this_oldid,rc_timestamp FROM recentchanges " .
+         "ORDER BY rc_cur_id,rc_timestamp";
        $res = wfQuery( $sql, DB_WRITE );
 
+       $lastCurId = 0;
+       $lastOldId = 0;
        while ( $obj = wfFetchObject( $res ) ) {
-               if ( ! ( $ns == $obj->rc_namespace &&
-                          0 == strcmp( $title, wfStrencode( $obj->rc_title ) ) ) ) {
-
-                       $ns = $obj->rc_namespace;
-                       $title = wfStrencode( $obj->rc_title );
-
-                       $sql = "SELECT cur_id,cur_timestamp FROM cur WHERE " .
-                         "cur_namespace={$ns} AND cur_title='{$title}'";
-                       $res2 = wfQuery( $sql, DB_WRITE );
-                       $obj2 = wfFetchObject( $res2 );
-
-                       $id = $obj2->cur_id;
-                       $ct = $obj2->cur_timestamp;
-
-                       $sql = "SELECT old_id FROM old WHERE old_namespace={$ns} " .
-                         "AND old_title='{$title}' ORDER BY old_timestamp DESC";
-                       $res2 = wfQuery( $sql, DB_WRITE );
-                       $numRows = wfNumRows( $res2 );
+               $new = 0;
+               if( $obj->rc_cur_id != $lastCurId ) {
+                       # Switch! Look up the previous last edit, if any
+                       $lastCurId = IntVal( $obj->rc_cur_id );
+                       $emit = wfInvertTimestamp( $obj->rc_timestamp );
+                       $sql2 = "SELECT old_id FROM old,cur " .
+                               "WHERE old_namespace=cur_namespace AND old_title=cur_title AND cur_id={$lastCurId} ".
+                               "AND old.inverse_timestamp>'{$emit}' ORDER BY old.inverse_timestamp LIMIT 1";
+                       $res2 = wfQuery( $sql2, DB_WRITE );
+                       if( $row = wfFetchObject( $res2 ) ) {
+                               $lastOldId = IntVal( $row->old_id );
+                       } else {
+                               # No previous edit
+                               $lastOldId = 0;
+                               $new = 1;
+                       }
+                       wfFreeResult( $res2 );
                }
-
-               if ( 0 != $numRows-- ) {
-                       $obj2 = wfFetchObject( $res2 );
-
-                       $sql = "UPDATE recentchanges SET rc_cur_id={$id},rc_cur_time=" .
-                         "'{$ct}',rc_last_oldid={$obj2->old_id} WHERE " .
-                         "rc_namespace={$ns} AND rc_title='{$title}' AND " .
-                         "rc_timestamp='{$obj->rc_timestamp}'";
-                       wfQuery( $sql, DB_WRITE );
+               if( $lastCurId == 0 ) {
+                       print "Uhhh, something wrong? No curid\n";
                } else {
-                       $sql = "UPDATE recentchanges SET rc_cur_id={$id},rc_cur_time=" .
-                         "'{$ct}' WHERE rc_namespace={$ns} AND rc_title='{$title}' " .
-                         "AND rc_timestamp='{$obj->rc_timestamp}'";
-                       wfQuery( $sql, DB_WRITE );
-               }
-
-               if ( 0 == ( ++$count % 500 ) ) {
-                       printf( "%d records processed.\n", $count );
+                       $sql3 = "UPDATE recentchanges SET rc_last_oldid=$lastOldId,rc_new=$new,rc_type=$new WHERE rc_cur_id={$lastCurId} AND rc_this_oldid={$obj->rc_this_oldid}";
+                       wfQuery( $sql3, DB_WRITE );
+                       $lastOldId = IntVal( $obj->rc_this_oldid );
                }
        }
+       wfFreeResult( $res );
 }
 
 ?>