cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dbros...@apache.org
Subject [1/5] git commit: remove unused fields/locals
Date Sun, 14 Oct 2012 18:59:35 GMT
Updated Branches:
  refs/heads/trunk c06c276c7 -> 5c5fe91f3


remove unused fields/locals


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

Branch: refs/heads/trunk
Commit: 5c5fe91f3a9e05bd51e1582818643a4e85c0cf35
Parents: e5ac764
Author: Dave Brosius <dbrosius@apache.org>
Authored: Sun Oct 14 14:57:50 2012 -0400
Committer: Dave Brosius <dbrosius@apache.org>
Committed: Sun Oct 14 14:57:50 2012 -0400

----------------------------------------------------------------------
 src/java/org/apache/cassandra/db/DecoratedKey.java |    3 ---
 .../org/apache/cassandra/db/SliceQueryPager.java   |    1 -
 src/java/org/apache/cassandra/db/SystemTable.java  |    3 ---
 .../apache/cassandra/io/sstable/SSTableWriter.java |    3 +--
 .../org/apache/cassandra/tools/BulkLoader.java     |    2 --
 .../org/apache/cassandra/utils/MergeIterator.java  |    2 --
 .../org/apache/cassandra/dht/BootStrapperTest.java |    7 -------
 7 files changed, 1 insertions(+), 20 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5c5fe91f/src/java/org/apache/cassandra/db/DecoratedKey.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/DecoratedKey.java b/src/java/org/apache/cassandra/db/DecoratedKey.java
index 72091a1..fc4bb32 100644
--- a/src/java/org/apache/cassandra/db/DecoratedKey.java
+++ b/src/java/org/apache/cassandra/db/DecoratedKey.java
@@ -22,7 +22,6 @@ import java.util.Comparator;
 
 import org.apache.cassandra.dht.IPartitioner;
 import org.apache.cassandra.dht.Token;
