You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2011/06/06 20:03:27 UTC
svn commit: r1132713 - in /cassandra/branches/cassandra-0.8: CHANGES.txt
src/java/org/apache/cassandra/cql/Cql.g test/system/test_cql.py
Author: jbellis
Date: Mon Jun 6 18:03:27 2011
New Revision: 1132713
URL: http://svn.apache.org/viewvc?rev=1132713&view=rev
Log:
change ALTER TABLE to ALTER COLUMNFAMILY
patch by jbellis
Modified:
cassandra/branches/cassandra-0.8/CHANGES.txt
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cql/Cql.g
cassandra/branches/cassandra-0.8/test/system/test_cql.py
Modified: cassandra/branches/cassandra-0.8/CHANGES.txt
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/CHANGES.txt?rev=1132713&r1=1132712&r2=1132713&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.8/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.8/CHANGES.txt Mon Jun 6 18:03:27 2011
@@ -6,7 +6,7 @@
- TTL support (CASSANDRA-2476)
- counter support (CASSANDRA-2473)
- improve JDBC spec compliance (CASSANDRA-2720)
- - ALTER TABLE (CASSANDRA-1709)
+ - ALTER COLUMNFAMILY (CASSANDRA-1709)
- DROP INDEX (CASSANDRA-2617)
* add support for comparator parameters and a generic ReverseType
(CASSANDRA-2355)
Modified: cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cql/Cql.g
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cql/Cql.g?rev=1132713&r1=1132712&r2=1132713&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cql/Cql.g (original)
+++ cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cql/Cql.g Mon Jun 6 18:03:27 2011
@@ -406,7 +406,7 @@ alterTableStatement returns [AlterTableS
OperationType type = null;
String columnFamily = null, columnName = null, validator = null;
}
- K_ALTER K_TABLE name=( IDENT | STRING_LITERAL | INTEGER ) { columnFamily = $name.text; }
+ K_ALTER K_COLUMNFAMILY name=( IDENT | STRING_LITERAL | INTEGER ) { columnFamily = $name.text; }
( K_ALTER { type = OperationType.ALTER; }
(col=( IDENT | STRING_LITERAL | INTEGER ) { columnName = $col.text; })
K_TYPE alterValidator=comparatorType { validator = $alterValidator.text; }
@@ -509,7 +509,6 @@ K_VALUES: V A L U E S;
K_TIMESTAMP: T I M E S T A M P;
K_TTL: T T L;
K_ALTER: A L T E R;
-K_TABLE: T A B L E;
K_ADD: A D D;
K_TYPE: T Y P E;
Modified: cassandra/branches/cassandra-0.8/test/system/test_cql.py
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/test/system/test_cql.py?rev=1132713&r1=1132712&r2=1132713&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.8/test/system/test_cql.py (original)
+++ cassandra/branches/cassandra-0.8/test/system/test_cql.py Mon Jun 6 18:03:27 2011
@@ -1039,7 +1039,7 @@ class TestCql(ThriftTester):
assert len(r) == 1, "expected 0 results, got %d" % len(r)
def test_alter_table_statement(self):
- "test ALTER TABLE statement"
+ "test ALTER statement"
cursor = init()
cursor.execute("""
CREATE KEYSPACE AlterTableKS WITH strategy_options:replication_factor = '1'
@@ -1060,7 +1060,7 @@ class TestCql(ThriftTester):
assert len(cfam.column_metadata) == 0
# testing "add a new column"
- cursor.execute("ALTER TABLE NewCf1 ADD name varchar")
+ cursor.execute("ALTER COLUMNFAMILY NewCf1 ADD name varchar")
ksdef = thrift_client.describe_keyspace("AlterTableKS")
assert len(ksdef.cf_defs) == 1, \
@@ -1072,7 +1072,7 @@ class TestCql(ThriftTester):
assert columns[0].validation_class == 'org.apache.cassandra.db.marshal.UTF8Type'
# testing "alter a column type"
- cursor.execute("ALTER TABLE NewCf1 ALTER name TYPE ascii")
+ cursor.execute("ALTER COLUMNFAMILY NewCf1 ALTER name TYPE ascii")
ksdef = thrift_client.describe_keyspace("AlterTableKS")
assert len(ksdef.cf_defs) == 1, \
@@ -1086,10 +1086,10 @@ class TestCql(ThriftTester):
# alter column with unknown validator
assert_raises(cql.ProgrammingError,
cursor.execute,
- "ALTER TABLE NewCf1 ADD name utf8")
+ "ALTER COLUMNFAMILY NewCf1 ADD name utf8")
# testing 'drop an existing column'
- cursor.execute("ALTER TABLE NewCf1 DROP name")
+ cursor.execute("ALTER COLUMNFAMILY NewCf1 DROP name")
ksdef = thrift_client.describe_keyspace("AlterTableKS")
assert len(ksdef.cf_defs) == 1, \
@@ -1101,17 +1101,17 @@ class TestCql(ThriftTester):
# add column with unknown validator
assert_raises(cql.ProgrammingError,
cursor.execute,
- "ALTER TABLE NewCf1 ADD name utf8")
+ "ALTER COLUMNFAMILY NewCf1 ADD name utf8")
# alter not existing column
assert_raises(cql.ProgrammingError,
cursor.execute,
- "ALTER TABLE NewCf1 ALTER name TYPE uuid")
+ "ALTER COLUMNFAMILY NewCf1 ALTER name TYPE uuid")
# drop not existing column
assert_raises(cql.ProgrammingError,
cursor.execute,
- "ALTER TABLE NewCf1 DROP name")
+ "ALTER COLUMNFAMILY NewCf1 DROP name")
def test_counter_column_support(self):
"update statement should be able to work with counter columns"