natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

r/m unused storageport from ReplicationStrategies. patch by jbellis 

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@834920 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jonathan Ellis 2009-11-11 15:48:45 +00:00
parent a905e9b3bc
commit 93c5afa5c9
6 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/java/org/apache/cassandra/locator/AbstractReplicationStrategy.java
View File

@ -45,14 +45,12 @@ public abstract class AbstractReplicationStrategy
protected TokenMetadata tokenMetadata_;
protected IPartitioner partitioner_;
protected int replicas_;
protected int storagePort_;
AbstractReplicationStrategy(TokenMetadata tokenMetadata, IPartitioner partitioner, int replicas, int storagePort)
AbstractReplicationStrategy(TokenMetadata tokenMetadata, IPartitioner partitioner, int replicas)
{
tokenMetadata_ = tokenMetadata;
partitioner_ = partitioner;
replicas_ = replicas;
storagePort_ = storagePort;
}
public abstract ArrayList<InetAddress> getNaturalEndpoints(Token token, TokenMetadata metadata);

9
src/java/org/apache/cassandra/locator/DatacenterShardStategy.java
View File

@ -87,11 +87,14 @@ public class DatacenterShardStategy extends AbstractReplicationStrategy
}
}
public DatacenterShardStategy(TokenMetadata tokenMetadata, IPartitioner<Token> partitioner, int replicas, int storagePort)
public DatacenterShardStategy(TokenMetadata tokenMetadata, IPartitioner<Token> partitioner, int replicas)
throws UnknownHostException
{
super(tokenMetadata, partitioner, replicas, storagePort);
assert (DatabaseDescriptor.getEndPointSnitch() instanceof DatacenterEndPointSnitch);
super(tokenMetadata, partitioner, replicas);
if ((!(DatabaseDescriptor.getEndPointSnitch() instanceof DatacenterEndPointSnitch)))
{
throw new IllegalArgumentException("DatacenterShardStrategy requires DatacenterEndpointSnitch");
}
}
public ArrayList<InetAddress> getNaturalEndpoints(Token token, TokenMetadata metadata)

4
src/java/org/apache/cassandra/locator/RackAwareStrategy.java
View File

@ -39,9 +39,9 @@ import org.apache.cassandra.utils.LogUtil;
*/
public class RackAwareStrategy extends AbstractReplicationStrategy
{
public RackAwareStrategy(TokenMetadata tokenMetadata, IPartitioner partitioner, int replicas, int storagePort)
public RackAwareStrategy(TokenMetadata tokenMetadata, IPartitioner partitioner, int replicas)
{
super(tokenMetadata, partitioner, replicas, storagePort);
super(tokenMetadata, partitioner, replicas);
}
public ArrayList<InetAddress> getNaturalEndpoints(Token token, TokenMetadata metadata)

4
src/java/org/apache/cassandra/locator/RackUnawareStrategy.java
View File

@ -35,9 +35,9 @@ import java.net.InetAddress;
*/
public class RackUnawareStrategy extends AbstractReplicationStrategy
{
public RackUnawareStrategy(TokenMetadata tokenMetadata, IPartitioner partitioner, int replicas, int storagePort)
public RackUnawareStrategy(TokenMetadata tokenMetadata, IPartitioner partitioner, int replicas)
{
super(tokenMetadata, partitioner, replicas, storagePort);
super(tokenMetadata, partitioner, replicas);
}
public ArrayList<InetAddress> getNaturalEndpoints(Token token, TokenMetadata metadata)

4
src/java/org/apache/cassandra/service/StorageService.java
View File

@ -229,11 +229,11 @@ public final class StorageService implements IEndPointStateChangeSubscriber, Sto
new MultiThreadedStage(StorageService.readStage_, DatabaseDescriptor.getConcurrentReaders()));
Class<AbstractReplicationStrategy> cls = DatabaseDescriptor.getReplicaPlacementStrategyClass();
Class [] parameterTypes = new Class[] { TokenMetadata.class, IPartitioner.class, int.class, int.class};
Class [] parameterTypes = new Class[] { TokenMetadata.class, IPartitioner.class, int.class};
try
{
Constructor<AbstractReplicationStrategy> constructor = cls.getConstructor(parameterTypes);
replicationStrategy_ = constructor.newInstance(tokenMetadata_, partitioner_, DatabaseDescriptor.getReplicationFactor(), DatabaseDescriptor.getStoragePort());
replicationStrategy_ = constructor.newInstance(tokenMetadata_, partitioner_, DatabaseDescriptor.getReplicationFactor());
}
catch (Exception e)
{

6
test/unit/org/apache/cassandra/locator/RackUnawareStrategyTest.java
View File

@ -44,7 +44,7 @@ public class RackUnawareStrategyTest
{
TokenMetadata tmd = new TokenMetadata();
IPartitioner partitioner = new RandomPartitioner();
AbstractReplicationStrategy strategy = new RackUnawareStrategy(tmd, partitioner, 3, 7000);
AbstractReplicationStrategy strategy = new RackUnawareStrategy(tmd, partitioner, 3);
List<Token> endPointTokens = new ArrayList<Token>();
List<Token> keyTokens = new ArrayList<Token>();
@ -60,7 +60,7 @@ public class RackUnawareStrategyTest
{
TokenMetadata tmd = new TokenMetadata();
IPartitioner partitioner = new OrderPreservingPartitioner();
AbstractReplicationStrategy strategy = new RackUnawareStrategy(tmd, partitioner, 3, 7000);
AbstractReplicationStrategy strategy = new RackUnawareStrategy(tmd, partitioner, 3);
List<Token> endPointTokens = new ArrayList<Token>();
List<Token> keyTokens = new ArrayList<Token>();
@ -99,7 +99,7 @@ public class RackUnawareStrategyTest
{
TokenMetadata tmd = new TokenMetadata();
IPartitioner partitioner = new RandomPartitioner();
AbstractReplicationStrategy strategy = new RackUnawareStrategy(tmd, partitioner, 3, 7000);
AbstractReplicationStrategy strategy = new RackUnawareStrategy(tmd, partitioner, 3);
Token[] endPointTokens = new Token[5];
Token[] keyTokens = new Token[5];