Author: jbellis
Date: Mon Jan 17 16:00:00 2011
New Revision: 1059965
URL: http://svn.apache.org/viewvc?rev=1059965&view=rev
Log:
fix CLI parsing of "cluster name."
patch by Pavel Yaskevich; reviewed by jbellis for CASSANDRA-1995
Modified:
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/cli/Cli.g
cassandra/branches/cassandra-0.7/test/unit/org/apache/cassandra/cli/CliTest.java
Modified:
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/cli/Cli.g
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/cli/Cli.g?rev=1059965&r1=1059964&r2=1059965&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/cli/Cli.g
(original)
+++ cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/cli/Cli.g
Mon Jan 17 16:00:00 2011
@@ -176,11 +176,11 @@ helpStatement
-> ^(NODE_HELP NODE_EXIT)
| HELP QUIT
-> ^(NODE_HELP NODE_EXIT)
- | HELP SHOW CLUSTER NAME
+ | HELP SHOW 'CLUSTER NAME'
-> ^(NODE_HELP NODE_SHOW_CLUSTER_NAME)
| HELP SHOW KEYSPACES
-> ^(NODE_HELP NODE_SHOW_KEYSPACES)
- | HELP SHOW VERSION
+ | HELP SHOW API_VERSION
-> ^(NODE_HELP NODE_SHOW_VERSION)
| HELP CREATE KEYSPACE
-> ^(NODE_HELP NODE_ADD_KEYSPACE)
@@ -276,7 +276,7 @@ assumeStatement
;
showClusterName
- : SHOW CLUSTER NAME
+ : SHOW 'CLUSTER NAME'
-> ^(NODE_SHOW_CLUSTER_NAME)
;
@@ -311,7 +311,7 @@ delColumnFamily
;
showVersion
- : SHOW VERSION
+ : SHOW API_VERSION
-> ^(NODE_SHOW_VERSION)
;
@@ -496,36 +496,34 @@ port
// CLI is case-insensitive with respect to these keywords.
// However, they MUST be listed in upper case here.
//
-CONFIG: 'CONFIG';
-CONNECT: 'CONNECT';
-COUNT: 'COUNT';
-CLUSTER: 'CLUSTER';
-DEL: 'DEL';
-DESCRIBE: 'DESCRIBE';
-USE: 'USE';
-GET: 'GET';
-HELP: 'HELP';
-EXIT: 'EXIT';
-FILE: 'FILE';
-NAME: 'NAME';
-QUIT: 'QUIT';
-SET: 'SET';
-SHOW: 'SHOW';
-KEYSPACE: 'KEYSPACE';
-KEYSPACES: 'KEYSPACES';
-VERSION: 'API VERSION';
-CREATE: 'CREATE';
-DROP: 'DROP';
-COLUMN: 'COLUMN';
-FAMILY: 'FAMILY';
-WITH: 'WITH';
-AND: 'AND';
-UPDATE: 'UPDATE';
-LIST: 'LIST';
-LIMIT: 'LIMIT';
-TRUNCATE: 'TRUNCATE';
-ASSUME: 'ASSUME';
-TTL: 'TTL';
+CONFIG: 'CONFIG';
+CONNECT: 'CONNECT';
+COUNT: 'COUNT';
+DEL: 'DEL';
+DESCRIBE: 'DESCRIBE';
+USE: 'USE';
+GET: 'GET';
+HELP: 'HELP';
+EXIT: 'EXIT';
+FILE: 'FILE';
+QUIT: 'QUIT';
+SET: 'SET';
+SHOW: 'SHOW';
+KEYSPACE: 'KEYSPACE';
+KEYSPACES: 'KEYSPACES';
+API_VERSION: 'API VERSION';
+CREATE: 'CREATE';
+DROP: 'DROP';
+COLUMN: 'COLUMN';
+FAMILY: 'FAMILY';
+WITH: 'WITH';
+AND: 'AND';
+UPDATE: 'UPDATE';
+LIST: 'LIST';
+LIMIT: 'LIMIT';
+TRUNCATE: 'TRUNCATE';
+ASSUME: 'ASSUME';
+TTL: 'TTL';
IP_ADDRESS
: IntegerLiteral '.' IntegerLiteral '.' IntegerLiteral '.' IntegerLiteral
Modified:
cassandra/branches/cassandra-0.7/test/unit/org/apache/cassandra/cli/CliTest.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/test/unit/org/apache/cassandra/cli/CliTest.java?rev=1059965&r1=1059964&r2=1059965&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.7/test/unit/org/apache/cassandra/cli/CliTest.java
(original)
+++
cassandra/branches/cassandra-0.7/test/unit/org/apache/cassandra/cli/CliTest.java
Mon Jan 17 16:00:00 2011
@@ -109,9 +109,38 @@ public class CliTest extends CleanupHelp
"create keyspace TESTIN;",
"drop keyspace tesTIN;",
"create column family myCF with column_type='Super' and
comparator='UTF8Type' AND subcomparator='UTF8Type';",
+ "create column family Countries with comparator=UTF8Type and
column_metadata=[ {column_name: name, validation_class: UTF8Type} ];",
+ "set Countries[1][name] = USA;",
+ "get Countries[1][name];",
"set myCF['key']['scName']['firstname'] = 'John';",
"get myCF['key']['scName']",
"use TestKEYSpace;",
+ "show cluster name",
+ "show api version",
+ "help help",
+ "help connect",
+ "help use",
+ "help describe KEYSPACE",
+ "HELP exit",
+ "help QUIT",
+ "help show cluster name",
+ "help show keyspaces",
+ "help show api version",
+ "help create keyspace",
+ "HELP update KEYSPACE",
+ "HELP CREATE column FAMILY",
+ "HELP UPDATE COLUMN family",
+ "HELP drop keyspace",
+ "help drop column family",
+ "HELP GET",
+ "HELP set",
+ "HELP DEL",
+ "HELP count",
+ "HELP list",
+ "HELP TRUNCATE",
+ "help assume",
+ "HELP",
+ "?"
};
@Test
