Merge branch 'cassandra-3.0' into cassandra-3.9 * cassandra-3.0: NullPointerExpception when reading/compacting table
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/43d726be Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/43d726be Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/43d726be Branch: refs/heads/trunk Commit: 43d726be95b1e3cfdbe1452b2fd76f9a67dd59f6 Parents: 9eae8d3 979e559 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Wed Jul 20 14:29:16 2016 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Wed Jul 20 14:29:16 2016 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../db/partitions/AbstractBTreePartition.java | 2 +- .../cassandra/db/partitions/PurgeFunction.java | 15 ++++++++----- .../cassandra/db/rows/BaseRowIterator.java | 2 +- src/java/org/apache/cassandra/db/rows/Row.java | 13 +++++++++--- .../apache/cassandra/db/transform/BaseRows.java | 2 +- .../apache/cassandra/db/transform/Filter.java | 12 +++++++---- .../validation/entities/StaticColumnsTest.java | 22 ++++++++++++++++++++ 8 files changed, 54 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/43d726be/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index c9dce65,6ea39cd..e4ef64c --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,40 -1,6 +1,41 @@@ -3.0.9 +3.9 + * Fix SSL JMX requiring truststore containing server cert (CASSANDRA-12109) +Merged from 3.0: + * NullPointerExpception when reading/compacting table (CASSANDRA-11988) * Fix problem with undeleteable rows on upgrade to new sstable format (CASSANDRA-12144) +Merged from 2.2: + * Fixed cqlshlib.test.remove_test_db (CASSANDRA-12214) + + +3.8 + * Fix hdr logging for single operation workloads (CASSANDRA-12145) + * Fix SASI PREFIX search in CONTAINS mode with partial terms (CASSANDRA-12073) + * Increase size of flushExecutor thread pool (CASSANDRA-12071) + * Partial revert of CASSANDRA-11971, cannot recycle buffer in SP.sendMessagesToNonlocalDC (CASSANDRA-11950) + * Upgrade netty to 4.0.39 (CASSANDRA-12032, CASSANDRA-12034) + * Improve details in compaction log message (CASSANDRA-12080) + * Allow unset values in CQLSSTableWriter (CASSANDRA-11911) + * Chunk cache to request compressor-compatible buffers if pool space is exhausted (CASSANDRA-11993) + * Remove DatabaseDescriptor dependencies from SequentialWriter (CASSANDRA-11579) + * Move skip_stop_words filter before stemming (CASSANDRA-12078) + * Support seek() in EncryptedFileSegmentInputStream (CASSANDRA-11957) + * SSTable tools mishandling LocalPartitioner (CASSANDRA-12002) + * When SEPWorker assigned work, set thread name to match pool (CASSANDRA-11966) + * Add cross-DC latency metrics (CASSANDRA-11596) + * Allow terms in selection clause (CASSANDRA-10783) + * Add bind variables to trace (CASSANDRA-11719) + * 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) + * Add Change-Data-Capture (CASSANDRA-8844) +Merged from 3.0: * Fix paging logic for deleted partitions with static columns (CASSANDRA-12107) * Wait until the message is being send to decide which serializer must be used (CASSANDRA-11393) * Fix migration of static thrift column names with non-text comparators (CASSANDRA-12147) http://git-wip-us.apache.org/repos/asf/cassandra/blob/43d726be/src/java/org/apache/cassandra/db/partitions/AbstractBTreePartition.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/43d726be/src/java/org/apache/cassandra/db/rows/Row.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/43d726be/src/java/org/apache/cassandra/db/transform/BaseRows.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/43d726be/test/unit/org/apache/cassandra/cql3/validation/entities/StaticColumnsTest.java ----------------------------------------------------------------------
