You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by di...@apache.org on 2016/12/03 02:10:47 UTC
[2/3] cassandra git commit: NoReplicationTokenAllocator should
support zero replication factor
NoReplicationTokenAllocator should support zero replication factor
Patch by Dikang Gu; reviewed by Branimir Lambov for CASSANDRA-12983
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0e357991
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0e357991
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0e357991
Branch: refs/heads/trunk
Commit: 0e357991b27645fd760823b98e46a96b85f9c020
Parents: dfcd06d
Author: Dikang Gu <di...@gmail.com>
Authored: Thu Dec 1 18:02:29 2016 -0800
Committer: Dikang Gu <di...@gmail.com>
Committed: Fri Dec 2 18:06:41 2016 -0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../dht/tokenallocator/TokenAllocatorFactory.java | 10 +++++++++-
.../tokenallocator/NoReplicationTokenAllocatorTest.java | 9 +++++++++
3 files changed, 19 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0e357991/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 306412b..0f607db 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.12
+ * NoReplicationTokenAllocator should work with zero replication factor (CASSANDRA-12983)
* cqlsh auto completion: refactor definition of compaction strategy options (CASSANDRA-12946)
* Add support for arithmetic operators (CASSANDRA-11935)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0e357991/src/java/org/apache/cassandra/dht/tokenallocator/TokenAllocatorFactory.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/dht/tokenallocator/TokenAllocatorFactory.java b/src/java/org/apache/cassandra/dht/tokenallocator/TokenAllocatorFactory.java
index f8c972d..d20de8f 100644
--- a/src/java/org/apache/cassandra/dht/tokenallocator/TokenAllocatorFactory.java
+++ b/src/java/org/apache/cassandra/dht/tokenallocator/TokenAllocatorFactory.java
@@ -21,17 +21,25 @@ package org.apache.cassandra.dht.tokenallocator;
import java.net.InetAddress;
import java.util.NavigableMap;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import org.apache.cassandra.dht.IPartitioner;
import org.apache.cassandra.dht.Token;
public class TokenAllocatorFactory
{
+ private static final Logger logger = LoggerFactory.getLogger(TokenAllocatorFactory.class);
public static TokenAllocator<InetAddress> createTokenAllocator(NavigableMap<Token, InetAddress> sortedTokens,
ReplicationStrategy<InetAddress> strategy,
IPartitioner partitioner)
{
- if(strategy.replicas() == 1)
+ if(strategy.replicas() == 1 || strategy.replicas() == 0)
+ {
+ logger.info("Using NoReplicationTokenAllocator.");
return new NoReplicationTokenAllocator<>(sortedTokens, strategy, partitioner);
+ }
+ logger.info("Using ReplicationAwareTokenAllocator.");
return new ReplicationAwareTokenAllocator<>(sortedTokens, strategy, partitioner);
}
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0e357991/test/long/org/apache/cassandra/dht/tokenallocator/NoReplicationTokenAllocatorTest.java
----------------------------------------------------------------------
diff --git a/test/long/org/apache/cassandra/dht/tokenallocator/NoReplicationTokenAllocatorTest.java b/test/long/org/apache/cassandra/dht/tokenallocator/NoReplicationTokenAllocatorTest.java
index fdcc6b8..c53f788 100644
--- a/test/long/org/apache/cassandra/dht/tokenallocator/NoReplicationTokenAllocatorTest.java
+++ b/test/long/org/apache/cassandra/dht/tokenallocator/NoReplicationTokenAllocatorTest.java
@@ -55,6 +55,7 @@ public class NoReplicationTokenAllocatorTest extends TokenAllocatorTestBase
for (int perUnitCount = 1; perUnitCount <= MAX_VNODE_COUNT; perUnitCount *= 4)
{
testNewCluster(perUnitCount, fixedTokenCount, new NoReplicationStrategy(), partitioner);
+ testNewCluster(perUnitCount, fixedTokenCount, new ZeroReplicationStrategy(), partitioner);
}
}
@@ -87,6 +88,7 @@ public class NoReplicationTokenAllocatorTest extends TokenAllocatorTestBase
for (int perUnitCount = 1; perUnitCount <= MAX_VNODE_COUNT; perUnitCount *= 4)
{
testExistingCluster(perUnitCount, fixedTokenCount, new NoReplicationStrategy(), partitioner);
+ testExistingCluster(perUnitCount, fixedTokenCount, new ZeroReplicationStrategy(), partitioner);
}
}
@@ -246,4 +248,11 @@ public class NoReplicationTokenAllocatorTest extends TokenAllocatorTestBase
}
}
+ static class ZeroReplicationStrategy extends NoReplicationStrategy
+ {
+ public int replicas()
+ {
+ return 0;
+ }
+ }
}