X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2Frebuildrecentchanges.inc;h=f846d2b75bb0b2eab05930d3b5321840dda74244;hb=8ce41bf5f5e1ccfd98ccb37bc6561560fb3f28c5;hp=dab86144d595aadbf31af683cf1721de83ee19db;hpb=3bcce499b2ce025155fb400ba89273c7a62a047c;p=lhc%2Fweb%2Fwiklou.git diff --git a/maintenance/rebuildrecentchanges.inc b/maintenance/rebuildrecentchanges.inc index dab86144d5..f846d2b75b 100644 --- a/maintenance/rebuildrecentchanges.inc +++ b/maintenance/rebuildrecentchanges.inc @@ -2,22 +2,38 @@ /** * Rebuild recent changes table. * + * @file * @todo document - * @addtogroup Maintenance + * @ingroup Maintenance */ +/** Public entry; more passes might come in! :) */ +function rebuildRecentChangesTable() { + rebuildRecentChangesTablePass1(); + rebuildRecentChangesTablePass2(); + rebuildRecentChangesTablePass3(); + rebuildRecentChangesTablePass4(); +} + /** */ function rebuildRecentChangesTablePass1() { - $fname = 'rebuildRecentChangesTablePass1'; $dbw = wfGetDB( DB_MASTER ); - extract( $dbw->tableNames( 'recentchanges', 'cur', 'old' ) ); $dbw->delete( 'recentchanges', '*' ); print( "Loading from page and revision tables...\n" ); global $wgRCMaxAge; + + print( '$wgRCMaxAge=' . $wgRCMaxAge ); + $days = $wgRCMaxAge / 24 / 3600; + if ( intval($days) == $days ) { + print( " (" . $days . " days)\n" ); + } else { + print( " (approx. " . intval($days) . " days)\n" ); + } + $cutoff = time() - $wgRCMaxAge; $dbw->insertSelect( 'recentchanges', array( 'page', 'revision' ), array( @@ -35,10 +51,11 @@ function rebuildRecentChangesTablePass1() 'rc_this_oldid' => 'rev_id', 'rc_last_oldid' => 0, // is this ok? 'rc_type' => $dbw->conditional( 'page_is_new != 0', RC_NEW, RC_EDIT ), + 'rc_deleted' => 'rev_deleted' ), array( 'rev_timestamp > ' . $dbw->addQuotes( $dbw->timestamp( $cutoff ) ), 'rev_page=page_id' - ), $fname, + ), __METHOD__, array(), // INSERT options array( 'ORDER BY' => 'rev_timestamp DESC', 'LIMIT' => 5000 ) // SELECT options ); @@ -64,48 +81,31 @@ function rebuildRecentChangesTablePass2() # Switch! Look up the previous last edit, if any $lastCurId = intval( $obj->rc_cur_id ); $emit = $obj->rc_timestamp; - $sql2 = "SELECT rev_id, rev_len, rev_text_id FROM $revision " . + $sql2 = "SELECT rev_id,rev_len FROM $revision " . "WHERE rev_page={$lastCurId} ". "AND rev_timestamp<'{$emit}' ORDER BY rev_timestamp DESC LIMIT 1"; $res2 = $dbw->query( $sql2 ); if( $row = $dbw->fetchObject( $res2 ) ) { - $lastOldId = intval( $row->rev_id ); - $lastTextId = intval( $row->rev_text_id ); - $lastSize = $row->rev_len; # Grab the last text size + $lastOldId = intval($row->rev_id); + # Grab the last text size if available + $lastSize = !is_null($row->rev_len) ? intval($row->rev_len) : 'NULL'; } else { # No previous edit $lastOldId = 0; - $lastTextId = 0; - $lastSize = NULL; - $new = 1; + $lastSize = 'NULL'; + $new = 1; // probably true } $dbw->freeResult( $res2 ); } if( $lastCurId == 0 ) { print "Uhhh, something wrong? No curid\n"; } else { - # Check the text if not in rev_len for the last entry's text size - if( !$lastSize ) { - $lastText = $dbw->selectField( 'text', 'old_text', array('old_id' => $lastTextId ) ); - $lastSize = $lastText ? strlen($lastText) : 'NULL'; - } # Grab the entry's text size - $res3 = $dbw->select( 'revision', array('rev_len','rev_text_id'), array('rev_id' => $obj->rc_this_oldid ) ); - if( $row = $dbw->fetchObject( $res3 ) ) { - $textId = $row->rev_text_id; - $size = $row->rev_len; - } else { - $textId = 0; - $size = NULL; - } - # Check the text if not in rev_len for the entry's text size - if( !$size ) { - $text = $dbw->selectField( 'text', 'old_text', array('old_id' => $textId ) ); - $size = $text ? strlen($text) : 'NULL'; - } + $size = $dbw->selectField( 'revision', 'rev_len', array('rev_id' => $obj->rc_this_oldid ) ); + $size = !is_null($size) ? intval($size) : 'NULL'; $sql3 = "UPDATE $recentchanges SET rc_last_oldid=$lastOldId,rc_new=$new,rc_type=$new," . - "rc_old_len='$lastSize',rc_new_len='$size' " . + "rc_old_len=$lastSize,rc_new_len=$size " . "WHERE rc_cur_id={$lastCurId} AND rc_this_oldid={$obj->rc_this_oldid}"; $dbw->query( $sql3 ); @@ -116,20 +116,81 @@ function rebuildRecentChangesTablePass2() } function rebuildRecentChangesTablePass3() +{ + $dbw = wfGetDB( DB_MASTER ); + + print( "Loading from user, page, and logging tables...\n" ); + + global $wgRCMaxAge; + // Some logs don't go in RC. This can't really detect all of those. + // At least do the basics logs for a standard install... + // FIXME: this needs to be maintained + $basicRCLogs = array( + 'block', + 'protect', + 'rights', + 'delete', + 'upload', + 'move', + 'import', + 'merge' ); + // Escape...blah blah + $selectLogs = array(); + foreach( $basicRCLogs as $logtype ) { + $safetype = $dbw->strencode( $logtype ); + $selectLogs[] = "'$safetype'"; + } + + $cutoff = time() - $wgRCMaxAge; + $dbw->insertSelect( 'recentchanges', array( 'logging', 'page', 'user' ), + array( + 'rc_timestamp' => 'log_timestamp', + 'rc_cur_time' => 'log_timestamp', + 'rc_user' => 'log_user', + 'rc_user_text' => 'user_name', + 'rc_namespace' => 'log_namespace', + 'rc_title' => 'log_title', + 'rc_comment' => 'log_comment', + 'rc_minor' => 0, + 'rc_bot' => 0, + 'rc_patrolled' => 1, + 'rc_new' => 0, + 'rc_this_oldid' => 0, + 'rc_last_oldid' => 0, + 'rc_type' => RC_LOG, + 'rc_cur_id' => 'page_id', + 'rc_log_type' => 'log_type', + 'rc_log_action' => 'log_action', + 'rc_logid' => 'log_id', + 'rc_params' => 'log_params', + 'rc_deleted' => 'log_deleted' + ), array( + 'log_timestamp > ' . $dbw->addQuotes( $dbw->timestamp( $cutoff ) ), + 'log_user=user_id', + 'log_namespace=page_namespace', + 'log_title=page_title', + 'log_type IN(' . implode(',',$selectLogs) . ')' + ), __METHOD__, + array(), // INSERT options + array( 'ORDER BY' => 'log_timestamp DESC', 'LIMIT' => 5000 ) // SELECT options + ); +} + +function rebuildRecentChangesTablePass4() { global $wgGroupPermissions, $wgUseRCPatrol; $dbw = wfGetDB( DB_MASTER ); - list ($recentchanges, $usergroups) = $dbw->tableNamesN( 'recentchanges', 'user_groups' ); + list($recentchanges,$usergroups,$user) = $dbw->tableNamesN( 'recentchanges', 'user_groups', 'user' ); $botgroups = $autopatrolgroups = array(); foreach( $wgGroupPermissions as $group => $rights ) { if( isset( $rights['bot'] ) && $rights['bot'] == true ) { - $botgroups[] = "'" . $dbw->strencode( $group ) . "'"; + $botgroups[] = $dbw->addQuotes( $group ); } if( $wgUseRCPatrol && isset( $rights['autopatrol'] ) && $rights['autopatrol'] == true ) { - $autopatrolgroups[] = "'" . $dbw->strencode( $group ) . "'"; + $autopatrolgroups[] = $dbw->addQuotes( $group ); } } # Flag our recent bot edits @@ -139,50 +200,47 @@ function rebuildRecentChangesTablePass3() print( "Flagging bot account edits...\n" ); - # Find all users in RC that are bots - $sql = "SELECT DISTINCT rc_user FROM $recentchanges " . - "LEFT JOIN $usergroups ON rc_user=ug_user " . - "WHERE ug_group IN($botwhere)"; + # Find all users that are bots + $sql = "SELECT DISTINCT user_name FROM $usergroups, $user " . + "WHERE ug_group IN($botwhere) AND user_id = ug_user"; $res = $dbw->query( $sql, DB_MASTER ); while( $obj = $dbw->fetchObject( $res ) ) { - $botusers[] = $obj->rc_user; + $botusers[] = $dbw->addQuotes( $obj->user_name ); } # Fill in the rc_bot field if( !empty($botusers) ) { $botwhere = implode(',',$botusers); $sql2 = "UPDATE $recentchanges SET rc_bot=1 " . - "WHERE rc_user IN($botwhere)"; + "WHERE rc_user_text IN($botwhere)"; $dbw->query( $sql2 ); } } + global $wgMiserMode; # Flag our recent autopatrolled edits - if( !empty($autopatrolgroups) ) { + if( !$wgMiserMode && !empty($autopatrolgroups) ) { $patrolwhere = implode(',',$autopatrolgroups); $patrolusers = array(); print( "Flagging auto-patrolled edits...\n" ); # Find all users in RC with autopatrol rights - $sql = "SELECT DISTINCT rc_user FROM $recentchanges " . - "LEFT JOIN $usergroups ON rc_user=ug_user " . - "WHERE ug_group IN($patrolwhere)"; + $sql = "SELECT DISTINCT user_name FROM $usergroups, $user " . + "WHERE ug_group IN($patrolwhere) AND user_id = ug_user"; $res = $dbw->query( $sql, DB_MASTER ); while( $obj = $dbw->fetchObject( $res ) ) { - $patrolusers[] = $obj->rc_user; + $patrolusers[] = $dbw->addQuotes( $obj->user_name ); } # Fill in the rc_patrolled field if( !empty($patrolusers) ) { $patrolwhere = implode(',',$patrolusers); $sql2 = "UPDATE $recentchanges SET rc_patrolled=1 " . - "WHERE rc_user IN($patrolwhere)"; + "WHERE rc_user_text IN($patrolwhere)"; $dbw->query( $sql2 ); } } $dbw->freeResult( $res ); } - -?>