Merge branch 'cassandra-3.X' of https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-3.X
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/747a62f6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/747a62f6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/747a62f6 Branch: refs/heads/cassandra-3.X Commit: 747a62f60776fd66963f115179f3c9b7d82bb79c Parents: 9fc14bc ecf05b8 Author: Marcus Eriksson <marc...@apache.org> Authored: Tue Oct 18 14:10:34 2016 +0200 Committer: Marcus Eriksson <marc...@apache.org> Committed: Tue Oct 18 14:10:34 2016 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + NEWS.txt | 3 + doc/cql3/CQL.textile | 1 - doc/source/cql/changes.rst | 1 + doc/source/cql/types.rst | 42 ++ pylib/cqlshlib/cql3handling.py | 4 +- pylib/cqlshlib/displaying.py | 1 + pylib/cqlshlib/formatting.py | 82 +++ src/antlr/Lexer.g | 22 + src/antlr/Parser.g | 2 + .../org/apache/cassandra/cql3/CQL3Type.java | 17 + .../org/apache/cassandra/cql3/Constants.java | 15 +- .../org/apache/cassandra/cql3/Duration.java | 590 +++++++++++++++++++ .../cassandra/cql3/SingleColumnRelation.java | 3 + .../cql3/statements/CreateTableStatement.java | 4 + .../cql3/statements/CreateViewStatement.java | 5 +- .../cassandra/db/marshal/AbstractType.java | 5 + .../cassandra/db/marshal/DurationType.java | 95 +++ .../apache/cassandra/db/marshal/ListType.java | 6 + .../apache/cassandra/db/marshal/MapType.java | 7 + .../apache/cassandra/db/marshal/TupleType.java | 6 + .../apache/cassandra/db/marshal/UserType.java | 6 + .../serializers/DurationSerializer.java | 94 +++ .../apache/cassandra/config/CFMetaDataTest.java | 10 +- .../cassandra/cql3/CQL3TypeLiteralTest.java | 7 + .../org/apache/cassandra/cql3/CQLTester.java | 3 + .../org/apache/cassandra/cql3/DurationTest.java | 114 ++++ .../org/apache/cassandra/cql3/ViewTest.java | 21 + .../validation/entities/CollectionsTest.java | 6 +- .../cql3/validation/entities/JsonTest.java | 25 +- .../cql3/validation/operations/BatchTest.java | 8 +- .../cql3/validation/operations/CreateTest.java | 131 ++++ 32 files changed, 1315 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/747a62f6/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 20a64e1,c0bc0e4..a5b0add --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,5 -1,5 +1,6 @@@ 3.10 + * Make the fanout size for LeveledCompactionStrategy to be configurable (CASSANDRA-11550) + * Add duration data type (CASSANDRA-11873) * Fix timeout in ReplicationAwareTokenAllocatorTest (CASSANDRA-12784) * Improve sum aggregate functions (CASSANDRA-12417) * Make cassandra.yaml docs for batch_size_*_threshold_in_kb reflect changes in CASSANDRA-10876 (CASSANDRA-12761) http://git-wip-us.apache.org/repos/asf/cassandra/blob/747a62f6/pylib/cqlshlib/cql3handling.py ----------------------------------------------------------------------
