From eb11a00a1e15bec1c7f0be9028ff20c252b2a0f9 Mon Sep 17 00:00:00 2001 From: Kevin Israel Date: Sat, 16 May 2015 17:32:57 -0400 Subject: [PATCH] Remove maintenance script deleteImageMemcached.php This script is broken; it deletes an object cache key that 1.11 (r22850 / ed4303922f4e) and newer no longer use. The most similar working script is probably refreshImageMetadata.php --force. Change-Id: Icf2223dc87861e02f20422492d40994f5302ad15 --- RELEASE-NOTES-1.26 | 1 + autoload.php | 1 - maintenance/deleteImageMemcached.php | 89 ---------------------------- 3 files changed, 1 insertion(+), 90 deletions(-) delete mode 100644 maintenance/deleteImageMemcached.php diff --git a/RELEASE-NOTES-1.26 b/RELEASE-NOTES-1.26 index 3d6651f952..61e04b8f6e 100644 --- a/RELEASE-NOTES-1.26 +++ b/RELEASE-NOTES-1.26 @@ -55,6 +55,7 @@ for editing, such as action overrides or specific api modules. * mediaWiki.confirmCloseWindow now returns an object of functions, instead of one function. The callback can't be called directly any more. The callback function is replaced with confirmCloseWindow.release(). +* Removed maintenance script deleteImageMemcached.php. == Compatibility == diff --git a/autoload.php b/autoload.php index c81c4bb118..bdc0d9374b 100644 --- a/autoload.php +++ b/autoload.php @@ -318,7 +318,6 @@ $wgAutoloadLocalClasses = array( 'DeleteDefaultMessages' => __DIR__ . '/maintenance/deleteDefaultMessages.php', 'DeleteEqualMessages' => __DIR__ . '/maintenance/deleteEqualMessages.php', 'DeleteFileOp' => __DIR__ . '/includes/filebackend/FileOp.php', - 'DeleteImageCache' => __DIR__ . '/maintenance/deleteImageMemcached.php', 'DeleteLogFormatter' => __DIR__ . '/includes/logging/DeleteLogFormatter.php', 'DeleteOldRevisions' => __DIR__ . '/maintenance/deleteOldRevisions.php', 'DeleteOrphanedRevisions' => __DIR__ . '/maintenance/deleteOrphanedRevisions.php', diff --git a/maintenance/deleteImageMemcached.php b/maintenance/deleteImageMemcached.php deleted file mode 100644 index 4799e5e0d7..0000000000 --- a/maintenance/deleteImageMemcached.php +++ /dev/null @@ -1,89 +0,0 @@ -mDescription = "Delete image information from the cache"; - $this->addOption( 'sleep', 'How many seconds to sleep between deletions', true, true ); - $this->addOption( 'until', 'Timestamp to delete all entries prior to', true, true ); - } - - public function execute() { - global $wgMemc; - - $until = preg_replace( "/[^\d]/", '', $this->getOption( 'until' ) ); - $sleep = (int)$this->getOption( 'sleep' ) * 1000; // milliseconds - - ini_set( 'display_errors', false ); - - $dbr = wfGetDB( DB_SLAVE ); - - $res = $dbr->select( 'image', - array( 'img_name' ), - array( "img_timestamp < {$until}" ), - __METHOD__ - ); - - $i = 0; - $total = $this->getImageCount(); - - foreach ( $res as $row ) { - if ( $i % $this->report == 0 ) { - $this->output( sprintf( - "%s: %13s done (%s)\n", - wfWikiID(), - "$i/$total", - wfPercent( $i / $total * 100 ) - ) ); - } - $md5 = md5( $row->img_name ); - $wgMemc->delete( wfMemcKey( 'Image', $md5 ) ); - - if ( $sleep != 0 ) { - usleep( $sleep ); - } - - ++$i; - } - } - - private function getImageCount() { - $dbr = wfGetDB( DB_SLAVE ); - - return $dbr->selectField( 'image', 'COUNT(*)', array(), __METHOD__ ); - } -} - -$maintClass = "DeleteImageCache"; -require_once RUN_MAINTENANCE_IF_MAIN; -- 2.20.1