Merge branch cassandra-3.0 into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0d8e853d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0d8e853d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0d8e853d Branch: refs/heads/trunk Commit: 0d8e853d923676331f4f336d9455089cc431535d Parents: 09fd433 7a3c3ab Author: Benjamin Lerer <[email protected]> Authored: Wed Feb 17 11:56:48 2016 +0100 Committer: Benjamin Lerer <[email protected]> Committed: Wed Feb 17 11:56:48 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 3 + .../cql3/statements/AlterTypeStatement.java | 28 +++++--- .../cql3/statements/DropTypeStatement.java | 40 ++---------- .../db/marshal/AbstractCompositeType.java | 6 ++ .../cassandra/db/marshal/AbstractType.java | 7 +- .../cassandra/db/marshal/CompositeType.java | 11 ---- .../apache/cassandra/db/marshal/ListType.java | 4 +- .../apache/cassandra/db/marshal/MapType.java | 5 +- .../cassandra/db/marshal/ReversedType.java | 4 +- .../apache/cassandra/db/marshal/SetType.java | 4 +- .../apache/cassandra/db/marshal/TupleType.java | 9 +-- .../apache/cassandra/db/marshal/UserType.java | 9 ++- .../cql3/validation/entities/UserTypesTest.java | 68 ++++++++++++++++++++ .../commitlog/CommitLogSegmentManagerTest.java | 63 ++++++++++++++++++ 14 files changed, 184 insertions(+), 77 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0d8e853d/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 376035d,f1a9719..2d0a727 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,28 -1,5 +1,31 @@@ +3.4 + * fix SASI memtable switching on flush (CASSANDRA-11159) + * Remove duplicate offline compaction tracking (CASSANDRA-11148) + * fix EQ semantics of analyzed SASI indexes (CASSANDRA-11130) + * Support long name output for nodetool commands (CASSANDRA-7950) + * Encrypted hints (CASSANDRA-11040) + * SASI index options validation (CASSANDRA-11136) + * Optimize disk seek using min/max column name meta data when the LIMIT clause is used + (CASSANDRA-8180) + * Add LIKE support to CQL3 (CASSANDRA-11067) + * Generic Java UDF types (CASSANDRA-10819) + * cqlsh: Include sub-second precision in timestamps by default (CASSANDRA-10428) + * Set javac encoding to utf-8 (CASSANDRA-11077) + * Integrate SASI index into Cassandra (CASSANDRA-10661) + * Add --skip-flush option to nodetool snapshot + * Skip values for non-queried columns (CASSANDRA-10657) + * Add support for secondary indexes on static columns (CASSANDRA-8103) + * CommitLogUpgradeTestMaker creates broken commit logs (CASSANDRA-11051) + * Add metric for number of dropped mutations (CASSANDRA-10866) + * Simplify row cache invalidation code (CASSANDRA-10396) + * Support user-defined compaction through nodetool (CASSANDRA-10660) + * Stripe view locks by key and table ID to reduce contention (CASSANDRA-10981) + * Add nodetool gettimeout and settimeout commands (CASSANDRA-10953) + * Add 3.0 metadata to sstablemetadata output (CASSANDRA-10838) +Merged from 3.0: ++======= + 3.0.4 + * Disallow drop/alter operations of UDTs used by UDAs (CASSANDRA-10721) * Add query time validation method on Index (CASSANDRA-11043) * Avoid potential AssertionError in mixed version cluster (CASSANDRA-11128) * Properly handle hinted handoff after topology changes (CASSANDRA-5902) http://git-wip-us.apache.org/repos/asf/cassandra/blob/0d8e853d/src/java/org/apache/cassandra/db/marshal/AbstractCompositeType.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0d8e853d/src/java/org/apache/cassandra/db/marshal/CompositeType.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0d8e853d/src/java/org/apache/cassandra/db/marshal/TupleType.java ----------------------------------------------------------------------
