Repository: cassandra Updated Branches: refs/heads/trunk 0655217ea -> 86f51fd4f
remove dead parm Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/86f51fd4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/86f51fd4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/86f51fd4 Branch: refs/heads/trunk Commit: 86f51fd4f042851b03f5bf602477de84d92a3172 Parents: 0655217 Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Thu Apr 2 01:04:01 2015 -0400 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Thu Apr 2 01:04:01 2015 -0400 ---------------------------------------------------------------------- src/java/org/apache/cassandra/cql3/ColumnCondition.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/86f51fd4/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 21c1f79..dfe2415 100644 --- a/src/java/org/apache/cassandra/cql3/ColumnCondition.java +++ b/src/java/org/apache/cassandra/cql3/ColumnCondition.java @@ -492,7 +492,7 @@ public class ColumnCondition throw new InvalidRequestException(String.format("Invalid comparison with null for operator \"%s\"", operator)); } - return valueAppliesTo(type, iter, value, operator, options); + return valueAppliesTo(type, iter, value, operator); } // frozen collections @@ -519,7 +519,7 @@ public class ColumnCondition return compareWithOperator(operator, type, conditionValue, cell.value()); } - static boolean valueAppliesTo(CollectionType type, Iterator<Cell> iter, Term.Terminal value, Operator operator, QueryOptions options) + static boolean valueAppliesTo(CollectionType type, Iterator<Cell> iter, Term.Terminal value, Operator operator) { if (value == null) return !iter.hasNext(); @@ -691,7 +691,7 @@ public class ColumnCondition List<Cell> cells = newArrayList(collectionColumns(name, current, now)); for (Term.Terminal value : inValues) { - if (CollectionBound.valueAppliesTo(type, cells.iterator(), value, Operator.EQ, options)) + if (CollectionBound.valueAppliesTo(type, cells.iterator(), value, Operator.EQ)) return true; } return false;
