Merge branch 'cassandra-3.0' into cassandra-3.11 * cassandra-3.0: Dropping column results in "corrupt" SSTable
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c0ac928d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c0ac928d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c0ac928d Branch: refs/heads/trunk Commit: c0ac928d985a59d00310fed124c5a2b3655db8e0 Parents: ee7023e 5262bb1 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Mon Mar 27 11:59:06 2017 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Mon Mar 27 11:59:06 2017 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../db/columniterator/SSTableIterator.java | 78 ++++++++++++-------- .../columniterator/SSTableReversedIterator.java | 3 +- .../cassandra/db/rows/RangeTombstoneMarker.java | 6 ++ .../apache/cassandra/db/rows/Unfiltered.java | 2 + .../cassandra/db/rows/UnfilteredSerializer.java | 43 +++++++++-- .../cql3/validation/operations/AlterTest.java | 51 +++++++++++++ 7 files changed, 144 insertions(+), 40 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c0ac928d/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 071dd1a,0b1bb01..98ed992 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,20 -1,5 +1,21 @@@ -3.0.13 +3.11.0 + * 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: + * Dropping column results in "corrupt" SSTable (CASSANDRA-13337) * Bugs handling range tombstones in the sstable iterators (CASSANDRA-13340) * Fix CONTAINS filtering for null collections (CASSANDRA-13246) * Applying: Use a unique metric reservoir per test run when using Cassandra-wide metrics residing in MBeans (CASSANDRA-13216) http://git-wip-us.apache.org/repos/asf/cassandra/blob/c0ac928d/src/java/org/apache/cassandra/db/columniterator/SSTableIterator.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c0ac928d/src/java/org/apache/cassandra/db/columniterator/SSTableReversedIterator.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c0ac928d/src/java/org/apache/cassandra/db/rows/RangeTombstoneMarker.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c0ac928d/src/java/org/apache/cassandra/db/rows/Unfiltered.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c0ac928d/src/java/org/apache/cassandra/db/rows/UnfilteredSerializer.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c0ac928d/test/unit/org/apache/cassandra/cql3/validation/operations/AlterTest.java ----------------------------------------------------------------------