-import org.apache.cassandra.service.StorageService;
 import org.apache.cassandra.utils.ByteBufferUtil;
 
 /**
@@ -36,8 +35,6 @@ import org.apache.cassandra.utils.ByteBufferUtil;
  */
 public class DecoratedKey extends RowPosition
 {
-    private static final IPartitioner partitioner = StorageService.getPartitioner();
-
     public static final Comparator<DecoratedKey> comparator = new Comparator<DecoratedKey>()
     {
         public int compare(DecoratedKey o1, DecoratedKey o2)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5c5fe91f/src/java/org/apache/cassandra/db/SliceQueryPager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/SliceQueryPager.java b/src/java/org/apache/cassandra/db/SliceQueryPager.java
index 405c7c4..b67c071 100644
--- a/src/java/org/apache/cassandra/db/SliceQueryPager.java
+++ b/src/java/org/apache/cassandra/db/SliceQueryPager.java
@@ -30,7 +30,6 @@ public class SliceQueryPager implements Iterator<ColumnFamily>
     public final DecoratedKey key;
 
     private ColumnSlice[] slices;
-    private ColumnFamily current;
     private boolean exhausted;
 
     public SliceQueryPager(ColumnFamilyStore cfs, DecoratedKey key, ColumnSlice[] slices)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5c5fe91f/src/java/org/apache/cassandra/db/SystemTable.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/SystemTable.java b/src/java/org/apache/cassandra/db/SystemTable.java
index 2883e0b..61b27d5 100644
--- a/src/java/org/apache/cassandra/db/SystemTable.java
+++ b/src/java/org/apache/cassandra/db/SystemTable.java
@@ -17,7 +17,6 @@
  */
 package org.apache.cassandra.db;
 
-import java.io.IOException;
 import java.net.InetAddress;
 import java.nio.ByteBuffer;
 import java.nio.charset.CharacterCodingException;
@@ -42,7 +41,6 @@ import org.apache.cassandra.db.filter.QueryPath;
 import org.apache.cassandra.db.marshal.AsciiType;
 import org.apache.cassandra.db.marshal.BytesType;
 import org.apache.cassandra.db.marshal.UTF8Type;
-import org.apache.cassandra.dht.IPartitioner;
 import org.apache.cassandra.dht.Range;
 import org.apache.cassandra.dht.Token;
 import org.apache.cassandra.service.StorageService;
@@ -479,7 +477,6 @@ public class SystemTable
      */
     public static CounterId getCurrentLocalCounterId()
     {
-        ByteBuffer id = null;
         Table table = Table.open(Table.SYSTEM_KS);
 
         // Get the last CounterId (since CounterId are timeuuid is thus ordered from the
older to the newer one)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5c5fe91f/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java b/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
index 0d92a76..f243f3e 100644
--- a/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
+++ b/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
@@ -49,7 +49,6 @@ public class SSTableWriter extends SSTable
     private DecoratedKey lastWrittenKey;
     private FileMark dataMark;
     private final SSTableMetadata.Collector sstableMetadataCollector;
-    private final TypeSizes typeSizes = TypeSizes.NATIVE;
 
     public SSTableWriter(String filename, long keyCount)
     {
@@ -101,7 +100,7 @@ public class SSTableWriter extends SSTable
         else
         {
             dbuilder = SegmentedFile.getBuilder(DatabaseDescriptor.getDiskAccessMode());
-            dataFile = SequentialWriter.open(new File(getFilename()), 
+            dataFile = SequentialWriter.open(new File(getFilename()),
 			                      !DatabaseDescriptor.populateIOCacheOnFlush());
             dataFile.setComputeDigest();
         }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5c5fe91f/src/java/org/apache/cassandra/tools/BulkLoader.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/BulkLoader.java b/src/java/org/apache/cassandra/tools/BulkLoader.java
index 9c3c5d7..f2f018f 100644
--- a/src/java/org/apache/cassandra/tools/BulkLoader.java
+++ b/src/java/org/apache/cassandra/tools/BulkLoader.java
@@ -177,7 +177,6 @@ public class BulkLoader
     static class ExternalClient extends SSTableLoader.Client
     {
         private final Map<String, Set<String>> knownCfs = new HashMap<String,
Set<String>>();
-        private final OutputHandler outputHandler;
         private final Set<InetAddress> hosts;
         private final int rpcPort;
         private final String user;
@@ -186,7 +185,6 @@ public class BulkLoader
         public ExternalClient(OutputHandler outputHandler, Set<InetAddress> hosts,
int port, String user, String passwd)
         {
             super();
-            this.outputHandler = outputHandler;
             this.hosts = hosts;
             this.rpcPort = port;
             this.user = user;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5c5fe91f/src/java/org/apache/cassandra/utils/MergeIterator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/MergeIterator.java b/src/java/org/apache/cassandra/utils/MergeIterator.java
index be97803..f05c14b 100644
--- a/src/java/org/apache/cassandra/utils/MergeIterator.java
+++ b/src/java/org/apache/cassandra/utils/MergeIterator.java
@@ -70,7 +70,6 @@ public abstract class MergeIterator<In,Out> extends AbstractIterator<Out>
implem
     /** A MergeIterator that consumes multiple input values per output value. */
     private static final class ManyToOne<In,Out> extends MergeIterator<In,Out>
     {
-        public final Comparator<In> comp;
         // a queue for return: all candidates must be open and have at least one item
         protected final PriorityQueue<Candidate<In>> queue;
         // a stack of the last consumed candidates, so that we can lazily call 'advance()'
@@ -80,7 +79,6 @@ public abstract class MergeIterator<In,Out> extends AbstractIterator<Out>
implem
         public ManyToOne(List<? extends CloseableIterator<In>> iters, Comparator<In>
comp, Reducer<In,Out> reducer)
         {
             super(iters, reducer);
-            this.comp = comp;
             this.queue = new PriorityQueue<Candidate<In>>(Math.max(1, iters.size()));
             for (CloseableIterator<In> iter : iters)
             {

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5c5fe91f/test/unit/org/apache/cassandra/dht/BootStrapperTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/dht/BootStrapperTest.java b/test/unit/org/apache/cassandra/dht/BootStrapperTest.java
index f7d1c7c..36aa279 100644
--- a/test/unit/org/apache/cassandra/dht/BootStrapperTest.java
+++ b/test/unit/org/apache/cassandra/dht/BootStrapperTest.java
@@ -75,13 +75,6 @@ public class BootStrapperTest extends SchemaLoader
             InetAddress.getByName("127.0.0.14"),
             InetAddress.getByName("127.0.0.15"),
         };
-        UUID[] bootstrapHostIds = new UUID[]
-        {
-            UUID.randomUUID(),
-            UUID.randomUUID(),
-            UUID.randomUUID(),
-            UUID.randomUUID(),
-        };
         Map<InetAddress, Double> load = new HashMap<InetAddress, Double>();
         for (int i = 0; i < addrs.length; i++)
         {


Mime
View raw message