Merge branch 'cassandra-3.0' into cassandra-3.11 * cassandra-3.0: Slice.isEmpty() returns false for some empty slices
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dc65a576 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dc65a576 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dc65a576 Branch: refs/heads/trunk Commit: dc65a576553f8766076920c8b639d80763d6e1f5 Parents: 7707a0e 31dec3d Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Thu Mar 9 11:59:32 2017 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Thu Mar 9 11:59:32 2017 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/Slice.java | 2 +- .../cql3/validation/operations/DeleteTest.java | 18 ++++++++++++++++++ 3 files changed, 20 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/dc65a576/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index f73dc12,1876922..2772fc2 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,15 -1,11 +1,16 @@@ -3.0.13 +3.11.0 + * 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) + * Fix primary index calculation for SASI (CASSANDRA-12910) + * More fixes to the TokenAllocator (CASSANDRA-12990) + * NoReplicationTokenAllocator should work with zero replication factor (CASSANDRA-12983) + * Address message coalescing regression (CASSANDRA-12676) +Merged from 3.0: + * Slice.isEmpty() returns false for some empty slices (CASSANDRA-13305) * Add formatted row output to assertEmpty in CQL Tester (CASSANDRA-13238) -Merged from 2.2: - * Fix GRANT/REVOKE when keyspace isn't specified (CASSANDRA-13053) - - -3.0.12 * Prevent data loss on upgrade 2.1 - 3.0 by adding component separator to LogRecord absolute path (CASSANDRA-13294) * Improve testing on macOS by eliminating sigar logging (CASSANDRA-13233) * Cqlsh copy-from should error out when csv contains invalid data for collections (CASSANDRA-13071) http://git-wip-us.apache.org/repos/asf/cassandra/blob/dc65a576/src/java/org/apache/cassandra/db/Slice.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/db/Slice.java index c3da222,3c645dc..4b36677 --- a/src/java/org/apache/cassandra/db/Slice.java +++ b/src/java/org/apache/cassandra/db/Slice.java @@@ -157,10 -157,10 +157,10 @@@ public class Slic * @return whether the slice formed by {@code start} and {@code end} is * empty or not. */ - public static boolean isEmpty(ClusteringComparator comparator, Slice.Bound start, Slice.Bound end) + public static boolean isEmpty(ClusteringComparator comparator, ClusteringBound start, ClusteringBound end) { assert start.isStart() && end.isEnd(); - return comparator.compare(end, start) < 0; + return comparator.compare(end, start) <= 0; } /** http://git-wip-us.apache.org/repos/asf/cassandra/blob/dc65a576/test/unit/org/apache/cassandra/cql3/validation/operations/DeleteTest.java ----------------------------------------------------------------------
