Author: jbellis Date: Thu Jun 9 22:16:07 2011 New Revision: 1134110 URL: http://svn.apache.org/viewvc?rev=1134110&view=rev Log: add SCHEMA/TABLE as aliases for KS/CF patch by pyaskevich; reviewed by jbellis for CASSANDRA-2743
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=1134110&r1=1134109&r2=1134110&view=diff ============================================================================== --- cassandra/branches/cassandra-0.8/CHANGES.txt (original) +++ cassandra/branches/cassandra-0.8/CHANGES.txt Thu Jun 9 22:16:07 2011 @@ -8,6 +8,7 @@ - improve JDBC spec compliance (CASSANDRA-2720) - ALTER COLUMNFAMILY (CASSANDRA-1709) - DROP INDEX (CASSANDRA-2617) + - add SCHEMA/TABLE as aliases for KS/CF (CASSANDRA-2743) * add support for comparator parameters and a generic ReverseType (CASSANDRA-2355) * add CompositeType and DynamicCompositeType (CASSANDRA-2231) 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=1134110&r1=1134109&r2=1134110&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 Thu Jun 9 22:16:07 2011 @@ -498,8 +498,10 @@ K_TRUNCATE: T R U N C A T E; K_DELETE: D E L E T E; K_IN: I N; K_CREATE: C R E A T E; -K_KEYSPACE: K E Y S P A C E; -K_COLUMNFAMILY: C O L U M N F A M I L Y; +K_KEYSPACE: ( K E Y S P A C E + | S C H E M A ); +K_COLUMNFAMILY:( C O L U M N F A M I L Y + | T A B L E ); K_INDEX: I N D E X; K_ON: O N; K_DROP: D R O P; 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=1134110&r1=1134109&r2=1134110&view=diff ============================================================================== --- cassandra/branches/cassandra-0.8/test/system/test_cql.py (original) +++ cassandra/branches/cassandra-0.8/test/system/test_cql.py Thu Jun 9 22:16:07 2011 @@ -44,7 +44,7 @@ def load_sample(dbconn): WITH comparator = ascii AND default_validation = ascii; """) dbconn.execute(""" - CREATE COLUMNFAMILY StandardString2 (KEY text PRIMARY KEY) + CREATE TABLE StandardString2 (KEY text PRIMARY KEY) WITH comparator = ascii AND default_validation = ascii; """) dbconn.execute(""" @@ -56,7 +56,7 @@ def load_sample(dbconn): WITH comparator = bigint AND default_validation = ascii; """) dbconn.execute(""" - CREATE COLUMNFAMILY StandardIntegerA (KEY text PRIMARY KEY) + CREATE TABLE StandardIntegerA (KEY text PRIMARY KEY) WITH comparator = varint AND default_validation = ascii; """) dbconn.execute(""" @@ -76,7 +76,7 @@ def load_sample(dbconn): WITH comparator = ascii AND default_validation = ascii; """) dbconn.execute(""" - CREATE COLUMNFAMILY CounterCF (KEY text PRIMARY KEY, count_me counter) + CREATE TABLE CounterCF (KEY text PRIMARY KEY, count_me counter) WITH comparator = ascii AND default_validation = counter; """) dbconn.execute("CREATE INDEX ON IndexedA (birthdate)") @@ -414,7 +414,7 @@ class TestCql(ThriftTester): "create a new keyspace" cursor = init() cursor.execute(""" - CREATE KEYSPACE TestKeyspace42 WITH strategy_options:DC1 = '1' + CREATE SCHEMA TestKeyspace42 WITH strategy_options:DC1 = '1' AND strategy_class = 'NetworkTopologyStrategy' """) @@ -436,7 +436,7 @@ class TestCql(ThriftTester): # TODO: temporary (until this can be done with CQL). thrift_client.describe_keyspace("Keyspace4Drop") - cursor.execute('DROP KEYSPACE Keyspace4Drop;') + cursor.execute('DROP SCHEMA Keyspace4Drop;') # Technically this should throw a ttypes.NotFound(), but this is # temporary and so not worth requiring it on PYTHONPATH. @@ -448,7 +448,7 @@ class TestCql(ThriftTester): "create a new column family" cursor = init() cursor.execute(""" - CREATE KEYSPACE CreateCFKeyspace WITH strategy_options:replication_factor = '1' + CREATE SCHEMA CreateCFKeyspace WITH strategy_options:replication_factor = '1' AND strategy_class = 'SimpleStrategy'; """) cursor.execute("USE CreateCFKeyspace;")