From 0ee77364c3f49e11d77918bca990a6708c9994e0 Mon Sep 17 00:00:00 2001 From: Alexandre Emsenhuber Date: Sat, 4 Jul 2009 19:57:41 +0000 Subject: [PATCH] svn:eol-style native --- maintenance/populateLogUsertext.inc | 108 ++++++++++++++-------------- maintenance/populateLogUsertext.php | 34 ++++----- 2 files changed, 71 insertions(+), 71 deletions(-) diff --git a/maintenance/populateLogUsertext.inc b/maintenance/populateLogUsertext.inc index 2734852f20..9e74ce97ff 100644 --- a/maintenance/populateLogUsertext.inc +++ b/maintenance/populateLogUsertext.inc @@ -1,54 +1,54 @@ -selectField( 'logging', 'MIN(log_id)', false, __FUNCTION__ ); - if( !$start ) { - echo "Nothing to do.\n"; - return true; - } - $end = $db->selectField( 'logging', 'MAX(log_id)', false, __FUNCTION__ ); - - # Do remaining chunk - $end += LOG_USERTEXT_BATCH_SIZE - 1; - $blockStart = $start; - $blockEnd = $start + LOG_USERTEXT_BATCH_SIZE - 1; - while( $blockEnd <= $end ) { - echo "...doing log_id from $blockStart to $blockEnd\n"; - $cond = "log_id BETWEEN $blockStart AND $blockEnd AND log_user = user_id"; - $res = $db->select( array('logging','user'), - array('log_id','user_name'), $cond, __FUNCTION__ ); - $batch = array(); - $db->begin(); - while( $row = $db->fetchObject( $res ) ) { - $db->update( 'logging', array('log_user_text' => $row->user_name), - array('log_id' => $row->log_id), __FUNCTION__ ); - } - $db->commit(); - $blockStart += LOG_USERTEXT_BATCH_SIZE; - $blockEnd += LOG_USERTEXT_BATCH_SIZE; - wfWaitForSlaves( 5 ); - } - if( $db->insert( - 'updatelog', - array( 'ul_key' => 'populate log_usertext' ), - __FUNCTION__, - 'IGNORE' - ) - ) { - wfOut( "log_usertext population complete.\n" ); - return true; - } else { - wfOut( "Could not insert log_usertext population row.\n" ); - return false; - } -} +selectField( 'logging', 'MIN(log_id)', false, __FUNCTION__ ); + if( !$start ) { + echo "Nothing to do.\n"; + return true; + } + $end = $db->selectField( 'logging', 'MAX(log_id)', false, __FUNCTION__ ); + + # Do remaining chunk + $end += LOG_USERTEXT_BATCH_SIZE - 1; + $blockStart = $start; + $blockEnd = $start + LOG_USERTEXT_BATCH_SIZE - 1; + while( $blockEnd <= $end ) { + echo "...doing log_id from $blockStart to $blockEnd\n"; + $cond = "log_id BETWEEN $blockStart AND $blockEnd AND log_user = user_id"; + $res = $db->select( array('logging','user'), + array('log_id','user_name'), $cond, __FUNCTION__ ); + $batch = array(); + $db->begin(); + while( $row = $db->fetchObject( $res ) ) { + $db->update( 'logging', array('log_user_text' => $row->user_name), + array('log_id' => $row->log_id), __FUNCTION__ ); + } + $db->commit(); + $blockStart += LOG_USERTEXT_BATCH_SIZE; + $blockEnd += LOG_USERTEXT_BATCH_SIZE; + wfWaitForSlaves( 5 ); + } + if( $db->insert( + 'updatelog', + array( 'ul_key' => 'populate log_usertext' ), + __FUNCTION__, + 'IGNORE' + ) + ) { + wfOut( "log_usertext population complete.\n" ); + return true; + } else { + wfOut( "Could not insert log_usertext population row.\n" ); + return false; + } +} diff --git a/maintenance/populateLogUsertext.php b/maintenance/populateLogUsertext.php index 99aedf221f..c775aa549e 100644 --- a/maintenance/populateLogUsertext.php +++ b/maintenance/populateLogUsertext.php @@ -1,17 +1,17 @@ -