cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject [6/8] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Date Tue, 02 Sep 2014 17:49:01 GMT
Merge branch 'cassandra-2.1.0' into cassandra-2.1

Conflicts:
	CHANGES.txt


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e75fe5c4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e75fe5c4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e75fe5c4

Branch: refs/heads/trunk
Commit: e75fe5c4f5546585180efcc4fca676afa69f8750
Parents: e0d7c77 82136e3
Author: Brandon Williams <brandonwilliams@apache.org>
Authored: Tue Sep 2 12:48:30 2014 -0500
Committer: Brandon Williams <brandonwilliams@apache.org>
Committed: Tue Sep 2 12:48:30 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/e75fe5c4/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index bd81431,b33bec4..a58af8f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,54 -1,5 +1,55 @@@
 -2.1.0-rc7
 +2.1.1
 + * (cqlsh): Show progress of COPY operations (CASSANDRA-7789)
 + * Add syntax to remove multiple elements from a map (CASSANDRA-6599)
 + * Support non-equals conditions in lightweight transactions (CASSANDRA-6839)
 + * Add IF [NOT] EXISTS to create/drop triggers (CASSANDRA-7606)
 + * (cqlsh) Display the current logged-in user (CASSANDRA-7785)
 + * (cqlsh) Don't ignore CTRL-C during COPY FROM execution (CASSANDRA-7815)
 + * (cqlsh) Order UDTs according to cross-type dependencies in DESCRIBE
 +   output (CASSANDRA-7659)
 + * (cqlsh) Fix handling of CAS statement results (CASSANDRA-7671)
 + * (cqlsh) COPY TO/FROM improvements (CASSANDRA-7405)
 + * Support list index operations with conditions (CASSANDRA-7499)
 + * Add max live/tombstoned cells to nodetool cfstats output (CASSANDRA-7731)
 + * Validate IPv6 wildcard addresses properly (CASSANDRA-7680)
 + * (cqlsh) Error when tracing query (CASSANDRA-7613)
 + * Avoid IOOBE when building SyntaxError message snippet (CASSANDRA-7569)
 + * SSTableExport uses correct validator to create string representation of partition
 +   keys (CASSANDRA-7498)
 + * Avoid NPEs when receiving type changes for an unknown keyspace (CASSANDRA-7689)
 + * Add support for custom 2i validation (CASSANDRA-7575)
 + * Pig support for hadoop CqlInputFormat (CASSANDRA-6454)
 + * Add listen_interface and rpc_interface options (CASSANDRA-7417)
 + * Improve schema merge performance (CASSANDRA-7444)
 + * Adjust MT depth based on # of partition validating (CASSANDRA-5263)
 + * Optimise NativeCell comparisons (CASSANDRA-6755)
 + * Configurable client timeout for cqlsh (CASSANDRA-7516)
 + * Include snippet of CQL query near syntax error in messages (CASSANDRA-7111)
 +Merged from 2.0:
 + * Better error message when condition is set on PK column (CASSANDRA-7804)
 + * Don't send schema change responses and events for no-op DDL
 +   statements (CASSANDRA-7600)
 + * (Hadoop) fix cluster initialisation for a split fetching (CASSANDRA-7774)
 + * Throw InvalidRequestException when queries contain relations on entire
 +   collection columns (CASSANDRA-7506)
 + * (cqlsh) enable CTRL-R history search with libedit (CASSANDRA-7577)
 + * (Hadoop) allow ACFRW to limit nodes to local DC (CASSANDRA-7252)
 + * (cqlsh) cqlsh should automatically disable tracing when selecting
 +   from system_traces (CASSANDRA-7641)
 + * (Hadoop) Add CqlOutputFormat (CASSANDRA-6927)
 + * Don't depend on cassandra config for nodetool ring (CASSANDRA-7508)
 + * (cqlsh) Fix failing cqlsh formatting tests (CASSANDRA-7703)
 + * Fix IncompatibleClassChangeError from hadoop2 (CASSANDRA-7229)
 + * Add 'nodetool sethintedhandoffthrottlekb' (CASSANDRA-7635)
 + * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS (CASSANDRA-7611)
 + * Catch errors when the JVM pulls the rug out from GCInspector (CASSANDRA-5345)
 + * cqlsh fails when version number parts are not int (CASSANDRA-7524)
 +Merged from 1.2:
 + * Improve PasswordAuthenticator default super user setup (CASSANDRA-7788)
 +
 +
 +2.1.0
+  * Add frozen keyword and require UDT to be frozen (CASSANDRA-7857)
   * Track added sstable size correctly (CASSANDRA-7239)
   * (cqlsh) Fix case insensitivity (CASSANDRA-7834)
   * Fix failure to stream ranges when moving (CASSANDRA-7836)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e75fe5c4/src/java/org/apache/cassandra/cql3/Cql.g
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e75fe5c4/test/unit/org/apache/cassandra/cql3/CQLTester.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e75fe5c4/test/unit/org/apache/cassandra/cql3/TupleTypeTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/cql3/TupleTypeTest.java
index 354a8f9,4ce24f8..53e7e71
--- a/test/unit/org/apache/cassandra/cql3/TupleTypeTest.java
+++ b/test/unit/org/apache/cassandra/cql3/TupleTypeTest.java
@@@ -89,9 -89,15 +89,15 @@@ public class TupleTypeTest extends CQLT
      @Test
      public void testInvalidQueries() throws Throwable
      {
-         createTable("CREATE TABLE %s (k int PRIMARY KEY, t tuple<int, text, double>)");
+         createTable("CREATE TABLE %s (k int PRIMARY KEY, t frozen<tuple<int, text,
double>>)");
  
 -        assertInvalid("INSERT INTO %s (k, t) VALUES (0, ())");
 +        assertInvalidSyntax("INSERT INTO %s (k, t) VALUES (0, ())");
          assertInvalid("INSERT INTO %s (k, t) VALUES (0, (2, 'foo', 3.1, 'bar'))");
      }
+ 
+     @Test
+     public void testNonFrozenTuple() throws Throwable
+     {
+         assertInvalid("CREATE TABLE wrong (k int PRIMARY KEY, v tuple<int, text>)");
+     }
  }


Mime
View raw message