You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by gd...@apache.org on 2010/01/06 14:59:30 UTC
svn commit: r896447 - in /incubator/cassandra/trunk:
src/java/org/apache/cassandra/client/ src/java/org/apache/cassandra/locator/
src/java/org/apache/cassandra/service/
test/unit/org/apache/cassandra/locator/
test/unit/org/apache/cassandra/service/
Author: gdusbabek
Date: Wed Jan 6 13:59:30 2010
New Revision: 896447
URL: http://svn.apache.org/viewvc?rev=896447&view=rev
Log:
Remove unused partitioner member from ReplicationStrategy classes. Patch by gdusbabek, reviewed by jbellis.
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/client/RingCache.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/locator/AbstractReplicationStrategy.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/locator/DatacenterShardStategy.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/locator/RackAwareStrategy.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/locator/RackUnawareStrategy.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java
incubator/cassandra/trunk/test/unit/org/apache/cassandra/locator/RackUnawareStrategyTest.java
incubator/cassandra/trunk/test/unit/org/apache/cassandra/service/MoveTest.java
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/client/RingCache.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/client/RingCache.java?rev=896447&r1=896446&r2=896447&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/client/RingCache.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/client/RingCache.java Wed Jan 6 13:59:30 2010
@@ -90,7 +90,7 @@
}
TokenMetadata tokenMetadata = new TokenMetadata(tokenEndpointMap);
- nodePicker_ = StorageService.getReplicationStrategy(tokenMetadata, partitioner_);
+ nodePicker_ = StorageService.getReplicationStrategy(tokenMetadata);
break;
}
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/locator/AbstractReplicationStrategy.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/locator/AbstractReplicationStrategy.java?rev=896447&r1=896446&r2=896447&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/locator/AbstractReplicationStrategy.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/locator/AbstractReplicationStrategy.java Wed Jan 6 13:59:30 2010
@@ -25,13 +25,10 @@
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 @@
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;
}
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/locator/DatacenterShardStategy.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/locator/DatacenterShardStategy.java?rev=896447&r1=896446&r2=896447&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/locator/DatacenterShardStategy.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/locator/DatacenterShardStategy.java Wed Jan 6 13:59:30 2010
@@ -29,7 +29,6 @@
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 DatacenterShardStategy(TokenMetadata tokenMetadata, IPartitioner<Token> 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");
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/locator/RackAwareStrategy.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/locator/RackAwareStrategy.java?rev=896447&r1=896446&r2=896447&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/locator/RackAwareStrategy.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/locator/RackAwareStrategy.java Wed Jan 6 13:59:30 2010
@@ -24,7 +24,6 @@
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 @@
*/
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<InetAddress> getNaturalEndpoints(Token token, TokenMetadata metadata)
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/locator/RackUnawareStrategy.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/locator/RackUnawareStrategy.java?rev=896447&r1=896446&r2=896447&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/locator/RackUnawareStrategy.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/locator/RackUnawareStrategy.java Wed Jan 6 13:59:30 2010
@@ -21,10 +21,8 @@
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 @@
*/
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<InetAddress> getNaturalEndpoints(Token token, TokenMetadata metadata)
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java?rev=896447&r1=896446&r2=896447&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java Wed Jan 6 13:59:30 2010
@@ -220,18 +220,18 @@
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<AbstractReplicationStrategy> cls = DatabaseDescriptor.getReplicaPlacementStrategyClass();
- Class [] parameterTypes = new Class[] { TokenMetadata.class, IPartitioner.class, int.class};
+ Class [] parameterTypes = new Class[] { TokenMetadata.class, int.class};
try
{
Constructor<AbstractReplicationStrategy> constructor = cls.getConstructor(parameterTypes);
- replicationStrategy = constructor.newInstance(tokenMetadata, partitioner, DatabaseDescriptor.getReplicationFactor());
+ replicationStrategy = constructor.newInstance(tokenMetadata, DatabaseDescriptor.getReplicationFactor());
}
catch (Exception e)
{
Modified: incubator/cassandra/trunk/test/unit/org/apache/cassandra/locator/RackUnawareStrategyTest.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/test/unit/org/apache/cassandra/locator/RackUnawareStrategyTest.java?rev=896447&r1=896446&r2=896447&view=diff
==============================================================================
--- incubator/cassandra/trunk/test/unit/org/apache/cassandra/locator/RackUnawareStrategyTest.java (original)
+++ incubator/cassandra/trunk/test/unit/org/apache/cassandra/locator/RackUnawareStrategyTest.java Wed Jan 6 13:59:30 2010
@@ -43,8 +43,7 @@
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<Token> endPointTokens = new ArrayList<Token>();
List<Token> keyTokens = new ArrayList<Token>();
@@ -60,7 +59,7 @@
{
TokenMetadata tmd = new TokenMetadata();
IPartitioner partitioner = new OrderPreservingPartitioner();
- AbstractReplicationStrategy strategy = new RackUnawareStrategy(tmd, partitioner, 3);
+ AbstractReplicationStrategy strategy = new RackUnawareStrategy(tmd, 3);
List<Token> endPointTokens = new ArrayList<Token>();
List<Token> keyTokens = new ArrayList<Token>();
@@ -98,8 +97,7 @@
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];
Modified: incubator/cassandra/trunk/test/unit/org/apache/cassandra/service/MoveTest.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/test/unit/org/apache/cassandra/service/MoveTest.java?rev=896447&r1=896446&r2=896447&view=diff
==============================================================================
--- incubator/cassandra/trunk/test/unit/org/apache/cassandra/service/MoveTest.java (original)
+++ incubator/cassandra/trunk/test/unit/org/apache/cassandra/service/MoveTest.java Wed Jan 6 13:59:30 2010
@@ -52,7 +52,7 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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);