Author: jbellis
Date: Mon Apr 27 15:01:08 2009
New Revision: 769013
URL: http://svn.apache.org/viewvc?rev=769013&view=rev
Log:
move *Partitioner from cassandra.service to cassandra.dht.
patch by jbellis; reviewed by Jun Rao for CASSANDRA-65
Added:
incubator/cassandra/trunk/src/org/apache/cassandra/dht/IPartitioner.java
- copied, changed from r768590,
incubator/cassandra/trunk/src/org/apache/cassandra/service/IPartitioner.java
incubator/cassandra/trunk/src/org/apache/cassandra/dht/OrderPreservingHashPartitioner.java
- copied, changed from r768590,
incubator/cassandra/trunk/src/org/apache/cassandra/service/OrderPreservingHashPartitioner.java
incubator/cassandra/trunk/src/org/apache/cassandra/dht/RandomPartitioner.java
- copied, changed from r768590,
incubator/cassandra/trunk/src/org/apache/cassandra/service/RandomPartitioner.java
Removed:
incubator/cassandra/trunk/src/org/apache/cassandra/service/IPartitioner.java
incubator/cassandra/trunk/src/org/apache/cassandra/service/OrderPreservingHashPartitioner.java
incubator/cassandra/trunk/src/org/apache/cassandra/service/RandomPartitioner.java
Modified:
incubator/cassandra/trunk/src/org/apache/cassandra/db/Memtable.java
incubator/cassandra/trunk/src/org/apache/cassandra/io/SSTable.java
incubator/cassandra/trunk/src/org/apache/cassandra/service/StorageService.java
Modified: incubator/cassandra/trunk/src/org/apache/cassandra/db/Memtable.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/org/apache/cassandra/db/Memtable.java?rev=769013&r1=769012&r2=769013&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/org/apache/cassandra/db/Memtable.java
(original)
+++ incubator/cassandra/trunk/src/org/apache/cassandra/db/Memtable.java Mon Apr
27 15:01:08 2009
@@ -44,7 +44,7 @@
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;
Copied:
incubator/cassandra/trunk/src/org/apache/cassandra/dht/IPartitioner.java (from
r768590,
incubator/cassandra/trunk/src/org/apache/cassandra/service/IPartitioner.java)
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/org/apache/cassandra/dht/IPartitioner.java?p2=incubator/cassandra/trunk/src/org/apache/cassandra/dht/IPartitioner.java&p1=incubator/cassandra/trunk/src/org/apache/cassandra/service/IPartitioner.java&r1=768590&r2=769013&rev=769013&view=diff
==============================================================================
---
incubator/cassandra/trunk/src/org/apache/cassandra/service/IPartitioner.java
(original)
+++ incubator/cassandra/trunk/src/org/apache/cassandra/dht/IPartitioner.java
Mon Apr 27 15:01:08 2009
@@ -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;
Copied:
incubator/cassandra/trunk/src/org/apache/cassandra/dht/OrderPreservingHashPartitioner.java
(from r768590,
incubator/cassandra/trunk/src/org/apache/cassandra/service/OrderPreservingHashPartitioner.java)
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/org/apache/cassandra/dht/OrderPreservingHashPartitioner.java?p2=incubator/cassandra/trunk/src/org/apache/cassandra/dht/OrderPreservingHashPartitioner.java&p1=incubator/cassandra/trunk/src/org/apache/cassandra/service/OrderPreservingHashPartitioner.java&r1=768590&r2=769013&rev=769013&view=diff
==============================================================================
---
incubator/cassandra/trunk/src/org/apache/cassandra/service/OrderPreservingHashPartitioner.java
(original)
+++
incubator/cassandra/trunk/src/org/apache/cassandra/dht/OrderPreservingHashPartitioner.java
Mon Apr 27 15:01:08 2009
@@ -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
{
Copied:
incubator/cassandra/trunk/src/org/apache/cassandra/dht/RandomPartitioner.java
(from r768590,
incubator/cassandra/trunk/src/org/apache/cassandra/service/RandomPartitioner.java)
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/org/apache/cassandra/dht/RandomPartitioner.java?p2=incubator/cassandra/trunk/src/org/apache/cassandra/dht/RandomPartitioner.java&p1=incubator/cassandra/trunk/src/org/apache/cassandra/service/RandomPartitioner.java&r1=768590&r2=769013&rev=769013&view=diff
==============================================================================
---
incubator/cassandra/trunk/src/org/apache/cassandra/service/RandomPartitioner.java
(original)
+++
incubator/cassandra/trunk/src/org/apache/cassandra/dht/RandomPartitioner.java
Mon Apr 27 15:01:08 2009
@@ -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
Modified: incubator/cassandra/trunk/src/org/apache/cassandra/io/SSTable.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/org/apache/cassandra/io/SSTable.java?rev=769013&r1=769012&r2=769013&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/org/apache/cassandra/io/SSTable.java
(original)
+++ incubator/cassandra/trunk/src/org/apache/cassandra/io/SSTable.java Mon Apr
27 15:01:08 2009
@@ -23,7 +23,7 @@
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;
Modified:
incubator/cassandra/trunk/src/org/apache/cassandra/service/StorageService.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/org/apache/cassandra/service/StorageService.java?rev=769013&r1=769012&r2=769013&view=diff
==============================================================================
---
incubator/cassandra/trunk/src/org/apache/cassandra/service/StorageService.java
(original)
+++
incubator/cassandra/trunk/src/org/apache/cassandra/service/StorageService.java
Mon Apr 27 15:01:08 2009
@@ -28,7 +28,6 @@
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.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.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.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
