Author: jbellis
Date: Wed Nov 11 15:48:45 2009
New Revision: 834920
URL: http://svn.apache.org/viewvc?rev=834920&view=rev
Log:
r/m unused storageport from ReplicationStrategies. patch by jbellis
Modified:
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
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=834920&r1=834919&r2=834920&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 Nov 11 15:48:45 2009
@@ -45,14 +45,12 @@
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);
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=834920&r1=834919&r2=834920&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 Nov 11 15:48:45 2009
@@ -87,11 +87,14 @@
}
}
- 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)
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=834920&r1=834919&r2=834920&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 Nov 11 15:48:45 2009
@@ -39,9 +39,9 @@
*/
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)
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=834920&r1=834919&r2=834920&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 Nov 11 15:48:45 2009
@@ -35,9 +35,9 @@
*/
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)
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=834920&r1=834919&r2=834920&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 Nov 11 15:48:45 2009
@@ -229,11 +229,11 @@
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)
{
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=834920&r1=834919&r2=834920&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 Nov 11 15:48:45 2009
@@ -44,7 +44,7 @@
{
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 @@
{
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 @@
{
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];
