X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2Fmcc.php;h=92f68635224a4482745a1b2e69148e3d64cccbee;hb=0ea43dd53018054f2627c206efcb2ce8c0b82224;hp=24ca063ad876ce2dff0bb10fb2a39eb36756432a;hpb=6bbcf091bf4513df95db2783097d90e2a13ceec9;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/mcc.php b/maintenance/mcc.php
old mode 100755
new mode 100644
index 24ca063ad8..92f6863522
--- a/maintenance/mcc.php
+++ b/maintenance/mcc.php
@@ -2,74 +2,157 @@
 /**
  * memcached diagnostic tool
  *
+ * @file
  * @todo document
- * @package MediaWiki
- * @subpackage Maintenance
+ * @ingroup Maintenance
  */
 
 /** */
-require_once( "commandLine.inc" );
+require_once( dirname( __FILE__ ) . '/commandLine.inc' );
 
-$mcc = new memcached( array('persistant' => true) );
+$mcc = new MWMemcached( array( 'persistant' => true/*, 'debug' => true*/ ) );
 $mcc->set_servers( $wgMemCachedServers );
-$mcc->set_debug( true );
+# $mcc->set_debug( true );
+
+function mccShowHelp( $command ) {
+	$commandList = array(
+		'get' => 'grabs something',
+		'getsock' => 'lists sockets',
+		'set' => 'changes something',
+		'delete' => 'deletes something',
+		'history' => 'show command line history',
+		'server' => 'show current memcached server',
+		'dumpmcc' => 'shows the whole thing',
+		'exit' => 'exit mcc',
+		'quit' => 'exit mcc',
+		'help' => 'help about a command',
+	);
+	if ( !$command ) {
+		$command = 'fullhelp';
+	}
+	if ( $command === 'fullhelp' ) {
+		$max_cmd_len = 0;
+		foreach( array_keys( $commandList ) as $cmd ) {
+			$max_cmd_len = max( $max_cmd_len, strlen($cmd) );
+		}
+		foreach ( $commandList as $cmd => $desc ) {
+			printf( "%-{$max_cmd_len}s: %s\n", $cmd, $desc );
+		}
+	} elseif ( isset( $commandList[$command] ) ) {
+		print "$command: $commandList[$command]\n";
+	} else {
+		print "$command: command does not exist or no help for it\n";
+	}
+}
 
 do {
 	$bad = false;
+	$showhelp = false;
 	$quit = false;
-	$line = readconsole( "> " );
-	$args = explode( " ", $line );
+
+	$line = Maintenance::readconsole();
+	if ( $line === false ) exit;
+
+	$args = explode( ' ', $line );
 	$command = array_shift( $args );
+
+	// process command
 	switch ( $command ) {
-		case "get":
-			print "Getting {$args[0]}[{$args[1]}]\n";
+		case 'help':
+			// show an help message
+			mccShowHelp( array_shift( $args ) );
+		break;
+
+		case 'get':
+			$sub = '';
+			if ( array_key_exists( 1, $args ) ) {
+				$sub = $args[1];
+			}
+			print "Getting {$args[0]}[$sub]\n";
 			$res = $mcc->get( $args[0] );
 			if ( array_key_exists( 1, $args ) ) {
 				$res = $res[$args[1]];
 			}
 			if ( $res === false ) {
-				#print 'Error: ' . $mcc->error_string() . "\n";
+				# print 'Error: ' . $mcc->error_string() . "\n";
 				print "MemCached error\n";
 			} elseif ( is_string( $res ) ) {
 				print "$res\n";
 			} else {
 				var_dump( $res );
 			}
+		break;
+
+		case 'getsock':
+			$res = $mcc->get( $args[0] );
+			$sock = $mcc->get_sock( $args[0] );
+			var_dump( $sock );
 			break;
-		case "set":
+
+		case 'server':
+			if ( $mcc->_single_sock !== null ) {
+				print $mcc->_single_sock . "\n";
+				break;
+			}
+			$res = $mcc->get( $args[0] );
+			$hv = $mcc->_hashfunc( $args[0] );
+			for ( $i = 0; $i < 3; $i++ ) {
+				print $mcc->_buckets[$hv % $mcc->_bucketcount] . "\n";
+				$hv += $mcc->_hashfunc( $i . $args[0] );
+			}
+			break;
+
+		case 'set':
 			$key = array_shift( $args );
 			if ( $args[0] == "#" && is_numeric( $args[1] ) ) {
-				$value = str_repeat( "*", $args[1] );
+				$value = str_repeat( '*', $args[1] );
 			} else {
-				$value = implode( " ", $args );
+				$value = implode( ' ', $args );
 			}
 			if ( !$mcc->set( $key, $value, 0 ) ) {
-				#print 'Error: ' . $mcc->error_string() . "\n";
+				# print 'Error: ' . $mcc->error_string() . "\n";
 				print "MemCached error\n";
 			}
 			break;
-		case "delete":
-			$key = implode( " ", $args );
+
+		case 'delete':
+			$key = implode( ' ', $args );
 			if ( !$mcc->delete( $key ) ) {
-				#print 'Error: ' . $mcc->error_string() . "\n";
+				# print 'Error: ' . $mcc->error_string() . "\n";
 				print "MemCached error\n";
 			}
-			break;				       
-		case "quit":
+			break;
+
+		case 'history':
+			if ( function_exists( 'readline_list_history' ) ) {
+				foreach ( readline_list_history() as $num => $line ) {
+					print "$num: $line\n";
+				}
+			} else {
+				print "readline_list_history() not available\n";
+			}
+			break;
+
+		case 'dumpmcc':
+			var_dump( $mcc );
+			break;
+
+		case 'quit':
+		case 'exit':
 			$quit = true;
 			break;
+
 		default:
 			$bad = true;
-	}
+	} // switch() end
+
 	if ( $bad ) {
 		if ( $command ) {
 			print "Bad command\n";
 		}
 	} else {
-		if ( function_exists( "readline_add_history" ) ) {
+		if ( function_exists( 'readline_add_history' ) ) {
 			readline_add_history( $line );
 		}
 	}
 } while ( !$quit );
-
-?>