Fix merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/82be86a5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/82be86a5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/82be86a5 Branch: refs/heads/trunk Commit: 82be86a5681a947333a675d7f3a72a202c0049ca Parents: 94f25ce Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Wed May 21 11:42:32 2014 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Wed May 21 11:42:32 2014 +0200 ---------------------------------------------------------------------- .../cassandra/cql3/statements/SelectStatement.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/82be86a5/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java index ca990a4..b212147 100644 --- a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java @@ -928,11 +928,11 @@ public class SelectStatement implements CQLStatement, MeasurableForPreparedCache if (slice.hasBound(b)) { ByteBuffer value = validateIndexedValue(def, slice.bound(b, options)); - IndexOperator op = slice.getIndexOperator(b); + IndexExpression.Operator op = slice.getIndexOperator(b); // If the underlying comparator for name is reversed, we need to reverse the IndexOperator: user operation // always refer to the "forward" sorting even if the clustering order is reversed, but the 2ndary code does // use the underlying comparator as is. - if (name.type instanceof ReversedType) + if (def.type instanceof ReversedType) op = reverse(op); expressions.add(new IndexExpression(def.name.bytes, op, value)); } @@ -1004,14 +1004,14 @@ public class SelectStatement implements CQLStatement, MeasurableForPreparedCache }; } - private static IndexOperator reverse(IndexOperator op) + private static IndexExpression.Operator reverse(IndexExpression.Operator op) { switch (op) { - case LT: return IndexOperator.GT; - case LTE: return IndexOperator.GTE; - case GT: return IndexOperator.LT; - case GTE: return IndexOperator.LTE; + case LT: return IndexExpression.Operator.GT; + case LTE: return IndexExpression.Operator.GTE; + case GT: return IndexExpression.Operator.LT; + case GTE: return IndexExpression.Operator.LTE; default: return op; } }
