X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FpurgeStaleMemcachedText.php;h=fc9a6a8947b90e6b88318abae8d5f3b3aca2776d;hb=5c9c710887689dc99f13a414032ca0ec5f5c544a;hp=f5a8825b9e6b3f3a85f774a639bcd1c2890c0381;hpb=1a38fe24473ef8647831f3e220afd9ec3e541967;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/purgeStaleMemcachedText.php b/maintenance/purgeStaleMemcachedText.php
index f5a8825b9e..fc9a6a8947 100644
--- a/maintenance/purgeStaleMemcachedText.php
+++ b/maintenance/purgeStaleMemcachedText.php
@@ -1,17 +1,36 @@
 <?php
+/**
+ * @ingroup Maintenance Memcached
+ * @file
+ */
 
 require_once( dirname( __FILE__ ) . '/commandLine.inc' );
 
 function purgeStaleMemcachedText() {
-	global $wgMemc;
+	global $wgMemc, $wgDBname;
 	$db = wfGetDB( DB_MASTER );
 	$maxTextId = $db->selectField( 'text', 'max(old_id)' );
-	$latestReplicatedTextId = $db->selectField( array( 'revision','recentchanges'), 'rev_text_id', array( 'rev_id = rc_this_oldid', "rc_timestamp < '20101225063000'" ) );
+	$latestReplicatedTextId = $db->selectField( array( 'recentchanges', 'revision' ), 'rev_text_id', 
+		array( 'rev_id = rc_this_oldid', "rc_timestamp < '20101225183000'"),  'purgeStaleMemcachedText', 
+		array( 'ORDER BY' => 'rc_timestamp DESC' ) );
 	$latestReplicatedTextId -= 100; # A bit of paranoia
 
+	echo "Going to purge text entries from $latestReplicatedTextId to $maxTextId in $wgDBname\n";
+
 	for ( $i = $latestReplicatedTextId; $i < $maxTextId; $i++ ) {
-		$key = wfMemcKey( 'revisiontext', 'textid', $i++ );
-		$wgMemc->delete( $key );
+		$key = wfMemcKey( 'revisiontext', 'textid', $i );
+		
+		while (1) {
+			if (! $wgMemc->delete( $key ) ) {
+				echo "Memcache delete for $key returned false\n";
+			}
+			if ( $wgMemc->get( $key ) ) {
+				echo "There's still content in $key!\n";
+			} else {
+				break;
+			}
+		}
+		
 	}
 }