Author: gdusbabek
Date: Tue Oct 19 14:23:43 2010
New Revision: 1024244
URL: http://svn.apache.org/viewvc?rev=1024244&view=rev
Log:
disable system_renam-ing in the cli. patch by gdusbabek, reviewed by jbellis.
CASSANDRA-1
630
Modified:
cassandra/trunk/src/java/org/apache/cassandra/cli/Cli.g
cassandra/trunk/src/java/org/apache/cassandra/cli/CliClient.java
Modified: cassandra/trunk/src/java/org/apache/cassandra/cli/Cli.g
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/cli/Cli.g?rev=1024244&r1=1024243&r2=1024244&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/cli/Cli.g (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/cli/Cli.g Tue Oct 19 14:23:43
2010
@@ -51,9 +51,7 @@ tokens {
NODE_ADD_KEYSPACE;
NODE_DEL_KEYSPACE;
NODE_DEL_COLUMN_FAMILY;
- NODE_RENAME_KEYSPACE;
NODE_UPDATE_KEYSPACE;
- NODE_RENAME_COLUMN_FAMILY;
NODE_UPDATE_COLUMN_FAMILY;
NODE_LIST;
@@ -115,8 +113,6 @@ statement
| updateColumnFamily
| delColumnFamily
| delKeyspace
- | renameColumnFamily
- | renameKeyspace
| useTable
| delStatement
| getStatement
@@ -165,10 +161,6 @@ helpStatement
-> ^(NODE_HELP NODE_DEL_KEYSPACE)
| K_HELP K_DROP K_COLUMN K_FAMILY
-> ^(NODE_HELP NODE_DEL_COLUMN_FAMILY)
- | K_HELP K_RENAME K_TABLE
- -> ^(NODE_HELP NODE_RENAME_KEYSPACE)
- | K_HELP K_RENAME K_COLUMN K_FAMILY
- -> ^(NODE_HELP NODE_RENAME_COLUMN_FAMILY)
| K_HELP K_GET
-> ^(NODE_HELP NODE_THRIFT_GET)
| K_HELP K_SET
@@ -264,17 +256,6 @@ delColumnFamily
-> ^(NODE_DEL_COLUMN_FAMILY columnFamily)
;
-renameKeyspace
- : K_RENAME K_TABLE keyspace keyspaceNewName
- -> ^(NODE_RENAME_KEYSPACE keyspace keyspaceNewName)
- ;
-
-renameColumnFamily
- : K_RENAME K_COLUMN K_FAMILY columnFamily newColumnFamily
- -> ^(NODE_RENAME_COLUMN_FAMILY columnFamily newColumnFamily)
- ;
-
-
showVersion
: K_SHOW K_VERSION
-> ^(NODE_SHOW_VERSION)
@@ -429,7 +410,6 @@ K_TABLES: 'KEYSPACES';
K_VERSION: 'API VERSION';
K_CREATE: 'CREATE';
K_DROP: 'DROP';
-K_RENAME: 'RENAME';
K_COLUMN: 'COLUMN';
K_FAMILY: 'FAMILY';
K_WITH: 'WITH';
Modified: cassandra/trunk/src/java/org/apache/cassandra/cli/CliClient.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/cli/CliClient.java?rev=1024244&r1=1024243&r2=1024244&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/cli/CliClient.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/cli/CliClient.java Tue Oct 19
14:23:43 2010
@@ -165,12 +165,6 @@ public class CliClient
case CliParser.NODE_DEL_KEYSPACE:
executeDelKeyspace(ast);
break;
- case CliParser.NODE_RENAME_COLUMN_FAMILY:
- executeRenameColumnFamily(ast);
- break;
- case CliParser.NODE_RENAME_KEYSPACE:
- executeRenameKeyspace(ast);
- break;
case CliParser.NODE_SHOW_CLUSTER_NAME:
executeShowClusterName();
break;
@@ -357,20 +351,6 @@ public class CliClient
css_.out.print("[{ column_name:Test,
validation_class:IntegerType, index_type:0, index_name:IdxName");
css_.out.println("}] and rows_cached=100 and comment='this is
helpful comment.'");
break;
-
- case CliParser.NODE_RENAME_KEYSPACE:
- css_.out.println("rename keyspace <old_name> <new_name>\n");
- css_.out.println("Renames the specified keyspace with the
given new name.\n");
- css_.out.println("example:");
- css_.out.println("rename keyspace foo bar");
- break;
-
- case CliParser.NODE_RENAME_COLUMN_FAMILY:
- css_.out.println("rename column family <name> <new_name>\n");
- css_.out.println("Renames the specified column family with the
given new name.\n");
- css_.out.println("example:");
- css_.out.println("rename column family foo bar");
- break;
case CliParser.NODE_DEL_KEYSPACE:
css_.out.println("drop keyspace <keyspace>\n");
@@ -1100,44 +1080,6 @@ public class CliClient
css_.out.println(thriftClient_.system_drop_column_family(columnName));
}
- /**
- * Rename existing keyspace
- * @param ast - a token tree representing current statement
- * @throws TException - exception
- * @throws InvalidRequestException - exception
- * @throws NotFoundException - exception
- */
- private void executeRenameKeyspace(CommonTree ast) throws TException,
InvalidRequestException, NotFoundException
- {
- if (!CliMain.isConnected())
- {
- return;
- }
- String keyspaceName = ast.getChild(0).getText();
- String keyspaceNewName = ast.getChild(1).getText();
-
- css_.out.println(thriftClient_.system_rename_keyspace(keyspaceName,
keyspaceNewName));
- }
-
- /**
- * Rename existing column family
- * @param ast - a token tree representing current statement
- * @throws TException - exception
- * @throws InvalidRequestException - exception
- * @throws NotFoundException - exception
- */
- private void executeRenameColumnFamily(CommonTree ast) throws TException,
InvalidRequestException, NotFoundException
- {
- if (!CliMain.isConnected() || !hasKeySpace())
- {
- return;
- }
- String columnName = ast.getChild(0).getText();
- String columnNewName = ast.getChild(1).getText();
-
- css_.out.println(thriftClient_.system_rename_column_family(columnName,
columnNewName));
- }
-
private void executeList(CommonTree ast)
throws TException, InvalidRequestException, NotFoundException,
IllegalAccessException, InstantiationException, NoSuchFieldException,
UnavailableException, TimedOutException, UnsupportedEncodingException
{
