Author: chetanm
Date: Tue Oct 3 05:08:58 2017
New Revision: 1810641
URL: http://svn.apache.org/viewvc?rev=1810641&view=rev
Log:
OAK-6535 - Synchronous Lucene Property Indexes
Ensure that sync indexes are not used when query has sorting enabled as
property index result cannot be merged with sorted lucene index result
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=1810641&r1=1810640&r2=1810641&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:08:58 2017
@@ -291,10 +291,12 @@ class IndexPlanner {
result.enableNodeNameRestriction();
}
- boolean uniqueIndexFound = planForSyncIndexes();
- if (uniqueIndexFound) {
- //For unique index there would be at max 1 entry
- plan.setEstimatedEntryCount(1);
+ if (sortOrder.isEmpty()) {
+ boolean uniqueIndexFound = planForSyncIndexes();
+ if (uniqueIndexFound) {
+ //For unique index there would be at max 1 entry
+ plan.setEstimatedEntryCount(1);
+ }
}
return plan.setCostPerEntry(definition.getCostPerEntry() /
costPerEntryFactor);
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=1810641&r1=1810640&r2=1810641&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:08:58 2017
@@ -1076,6 +1076,29 @@ public class IndexPlannerTest {
assertEquals("foo", hr.pr.propertyName);
}
+ @Test
+ public void syncIndex_NotUsedWithSort() throws Exception{
+ IndexDefinitionBuilder defnb = new IndexDefinitionBuilder();
+ defnb.indexRule("nt:base").property("foo").propertyIndex().sync();
+ defnb.indexRule("nt:base").property("bar").propertyIndex().ordered();
+
+ 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"));
+
+ 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"));
