Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ed0532c6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ed0532c6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ed0532c6 Branch: refs/heads/trunk Commit: ed0532c64c9db61ac38915c904a0db3df46e2bf8 Parents: 873d064 e75fe5c Author: Brandon Williams <[email protected]> Authored: Tue Sep 2 12:48:45 2014 -0500 Committer: Brandon Williams <[email protected]> Committed: Tue Sep 2 12:48:45 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/cassandra-shuffle | 58 -------------------- .../org/apache/cassandra/cql3/CQL3Type.java | 44 +++++++++++++++ src/java/org/apache/cassandra/cql3/Cql.g | 9 +++ .../org/apache/cassandra/cql3/CQLTester.java | 5 +- .../apache/cassandra/cql3/TupleTypeTest.java | 16 ++++-- .../apache/cassandra/cql3/UserTypesTest.java | 13 ++++- 7 files changed, 76 insertions(+), 70 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed0532c6/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed0532c6/src/java/org/apache/cassandra/cql3/Cql.g ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/cql3/Cql.g index 55fa76b,9d54866..af2c239 --- a/src/java/org/apache/cassandra/cql3/Cql.g +++ b/src/java/org/apache/cassandra/cql3/Cql.g @@@ -1362,15 -1300,8 +1370,16 @@@ K_TUPLE: T U P L E K_TRIGGER: T R I G G E R; K_STATIC: S T A T I C; + K_FROZEN: F R O Z E N; +K_FUNCTION: F U N C T I O N; +K_RETURNS: R E T U R N S; +K_LANGUAGE: L A N G U A G E; +K_NON: N O N; +K_OR: O R; +K_REPLACE: R E P L A C E; +K_DETERMINISTIC: D E T E R M I N I S T I C; + // Case-insensitive alpha characters fragment A: ('a'|'A'); fragment B: ('b'|'B'); http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed0532c6/test/unit/org/apache/cassandra/cql3/CQLTester.java ---------------------------------------------------------------------- diff --cc test/unit/org/apache/cassandra/cql3/CQLTester.java index 8817083,e776fc7..89487f4 --- a/test/unit/org/apache/cassandra/cql3/CQLTester.java +++ b/test/unit/org/apache/cassandra/cql3/CQLTester.java @@@ -237,15 -220,12 +237,12 @@@ public abstract class CQLTeste protected UntypedResultSet execute(String query, Object... values) throws Throwable { - if (currentTable == null) - throw new RuntimeException("You must create a table first with createTable"); - try { - query = String.format(query, KEYSPACE + "." + currentTable); + query = currentTable == null ? query : String.format(query, KEYSPACE + "." + currentTable); UntypedResultSet rs; - if (USE_PREPARED_VALUES) + if (usePrepared) { logger.info("Executing: {} with values {}", query, formatAllValues(values)); rs = QueryProcessor.executeOnceInternal(query, transformValues(values));
