From dcaf84e356d1538092c1cc9b68034a55bc1eba4f Mon Sep 17 00:00:00 2001 From: Gary Dusbabek Date: Wed, 6 Jan 2010 13:59:30 +0000 Subject: [PATCH] Remove unused partitioner member from ReplicationStrategy classes. Patch by gdusbabek, reviewed by jbellis. git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@896447 13f79535-47bb-0310-9956-ffa450edef68 --- src/java/org/apache/cassandra/client/RingCache.java | 2 +- .../locator/AbstractReplicationStrategy.java | 7 +------ .../cassandra/locator/DatacenterShardStategy.java | 5 ++--- .../apache/cassandra/locator/RackAwareStrategy.java | 5 ++--- .../cassandra/locator/RackUnawareStrategy.java | 6 ++---- .../org/apache/cassandra/service/StorageService.java | 8 ++++---- .../cassandra/locator/RackUnawareStrategyTest.java | 8 +++----- test/unit/org/apache/cassandra/service/MoveTest.java | 12 ++++++------ 8 files changed, 21 insertions(+), 32 deletions(-) diff --git a/src/java/org/apache/cassandra/client/RingCache.java b/src/java/org/apache/cassandra/client/RingCache.java index 7645bccbe9..facb352e1f 100644 --- a/src/java/org/apache/cassandra/client/RingCache.java +++ b/src/java/org/apache/cassandra/client/RingCache.java @@ -90,7 +90,7 @@ public class RingCache } TokenMetadata tokenMetadata = new TokenMetadata(tokenEndpointMap); - nodePicker_ = StorageService.getReplicationStrategy(tokenMetadata, partitioner_); + nodePicker_ = StorageService.getReplicationStrategy(tokenMetadata); break; } diff --git a/src/java/org/apache/cassandra/locator/AbstractReplicationStrategy.java b/src/java/org/apache/cassandra/locator/AbstractReplicationStrategy.java index 1e5abdd997..0bd72fe0cd 100644 --- a/src/java/org/apache/cassandra/locator/AbstractReplicationStrategy.java +++ b/src/java/org/apache/cassandra/locator/AbstractReplicationStrategy.java @@ -25,13 +25,10 @@ import org.apache.log4j.Logger; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; -import org.apache.cassandra.dht.IPartitioner; import org.apache.cassandra.dht.Range; import org.apache.cassandra.dht.Token; import org.apache.cassandra.gms.FailureDetector; import org.apache.cassandra.service.ConsistencyLevel; -import org.apache.cassandra.service.IResponseResolver; -import org.apache.cassandra.service.QuorumResponseHandler; import org.apache.cassandra.service.WriteResponseHandler; import org.apache.cassandra.utils.FBUtilities; @@ -45,13 +42,11 @@ public abstract class AbstractReplicationStrategy protected static final Logger logger_ = Logger.getLogger(AbstractReplicationStrategy.class); protected TokenMetadata tokenMetadata_; - protected IPartitioner partitioner_; protected int replicas_; - AbstractReplicationStrategy(TokenMetadata tokenMetadata, IPartitioner partitioner, int replicas) + AbstractReplicationStrategy(TokenMetadata tokenMetadata, int replicas) { tokenMetadata_ = tokenMetadata; - partitioner_ = partitioner; replicas_ = replicas; } diff --git a/src/java/org/apache/cassandra/locator/DatacenterShardStategy.java b/src/java/org/apache/cassandra/locator/DatacenterShardStategy.java index 4f34daa54c..719bfdafe3 100644 --- a/src/java/org/apache/cassandra/locator/DatacenterShardStategy.java +++ b/src/java/org/apache/cassandra/locator/DatacenterShardStategy.java @@ -29,7 +29,6 @@ import java.util.*; import java.util.Map.Entry; import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.dht.IPartitioner; import org.apache.cassandra.dht.Token; import org.apache.cassandra.service.*; @@ -108,10 +107,10 @@ public class DatacenterShardStategy extends AbstractReplicationStrategy } } - public DatacenterShardStategy(TokenMetadata tokenMetadata, IPartitioner partitioner, int replicas) + public DatacenterShardStategy(TokenMetadata tokenMetadata, int replicas) throws UnknownHostException { - super(tokenMetadata, partitioner, replicas); + super(tokenMetadata, replicas); if ((!(DatabaseDescriptor.getEndPointSnitch() instanceof DatacenterEndPointSnitch))) { throw new IllegalArgumentException("DatacenterShardStrategy requires DatacenterEndpointSnitch"); diff --git a/src/java/org/apache/cassandra/locator/RackAwareStrategy.java b/src/java/org/apache/cassandra/locator/RackAwareStrategy.java index 3cd246aa54..72b611bae0 100644 --- a/src/java/org/apache/cassandra/locator/RackAwareStrategy.java +++ b/src/java/org/apache/cassandra/locator/RackAwareStrategy.java @@ -24,7 +24,6 @@ import java.util.Collections; import java.util.List; import org.apache.cassandra.dht.Token; -import org.apache.cassandra.dht.IPartitioner; import java.net.InetAddress; import org.apache.cassandra.service.StorageService; @@ -37,9 +36,9 @@ import org.apache.cassandra.service.StorageService; */ public class RackAwareStrategy extends AbstractReplicationStrategy { - public RackAwareStrategy(TokenMetadata tokenMetadata, IPartitioner partitioner, int replicas) + public RackAwareStrategy(TokenMetadata tokenMetadata, int replicas) { - super(tokenMetadata, partitioner, replicas); + super(tokenMetadata, replicas); } public ArrayList getNaturalEndpoints(Token token, TokenMetadata metadata) diff --git a/src/java/org/apache/cassandra/locator/RackUnawareStrategy.java b/src/java/org/apache/cassandra/locator/RackUnawareStrategy.java index faf3f9bf96..9cd319adde 100644 --- a/src/java/org/apache/cassandra/locator/RackUnawareStrategy.java +++ b/src/java/org/apache/cassandra/locator/RackUnawareStrategy.java @@ -21,10 +21,8 @@ package org.apache.cassandra.locator; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import java.util.Map; import org.apache.cassandra.dht.Token; -import org.apache.cassandra.dht.IPartitioner; import java.net.InetAddress; /** @@ -35,9 +33,9 @@ import java.net.InetAddress; */ public class RackUnawareStrategy extends AbstractReplicationStrategy { - public RackUnawareStrategy(TokenMetadata tokenMetadata, IPartitioner partitioner, int replicas) + public RackUnawareStrategy(TokenMetadata tokenMetadata, int replicas) { - super(tokenMetadata, partitioner, replicas); + super(tokenMetadata, replicas); } public ArrayList getNaturalEndpoints(Token token, TokenMetadata metadata) diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java index bfde1a34f0..6f6fe8535c 100644 --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@ -220,18 +220,18 @@ public final class StorageService implements IEndPointStateChangeSubscriber, Sto MessagingService.instance().registerVerbHandlers(streamInitiateDoneVerbHandler_, new Streaming.StreamInitiateDoneVerbHandler()); MessagingService.instance().registerVerbHandlers(streamFinishedVerbHandler_, new Streaming.StreamFinishedVerbHandler()); - replicationStrategy_ = getReplicationStrategy(tokenMetadata_, partitioner_); + replicationStrategy_ = getReplicationStrategy(tokenMetadata_); } - public static AbstractReplicationStrategy getReplicationStrategy(TokenMetadata tokenMetadata, IPartitioner partitioner) + public static AbstractReplicationStrategy getReplicationStrategy(TokenMetadata tokenMetadata) { AbstractReplicationStrategy replicationStrategy = null; Class cls = DatabaseDescriptor.getReplicaPlacementStrategyClass(); - Class [] parameterTypes = new Class[] { TokenMetadata.class, IPartitioner.class, int.class}; + Class [] parameterTypes = new Class[] { TokenMetadata.class, int.class}; try { Constructor constructor = cls.getConstructor(parameterTypes); - replicationStrategy = constructor.newInstance(tokenMetadata, partitioner, DatabaseDescriptor.getReplicationFactor()); + replicationStrategy = constructor.newInstance(tokenMetadata, DatabaseDescriptor.getReplicationFactor()); } catch (Exception e) { diff --git a/test/unit/org/apache/cassandra/locator/RackUnawareStrategyTest.java b/test/unit/org/apache/cassandra/locator/RackUnawareStrategyTest.java index c0e6cd2e83..db4c8f22c2 100644 --- a/test/unit/org/apache/cassandra/locator/RackUnawareStrategyTest.java +++ b/test/unit/org/apache/cassandra/locator/RackUnawareStrategyTest.java @@ -43,8 +43,7 @@ public class RackUnawareStrategyTest public void testBigIntegerEndpoints() throws UnknownHostException { TokenMetadata tmd = new TokenMetadata(); - IPartitioner partitioner = new RandomPartitioner(); - AbstractReplicationStrategy strategy = new RackUnawareStrategy(tmd, partitioner, 3); + AbstractReplicationStrategy strategy = new RackUnawareStrategy(tmd, 3); List endPointTokens = new ArrayList(); List keyTokens = new ArrayList(); @@ -60,7 +59,7 @@ public class RackUnawareStrategyTest { TokenMetadata tmd = new TokenMetadata(); IPartitioner partitioner = new OrderPreservingPartitioner(); - AbstractReplicationStrategy strategy = new RackUnawareStrategy(tmd, partitioner, 3); + AbstractReplicationStrategy strategy = new RackUnawareStrategy(tmd, 3); List endPointTokens = new ArrayList(); List keyTokens = new ArrayList(); @@ -98,8 +97,7 @@ public class RackUnawareStrategyTest public void testGetEndpointsDuringBootstrap() throws UnknownHostException { TokenMetadata tmd = new TokenMetadata(); - IPartitioner partitioner = new RandomPartitioner(); - AbstractReplicationStrategy strategy = new RackUnawareStrategy(tmd, partitioner, 3); + AbstractReplicationStrategy strategy = new RackUnawareStrategy(tmd, 3); Token[] endPointTokens = new Token[5]; Token[] keyTokens = new Token[5]; diff --git a/test/unit/org/apache/cassandra/service/MoveTest.java b/test/unit/org/apache/cassandra/service/MoveTest.java index a28affbe47..e41b91caa9 100644 --- a/test/unit/org/apache/cassandra/service/MoveTest.java +++ b/test/unit/org/apache/cassandra/service/MoveTest.java @@ -52,7 +52,7 @@ public class MoveTest TokenMetadata tmd = ss.getTokenMetadata(); tmd.clearUnsafe(); IPartitioner partitioner = new RandomPartitioner(); - AbstractReplicationStrategy testStrategy = new RackUnawareStrategy(tmd, partitioner, 3); + AbstractReplicationStrategy testStrategy = new RackUnawareStrategy(tmd, 3); IPartitioner oldPartitioner = ss.setPartitionerUnsafe(partitioner); AbstractReplicationStrategy oldStrategy = ss.setReplicationStrategyUnsafe(testStrategy); @@ -108,7 +108,7 @@ public class MoveTest TokenMetadata tmd = ss.getTokenMetadata(); tmd.clearUnsafe(); IPartitioner partitioner = new RandomPartitioner(); - AbstractReplicationStrategy testStrategy = new RackUnawareStrategy(tmd, partitioner, 3); + AbstractReplicationStrategy testStrategy = new RackUnawareStrategy(tmd, 3); IPartitioner oldPartitioner = ss.setPartitionerUnsafe(partitioner); AbstractReplicationStrategy oldStrategy = ss.setReplicationStrategyUnsafe(testStrategy); @@ -290,7 +290,7 @@ public class MoveTest TokenMetadata tmd = ss.getTokenMetadata(); tmd.clearUnsafe(); IPartitioner partitioner = new RandomPartitioner(); - AbstractReplicationStrategy testStrategy = new RackUnawareStrategy(tmd, partitioner, 3); + AbstractReplicationStrategy testStrategy = new RackUnawareStrategy(tmd, 3); IPartitioner oldPartitioner = ss.setPartitionerUnsafe(partitioner); AbstractReplicationStrategy oldStrategy = ss.setReplicationStrategyUnsafe(testStrategy); @@ -359,7 +359,7 @@ public class MoveTest TokenMetadata tmd = ss.getTokenMetadata(); tmd.clearUnsafe(); IPartitioner partitioner = new RandomPartitioner(); - AbstractReplicationStrategy testStrategy = new RackUnawareStrategy(tmd, partitioner, 3); + AbstractReplicationStrategy testStrategy = new RackUnawareStrategy(tmd, 3); IPartitioner oldPartitioner = ss.setPartitionerUnsafe(partitioner); AbstractReplicationStrategy oldStrategy = ss.setReplicationStrategyUnsafe(testStrategy); @@ -403,7 +403,7 @@ public class MoveTest TokenMetadata tmd = ss.getTokenMetadata(); tmd.clearUnsafe(); IPartitioner partitioner = new RandomPartitioner(); - AbstractReplicationStrategy testStrategy = new RackUnawareStrategy(tmd, partitioner, 3); + AbstractReplicationStrategy testStrategy = new RackUnawareStrategy(tmd, 3); IPartitioner oldPartitioner = ss.setPartitionerUnsafe(partitioner); AbstractReplicationStrategy oldStrategy = ss.setReplicationStrategyUnsafe(testStrategy); @@ -453,7 +453,7 @@ public class MoveTest TokenMetadata tmd = ss.getTokenMetadata(); tmd.clearUnsafe(); IPartitioner partitioner = new RandomPartitioner(); - AbstractReplicationStrategy testStrategy = new RackUnawareStrategy(tmd, partitioner, 3); + AbstractReplicationStrategy testStrategy = new RackUnawareStrategy(tmd, 3); IPartitioner oldPartitioner = ss.setPartitionerUnsafe(partitioner); AbstractReplicationStrategy oldStrategy = ss.setReplicationStrategyUnsafe(testStrategy);