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/d2248f20 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d2248f20 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d2248f20 Branch: refs/heads/trunk Commit: d2248f20641ac589e25293919963e3f43f377f55 Parents: 29d6237 3153c63 Author: Aleksey Yeshchenko <alek...@apple.com> Authored: Fri Mar 23 14:41:15 2018 +0000 Committer: Aleksey Yeshchenko <alek...@apple.com> Committed: Fri Mar 23 14:41:15 2018 +0000 ---------------------------------------------------------------------- CHANGES.txt | 3 ++- .../org/apache/cassandra/db/ReadResponse.java | 22 +++++++++++++++- .../db/rows/RangeTombstoneBoundMarker.java | 2 +- .../db/rows/RangeTombstoneBoundaryMarker.java | 5 +++- .../apache/cassandra/service/DataResolver.java | 27 +++++++++++++++----- 5 files changed, 49 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d2248f20/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 27a25cc,d701a22..987b9f7 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,10 -1,6 +1,11 @@@ -3.0.17 +3.11.3 - * Use zero as default score in DynamicEndpointSnitch (CASSANDRA-14252) + * 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: + * Handle repeat open bound from SRP in read repair (CASSANDRA-14330) + * Use zero as default score in DynamicEndpointSnitch (CASSANDRA-14252) * Respect max hint window when hinting for LWT (CASSANDRA-14215) * Adding missing WriteType enum values to v3, v4, and v5 spec (CASSANDRA-13697) * Don't regenerate bloomfilter and summaries on startup (CASSANDRA-11163) http://git-wip-us.apache.org/repos/asf/cassandra/blob/d2248f20/src/java/org/apache/cassandra/db/ReadResponse.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d2248f20/src/java/org/apache/cassandra/db/rows/RangeTombstoneBoundMarker.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/db/rows/RangeTombstoneBoundMarker.java index fb94da3,0079114..f6ba149 --- a/src/java/org/apache/cassandra/db/rows/RangeTombstoneBoundMarker.java +++ b/src/java/org/apache/cassandra/db/rows/RangeTombstoneBoundMarker.java @@@ -133,15 -138,9 +133,15 @@@ public class RangeTombstoneBoundMarker deletion.digest(digest); } + @Override + public void digest(MessageDigest digest, Set<ByteBuffer> columnsToExclude) + { + digest(digest); + } + public String toString(CFMetaData metadata) { - return "Marker " + bound.toString(metadata) + '@' + deletion.markedForDeleteAt(); + return String.format("Marker %s@%d/%d", bound.toString(metadata), deletion.markedForDeleteAt(), deletion.localDeletionTime()); } @Override http://git-wip-us.apache.org/repos/asf/cassandra/blob/d2248f20/src/java/org/apache/cassandra/db/rows/RangeTombstoneBoundaryMarker.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/db/rows/RangeTombstoneBoundaryMarker.java index 9190ecf,c4bc2f2..f183309 --- a/src/java/org/apache/cassandra/db/rows/RangeTombstoneBoundaryMarker.java +++ b/src/java/org/apache/cassandra/db/rows/RangeTombstoneBoundaryMarker.java @@@ -152,15 -151,12 +152,18 @@@ public class RangeTombstoneBoundaryMark startDeletion.digest(digest); } + @Override + public void digest(MessageDigest digest, Set<ByteBuffer> columnsToExclude) + { + digest(digest); + } + public String toString(CFMetaData metadata) { - return String.format("Marker %s@%d-%d", bound.toString(metadata), endDeletion.markedForDeleteAt(), startDeletion.markedForDeleteAt()); + return String.format("Marker %s@%d/%d-%d/%d", + bound.toString(metadata), + endDeletion.markedForDeleteAt(), endDeletion.localDeletionTime(), + startDeletion.markedForDeleteAt(), startDeletion.localDeletionTime()); } @Override http://git-wip-us.apache.org/repos/asf/cassandra/blob/d2248f20/src/java/org/apache/cassandra/service/DataResolver.java ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
