Merge branch 'cassandra-3.11' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/67e9a5ff Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/67e9a5ff Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/67e9a5ff Branch: refs/heads/trunk Commit: 67e9a5ffd27e78d19d4a82f2f6d31cce44fd6b32 Parents: 957ad8c 2c111d1 Author: Alex Petrov <[email protected]> Authored: Fri Mar 10 13:31:59 2017 +0100 Committer: Alex Petrov <[email protected]> Committed: Fri Mar 10 13:31:59 2017 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/index/sasi/TermIterator.java | 2 +- .../index/sasi/plan/QueryController.java | 3 - .../sasi/utils/RangeIntersectionIterator.java | 9 ++- .../index/sasi/utils/RangeIterator.java | 79 +++++++++++++++----- .../index/sasi/utils/RangeUnionIterator.java | 9 ++- .../cassandra/index/sasi/SASIIndexTest.java | 6 +- .../index/sasi/utils/LongIteratorTest.java | 56 ++++++++++++++ .../utils/RangeIntersectionIteratorTest.java | 78 ++++++++++++++++++- .../sasi/utils/RangeUnionIteratorTest.java | 72 +++++++++++++++++- 10 files changed, 283 insertions(+), 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/67e9a5ff/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 0e5bc25,302a028..3acc2b4 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,47 -1,7 +1,48 @@@ +4.0 + * Add the currentTimestamp, currentDate, currentTime and currentTimeUUID functions (CASSANDRA-13132) + * Remove config option index_interval (CASSANDRA-10671) + * Reduce lock contention for collection types and serializers (CASSANDRA-13271) + * Make it possible to override MessagingService.Verb ids (CASSANDRA-13283) + * Avoid synchronized on prepareForRepair in ActiveRepairService (CASSANDRA-9292) + * Adds the ability to use uncompressed chunks in compressed files (CASSANDRA-10520) + * Don't flush sstables when streaming for incremental repair (CASSANDRA-13226) + * Remove unused method (CASSANDRA-13227) + * Fix minor bugs related to #9143 (CASSANDRA-13217) + * Output warning if user increases RF (CASSANDRA-13079) + * Remove pre-3.0 streaming compatibility code for 4.0 (CASSANDRA-13081) + * Add support for + and - operations on dates (CASSANDRA-11936) + * Fix consistency of incrementally repaired data (CASSANDRA-9143) + * Increase commitlog version (CASSANDRA-13161) + * Make TableMetadata immutable, optimize Schema (CASSANDRA-9425) + * Refactor ColumnCondition (CASSANDRA-12981) + * Parallelize streaming of different keyspaces (CASSANDRA-4663) + * Improved compactions metrics (CASSANDRA-13015) + * Speed-up start-up sequence by avoiding un-needed flushes (CASSANDRA-13031) + * Use Caffeine (W-TinyLFU) for on-heap caches (CASSANDRA-10855) + * Thrift removal (CASSANDRA-11115) + * Remove pre-3.0 compatibility code for 4.0 (CASSANDRA-12716) + * 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) + * Use new token allocation for non bootstrap case as well (CASSANDRA-13080) + * Avoid byte-array copy when key cache is disabled (CASSANDRA-13084) + * Require forceful decommission if number of nodes is less than replication factor (CASSANDRA-12510) + * Allow IN restrictions on column families with collections (CASSANDRA-12654) + * Log message size in trace message in OutboundTcpConnection (CASSANDRA-13028) + * Add timeUnit Days for cassandra-stress (CASSANDRA-13029) + * Add mutation size and batch metrics (CASSANDRA-12649) + * Add method to get size of endpoints to TokenMetadata (CASSANDRA-12999) + * Expose time spent waiting in thread pool queue (CASSANDRA-8398) + * Conditionally update index built status to avoid unnecessary flushes (CASSANDRA-12969) + * cqlsh auto completion: refactor definition of compaction strategy options (CASSANDRA-12946) + * Add support for arithmetic operators (CASSANDRA-11935) + + 3.11.0 + * Improve SASI range iterator efficiency on intersection with an empty range (CASSANDRA-12915). * Fix equality comparisons of columns using the duration type (CASSANDRA-13174) - * Obfuscate password in stress-graphs (CASSANDRA-12233) * Move to FastThreadLocalThread and FastThreadLocal (CASSANDRA-13034) * nodetool stopdaemon errors out (CASSANDRA-13030) * Tables in system_distributed should not use gcgs of 0 (CASSANDRA-12954) http://git-wip-us.apache.org/repos/asf/cassandra/blob/67e9a5ff/src/java/org/apache/cassandra/index/sasi/plan/QueryController.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/67e9a5ff/src/java/org/apache/cassandra/index/sasi/utils/RangeIntersectionIterator.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/67e9a5ff/test/unit/org/apache/cassandra/index/sasi/SASIIndexTest.java ----------------------------------------------------------------------
