cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dbros...@apache.org
Subject [1/2] git commit: remove dead code
Date Tue, 25 Mar 2014 04:32:31 GMT
Repository: cassandra
Updated Branches:
  refs/heads/trunk e5314641a -> f63fafbfa


remove dead code


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9ef88156
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9ef88156
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9ef88156

Branch: refs/heads/trunk
Commit: 9ef88156884419bd4bba6f10a24a60a2e7252c37
Parents: 8a2a0c3
Author: Dave Brosius <dbrosius@mebigfatguy.com>
Authored: Tue Mar 25 00:31:26 2014 -0400
Committer: Dave Brosius <dbrosius@mebigfatguy.com>
Committed: Tue Mar 25 00:31:26 2014 -0400

----------------------------------------------------------------------
 .../apache/cassandra/dht/AbstractByteOrderedPartitioner.java   | 2 +-
 .../org/apache/cassandra/dht/OrderPreservingPartitioner.java   | 2 +-
 src/java/org/apache/cassandra/service/StorageService.java      | 6 +++---
 src/java/org/apache/cassandra/thrift/CassandraServer.java      | 2 +-
 test/unit/org/apache/cassandra/db/KeyCollisionTest.java        | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9ef88156/src/java/org/apache/cassandra/dht/AbstractByteOrderedPartitioner.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/dht/AbstractByteOrderedPartitioner.java b/src/java/org/apache/cassandra/dht/AbstractByteOrderedPartitioner.java
index 5858a4a..0adab50 100644
--- a/src/java/org/apache/cassandra/dht/AbstractByteOrderedPartitioner.java
+++ b/src/java/org/apache/cassandra/dht/AbstractByteOrderedPartitioner.java
@@ -198,7 +198,7 @@ public abstract class AbstractByteOrderedPartitioner extends AbstractPartitioner
                 for (Range<Token> r : sortedRanges)
                 {
                     // Looping over every KS:CF:Range, get the splits size and add it to
the count
-                    allTokens.put(r.right, allTokens.get(r.right) + StorageService.instance.getSplits(ks,
cfmd.cfName, r, 1, cfmd).size());
+                    allTokens.put(r.right, allTokens.get(r.right) + StorageService.instance.getSplits(ks,
cfmd.cfName, r, 1).size());
                 }
             }
         }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9ef88156/src/java/org/apache/cassandra/dht/OrderPreservingPartitioner.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/dht/OrderPreservingPartitioner.java b/src/java/org/apache/cassandra/dht/OrderPreservingPartitioner.java
index d812d3e..ab80ef7 100644
--- a/src/java/org/apache/cassandra/dht/OrderPreservingPartitioner.java
+++ b/src/java/org/apache/cassandra/dht/OrderPreservingPartitioner.java
@@ -199,7 +199,7 @@ public class OrderPreservingPartitioner extends AbstractPartitioner<StringToken>
                 for (Range<Token> r : sortedRanges)
                 {
                     // Looping over every KS:CF:Range, get the splits size and add it to
the count
-                    allTokens.put(r.right, allTokens.get(r.right) + StorageService.instance.getSplits(ks,
cfmd.cfName, r, cfmd.getMinIndexInterval(), cfmd).size());
+                    allTokens.put(r.right, allTokens.get(r.right) + StorageService.instance.getSplits(ks,
cfmd.cfName, r, cfmd.getMinIndexInterval()).size());
                 }
             }
         }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9ef88156/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index 57fbaf0..bfcfcce 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -2832,7 +2832,7 @@ public class StorageService extends NotificationBroadcasterSupport implements
IE
      * @return list of Token ranges (_not_ keys!) together with estimated key count,
      *      breaking up the data this node is responsible for into pieces of roughly keysPerSplit
      */
-    public List<Pair<Range<Token>, Long>> getSplits(String keyspaceName,
String cfName, Range<Token> range, int keysPerSplit, CFMetaData metadata)
+    public List<Pair<Range<Token>, Long>> getSplits(String keyspaceName,
String cfName, Range<Token> range, int keysPerSplit)
     {
         Keyspace t = Keyspace.open(keyspaceName);
         ColumnFamilyStore cfs = t.getColumnFamilyStore(cfName);
@@ -2846,10 +2846,10 @@ public class StorageService extends NotificationBroadcasterSupport
implements IE
         final int splitCount = Math.max(1, Math.min(maxSplitCount, (int)(totalRowCountEstimate
/ keysPerSplit)));
 
         List<Token> tokens = keysToTokens(range, keys);
-        return getSplits(tokens, splitCount, metadata, cfs);
+        return getSplits(tokens, splitCount, cfs);
     }
 
-    private List<Pair<Range<Token>, Long>> getSplits(List<Token>
tokens, int splitCount, CFMetaData metadata, ColumnFamilyStore cfs)
+    private List<Pair<Range<Token>, Long>> getSplits(List<Token>
tokens, int splitCount, ColumnFamilyStore cfs)
     {
         final double step = (double) (tokens.size() - 1) / splitCount;
         Token prevToken = tokens.get(0);

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9ef88156/src/java/org/apache/cassandra/thrift/CassandraServer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/thrift/CassandraServer.java b/src/java/org/apache/cassandra/thrift/CassandraServer.java
index 62ef167..bc8a751 100644
--- a/src/java/org/apache/cassandra/thrift/CassandraServer.java
+++ b/src/java/org/apache/cassandra/thrift/CassandraServer.java
@@ -1466,7 +1466,7 @@ public class CassandraServer implements Cassandra.Iface
             Token.TokenFactory tf = StorageService.getPartitioner().getTokenFactory();
             Range<Token> tr = new Range<Token>(tf.fromString(start_token), tf.fromString(end_token));
             List<Pair<Range<Token>, Long>> splits =
-                    StorageService.instance.getSplits(state().getKeyspace(), cfName, tr,
keys_per_split, Schema.instance.getCFMetaData(state().getKeyspace(), cfName));
+                    StorageService.instance.getSplits(state().getKeyspace(), cfName, tr,
keys_per_split);
             List<CfSplit> result = new ArrayList<CfSplit>(splits.size());
             for (Pair<Range<Token>, Long> split : splits)
                 result.add(new CfSplit(split.left.left.toString(), split.left.right.toString(),
split.right));

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9ef88156/test/unit/org/apache/cassandra/db/KeyCollisionTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/KeyCollisionTest.java b/test/unit/org/apache/cassandra/db/KeyCollisionTest.java
index 633c9b2..57f077f 100644
--- a/test/unit/org/apache/cassandra/db/KeyCollisionTest.java
+++ b/test/unit/org/apache/cassandra/db/KeyCollisionTest.java
@@ -194,7 +194,7 @@ public class KeyCollisionTest extends SchemaLoader
                     for (Range<Token> r : sortedRanges)
                     {
                         // Looping over every KS:CF:Range, get the splits size and add it
to the count
-                        allTokens.put(r.right, allTokens.get(r.right) + StorageService.instance.getSplits(ks,
cfmd.cfName, r, 1, cfmd).size());
+                        allTokens.put(r.right, allTokens.get(r.right) + StorageService.instance.getSplits(ks,
cfmd.cfName, r, 1).size());
                     }
                 }
             }


Mime
View raw message