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/a0d5ad98 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a0d5ad98 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a0d5ad98 Branch: refs/heads/trunk Commit: a0d5ad98b2dc94cabd89035320b9ea744bf5cd21 Parents: 580963a 849f8cd Author: Stefania Alborghetti <[email protected]> Authored: Thu Mar 30 09:09:16 2017 +0800 Committer: Stefania Alborghetti <[email protected]> Committed: Thu Mar 30 09:09:16 2017 +0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/db/SystemKeyspace.java | 44 ++++---- .../org/apache/cassandra/io/util/FileUtils.java | 26 +++++ .../apache/cassandra/db/SystemKeyspaceTest.java | 106 ++++++++++++++++++- 4 files changed, 154 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a0d5ad98/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 81f4688,5d7b267..9cde2d8 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,25 -1,6 +1,26 @@@ -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: + * Fix possible NPE on upgrade to 3.0/3.X in case of IO errors (CASSANDRA-13389) * 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/a0d5ad98/src/java/org/apache/cassandra/db/SystemKeyspace.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a0d5ad98/src/java/org/apache/cassandra/io/util/FileUtils.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/io/util/FileUtils.java index 662dd4e,0bfbbb1..c6e4e63 --- a/src/java/org/apache/cassandra/io/util/FileUtils.java +++ b/src/java/org/apache/cassandra/io/util/FileUtils.java @@@ -28,8 -27,10 +28,11 @@@ import java.text.DecimalFormat import java.util.Arrays; import java.util.Collections; import java.util.List; +import java.util.Optional; import java.util.concurrent.atomic.AtomicReference; + import java.util.function.Consumer; + import java.util.function.Predicate; + import java.util.stream.StreamSupport; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/cassandra/blob/a0d5ad98/test/unit/org/apache/cassandra/db/SystemKeyspaceTest.java ----------------------------------------------------------------------
