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/e4cef08d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e4cef08d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e4cef08d Branch: refs/heads/cassandra-3.11 Commit: e4cef08d0d7e84b62ef56ce54a16aa119bf86329 Parents: 83c9ac3 3872580 Author: Stefan Podkowinski <s.podkowin...@gmail.com> Authored: Wed May 24 14:21:50 2017 +0200 Committer: Stefan Podkowinski <s.podkowin...@gmail.com> Committed: Wed May 24 14:22:54 2017 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/repair/messages/RepairOption.java | 4 ++ .../org/apache/cassandra/utils/MerkleTree.java | 42 +++++++++++++++++++- .../repair/messages/RepairOptionTest.java | 2 +- .../apache/cassandra/utils/MerkleTreeTest.java | 34 +++++++++++++++- 5 files changed, 79 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e4cef08d/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 3a99e6a,98a1808..fd9647e --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,40 -1,5 +1,41 @@@ -3.0.14 +3.11.0 + * Fix the problem with duplicated rows when using paging with SASI (CASSANDRA-13302) + * Allow CONTAINS statements filtering on the partition key and itâs parts (CASSANDRA-13275) + * Fall back to even ranges calculation in clusters with vnodes when tokens are distributed unevenly (CASSANDRA-13229) + * Fix duration type validation to prevent overflow (CASSANDRA-13218) + * Forbid unsupported creation of SASI indexes over partition key columns (CASSANDRA-13228) + * Reject multiple values for a key in CQL grammar. (CASSANDRA-13369) + * UDA fails without input rows (CASSANDRA-13399) + * Fix compaction-stress by using daemonInitialization (CASSANDRA-13188) + * V5 protocol flags decoding broken (CASSANDRA-13443) + * Use write lock not read lock for removing sstables from compaction strategies. (CASSANDRA-13422) + * Use corePoolSize equal to maxPoolSize in JMXEnabledThreadPoolExecutors (CASSANDRA-13329) + * Avoid rebuilding SASI indexes containing no values (CASSANDRA-12962) + * Add charset to Analyser input stream (CASSANDRA-13151) + * Fix testLimitSSTables flake caused by concurrent flush (CASSANDRA-12820) + * 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) + * Delete illegal character from StandardTokenizerImpl.jflex (CASSANDRA-13417) + * Fix cqlsh automatic protocol downgrade regression (CASSANDRA-13307) + * Tracing payload not passed from QueryMessage to tracing session (CASSANDRA-12835) +Merged from 3.0: + * Fix repair process violating start/end token limits for small ranges (CASSANDRA-13052) * Add storage port options to sstableloader (CASSANDRA-13518) * Properly handle quoted index names in cqlsh DESCRIBE output (CASSANDRA-12847) * Avoid reading static row twice from old format sstables (CASSANDRA-13236) http://git-wip-us.apache.org/repos/asf/cassandra/blob/e4cef08d/src/java/org/apache/cassandra/repair/messages/RepairOption.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e4cef08d/src/java/org/apache/cassandra/utils/MerkleTree.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e4cef08d/test/unit/org/apache/cassandra/repair/messages/RepairOptionTest.java ---------------------------------------------------------------------- diff --cc test/unit/org/apache/cassandra/repair/messages/RepairOptionTest.java index 29d9756,b617e96..9fe8b93 --- a/test/unit/org/apache/cassandra/repair/messages/RepairOptionTest.java +++ b/test/unit/org/apache/cassandra/repair/messages/RepairOptionTest.java @@@ -130,28 -120,9 +130,28 @@@ public class RepairOptionTes } @Test + public void testPullRepairParseOptions() + { + Map<String, String> options = new HashMap<>(); + + options.put(RepairOption.PULL_REPAIR_KEY, "true"); + assertParseThrowsIllegalArgumentExceptionWithMessage(options, "Pull repair can only be performed between two hosts"); + + options.put(RepairOption.HOSTS_KEY, "127.0.0.1,127.0.0.2,127.0.0.3"); + assertParseThrowsIllegalArgumentExceptionWithMessage(options, "Pull repair can only be performed between two hosts"); + + options.put(RepairOption.HOSTS_KEY, "127.0.0.1,127.0.0.2"); + assertParseThrowsIllegalArgumentExceptionWithMessage(options, "Token ranges must be specified when performing pull repair"); + + options.put(RepairOption.RANGES_KEY, "0:10"); + RepairOption option = RepairOption.parse(options, Murmur3Partitioner.instance); + assertTrue(option.isPullRepair()); + } + + @Test public void testIncrementalRepairWithSubrangesIsNotGlobal() throws Exception { - RepairOption ro = RepairOption.parse(ImmutableMap.of(RepairOption.INCREMENTAL_KEY, "true", RepairOption.RANGES_KEY, "42:42"), + RepairOption ro = RepairOption.parse(ImmutableMap.of(RepairOption.INCREMENTAL_KEY, "true", RepairOption.RANGES_KEY, "41:42"), Murmur3Partitioner.instance); assertFalse(ro.isGlobal()); ro = RepairOption.parse(ImmutableMap.of(RepairOption.INCREMENTAL_KEY, "true", RepairOption.RANGES_KEY, ""), --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
