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/8ef1e2ce Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8ef1e2ce Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8ef1e2ce Branch: refs/heads/trunk Commit: 8ef1e2ce252217a8a945b32087b5ae612568f908 Parents: 5e913ab 6c867f0 Author: Marcus Eriksson <[email protected]> Authored: Tue Jun 7 07:45:10 2016 +0200 Committer: Marcus Eriksson <[email protected]> Committed: Tue Jun 7 07:45:10 2016 +0200 ---------------------------------------------------------------------- CHANGES.txt | 2 + NEWS.txt | 10 + doc/cql3/CQL.textile | 5 +- pylib/cqlshlib/cql3handling.py | 7 + pylib/cqlshlib/cqlhandling.py | 3 +- pylib/cqlshlib/test/test_cqlsh_completion.py | 11 +- .../DateTieredCompactionStrategy.java | 4 + .../TimeWindowCompactionStrategy.java | 380 +++++++++++++++++++ .../TimeWindowCompactionStrategyOptions.java | 148 ++++++++ .../db/compaction/CompactionsCQLTest.java | 13 + .../TimeWindowCompactionStrategyTest.java | 274 +++++++++++++ 11 files changed, 854 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8ef1e2ce/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 40ffdf3,cdbaebb..d18fc9d --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,20 -1,8 +1,22 @@@ -3.0.8 +3.8 + * Switch counter shards' clock to timestamps (CASSANDRA-9811) + * Introduce HdrHistogram and response/service/wait separation to stress tool (CASSANDRA-11853) + * entry-weighers in QueryProcessor should respect partitionKeyBindIndexes field (CASSANDRA-11718) + * Support older ant versions (CASSANDRA-11807) + * Estimate compressed on disk size when deciding if sstable size limit reached (CASSANDRA-11623) + * cassandra-stress profiles should support case sensitive schemas (CASSANDRA-11546) + * Remove DatabaseDescriptor dependency from FileUtils (CASSANDRA-11578) + * Faster streaming (CASSANDRA-9766) + * Add prepared query parameter to trace for "Execute CQL3 prepared query" session (CASSANDRA-11425) + * Add repaired percentage metric (CASSANDRA-11503) ++Merged from 3.0: + * Add TimeWindowCompactionStrategy (CASSANDRA-9666) -3.0.7 +3.7 + * Support multiple folders for user defined compaction tasks (CASSANDRA-11765) + * Fix race in CompactionStrategyManager's pause/resume (CASSANDRA-11922) +Merged from 3.0: * Fix legacy serialization of Thrift-generated non-compound range tombstones when communicating with 2.x nodes (CASSANDRA-11930) * Fix Directories instantiations where CFS.initialDirectories should be used (CASSANDRA-11849) http://git-wip-us.apache.org/repos/asf/cassandra/blob/8ef1e2ce/NEWS.txt ---------------------------------------------------------------------- diff --cc NEWS.txt index f8b589f,dbaece1..076d024 --- a/NEWS.txt +++ b/NEWS.txt @@@ -13,33 -13,31 +13,43 @@@ restore snapshots created with the prev 'sstableloader' tool. You can upgrade the file format of your snapshots using the provided 'sstableupgrade' tool. -3.0.7 -===== -Upgrading ---------- - - A maximum size for SSTables values has been introduced, to prevent out of memory - exceptions when reading corrupt SSTables. This maximum size can be set via - max_value_size_in_mb in cassandra.yaml. The default is 256MB, which matches the default - value of native_transport_max_frame_size_in_mb. SSTables will be considered corrupt if - they contain values whose size exceeds this limit. See CASSANDRA-9530 for more details. +3.8 +=== + +New features +------------ + - A new option has been added to cassandra-stress "-rate fixed={number}/s" + that forces a scheduled rate of operations/sec over time. Using this, stress can + accurately account for coordinated ommission from the stress process. + - The cassandra-stress "-rate limit=" option has been renamed to "-rate throttle=" + - hdr histograms have been added to stress runs, it's output can be saved to disk using: + "-log hdrfile=" option. This histogram includes response/service/wait times when used with the + fixed or throttle rate options. The histogram file can be plotted on + http://hdrhistogram.github.io/HdrHistogram/plotFiles.html ++ - TimeWindowCompactionStrategy has been added. This has proven to be a better approach ++ to time series compaction and new tables should use this instead of DTCS. See ++ CASSANDRA-9666 for details. + + Deprecation + ----------- + - DateTieredCompactionStrategy has been deprecated - new tables should use + TimeWindowCompactionStrategy. Note that migrating an existing DTCS-table to TWCS might + cause increased compaction load for a while after the migration so make sure you run + tests before migrating. Read CASSANDRA-9666 for background on this. -New features ------------- - - TimeWindowCompactionStrategy has been added. This has proven to be a better approach - to time series compaction and new tables should use this instead of DTCS. See - CASSANDRA-9666 for details. +3.7 +=== -3.0.6 +Upgrading +--------- + - A maximum size for SSTables values has been introduced, to prevent out of memory + exceptions when reading corrupt SSTables. This maximum size can be set via + max_value_size_in_mb in cassandra.yaml. The default is 256MB, which matches the default + value of native_transport_max_frame_size_in_mb. SSTables will be considered corrupt if + they contain values whose size exceeds this limit. See CASSANDRA-9530 for more details. + +3.6 ===== New features http://git-wip-us.apache.org/repos/asf/cassandra/blob/8ef1e2ce/doc/cql3/CQL.textile ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8ef1e2ce/pylib/cqlshlib/cql3handling.py ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8ef1e2ce/pylib/cqlshlib/test/test_cqlsh_completion.py ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8ef1e2ce/src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategy.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8ef1e2ce/test/unit/org/apache/cassandra/db/compaction/CompactionsCQLTest.java ----------------------------------------------------------------------
