Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/191ad7b8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/191ad7b8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/191ad7b8 Branch: refs/heads/trunk Commit: 191ad7b87a4ded26be4ab0bd192ef676f059276c Parents: f0403b4 eb91942 Author: Sam Tunnicliffe <s...@beobal.com> Authored: Thu Jun 14 18:16:23 2018 +0100 Committer: Sam Tunnicliffe <s...@beobal.com> Committed: Thu Jun 14 18:18:47 2018 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/db/columniterator/AbstractSSTableIterator.java | 2 +- .../cassandra/db/columniterator/SSTableReversedIterator.java | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/191ad7b8/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 083f480,ebf8764..e807340 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,22 -1,5 +1,23 @@@ -3.0.17 +3.11.3 + * Remove BTree.Builder Recycler to reduce memory usage (CASSANDRA-13929) + * Reduce nodetool GC thread count (CASSANDRA-14475) + * Fix New SASI view creation during Index Redistribution (CASSANDRA-14055) + * Remove string formatting lines from BufferPool hot path (CASSANDRA-14416) + * Update metrics to 3.1.5 (CASSANDRA-12924) + * Detect OpenJDK jvm type and architecture (CASSANDRA-12793) + * Don't use guava collections in the non-system keyspace jmx attributes (CASSANDRA-12271) + * Allow existing nodes to use all peers in shadow round (CASSANDRA-13851) + * Fix cqlsh to read connection.ssl cqlshrc option again (CASSANDRA-14299) + * Downgrade log level to trace for CommitLogSegmentManager (CASSANDRA-14370) + * CQL fromJson(null) throws NullPointerException (CASSANDRA-13891) + * Serialize empty buffer as empty string for json output format (CASSANDRA-14245) + * Allow logging implementation to be interchanged for embedded testing (CASSANDRA-13396) + * SASI tokenizer for simple delimiter based entries (CASSANDRA-14247) + * Fix Loss of digits when doing CAST from varint/bigint to decimal (CASSANDRA-14170) + * RateBasedBackPressure unnecessarily invokes a lock on the Guava RateLimiter (CASSANDRA-14163) + * Fix wildcard GROUP BY queries (CASSANDRA-14209) +Merged from 3.0: + * Reverse order queries with range tombstones can cause data loss (CASSANDRA-14513) * Fix regression of lagging commitlog flush log message (CASSANDRA-14451) * Add Missing dependencies in pom-all (CASSANDRA-14422) * Cleanup StartupClusterConnectivityChecker and PING Verb (CASSANDRA-14447) http://git-wip-us.apache.org/repos/asf/cassandra/blob/191ad7b8/src/java/org/apache/cassandra/db/columniterator/AbstractSSTableIterator.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/db/columniterator/AbstractSSTableIterator.java index c15416f,386b2c8..4eaf8f6 --- a/src/java/org/apache/cassandra/db/columniterator/AbstractSSTableIterator.java +++ b/src/java/org/apache/cassandra/db/columniterator/AbstractSSTableIterator.java @@@ -483,15 -417,15 +483,15 @@@ public abstract class AbstractSSTableIt // Sets the reader to the beginning of blockIdx. public void setToBlock(int blockIdx) throws IOException { - if (blockIdx >= 0 && blockIdx < indexes.size()) + if (blockIdx >= 0 && blockIdx < indexEntry.columnsIndexCount()) { reader.seekToPosition(columnOffset(blockIdx)); + mark = reader.file.mark(); reader.deserializer.clearState(); } currentIndexIdx = blockIdx; - reader.openMarker = blockIdx > 0 ? indexes.get(blockIdx - 1).endOpenMarker : null; + reader.openMarker = blockIdx > 0 ? index(blockIdx - 1).endOpenMarker : null; - mark = reader.file.mark(); // If we're reading an old format file and we move to the first block in the index (i.e. the // head of the partition), we skip the static row as it's already been read when we first opened http://git-wip-us.apache.org/repos/asf/cassandra/blob/191ad7b8/src/java/org/apache/cassandra/db/columniterator/SSTableReversedIterator.java ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
