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 da...@apache.org on 2015/10/01 13:31:13 UTC
svn commit: r1706216 - in /jackrabbit/oak/branches/1.2: ./
oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/
oak-core/src/main/java/org/apache/jackrabbit/oak/query/fulltext/
oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/nodet...
Author: davide
Date: Thu Oct 1 11:31:12 2015
New Revision: 1706216
URL: http://svn.apache.org/viewvc?rev=1706216&view=rev
Log:
OAK-3371 - Wrong evaluation of NOT clause
- merging r1706212
Added:
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/NotFullTextImpl.java
- copied unchanged from r1706212, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/NotFullTextImpl.java
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/NotFullTextSearchImpl.java
- copied unchanged from r1706212, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/NotFullTextSearchImpl.java
Modified:
jackrabbit/oak/branches/1.2/ (props changed)
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/AstElementFactory.java
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/FullTextSearchImpl.java
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/query/fulltext/FullTextContains.java
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/query/fulltext/FullTextExpression.java
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/query/fulltext/package-info.java
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/nodetype/NodeTypeIndexQueryTest.java
jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndex.java
jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java
jackrabbit/oak/branches/1.2/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexAggregationTest.java
jackrabbit/oak/branches/1.2/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexQueryTest.java
Propchange: jackrabbit/oak/branches/1.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 1 11:31:12 2015
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673410,1673414-1673415,1673436,1673644,1673662-1673664,1673669,1673695,1673713,1673738,1673787,1673791,1674046,1674065,1674075,1674107,1674228,1674780,1674880,1675054-1675055,1675319,1675332,1675354,1675357,1675382,1675555,1675566,1675593,1676198,1676237,1676407,1676458,1676539,1676670,1676693,1676703,1676725,1677579,1677581,1677609,1677611,1677774,1677788,1677797,1677804,1677806,1677939,1677991,1678023,1678095-1678096,1678124,1678171,1678173,1678211,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679232,1679235,1679503,1679958,1679961,1680170,1680172,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680747,1680805-1680806,1680903,1681282,1681767,1681918,1681955,1682042,1682218,1682235,1682437,1682494,1682555,1682855,1682904,1683059,1683089,1683213,1683249,1683259,1683278,1683323,1683687,1683700,1684174-1684175,1684186,1684376,1684442,1684561,1684570,1684601,1684618,1684820
,1684868,1685023,1685075,1685370,1685552,1685589-1685590,1685840,1685964,1685977,1685989,1685999,1686023,1686032,1686097,1686162,1686229,1686234,1686253,1686414,1686780,1686854,1686857,1686971,1687053-1687055,1687175,1687196,1687198,1687220,1687239-1687240,1687301,1687441,1687553,1688089-1688090,1688172,1688179,1688349,1688421,1688436,1688453,1688616,1688622,1688634,1688636,1688817,1689003-1689004,1689008,1689577,1689581,1689623,1689810,1689828,1689831,1689833,1689903,1690017,1690043,1690047,1690057,1690247,1690249,1690634-1690637,1690650,1690669,1690674,1690885,1690941,1691139,1691151,1691159,1691167,1691183,1691188,1691210,1691280,1691307,1691331-1691333,1691345,1691384-1691385,1691401,1691509,1692133-1692134,1692156,1692250,1692274,1692363,1692382,1692478,1692955,1693002,1693030,1693209,1693421,1693525-1693526,1694007,1694393-1694394,1695050,1695122,1695280,1695299,1695457,1695482,1695507,1695521,1695540,1696194,1696242,1696285,1696578,1696759,1696916,1697363,1697373,1697410,1697
582,1697589,1697616,1697672,1700191,1700231,1700397,1700403,1700506,1700571,1700727,1700749,1700769,1700775,1701065,1701619,1701733,1701743,1701750,1701768,1701806,1701810,1701814,1701948,1701955,1701959,1701965,1701986,1702014,1702022,1702272,1702387,1702405,1702423,1702860,1702942,1702960,1703212,1703382,1703395,1703411,1703428,1703430,1703568,1703592,1703758,1703858,1703878,1704256,1704282,1704285,1704457,1704479,1704490,1704614,1704629,1704636,1704655,1704670,1704886,1705005,1705027,1705043,1705055,1705268,1705273,1705677,1705701
+/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673410,1673414-1673415,1673436,1673644,1673662-1673664,1673669,1673695,1673713,1673738,1673787,1673791,1674046,1674065,1674075,1674107,1674228,1674780,1674880,1675054-1675055,1675319,1675332,1675354,1675357,1675382,1675555,1675566,1675593,1676198,1676237,1676407,1676458,1676539,1676670,1676693,1676703,1676725,1677579,1677581,1677609,1677611,1677774,1677788,1677797,1677804,1677806,1677939,1677991,1678023,1678095-1678096,1678124,1678171,1678173,1678211,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679232,1679235,1679503,1679958,1679961,1680170,1680172,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680747,1680805-1680806,1680903,1681282,1681767,1681918,1681955,1682042,1682218,1682235,1682437,1682494,1682555,1682855,1682904,1683059,1683089,1683213,1683249,1683259,1683278,1683323,1683687,1683700,1684174-1684175,1684186,1684376,1684442,1684561,1684570,1684601,1684618,1684820
,1684868,1685023,1685075,1685370,1685552,1685589-1685590,1685840,1685964,1685977,1685989,1685999,1686023,1686032,1686097,1686162,1686229,1686234,1686253,1686414,1686780,1686854,1686857,1686971,1687053-1687055,1687175,1687196,1687198,1687220,1687239-1687240,1687301,1687441,1687553,1688089-1688090,1688172,1688179,1688349,1688421,1688436,1688453,1688616,1688622,1688634,1688636,1688817,1689003-1689004,1689008,1689577,1689581,1689623,1689810,1689828,1689831,1689833,1689903,1690017,1690043,1690047,1690057,1690247,1690249,1690634-1690637,1690650,1690669,1690674,1690885,1690941,1691139,1691151,1691159,1691167,1691183,1691188,1691210,1691280,1691307,1691331-1691333,1691345,1691384-1691385,1691401,1691509,1692133-1692134,1692156,1692250,1692274,1692363,1692382,1692478,1692955,1693002,1693030,1693209,1693421,1693525-1693526,1694007,1694393-1694394,1695050,1695122,1695280,1695299,1695457,1695482,1695507,1695521,1695540,1696194,1696242,1696285,1696578,1696759,1696916,1697363,1697373,1697410,1697
582,1697589,1697616,1697672,1700191,1700231,1700397,1700403,1700506,1700571,1700727,1700749,1700769,1700775,1701065,1701619,1701733,1701743,1701750,1701768,1701806,1701810,1701814,1701948,1701955,1701959,1701965,1701986,1702014,1702022,1702272,1702387,1702405,1702423,1702860,1702942,1702960,1703212,1703382,1703395,1703411,1703428,1703430,1703568,1703592,1703758,1703858,1703878,1704256,1704282,1704285,1704457,1704479,1704490,1704614,1704629,1704636,1704655,1704670,1704886,1705005,1705027,1705043,1705055,1705268,1705273,1705677,1705701,1706212
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/AstElementFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/AstElementFactory.java?rev=1706216&r1=1706215&r2=1706216&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/AstElementFactory.java (original)
+++ jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/AstElementFactory.java Thu Oct 1 11:31:12 2015
@@ -104,6 +104,9 @@ public class AstElementFactory {
}
public NotImpl not(ConstraintImpl constraint) {
+ if (constraint instanceof FullTextSearchImpl) {
+ return new NotFullTextImpl((FullTextSearchImpl) constraint);
+ }
return new NotImpl(constraint);
}
Modified: jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/FullTextSearchImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/FullTextSearchImpl.java?rev=1706216&r1=1706215&r2=1706216&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/FullTextSearchImpl.java (original)
+++ jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/FullTextSearchImpl.java Thu Oct 1 11:31:12 2015
@@ -50,10 +50,10 @@ public class FullTextSearchImpl extends
*/
public static final boolean JACKRABBIT_2_SINGLE_QUOTED_PHRASE = true;
- private final String selectorName;
+ final String selectorName;
private final String relativePath;
- private final String propertyName;
- private final StaticOperandImpl fullTextSearchExpression;
+ final String propertyName;
+ final StaticOperandImpl fullTextSearchExpression;
private SelectorImpl selector;
public FullTextSearchImpl(
@@ -139,7 +139,7 @@ public class FullTextSearchImpl extends
p = PathUtils.concat(relativePath, p);
}
String p2 = normalizePropertyName(p);
- String rawText = v.getValue(Type.STRING);
+ String rawText = getRawText(v);
FullTextExpression e = FullTextParser.parse(p2, rawText);
return new FullTextContains(p2, rawText, e);
} catch (ParseException e) {
@@ -147,11 +147,30 @@ public class FullTextSearchImpl extends
}
}
+ String getRawText(PropertyValue v) {
+ return v.getValue(Type.STRING);
+ }
+
@Override
public Set<SelectorImpl> getSelectors() {
return Collections.singleton(selector);
}
+ /**
+ * verify that a property exists in the node. {@code property IS NOT NULL}
+ *
+ * @param propertyName the property to check
+ * @param selector the selector to work with
+ * @return true if the property is there, false otherwise.
+ */
+ boolean enforcePropertyExistence(String propertyName, SelectorImpl selector) {
+ PropertyValue p = selector.currentProperty(propertyName);
+ if (p == null) {
+ return false;
+ }
+ return true;
+ }
+
@Override
public boolean evaluate() {
// disable evaluation if a fulltext index is used,
@@ -163,10 +182,7 @@ public class FullTextSearchImpl extends
// condition checks out, this takes out some extra rows from the index
// aggregation bits
if (relativePath == null && propertyName != null) {
- PropertyValue p = selector.currentProperty(propertyName);
- if (p == null) {
- return false;
- }
+ return enforcePropertyExistence(propertyName, selector);
}
return true;
}
@@ -259,7 +275,7 @@ public class FullTextSearchImpl extends
p = PathUtils.concat(p, relativePath);
}
p = normalizePropertyName(p);
- f.restrictProperty(p, Operator.NOT_EQUAL, null);
+ restrictPropertyOnFilter(p, f);
}
}
f.restrictFulltextCondition(fullTextSearchExpression.currentValue().getValue(Type.STRING));
@@ -272,4 +288,14 @@ public class FullTextSearchImpl extends
}
}
+ /**
+ * restrict the provided property to the property to the provided filter achieving so
+ * {@code property IS NOT NULL}
+ *
+ * @param propertyName
+ * @param f
+ */
+ void restrictPropertyOnFilter(String propertyName, FilterImpl f) {
+ f.restrictProperty(propertyName, Operator.NOT_EQUAL, null);
+ }
}
Modified: jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/query/fulltext/FullTextContains.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/query/fulltext/FullTextContains.java?rev=1706216&r1=1706215&r2=1706216&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/query/fulltext/FullTextContains.java (original)
+++ jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/query/fulltext/FullTextContains.java Thu Oct 1 11:31:12 2015
@@ -75,4 +75,8 @@ public class FullTextContains extends Fu
return rawText;
}
+ @Override
+ public boolean isNot() {
+ return base.isNot();
+ }
}
Modified: jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/query/fulltext/FullTextExpression.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/query/fulltext/FullTextExpression.java?rev=1706216&r1=1706215&r2=1706216&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/query/fulltext/FullTextExpression.java (original)
+++ jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/query/fulltext/FullTextExpression.java Thu Oct 1 11:31:12 2015
@@ -89,4 +89,13 @@ public abstract class FullTextExpression
*/
public abstract boolean accept(FullTextVisitor v);
+ /**
+ * whether the current {@link FullTextExpression} is a {@code NOT} condition or not. Default is
+ * false
+ *
+ * @return true if the current condition represent a NOT, false otherwise.
+ */
+ public boolean isNot() {
+ return false;
+ }
}
\ No newline at end of file
Modified: jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/query/fulltext/package-info.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/query/fulltext/package-info.java?rev=1706216&r1=1706215&r2=1706216&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/query/fulltext/package-info.java (original)
+++ jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/query/fulltext/package-info.java Thu Oct 1 11:31:12 2015
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-@Version("1.0")
+@Version("1.1")
@Export(optional = "provide:=true")
package org.apache.jackrabbit.oak.query.fulltext;
Modified: jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/nodetype/NodeTypeIndexQueryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/nodetype/NodeTypeIndexQueryTest.java?rev=1706216&r1=1706215&r2=1706216&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/nodetype/NodeTypeIndexQueryTest.java (original)
+++ jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/nodetype/NodeTypeIndexQueryTest.java Thu Oct 1 11:31:12 2015
@@ -20,8 +20,14 @@ import static com.google.common.collect.
import static org.apache.jackrabbit.JcrConstants.JCR_MIXINTYPES;
import static org.apache.jackrabbit.JcrConstants.JCR_PRIMARYTYPE;
import static org.apache.jackrabbit.oak.plugins.index.IndexUtils.createIndexDefinition;
+import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.NT_UNSTRUCTURED;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
import java.util.ArrayList;
+import java.util.List;
+
+import javax.jcr.query.Query;
import org.apache.jackrabbit.oak.Oak;
import org.apache.jackrabbit.oak.api.ContentRepository;
@@ -48,8 +54,10 @@ public class NodeTypeIndexQueryTest exte
.createContentRepository();
}
- private static void child(Tree t, String n, String type) {
- t.addChild(n).setProperty(JCR_PRIMARYTYPE, type, Type.NAME);
+ private static Tree child(Tree t, String n, String type) {
+ Tree t1 = t.addChild(n);
+ t1.setProperty(JCR_PRIMARYTYPE, type, Type.NAME);
+ return t1;
}
private static void mixLanguage(Tree t, String n) {
@@ -84,4 +92,33 @@ public class NodeTypeIndexQueryTest exte
setTraversalEnabled(true);
}
+
+ @Test
+ public void oak3371() throws Exception {
+ setTraversalEnabled(false);
+ Tree t, t1;
+
+ NodeUtil n = new NodeUtil(root.getTree("/oak:index"));
+ createIndexDefinition(n, "nodeType", false, new String[] {
+ JCR_PRIMARYTYPE }, new String[] { NT_UNSTRUCTURED });
+
+ root.commit();
+
+ t = root.getTree("/");
+ t = child(t, "test", NT_UNSTRUCTURED);
+ t1 = child(t, "a", NT_UNSTRUCTURED);
+ t1.setProperty("foo", "bar");
+ child(t, "b", NT_UNSTRUCTURED);
+
+ root.commit();
+
+ List<String> plan = executeQuery(
+ "explain SELECT * FROM [nt:unstructured] WHERE ISDESCENDANTNODE([/test]) AND NOT CONTAINS(foo, 'bar')",
+ Query.JCR_SQL2, false);
+
+ assertEquals(1, plan.size());
+ assertTrue(plan.get(0).contains("no-index"));
+
+ setTraversalEnabled(true);
+ }
}
\ No newline at end of file
Modified: jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndex.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndex.java?rev=1706216&r1=1706215&r2=1706216&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndex.java (original)
+++ jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndex.java Thu Oct 1 11:31:12 2015
@@ -70,7 +70,6 @@ import org.apache.jackrabbit.oak.spi.que
import org.apache.jackrabbit.oak.spi.query.IndexRow;
import org.apache.jackrabbit.oak.spi.query.PropertyValues;
import org.apache.jackrabbit.oak.spi.query.QueryConstants;
-import org.apache.jackrabbit.oak.spi.query.QueryIndex;
import org.apache.jackrabbit.oak.spi.query.QueryIndex.AdvanceFulltextQueryIndex;
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.apache.lucene.analysis.Analyzer;
@@ -587,14 +586,8 @@ public class LuceneIndex implements Adva
if (qs.size() == 0) {
return new LuceneRequestFacade<Query>(new MatchAllDocsQuery());
}
- if (qs.size() == 1) {
- return new LuceneRequestFacade<Query>(qs.get(0));
- }
- BooleanQuery bq = new BooleanQuery();
- for (Query q : qs) {
- bq.add(q, MUST);
- }
- return new LuceneRequestFacade<Query>(bq);
+
+ return LucenePropertyIndex.performAdditionalWraps(qs);
}
private static void addNonFullTextConstraints(List<Query> qs,
Modified: jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java?rev=1706216&r1=1706215&r2=1706216&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java (original)
+++ jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java Thu Oct 1 11:31:12 2015
@@ -29,6 +29,7 @@ import java.util.Set;
import java.util.concurrent.atomic.AtomicReference;
import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import javax.jcr.PropertyType;
@@ -37,6 +38,7 @@ import com.google.common.collect.Iterabl
import com.google.common.collect.Lists;
import com.google.common.collect.Queues;
import com.google.common.collect.Sets;
+
import org.apache.jackrabbit.oak.api.PropertyValue;
import org.apache.jackrabbit.oak.api.Result.SizePrecision;
import org.apache.jackrabbit.oak.api.Type;
@@ -102,6 +104,7 @@ import org.apache.lucene.util.Version;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState;
import static com.google.common.collect.Lists.newArrayListWithCapacity;
import static org.apache.jackrabbit.JcrConstants.JCR_MIXINTYPES;
@@ -653,16 +656,73 @@ public class LucenePropertyIndex impleme
throw new IllegalStateException("No query created for filter " + filter);
}
+ return performAdditionalWraps(qs);
+ }
+
+ /**
+ * Perform additional wraps on the list of queries to allow, for example, the NOT CONTAINS to
+ * play properly when sent to lucene.
+ *
+ * @param qs the list of queries. Cannot be null.
+ * @return
+ */
+ @Nonnull
+ public static LuceneRequestFacade<Query> performAdditionalWraps(@Nonnull List<Query> qs) {
+ checkNotNull(qs);
if (qs.size() == 1) {
+ Query q = qs.get(0);
+ if (q instanceof BooleanQuery) {
+ BooleanQuery ibq = (BooleanQuery) q;
+ boolean onlyNotClauses = true;
+ for (BooleanClause c : ibq.getClauses()) {
+ if (c.getOccur() != BooleanClause.Occur.MUST_NOT) {
+ onlyNotClauses = false;
+ break;
+ }
+ }
+ if (onlyNotClauses) {
+ // if we have only NOT CLAUSES we have to add a match all docs (*.*) for the
+ // query to work
+ ibq.add(new MatchAllDocsQuery(), BooleanClause.Occur.SHOULD);
+ }
+ }
return new LuceneRequestFacade<Query>(qs.get(0));
}
BooleanQuery bq = new BooleanQuery();
for (Query q : qs) {
- bq.add(q, MUST);
+ boolean unwrapped = false;
+ if (q instanceof BooleanQuery) {
+ unwrapped = unwrapMustNot((BooleanQuery) q, bq);
+ }
+
+ if (!unwrapped) {
+ bq.add(q, MUST);
+ }
}
return new LuceneRequestFacade<Query>(bq);
}
+ /**
+ * unwraps any NOT clauses from the provided boolean query into another boolean query.
+ *
+ * @param input the query to be analysed for the existence of NOT clauses. Cannot be null.
+ * @param output the query where the unwrapped NOTs will be saved into. Cannot be null.
+ * @return true if there where at least one unwrapped NOT. false otherwise.
+ */
+ private static boolean unwrapMustNot(@Nonnull BooleanQuery input, @Nonnull BooleanQuery output) {
+ checkNotNull(input);
+ checkNotNull(output);
+ boolean unwrapped = false;
+ for (BooleanClause bc : input.getClauses()) {
+ if (bc.getOccur() == BooleanClause.Occur.MUST_NOT) {
+ output.add(bc);
+ unwrapped = true;
+ }
+ }
+
+ return unwrapped;
+ }
+
private CustomScoreQuery getCustomScoreQuery(IndexPlan plan, Query subQuery) {
PlanResult planResult = getPlanResult(plan);
IndexDefinition idxDef = planResult.indexDefinition;
@@ -1027,7 +1087,7 @@ public class LucenePropertyIndex impleme
@Override
public boolean visit(FullTextContains contains) {
- visitTerm(contains.getPropertyName(), contains.getRawText(), null, false);
+ visitTerm(contains.getPropertyName(), contains.getRawText(), null, contains.isNot());
return true;
}
Modified: jackrabbit/oak/branches/1.2/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexAggregationTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexAggregationTest.java?rev=1706216&r1=1706215&r2=1706216&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexAggregationTest.java (original)
+++ jackrabbit/oak/branches/1.2/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexAggregationTest.java Thu Oct 1 11:31:12 2015
@@ -16,6 +16,7 @@
*/
package org.apache.jackrabbit.oak.plugins.index.lucene;
+import static com.google.common.collect.ImmutableList.of;
import static com.google.common.collect.Lists.newArrayList;
import static org.apache.jackrabbit.JcrConstants.JCR_CONTENT;
import static org.apache.jackrabbit.JcrConstants.JCR_PRIMARYTYPE;
@@ -28,15 +29,19 @@ import java.util.Calendar;
import org.apache.jackrabbit.JcrConstants;
import org.apache.jackrabbit.oak.Oak;
+import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.api.ContentRepository;
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.api.Type;
+import org.apache.jackrabbit.oak.plugins.index.IndexConstants;
import org.apache.jackrabbit.oak.plugins.index.aggregate.NodeAggregator;
import org.apache.jackrabbit.oak.plugins.index.aggregate.SimpleNodeAggregator;
import static org.apache.jackrabbit.oak.plugins.index.lucene.TestUtil.newNodeAggregator;
import static org.apache.jackrabbit.oak.plugins.index.lucene.TestUtil.useV2;
import static org.apache.jackrabbit.oak.plugins.memory.BinaryPropertyState.binaryProperty;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
import org.apache.jackrabbit.oak.plugins.nodetype.write.InitialContent;
import org.apache.jackrabbit.oak.query.AbstractQueryTest;
@@ -412,4 +417,55 @@ public class LuceneIndexAggregationTest
"xpath", ImmutableList.of("/myFolder", "/myFolder/myFile", "/myFolder/myFile/jcr:content"));
}
+ @Test
+ public void oak3371AggregateV2() throws CommitFailedException {
+ oak3371();
+ }
+
+ @Test
+ public void oak3371AggregateV1() throws CommitFailedException {
+
+ Tree indexdef = root.getTree("/oak:index/" + TEST_INDEX_NAME);
+ assertNotNull(indexdef);
+ assertTrue(indexdef.exists());
+ indexdef.setProperty(LuceneIndexConstants.COMPAT_MODE, 1L);
+ indexdef.setProperty(IndexConstants.REINDEX_PROPERTY_NAME, true);
+ root.commit();
+
+ oak3371();
+ }
+
+ private void oak3371() throws CommitFailedException {
+ setTraversalEnabled(false);
+ Tree test, t;
+
+ test = root.getTree("/").addChild("test");
+ t = test.addChild("a");
+ t.setProperty(JCR_PRIMARYTYPE, NT_FOLDER, Type.NAME);
+ t.setProperty("foo", "bar");
+ t = test.addChild("b");
+ t.setProperty(JCR_PRIMARYTYPE, NT_FOLDER, Type.NAME);
+ t.setProperty("foo", "cat");
+ t = test.addChild("c");
+ t.setProperty(JCR_PRIMARYTYPE, NT_FOLDER, Type.NAME);
+ t = test.addChild("d");
+ t.setProperty(JCR_PRIMARYTYPE, NT_FOLDER, Type.NAME);
+ t.setProperty("foo", "bar cat");
+ root.commit();
+
+ assertQuery(
+ "SELECT * FROM [nt:folder] WHERE ISDESCENDANTNODE('/test') AND CONTAINS(foo, 'bar')",
+ of("/test/a", "/test/d"));
+ assertQuery(
+ "SELECT * FROM [nt:folder] WHERE ISDESCENDANTNODE('/test') AND NOT CONTAINS(foo, 'bar')",
+ of("/test/b", "/test/c"));
+ assertQuery(
+ "SELECT * FROM [nt:folder] WHERE ISDESCENDANTNODE('/test') AND CONTAINS(foo, 'bar cat')",
+ of("/test/d"));
+ assertQuery(
+ "SELECT * FROM [nt:folder] WHERE ISDESCENDANTNODE('/test') AND NOT CONTAINS(foo, 'bar cat')",
+ of("/test/c"));
+
+ setTraversalEnabled(true);
+ }
}
Modified: jackrabbit/oak/branches/1.2/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexQueryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexQueryTest.java?rev=1706216&r1=1706215&r2=1706216&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexQueryTest.java (original)
+++ jackrabbit/oak/branches/1.2/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexQueryTest.java Thu Oct 1 11:31:12 2015
@@ -514,4 +514,46 @@ public class LuceneIndexQueryTest extend
walktree(t1);
}
}
+
+ private static Tree child(Tree t, String n, String type) {
+ Tree t1 = t.addChild(n);
+ t1.setProperty(JCR_PRIMARYTYPE, type, Type.NAME);
+ return t1;
+ }
+
+ @Test
+ public void oak3371() throws Exception {
+ setTraversalEnabled(false);
+ Tree t, t1;
+
+ t = root.getTree("/");
+ t = child(t, "test", NT_UNSTRUCTURED);
+ t1 = child(t, "a", NT_UNSTRUCTURED);
+ t1.setProperty("foo", "bar");
+ t1 = child(t, "b", NT_UNSTRUCTURED);
+ t1.setProperty("foo", "cat");
+ t1 = child(t, "c", NT_UNSTRUCTURED);
+ t1 = child(t, "d", NT_UNSTRUCTURED);
+ t1.setProperty("foo", "bar cat");
+
+ root.commit();
+
+ assertQuery(
+ "SELECT * FROM [nt:unstructured] WHERE ISDESCENDANTNODE('/test') AND CONTAINS(foo, 'bar')",
+ of("/test/a", "/test/d"));
+
+ assertQuery(
+ "SELECT * FROM [nt:unstructured] WHERE ISDESCENDANTNODE('/test') AND NOT CONTAINS(foo, 'bar')",
+ of("/test/b", "/test/c"));
+
+ assertQuery(
+ "SELECT * FROM [nt:unstructured] WHERE ISDESCENDANTNODE('/test') AND CONTAINS(foo, 'bar cat')",
+ of("/test/d"));
+
+ assertQuery(
+ "SELECT * FROM [nt:unstructured] WHERE ISDESCENDANTNODE('/test') AND NOT CONTAINS(foo, 'bar cat')",
+ of("/test/c"));
+
+ setTraversalEnabled(true);
+ }
}