From e31ed04b1633fa2f791e96449415fefc3da2887a Mon Sep 17 00:00:00 2001 From: Roan Kattouw Date: Wed, 27 Oct 2010 15:51:31 +0000 Subject: [PATCH] Whitespace fixes for r75486 --- maintenance/cleanupRemovedModules.php | 83 +++++++++++++++++++ .../mediawiki.language/mediawiki.language.js | 20 ++--- resources/mediawiki/mediawiki.js | 2 +- 3 files changed, 94 insertions(+), 11 deletions(-) create mode 100644 maintenance/cleanupRemovedModules.php diff --git a/maintenance/cleanupRemovedModules.php b/maintenance/cleanupRemovedModules.php new file mode 100644 index 0000000000..9f22adf55c --- /dev/null +++ b/maintenance/cleanupRemovedModules.php @@ -0,0 +1,83 @@ + + */ + +require_once( dirname( __FILE__ ) . '/Maintenance.php' ); + +class CleanupRemovedModules extends Maintenance { + + public function __construct() { + parent::__construct(); + $this->mDescription = 'Remove cache entries for removed ResourceLoader modules from the database'; + $this->addOption( 'batchsize', 'Delete rows in batches of this size. Default: 500', false, true ); + $this->addOption( 'max-slave-lag', 'If the slave lag exceeds this many seconds, wait until it drops below this value. Default: 5', false, true ); + } + + public function execute() { + $dbw = wfGetDB( DB_MASTER ); + $rl = new ResourceLoader(); + $moduleNames = array_keys( $rl->getModules() ); + $moduleList = implode( ', ', array_map( array( $dbw, 'addQuotes' ), $moduleNames ) ); + $limit = min( 1, intval( $this->getOption( 'batchsize', 500 ) ) ); + $maxlag = intval( $this->getOption( 'max-slave-lag', 5 ) ); + + $this->output( "Cleaning up module_deps table...\n" ); + $i = 1; + do { + // $dbw->delete() doesn't support LIMIT :( + $dbw->query( "DELETE FROM module_deps WHERE md_module NOT IN ($moduleList) LIMIT $limit", __METHOD__ ); + $numRows = $dbw->affectedRows(); + $this->output( "Batch $i: $numRows rows\n" ); + $i++; + wfWaitForSlaves( $maxlag ); + } while( $dbw->affectedRows() > 0 ); + $this->output( "done\n" ); + + $this->output( "Cleaning up msg_resource table...\n" ); + $i = 1; + do { + // $dbw->delete() doesn't support LIMIT :( + $dbw->query( "DELETE FROM msg_resource WHERE mr_resource NOT IN ($moduleList) LIMIT $limit", __METHOD__ ); + $numRows = $dbw->affectedRows(); + $this->output( "Batch $i: $numRows rows\n" ); + $i++; + wfWaitForSlaves( $maxlag ); + } while( $dbw->affectedRows() > 0 ); + $this->output( "done\n" ); + + $this->output( "Cleaning up msg_resource_links table...\n" ); + $i = 1; + do { + // $dbw->delete() doesn't support LIMIT :( + $dbw->query( "DELETE FROM msg_resource_links WHERE mrl_resource NOT IN ($moduleList) LIMIT $limit", __METHOD__ ); + $numRows = $dbw->affectedRows(); + $this->output( "Batch $i: $numRows rows\n" ); + $i++; + wfWaitForSlaves( $maxlag ); + } while( $dbw->affectedRows() > 0 ); + $this->output( "done\n" ); + } +} + +$maintClass = "CleanupRemovedModules"; +require_once( DO_MAINTENANCE ); \ No newline at end of file diff --git a/resources/mediawiki.language/mediawiki.language.js b/resources/mediawiki.language/mediawiki.language.js index 0c895097f9..e2ec8559b9 100644 --- a/resources/mediawiki.language/mediawiki.language.js +++ b/resources/mediawiki.language/mediawiki.language.js @@ -18,9 +18,9 @@ mediaWiki.language = { * @example {{Template:title|params}} */ 'procPLURAL': function( template ) { - if( template.title && template.parameters && mediaWiki.language.convertPlural) { + if ( template.title && template.parameters && mediaWiki.language.convertPlural ) { // Check if we have forms to replace - if ( template.parameters.length == 0 ) { + if ( template.parameters.length == 0 ) { return ''; } // Restore the count into a Number ( if it got converted earlier ) @@ -29,7 +29,7 @@ mediaWiki.language = { return mediaWiki.language.convertPlural( parseInt( count ), template.parameters ); } // Could not process plural return first form or nothing - if( template.parameters[0] ) { + if ( template.parameters[0] ) { return template.parameters[0]; } return ''; @@ -41,10 +41,10 @@ mediaWiki.language = { * @param {array} forms List of plural forms * @return {string} Correct form for quantifier in this language */ - 'convertPlural': function( count, forms ){ - if ( !forms || forms.length == 0 ) { + 'convertPlural': function( count, forms ){ + if ( !forms || forms.length == 0 ) { return ''; - } + } return ( parseInt( count ) == 1 ) ? forms[0] : forms[1]; }, /** @@ -72,9 +72,9 @@ mediaWiki.language = { } // Set the target Transform table: var transformTable = mediaWiki.language.digitTransformTable; - // Check if the "restore" to Latin number flag is set: - if ( integer ) { - if ( parseInt( number ) == number ) { + // Check if the "restore" to Latin number flag is set: + if ( integer ) { + if ( parseInt( number ) == number ) { return number; } var tmp = []; @@ -92,7 +92,7 @@ mediaWiki.language = { convertedNumber += numberString[i]; } } - return integer ? parseInt( convertedNumber) : convertedNumber; + return integer ? parseInt( convertedNumber ) : convertedNumber; }, // Digit Transform Table, populated by language classes where applicable 'digitTransformTable': null diff --git a/resources/mediawiki/mediawiki.js b/resources/mediawiki/mediawiki.js index dcb8c791c4..78c278806b 100644 --- a/resources/mediawiki/mediawiki.js +++ b/resources/mediawiki/mediawiki.js @@ -249,7 +249,7 @@ window.mediaWiki = new ( function( $ ) { this.message = function( key, parameters ) { // Support variadic arguments if ( typeof parameters !== 'undefined' ) { - parameters = $.makeArray( arguments); + parameters = $.makeArray( arguments ); parameters.shift(); } else { parameters = []; -- 2.20.1