Merge branch cassandra-3.X into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f782f148 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f782f148 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f782f148 Branch: refs/heads/trunk Commit: f782f148bdde962adf11d268db3435231dba5083 Parents: 58cf4c9 8b3de2f Author: Benjamin Lerer <[email protected]> Authored: Mon Nov 21 18:54:34 2016 +0100 Committer: Benjamin Lerer <[email protected]> Committed: Mon Nov 21 18:54:34 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 5 + doc/source/cql/changes.rst | 4 +- doc/source/cql/definitions.rst | 4 +- doc/source/cql/index.rst | 1 + doc/source/cql/operators.rst | 57 ++ pylib/cqlshlib/cql3handling.py | 2 +- src/antlr/Lexer.g | 6 +- src/antlr/Parser.g | 248 +++++-- .../org/apache/cassandra/cql3/Constants.java | 58 +- src/java/org/apache/cassandra/cql3/Lists.java | 85 ++- src/java/org/apache/cassandra/cql3/Maps.java | 122 ++- src/java/org/apache/cassandra/cql3/Sets.java | 95 ++- src/java/org/apache/cassandra/cql3/Tuples.java | 147 +++- .../org/apache/cassandra/cql3/UserTypes.java | 115 ++- .../cassandra/cql3/functions/FunctionCall.java | 37 +- .../cql3/functions/FunctionResolver.java | 91 ++- .../cassandra/cql3/functions/OperationFcts.java | 380 ++++++++++ .../cql3/selection/CollectionFactory.java | 91 +++ .../cql3/selection/ForwardingFactory.java | 90 +++ .../cassandra/cql3/selection/ListSelector.java | 104 +++ .../cassandra/cql3/selection/MapSelector.java | 195 +++++ .../cql3/selection/ScalarFunctionSelector.java | 9 - .../cassandra/cql3/selection/Selectable.java | 647 +++++++++++++++- .../cassandra/cql3/selection/Selector.java | 11 - .../cassandra/cql3/selection/SetSelector.java | 106 +++ .../cassandra/cql3/selection/TupleSelector.java | 101 +++ .../cql3/selection/UserTypeSelector.java | 177 +++++ .../org/apache/cassandra/db/SystemKeyspace.java | 1 + .../cassandra/db/marshal/AbstractType.java | 13 +- .../cassandra/db/marshal/BooleanType.java | 2 +- .../apache/cassandra/db/marshal/ByteType.java | 56 +- .../cassandra/db/marshal/CounterColumnType.java | 40 +- .../apache/cassandra/db/marshal/DateType.java | 2 +- .../cassandra/db/marshal/DecimalType.java | 76 +- .../apache/cassandra/db/marshal/DoubleType.java | 69 +- .../apache/cassandra/db/marshal/EmptyType.java | 2 +- .../apache/cassandra/db/marshal/FloatType.java | 61 +- .../apache/cassandra/db/marshal/Int32Type.java | 48 +- .../cassandra/db/marshal/IntegerType.java | 69 +- .../cassandra/db/marshal/LexicalUUIDType.java | 2 +- .../apache/cassandra/db/marshal/LongType.java | 52 +- .../apache/cassandra/db/marshal/NumberType.java | 223 ++++++ .../cassandra/db/marshal/ReversedType.java | 2 +- .../apache/cassandra/db/marshal/ShortType.java | 51 +- .../cassandra/db/marshal/TimeUUIDType.java | 2 +- .../cassandra/db/marshal/TimestampType.java | 2 +- .../apache/cassandra/db/marshal/TupleType.java | 5 + .../apache/cassandra/db/marshal/UUIDType.java | 2 +- .../apache/cassandra/db/marshal/UserType.java | 5 + .../exceptions/OperationExecutionException.java | 57 ++ .../cassandra/serializers/ByteSerializer.java | 4 +- .../apache/cassandra/utils/ByteBufferUtil.java | 17 + .../org/apache/cassandra/cql3/CQLTester.java | 4 +- .../cql3/functions/OperationFctsTest.java | 744 +++++++++++++++++++ .../selection/SelectionColumnMappingTest.java | 94 +++ .../cql3/selection/TermSelectionTest.java | 386 +++++++++- .../cql3/validation/operations/SelectTest.java | 10 + 57 files changed, 4769 insertions(+), 320 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f782f148/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index fa9233a,1f1625c..6cd725c --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,10 -1,8 +1,15 @@@ +4.0 + * Add column definition kind to dropped columns in schema (CASSANDRA-12705) + * Add (automate) Nodetool Documentation (CASSANDRA-12672) + * Update bundled cqlsh python driver to 3.7.0 (CASSANDRA-12736) + * Reject invalid replication settings when creating or altering a keyspace (CASSANDRA-12681) + * Clean up the SSTableReader#getScanner API wrt removal of RateLimiter (CASSANDRA-12422) + + 3.12 + * Add support for arithmetic operators (CASSANDRA-11935) + + 3.11 + * AnticompactionRequestSerializer serializedSize is incorrect (CASSANDRA-12934) 3.10 * Don't shut down socket input/output on StreamSession (CASSANDRA-12903) http://git-wip-us.apache.org/repos/asf/cassandra/blob/f782f148/test/unit/org/apache/cassandra/cql3/CQLTester.java ----------------------------------------------------------------------
