From bfb2e952204f9879133826305b2b5dfda3e61776 Mon Sep 17 00:00:00 2001 From: Jonathan Ellis Date: Mon, 27 Apr 2009 15:01:51 +0000 Subject: [PATCH] rename getDefaultToken -> getInitialToken patch by jbellis; reviewed by Jun Rao for CASSANDRA-65 git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@769019 13f79535-47bb-0310-9956-ffa450edef68 --- src/org/apache/cassandra/db/ColumnFamilyStore.java | 4 ++-- src/org/apache/cassandra/dht/IPartitioner.java | 5 ++++- .../apache/cassandra/dht/OrderPreservingPartitioner.java | 2 +- src/org/apache/cassandra/dht/RandomPartitioner.java | 2 +- src/org/apache/cassandra/locator/RackAwareStrategy.java | 2 +- src/org/apache/cassandra/locator/RackUnawareStrategy.java | 2 +- src/org/apache/cassandra/service/StorageService.java | 8 ++++---- .../apache/cassandra/locator/RackUnawareStrategyTest.java | 3 +-- test/unit/org/apache/cassandra/db/SystemTableTest.java | 2 +- 9 files changed, 16 insertions(+), 14 deletions(-) diff --git a/src/org/apache/cassandra/db/ColumnFamilyStore.java b/src/org/apache/cassandra/db/ColumnFamilyStore.java index c2ccc04c13..12d144c15a 100644 --- a/src/org/apache/cassandra/db/ColumnFamilyStore.java +++ b/src/org/apache/cassandra/db/ColumnFamilyStore.java @@ -1113,7 +1113,7 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean continue; } } - if (Range.isTokenInRanges(StorageService.getPartitioner().getTokenForKey(lastkey), ranges)) + if (Range.isTokenInRanges(StorageService.getPartitioner().getInitialToken(lastkey), ranges)) { if(ssTableRange == null ) { @@ -1143,7 +1143,7 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean continue; } /* keep on looping until we find a key in the range */ - while (!Range.isTokenInRanges(StorageService.getPartitioner().getTokenForKey(filestruct.getKey()), ranges)) + while (!Range.isTokenInRanges(StorageService.getPartitioner().getInitialToken(filestruct.getKey()), ranges)) { filestruct.advance(); if (filestruct.isExhausted()) diff --git a/src/org/apache/cassandra/dht/IPartitioner.java b/src/org/apache/cassandra/dht/IPartitioner.java index fbffce3364..dcb2b00e93 100644 --- a/src/org/apache/cassandra/dht/IPartitioner.java +++ b/src/org/apache/cassandra/dht/IPartitioner.java @@ -37,7 +37,10 @@ public interface IPartitioner public Comparator getReverseDecoratedKeyComparator(); - public Token getTokenForKey(String key); + /** + * @return the token to use for this node if none was saved + */ + public Token getInitialToken(String key); public Token getDefaultToken(); diff --git a/src/org/apache/cassandra/dht/OrderPreservingPartitioner.java b/src/org/apache/cassandra/dht/OrderPreservingPartitioner.java index 833a6329d7..6dc2eb64b7 100644 --- a/src/org/apache/cassandra/dht/OrderPreservingPartitioner.java +++ b/src/org/apache/cassandra/dht/OrderPreservingPartitioner.java @@ -110,7 +110,7 @@ public class OrderPreservingPartitioner implements IPartitioner return tokenFactory; } - public Token getTokenForKey(String key) + public Token getInitialToken(String key) { return new StringToken(key); } diff --git a/src/org/apache/cassandra/dht/RandomPartitioner.java b/src/org/apache/cassandra/dht/RandomPartitioner.java index f95e556e88..2f92257ec2 100644 --- a/src/org/apache/cassandra/dht/RandomPartitioner.java +++ b/src/org/apache/cassandra/dht/RandomPartitioner.java @@ -103,7 +103,7 @@ public class RandomPartitioner implements IPartitioner return tokenFactory; } - public Token getTokenForKey(String key) + public Token getInitialToken(String key) { return new BigIntegerToken(FBUtilities.hash(key)); } diff --git a/src/org/apache/cassandra/locator/RackAwareStrategy.java b/src/org/apache/cassandra/locator/RackAwareStrategy.java index c9bda3bd81..cbedac5a7b 100644 --- a/src/org/apache/cassandra/locator/RackAwareStrategy.java +++ b/src/org/apache/cassandra/locator/RackAwareStrategy.java @@ -110,7 +110,7 @@ public class RackAwareStrategy extends AbstractStrategy for ( String key : keys ) { - results.put(key, getStorageEndPoints(partitioner_.getTokenForKey(key))); + results.put(key, getStorageEndPoints(partitioner_.getInitialToken(key))); } return results; diff --git a/src/org/apache/cassandra/locator/RackUnawareStrategy.java b/src/org/apache/cassandra/locator/RackUnawareStrategy.java index 497fea969f..ed79717c76 100644 --- a/src/org/apache/cassandra/locator/RackUnawareStrategy.java +++ b/src/org/apache/cassandra/locator/RackUnawareStrategy.java @@ -67,7 +67,7 @@ public class RackUnawareStrategy extends AbstractStrategy for ( String key : keys ) { - results.put(key, getStorageEndPoints(partitioner_.getTokenForKey(key))); + results.put(key, getStorageEndPoints(partitioner_.getInitialToken(key))); } return results; diff --git a/src/org/apache/cassandra/service/StorageService.java b/src/org/apache/cassandra/service/StorageService.java index 5635d6d59f..fd9f4dff75 100644 --- a/src/org/apache/cassandra/service/StorageService.java +++ b/src/org/apache/cassandra/service/StorageService.java @@ -774,7 +774,7 @@ public final class StorageService implements IEndPointStateChangeSubscriber, Sto Token[] tokens = tokenToEndPointMap.keySet().toArray(new Token[tokenToEndPointMap.keySet().size()]); Arrays.sort(tokens); int index = Arrays.binarySearch(tokens, token) * (keys.length/tokens.length); - Token newToken = partitioner_.getTokenForKey(keys[index]); + Token newToken = partitioner_.getInitialToken(keys[index]); /* update the token */ updateToken(newToken); } @@ -1064,7 +1064,7 @@ public final class StorageService implements IEndPointStateChangeSubscriber, Sto public EndPoint getPrimary(String key) { EndPoint endpoint = StorageService.tcpAddr_; - Token token = partitioner_.getTokenForKey(key); + Token token = partitioner_.getInitialToken(key); Map tokenToEndPointMap = tokenMetadata_.cloneTokenEndPointMap(); List tokens = new ArrayList(tokenToEndPointMap.keySet()); if (tokens.size() > 0) @@ -1112,7 +1112,7 @@ public final class StorageService implements IEndPointStateChangeSubscriber, Sto */ public EndPoint[] getNStorageEndPoint(String key) { - return nodePicker_.getStorageEndPoints(partitioner_.getTokenForKey(key)); + return nodePicker_.getStorageEndPoints(partitioner_.getInitialToken(key)); } private Map getNStorageEndPoints(String[] keys) @@ -1151,7 +1151,7 @@ public final class StorageService implements IEndPointStateChangeSubscriber, Sto */ public Map getNStorageEndPointMap(String key) { - return nodePicker_.getHintedStorageEndPoints(partitioner_.getTokenForKey(key)); + return nodePicker_.getHintedStorageEndPoints(partitioner_.getInitialToken(key)); } /** diff --git a/test/org/apache/cassandra/locator/RackUnawareStrategyTest.java b/test/org/apache/cassandra/locator/RackUnawareStrategyTest.java index fcf508caad..eeb6f5357e 100644 --- a/test/org/apache/cassandra/locator/RackUnawareStrategyTest.java +++ b/test/org/apache/cassandra/locator/RackUnawareStrategyTest.java @@ -2,7 +2,6 @@ package org.apache.cassandra.locator; import java.util.List; import java.util.ArrayList; -import java.math.BigInteger; import org.testng.annotations.Test; import org.apache.cassandra.dht.IPartitioner; @@ -42,7 +41,7 @@ public class RackUnawareStrategyTest List keyTokens = new ArrayList(); for (int i = 0; i < 5; i++) { endPointTokens.add(new StringToken(String.valueOf((char)('a' + i * 2)))); - keyTokens.add(partitioner.getTokenForKey(String.valueOf((char)('a' + i * 2 + 1)))); + keyTokens.add(partitioner.getInitialToken(String.valueOf((char)('a' + i * 2 + 1)))); } testGetStorageEndPoints(tmd, strategy, endPointTokens.toArray(new Token[0]), keyTokens.toArray(new Token[0])); } diff --git a/test/unit/org/apache/cassandra/db/SystemTableTest.java b/test/unit/org/apache/cassandra/db/SystemTableTest.java index 67bd6ea35a..0fb7a54e62 100644 --- a/test/unit/org/apache/cassandra/db/SystemTableTest.java +++ b/test/unit/org/apache/cassandra/db/SystemTableTest.java @@ -9,6 +9,6 @@ import java.io.IOException; public class SystemTableTest extends ServerTest { @Test public void testMain() throws IOException { - SystemTable.openSystemTable(SystemTable.cfName_).updateToken(StorageService.getPartitioner().getTokenForKey("503545744:0")); + SystemTable.openSystemTable(SystemTable.cfName_).updateToken(StorageService.getPartitioner().getInitialToken("503545744:0")); } }