You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by ju...@apache.org on 2014/07/15 17:26:35 UTC
svn commit: r1610727 - in
/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query:
ast/ComparisonImpl.java ast/Operator.java index/FilterImpl.java
Author: jukka
Date: Tue Jul 15 15:26:34 2014
New Revision: 1610727
URL: http://svn.apache.org/r1610727
Log:
OAK-1965: Support for constraints like: foo = 'X' OR bar = 'Y'
The IN operator is handled as a separate constraint type
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/ComparisonImpl.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/Operator.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/index/FilterImpl.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/ComparisonImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/ComparisonImpl.java?rev=1610727&r1=1610726&r2=1610727&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/ComparisonImpl.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/ComparisonImpl.java Tue Jul 15 15:26:34 2014
@@ -137,7 +137,6 @@ public class ComparisonImpl extends Cons
return p1.compareTo(p2) < 0;
case LIKE:
return evaluateLike(p1, p2);
- // case IN is not needed here, as this is handled in the class InImpl.
}
throw new IllegalArgumentException("Unknown operator: " + operator);
}
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/Operator.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/Operator.java?rev=1610727&r1=1610726&r2=1610727&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/Operator.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/Operator.java Tue Jul 15 15:26:34 2014
@@ -33,9 +33,7 @@ public enum Operator {
LESS_OR_EQUAL("<="),
- LIKE("like"),
-
- IN("in");
+ LIKE("like");
/**
* The name of this operator.
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/index/FilterImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/index/FilterImpl.java?rev=1610727&r1=1610726&r2=1610727&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/index/FilterImpl.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/index/FilterImpl.java Tue Jul 15 15:26:34 2014
@@ -350,8 +350,6 @@ public class FilterImpl implements Filte
x.first = v;
}
break;
- case IN:
-
}
if (x.first != null && x.last != null) {
if (x.first.compareTo(x.last) > 0) {