From 91afe8b6e9e9f0a808261b72c8532841b871ba45 Mon Sep 17 00:00:00 2001 From: Jonathan Ellis Date: Mon, 27 Apr 2009 15:01:08 +0000 Subject: [PATCH] move *Partitioner from cassandra.service to cassandra.dht. patch by jbellis; reviewed by Jun Rao for CASSANDRA-65 git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@769013 13f79535-47bb-0310-9956-ffa450edef68 --- src/org/apache/cassandra/db/Memtable.java | 2 +- .../{service => dht}/IPartitioner.java | 2 +- .../OrderPreservingHashPartitioner.java | 5 +++-- .../{service => dht}/RandomPartitioner.java | 3 ++- src/org/apache/cassandra/io/SSTable.java | 2 +- .../cassandra/service/StorageService.java | 17 +++++------------ 6 files changed, 13 insertions(+), 18 deletions(-) rename src/org/apache/cassandra/{service => dht}/IPartitioner.java (94%) rename src/org/apache/cassandra/{service => dht}/OrderPreservingHashPartitioner.java (93%) rename src/org/apache/cassandra/{service => dht}/RandomPartitioner.java (93%) diff --git a/src/org/apache/cassandra/db/Memtable.java b/src/org/apache/cassandra/db/Memtable.java index 8c6149412f..42dc9190ef 100644 --- a/src/org/apache/cassandra/db/Memtable.java +++ b/src/org/apache/cassandra/db/Memtable.java @@ -44,7 +44,7 @@ import org.apache.cassandra.io.DataOutputBuffer; import org.apache.cassandra.io.SSTable; import org.apache.cassandra.utils.BloomFilter; import org.apache.cassandra.utils.LogUtil; -import org.apache.cassandra.service.IPartitioner; +import org.apache.cassandra.dht.IPartitioner; import org.apache.cassandra.service.StorageService; import org.cliffc.high_scale_lib.NonBlockingHashSet; diff --git a/src/org/apache/cassandra/service/IPartitioner.java b/src/org/apache/cassandra/dht/IPartitioner.java similarity index 94% rename from src/org/apache/cassandra/service/IPartitioner.java rename to src/org/apache/cassandra/dht/IPartitioner.java index 6e48ca9039..e298b227d7 100644 --- a/src/org/apache/cassandra/service/IPartitioner.java +++ b/src/org/apache/cassandra/dht/IPartitioner.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.cassandra.service; +package org.apache.cassandra.dht; import java.math.BigInteger; import java.util.Comparator; diff --git a/src/org/apache/cassandra/service/OrderPreservingHashPartitioner.java b/src/org/apache/cassandra/dht/OrderPreservingHashPartitioner.java similarity index 93% rename from src/org/apache/cassandra/service/OrderPreservingHashPartitioner.java rename to src/org/apache/cassandra/dht/OrderPreservingHashPartitioner.java index 9365ea8e6d..9af1584cfb 100644 --- a/src/org/apache/cassandra/service/OrderPreservingHashPartitioner.java +++ b/src/org/apache/cassandra/dht/OrderPreservingHashPartitioner.java @@ -16,11 +16,12 @@ * limitations under the License. */ -package org.apache.cassandra.service; +package org.apache.cassandra.dht; import java.math.BigInteger; import java.util.Comparator; -import java.text.Collator; + +import org.apache.cassandra.dht.IPartitioner; public class OrderPreservingHashPartitioner implements IPartitioner { diff --git a/src/org/apache/cassandra/service/RandomPartitioner.java b/src/org/apache/cassandra/dht/RandomPartitioner.java similarity index 93% rename from src/org/apache/cassandra/service/RandomPartitioner.java rename to src/org/apache/cassandra/dht/RandomPartitioner.java index cedd6297f1..9234068fb3 100644 --- a/src/org/apache/cassandra/service/RandomPartitioner.java +++ b/src/org/apache/cassandra/dht/RandomPartitioner.java @@ -16,12 +16,13 @@ * limitations under the License. */ -package org.apache.cassandra.service; +package org.apache.cassandra.dht; import java.math.BigInteger; import java.util.Comparator; import org.apache.cassandra.utils.FBUtilities; +import org.apache.cassandra.dht.IPartitioner; /** * This class generates a MD5 hash of the key. It uses the standard technique diff --git a/src/org/apache/cassandra/io/SSTable.java b/src/org/apache/cassandra/io/SSTable.java index 961cc66359..71b7171587 100644 --- a/src/org/apache/cassandra/io/SSTable.java +++ b/src/org/apache/cassandra/io/SSTable.java @@ -23,7 +23,7 @@ import java.util.*; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.service.StorageService; -import org.apache.cassandra.service.IPartitioner; +import org.apache.cassandra.dht.IPartitioner; import org.apache.cassandra.utils.BasicUtilities; import org.apache.cassandra.utils.BloomFilter; import org.apache.cassandra.utils.FileUtils; diff --git a/src/org/apache/cassandra/service/StorageService.java b/src/org/apache/cassandra/service/StorageService.java index aacd7437bb..0d488d34a4 100644 --- a/src/org/apache/cassandra/service/StorageService.java +++ b/src/org/apache/cassandra/service/StorageService.java @@ -28,7 +28,6 @@ import java.util.concurrent.locks.ReentrantLock; import java.io.*; import java.lang.management.ManagementFactory; import java.math.BigInteger; -import java.net.UnknownHostException; import javax.management.MBeanServer; import javax.management.ObjectName; @@ -57,20 +56,20 @@ import org.apache.cassandra.dht.BootStrapper; import org.apache.cassandra.dht.BootstrapInitiateMessage; import org.apache.cassandra.dht.BootstrapMetadataVerbHandler; import org.apache.cassandra.dht.Range; +import org.apache.cassandra.dht.IPartitioner; +import org.apache.cassandra.dht.RandomPartitioner; +import org.apache.cassandra.dht.OrderPreservingHashPartitioner; import org.apache.cassandra.gms.ApplicationState; import org.apache.cassandra.gms.EndPointState; import org.apache.cassandra.gms.FailureDetector; import org.apache.cassandra.gms.Gossiper; import org.apache.cassandra.gms.IEndPointStateChangeSubscriber; -import org.apache.cassandra.io.DataInputBuffer; -import org.apache.cassandra.io.ICompactSerializer; import org.apache.cassandra.locator.EndPointSnitch; import org.apache.cassandra.locator.IEndPointSnitch; import org.apache.cassandra.locator.IReplicaPlacementStrategy; import org.apache.cassandra.locator.RackAwareStrategy; import org.apache.cassandra.locator.RackUnawareStrategy; import org.apache.cassandra.locator.TokenMetadata; -import org.apache.cassandra.net.CompactEndPointSerializationHelper; import org.apache.cassandra.net.EndPoint; import org.apache.cassandra.net.IVerbHandler; import org.apache.cassandra.net.Message; @@ -81,14 +80,9 @@ import org.apache.cassandra.tools.MembershipCleanerVerbHandler; import org.apache.cassandra.tools.TokenUpdateVerbHandler; import org.apache.cassandra.utils.FileUtils; import org.apache.cassandra.utils.LogUtil; -import org.apache.commons.math.linear.RealMatrix; -import org.apache.commons.math.linear.RealMatrixImpl; + import org.apache.log4j.Logger; -import org.apache.cassandra.concurrent.*; -import org.apache.cassandra.db.*; -import org.apache.cassandra.net.io.*; -import org.apache.cassandra.gms.*; -import org.apache.cassandra.utils.*; + import org.apache.zookeeper.CreateMode; import org.apache.zookeeper.KeeperException; import org.apache.zookeeper.WatchedEvent; @@ -96,7 +90,6 @@ import org.apache.zookeeper.Watcher; import org.apache.zookeeper.ZooKeeper; import org.apache.zookeeper.ZooDefs.Ids; import org.apache.zookeeper.data.Stat; -import org.apache.zookeeper.proto.WatcherEvent; /* * This abstraction contains the token/identifier of this node