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 ch...@apache.org on 2014/11/26 13:41:20 UTC
svn commit: r1641802 - in /jackrabbit/oak/trunk/oak-lucene/src:
main/java/org/apache/jackrabbit/oak/plugins/index/lucene/
test/java/org/apache/jackrabbit/oak/plugins/index/lucene/
Author: chetanm
Date: Wed Nov 26 12:41:20 2014
New Revision: 1641802
URL: http://svn.apache.org/r1641802
Log:
OAK-2268 - Support index time Aggregation of repository nodes
If any node include based aggregate is defined that IndexDefinition supports fulltext
Modified:
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/Aggregate.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinition.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinitionTest.java
Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/Aggregate.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/Aggregate.java?rev=1641802&r1=1641801&r2=1641802&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/Aggregate.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/Aggregate.java Wed Nov 26 12:41:20 2014
@@ -26,7 +26,9 @@ import java.util.regex.Pattern;
import javax.annotation.CheckForNull;
+import com.google.common.base.Predicate;
import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.api.PropertyState;
@@ -53,6 +55,7 @@ class Aggregate {
private final List<? extends Include> includes;
final int reAggregationLimit;
private final List<NodeInclude> relativeNodeIncludes;
+ private final boolean nodeAggregates;
Aggregate(String nodeTypeName) {
this(nodeTypeName, Collections.<Include>emptyList());
@@ -68,6 +71,7 @@ class Aggregate {
this.includes = ImmutableList.copyOf(includes);
this.reAggregationLimit = recursionLimit;
this.relativeNodeIncludes = findRelativeNodeIncludes(includes);
+ this.nodeAggregates = hasNodeIncludes(includes);
}
public List<? extends Include> getIncludes() {
@@ -98,6 +102,10 @@ class Aggregate {
return false;
}
+ public boolean hasNodeAggregates(){
+ return nodeAggregates;
+ }
+
@Override
public String toString() {
return nodeTypeName;
@@ -144,6 +152,15 @@ class Aggregate {
return ImmutableList.copyOf(result);
}
+ private static boolean hasNodeIncludes(List<? extends Include> includes) {
+ return Iterables.any(includes, new Predicate<Include>() {
+ @Override
+ public boolean apply(Include input) {
+ return input instanceof NodeInclude;
+ }
+ });
+ }
+
public static interface AggregateMapper {
@CheckForNull
Aggregate getAggregate(String nodeTypeName);
Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinition.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinition.java?rev=1641802&r1=1641801&r2=1641802&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinition.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinition.java Wed Nov 26 12:41:20 2014
@@ -463,7 +463,7 @@ class IndexDefinition implements Aggrega
this.aggregate = combine(propAggregate, nodeTypeName);
this.namePatterns = ImmutableList.copyOf(namePatterns);
- this.fulltextEnabled = hasAnyFullTextEnabledProperty();
+ this.fulltextEnabled = aggregate.hasNodeAggregates() || hasAnyFullTextEnabledProperty();
this.propertyIndexEnabled = hasAnyPropertyIndexConfigured();
}
@@ -484,10 +484,10 @@ class IndexDefinition implements Aggrega
this.defaultStorageEnabled = original.defaultStorageEnabled;
this.inherited = original.inherited;
this.propertyTypes = original.propertyTypes;
- this.fulltextEnabled = original.fulltextEnabled;
this.propertyIndexEnabled = original.propertyIndexEnabled;
this.propAggregate = original.propAggregate;
this.aggregate = combine(propAggregate, nodeTypeName);
+ this.fulltextEnabled = aggregate.hasNodeAggregates() || original.fulltextEnabled;
}
/**
Modified: jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinitionTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinitionTest.java?rev=1641802&r1=1641801&r2=1641802&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinitionTest.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinitionTest.java Wed Nov 26 12:41:20 2014
@@ -22,6 +22,7 @@ package org.apache.jackrabbit.oak.plugin
import javax.jcr.PropertyType;
import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Iterables;
import org.apache.jackrabbit.JcrConstants;
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.commons.PathUtils;
@@ -393,6 +394,21 @@ public class IndexDefinitionTest {
assertNull("Property regex used should not allow relative properties", rule.getConfig("foo/bar"));
}
+ @Test
+ public void fulltextEnabledAndAggregate() throws Exception{
+ NodeBuilder defnb = newLucenePropertyIndexDefinition(builder.child(INDEX_DEFINITIONS_NAME),
+ "lucene", of("foo"), "async");
+ IndexDefinition defn = new IndexDefinition(root, defnb.getNodeState());
+ assertFalse(defn.isFullTextEnabled());
+
+ NodeBuilder aggregates = defnb.child(LuceneIndexConstants.AGGREGATES);
+ NodeBuilder aggFolder = aggregates.child("nt:base");
+ aggFolder.child("i1").setProperty(LuceneIndexConstants.AGG_PATH, "*");
+
+ defn = new IndexDefinition(root, defnb.getNodeState());
+ assertTrue(defn.isFullTextEnabled());
+ }
+
private static IndexingRule getRule(IndexDefinition defn, String typeName){
return defn.getApplicableIndexingRule(newTree(newNode(typeName)));