cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dbros...@apache.org
Subject git commit: remove dead parms on private methods
Date Wed, 26 Mar 2014 02:29:59 GMT
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 3bb87d169 -> 0ac36ea86


remove dead parms on private methods


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

Branch: refs/heads/cassandra-2.1
Commit: 0ac36ea86bb9773997856ff897842bf66d69f5fc
Parents: 3bb87d1
Author: Dave Brosius <dbrosius@mebigfatguy.com>
Authored: Tue Mar 25 22:29:29 2014 -0400
Committer: Dave Brosius <dbrosius@mebigfatguy.com>
Committed: Tue Mar 25 22:29:29 2014 -0400

----------------------------------------------------------------------
 .../org/apache/cassandra/cql3/ColumnCondition.java     | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0ac36ea8/src/java/org/apache/cassandra/cql3/ColumnCondition.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/ColumnCondition.java b/src/java/org/apache/cassandra/cql3/ColumnCondition.java
index 0c69a60..520858f 100644
--- a/src/java/org/apache/cassandra/cql3/ColumnCondition.java
+++ b/src/java/org/apache/cassandra/cql3/ColumnCondition.java
@@ -23,7 +23,6 @@ import java.util.*;
 import com.google.common.base.Predicate;
 import com.google.common.collect.Iterators;
 
-import org.apache.cassandra.config.CFMetaData;
 import org.apache.cassandra.config.ColumnDefinition;
 import org.apache.cassandra.db.*;
 import org.apache.cassandra.db.composites.CellName;
@@ -117,14 +116,14 @@ public class ColumnCondition
 
         switch (type.kind)
         {
-            case LIST: return listAppliesTo(current.metadata(), iter, ((Lists.Value)v).elements);
-            case SET: return setAppliesTo(current.metadata(), iter, ((Sets.Value)v).elements);
-            case MAP: return mapAppliesTo(current.metadata(), iter, ((Maps.Value)v).map);
+            case LIST: return listAppliesTo(iter, ((Lists.Value)v).elements);
+            case SET: return setAppliesTo(iter, ((Sets.Value)v).elements);
+            case MAP: return mapAppliesTo(iter, ((Maps.Value)v).map);
         }
         throw new AssertionError();
     }
 
-    private boolean listAppliesTo(CFMetaData cfm, Iterator<Cell> iter, List<ByteBuffer>
elements)
+    private boolean listAppliesTo(Iterator<Cell> iter, List<ByteBuffer> elements)
     {
         for (ByteBuffer e : elements)
             if (!iter.hasNext() || iter.next().value().equals(e))
@@ -133,7 +132,7 @@ public class ColumnCondition
         return !iter.hasNext();
     }
 
-    private boolean setAppliesTo(CFMetaData cfm, Iterator<Cell> iter, Set<ByteBuffer>
elements)
+    private boolean setAppliesTo(Iterator<Cell> iter, Set<ByteBuffer> elements)
     {
         Set<ByteBuffer> remaining = new HashSet<>(elements);
         while (iter.hasNext())
@@ -147,7 +146,7 @@ public class ColumnCondition
         return remaining.isEmpty();
     }
 
-    private boolean mapAppliesTo(CFMetaData cfm, Iterator<Cell> iter, Map<ByteBuffer,
ByteBuffer> elements)
+    private boolean mapAppliesTo(Iterator<Cell> iter, Map<ByteBuffer, ByteBuffer>
elements)
     {
         Map<ByteBuffer, ByteBuffer> remaining = new HashMap<>(elements);
         while (iter.hasNext())


Mime
View raw message