cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [4/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11
Date Wed, 29 Mar 2017 11:24:58 GMT
Merge branch 'cassandra-3.0' into cassandra-3.11

* cassandra-3.0:
  Legacy deserializer can create empty range tombstones


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/580963a2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/580963a2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/580963a2

Branch: refs/heads/trunk
Commit: 580963a2184b8f70f319ba59353fd258de239e36
Parents: bd77081 451fe9d
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Wed Mar 29 13:22:29 2017 +0200
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Wed Mar 29 13:22:29 2017 +0200

----------------------------------------------------------------------
 CHANGES.txt                                     |   1 +
 .../cassandra/db/UnfilteredDeserializer.java    | 119 ++++++++++++++-----
 .../db/rows/RangeTombstoneBoundMarker.java      |   8 ++
 .../db/rows/RangeTombstoneBoundaryMarker.java   |   5 +
 .../cassandra/db/rows/RangeTombstoneMarker.java |   2 +
 .../cassandra/db/OldFormatDeserializerTest.java |  54 +++++++++
 6 files changed, 162 insertions(+), 27 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/580963a2/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 9cd1ca7,c4293de..81f4688
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,24 -1,5 +1,25 @@@
 -3.0.13
 +3.11.0
 + * cdc column addition strikes again (CASSANDRA-13382)
 + * Fix static column indexes (CASSANDRA-13277) 
 + * DataOutputBuffer.asNewBuffer broken (CASSANDRA-13298)
 + * unittest CipherFactoryTest failed on MacOS (CASSANDRA-13370)
 + * Forbid SELECT restrictions and CREATE INDEX over non-frozen UDT columns (CASSANDRA-13247)
 + * Default logging we ship will incorrectly print "?:?" for "%F:%L" pattern (CASSANDRA-13317)
 + * Possible AssertionError in UnfilteredRowIteratorWithLowerBound (CASSANDRA-13366)
 + * Support unaligned memory access for AArch64 (CASSANDRA-13326)
 + * Improve SASI range iterator efficiency on intersection with an empty range (CASSANDRA-12915).
 + * 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:
+  * Legacy deserializer can create empty range tombstones (CASSANDRA-13341)
 + * Legacy caching options can prevent 3.0 upgrade (CASSANDRA-13384)
   * Use the Kernel32 library to retrieve the PID on Windows and fix startup checks (CASSANDRA-13333)
   * Fix code to not exchange schema across major versions (CASSANDRA-13274)
   * Dropping column results in "corrupt" SSTable (CASSANDRA-13337)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/580963a2/src/java/org/apache/cassandra/db/UnfilteredDeserializer.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/580963a2/src/java/org/apache/cassandra/db/rows/RangeTombstoneBoundMarker.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/580963a2/src/java/org/apache/cassandra/db/rows/RangeTombstoneBoundaryMarker.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/rows/RangeTombstoneBoundaryMarker.java
index fd41bea,0683d76..70d6a9d
--- a/src/java/org/apache/cassandra/db/rows/RangeTombstoneBoundaryMarker.java
+++ b/src/java/org/apache/cassandra/db/rows/RangeTombstoneBoundaryMarker.java
@@@ -120,9 -120,14 +120,14 @@@ public class RangeTombstoneBoundaryMark
          return new RangeTombstoneBoundaryMarker(clustering().copy(allocator), endDeletion,
startDeletion);
      }
  
+     public RangeTombstoneBoundaryMarker withNewOpeningDeletionTime(boolean reversed, DeletionTime
newDeletionTime)
+     {
+         return new RangeTombstoneBoundaryMarker(clustering(), reversed ? newDeletionTime
: endDeletion, reversed ? startDeletion : newDeletionTime);
+     }
+ 
 -    public static RangeTombstoneBoundaryMarker makeBoundary(boolean reversed, Slice.Bound
close, Slice.Bound open, DeletionTime closeDeletion, DeletionTime openDeletion)
 +    public static RangeTombstoneBoundaryMarker makeBoundary(boolean reversed, ClusteringBound
close, ClusteringBound open, DeletionTime closeDeletion, DeletionTime openDeletion)
      {
 -        assert RangeTombstone.Bound.Kind.compare(close.kind(), open.kind()) == 0 : "Both
bound don't form a boundary";
 +        assert ClusteringPrefix.Kind.compare(close.kind(), open.kind()) == 0 : "Both bound
don't form a boundary";
          boolean isExclusiveClose = close.isExclusive() || (close.isInclusive() &&
open.isInclusive() && openDeletion.supersedes(closeDeletion));
          return isExclusiveClose
               ? exclusiveCloseInclusiveOpen(reversed, close.getRawValues(), closeDeletion,
openDeletion)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/580963a2/src/java/org/apache/cassandra/db/rows/RangeTombstoneMarker.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/580963a2/test/unit/org/apache/cassandra/db/OldFormatDeserializerTest.java
----------------------------------------------------------------------


Mime
View raw message