svn commit: r1810654 - in /jackrabbit/oak/trunk/oak-lucene/src: main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlanner.java test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlannerTest.java

[ch...@apache.org]

Author: chetanm
Date: Tue Oct  3 05:11:51 2017
New Revision: 1810654

URL: http://svn.apache.org/viewvc?rev=1810654&view=rev
Log:
OAK-6535 - Synchronous Lucene Property Indexes

Sync index should not be used if query has fulltext constraints

Modified:
    jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlanner.java
    jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlannerTest.java

Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlanner.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlanner.java?rev=1810654&r1=1810653&r2=1810654&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlanner.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlanner.java Tue Oct  3 05:11:51 2017
@@ -291,7 +291,7 @@ class IndexPlanner {
                 result.enableNodeNameRestriction();
             }
 
-            if (sortOrder.isEmpty()) {
+            if (sortOrder.isEmpty() && ft == null) {
                 boolean uniqueIndexFound = planForSyncIndexes();
                 if (uniqueIndexFound) {
                     //For unique index there would be at max 1 entry
@@ -628,7 +628,8 @@ class IndexPlanner {
 
     private boolean planForSyncIndexes() {
         //If no sync index involved then return right away
-        if (!definition.hasSyncPropertyDefinitions() || result.propDefns.isEmpty()) {
+        if (!definition.hasSyncPropertyDefinitions()
+                || result.propDefns.isEmpty()) {
             return false;
         }
 

Modified: jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlannerTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlannerTest.java?rev=1810654&r1=1810653&r2=1810654&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlannerTest.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlannerTest.java Tue Oct  3 05:11:51 2017
@@ -1099,6 +1099,30 @@ public class IndexPlannerTest {
         assertNull(hr);
     }
 
+    @Test
+    public void syncIndex_NotUsedWithFulltext() throws Exception{
+        IndexDefinitionBuilder defnb = new IndexDefinitionBuilder();
+        defnb.indexRule("nt:base").property("foo").propertyIndex().sync();
+        defnb.indexRule("nt:base").property("bar").analyzed();
+
+        IndexDefinition defn = new IndexDefinition(root, defnb.build(), "/foo");
+        IndexNode node = createIndexNode(defn, 100);
+
+        FilterImpl filter = createFilter("nt:base");
+        filter.restrictProperty("foo", Operator.EQUAL, PropertyValues.newString("bar"));
+        filter.setFullTextConstraint(FullTextParser.parse("bar", "mountain"));
+
+        IndexPlanner planner = new IndexPlanner(node, "/foo", filter,
+                ImmutableList.of(new OrderEntry("bar", Type.LONG, OrderEntry.Order.ASCENDING)));
+        QueryIndex.IndexPlan plan = planner.getPlan();
+        assertNotNull(plan);
+
+        assertEquals(100, plan.getEstimatedEntryCount());
+        PropertyIndexResult hr = pr(plan).getPropertyIndexResult();
+
+        assertNull(hr);
+    }
+
 
     private IndexPlanner createPlannerForFulltext(NodeState defn, FullTextExpression exp) throws IOException {
         IndexNode node = createIndexNode(new IndexDefinition(root, defn, "/foo"));