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 to...@apache.org on 2019/02/21 14:46:28 UTC
svn commit: r1854055 - in /jackrabbit/oak/trunk/oak-solr-core/src:
main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/
main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/nodestate/
main/java/org/apache/jackrabbit/oak...
Author: tommaso
Date: Thu Feb 21 14:46:28 2019
New Revision: 1854055
URL: http://svn.apache.org/viewvc?rev=1854055&view=rev
Log:
OAK-8072 - aggregate jcr:content search results as their parents
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/DefaultSolrConfiguration.java
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/OakSolrConfiguration.java
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/OakSolrConfigurationDefaults.java
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/nodestate/OakSolrNodeStateConfiguration.java
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/OakSolrConfigurationProviderService.java
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/SolrQueryIndexProviderService.java
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java
jackrabbit/oak/trunk/oak-solr-core/src/main/resources/solr/oak/conf/schema.xml
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrIndexIT.java
Modified: jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/DefaultSolrConfiguration.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/DefaultSolrConfiguration.java?rev=1854055&r1=1854054&r2=1854055&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/DefaultSolrConfiguration.java (original)
+++ jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/DefaultSolrConfiguration.java Thu Feb 21 14:46:28 2019
@@ -125,6 +125,11 @@ public class DefaultSolrConfiguration im
return OakSolrConfigurationDefaults.COLLAPSE_JCR_CONTENT_NODES;
}
+ @Override
+ public boolean collapseJcrContentParents() {
+ return OakSolrConfigurationDefaults.COLLAPSE_JCR_CONTENT_PARENTS;
+ }
+
@NotNull
@Override
public String getCollapsedPathField() {
Modified: jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/OakSolrConfiguration.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/OakSolrConfiguration.java?rev=1854055&r1=1854054&r2=1854055&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/OakSolrConfiguration.java (original)
+++ jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/OakSolrConfiguration.java Thu Feb 21 14:46:28 2019
@@ -141,6 +141,14 @@ public interface OakSolrConfiguration {
boolean collapseJcrContentNodes();
/**
+ * Make all nodes / documents matching a query having name equals to 'jcr:content' collapse into their respective
+ * parent.
+ * @return {@code true} if only the parent of 'jcr:content' nodes should be returned,
+ * {@code false} otherwise
+ */
+ boolean collapseJcrContentParents();
+
+ /**
* Provide the name of the field to be used for indexing the collapsed path of each node when {@link #collapseJcrContentNodes()}
* is set to {@code true}.
*
Modified: jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/OakSolrConfigurationDefaults.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/OakSolrConfigurationDefaults.java?rev=1854055&r1=1854054&r2=1854055&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/OakSolrConfigurationDefaults.java (original)
+++ jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/OakSolrConfigurationDefaults.java Thu Feb 21 14:46:28 2019
@@ -41,4 +41,5 @@ public class OakSolrConfigurationDefault
public static final boolean COLLAPSE_JCR_CONTENT_NODES = false;
public static final String COLLAPSED_PATH_FIELD = "path_collapsed";
public static final String PATH_DEPTH_FIELD = "path_depth";
+ public static final boolean COLLAPSE_JCR_CONTENT_PARENTS = true;
}
Modified: jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/nodestate/OakSolrNodeStateConfiguration.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/nodestate/OakSolrNodeStateConfiguration.java?rev=1854055&r1=1854054&r2=1854055&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/nodestate/OakSolrNodeStateConfiguration.java (original)
+++ jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/nodestate/OakSolrNodeStateConfiguration.java Thu Feb 21 14:46:28 2019
@@ -183,6 +183,11 @@ public class OakSolrNodeStateConfigurati
return getBooleanValueFor(Properties.COLLAPSE_JCR_CONTENT_NODES, OakSolrConfigurationDefaults.COLLAPSE_JCR_CONTENT_NODES);
}
+ @Override
+ public boolean collapseJcrContentParents() {
+ return getBooleanValueFor(Properties.COLLAPSE_JCR_CONTENT_PARENTS, OakSolrConfigurationDefaults.COLLAPSE_JCR_CONTENT_PARENTS);
+ }
+
@NotNull
@Override
public String getCollapsedPathField() {
@@ -260,5 +265,6 @@ public class OakSolrNodeStateConfigurati
public static final String USED_PROPERTIES = "usedProperties";
public static final String COLLAPSE_JCR_CONTENT_NODES = "collapseJcrContentNodes";
public static final String DEPTH_FIELD= "depthField";
+ public static final String COLLAPSE_JCR_CONTENT_PARENTS = "collapseJcrContentParents";
}
}
Modified: jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/OakSolrConfigurationProviderService.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/OakSolrConfigurationProviderService.java?rev=1854055&r1=1854054&r2=1854055&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/OakSolrConfigurationProviderService.java (original)
+++ jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/OakSolrConfigurationProviderService.java Thu Feb 21 14:46:28 2019
@@ -110,6 +110,9 @@ public class OakSolrConfigurationProvide
@Property(boolValue = OakSolrConfigurationDefaults.COLLAPSE_JCR_CONTENT_NODES, label = "collapse jcr:content nodes")
private static final String COLLAPSE_JCR_CONTENT_NODES = "collapse.jcrcontent.nodes";
+ @Property(boolValue = OakSolrConfigurationDefaults.COLLAPSE_JCR_CONTENT_PARENTS, label = "collapse jcr:content parents")
+ private static final String COLLAPSE_JCR_CONTENT_PARENTS = "collapse.jcrcontent.parents";
+
private String pathChildrenFieldName;
private String pathParentFieldName;
private String pathDescendantsFieldName;
@@ -126,6 +129,7 @@ public class OakSolrConfigurationProvide
private String[] typeMappings;
private String[] propertyMappings;
private boolean collapseJcrContentNodes;
+ private boolean collapseJcrContentParents;
private String depthField;
private OakSolrConfiguration oakSolrConfiguration;
@@ -149,6 +153,7 @@ public class OakSolrConfigurationProvide
usedProperties = PropertiesUtil.toStringArray(componentContext.getProperties().get(USED_PROPERTIES));
propertyMappings = PropertiesUtil.toStringArray(componentContext.getProperties().get(PROPERTY_MAPPINGS));
collapseJcrContentNodes = Boolean.valueOf(String.valueOf(componentContext.getProperties().get(COLLAPSE_JCR_CONTENT_NODES)));
+ collapseJcrContentParents = Boolean.valueOf(String.valueOf(componentContext.getProperties().get(COLLAPSE_JCR_CONTENT_PARENTS)));
}
@Deactivate
@@ -281,6 +286,11 @@ public class OakSolrConfigurationProvide
return collapseJcrContentNodes;
}
+ @Override
+ public boolean collapseJcrContentParents() {
+ return collapseJcrContentParents;
+ }
+
@NotNull
@Override
public String getCollapsedPathField() {
Modified: jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/SolrQueryIndexProviderService.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/SolrQueryIndexProviderService.java?rev=1854055&r1=1854054&r2=1854055&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/SolrQueryIndexProviderService.java (original)
+++ jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/SolrQueryIndexProviderService.java Thu Feb 21 14:46:28 2019
@@ -48,7 +48,7 @@ import org.slf4j.LoggerFactory;
@Component(metatype = true, immediate = true, label = "Apache Jackrabbit Oak Solr Query index provider configuration")
public class SolrQueryIndexProviderService {
- private static final boolean QUERY_TIME_AGGREGATION_DEFAULT = false;
+ private static final boolean QUERY_TIME_AGGREGATION_DEFAULT = true;
private final Logger log = LoggerFactory.getLogger(getClass());
Modified: jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java?rev=1854055&r1=1854054&r2=1854055&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java (original)
+++ jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java Thu Feb 21 14:46:28 2019
@@ -33,6 +33,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.JcrConstants;
import org.apache.jackrabbit.oak.api.PropertyValue;
import org.apache.jackrabbit.oak.api.Result.SizePrecision;
import org.apache.jackrabbit.oak.commons.PathUtils;
@@ -690,7 +691,12 @@ public class SolrQueryIndex implements F
@Override
public String next() {
currentRow = it.next();
- return currentRow.path;
+ String path = currentRow.path;
+ if (configuration.collapseJcrContentParents() && path.endsWith(JcrConstants.JCR_CONTENT)) {
+ return PathUtils.getParentPath(path);
+ } else {
+ return path;
+ }
}
@Override
Modified: jackrabbit/oak/trunk/oak-solr-core/src/main/resources/solr/oak/conf/schema.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/resources/solr/oak/conf/schema.xml?rev=1854055&r1=1854054&r2=1854055&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-solr-core/src/main/resources/solr/oak/conf/schema.xml (original)
+++ jackrabbit/oak/trunk/oak-solr-core/src/main/resources/solr/oak/conf/schema.xml Thu Feb 21 14:46:28 2019
@@ -123,7 +123,7 @@
<field name=":suggest-weight" type="tint" indexed="false" stored="false" default="1" docValues="true"/>
<field name=":suggest" type="string" indexed="true" stored="true" multiValued="true" />
<field name=":spellcheck" type="spellcheck" indexed="true" stored="false" multiValued="true" />
- <field name="path_collapsed" type="string" indexed="true" stored="false"/>
+ <field name="path_collapsed" type="string" indexed="true" stored="false" docValues="true"/>
<field name="path_depth" type="tint" indexed="true" stored="false"/>
<field name="_version_" type="long" indexed="true" stored="true"/>
Modified: jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrIndexIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrIndexIT.java?rev=1854055&r1=1854054&r2=1854055&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrIndexIT.java (original)
+++ jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrIndexIT.java Thu Feb 21 14:46:28 2019
@@ -27,6 +27,7 @@ import org.apache.jackrabbit.oak.Oak;
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.aggregate.SimpleNodeAggregator;
import org.apache.jackrabbit.oak.plugins.index.solr.configuration.DefaultSolrConfigurationProvider;
import org.apache.jackrabbit.oak.plugins.index.solr.index.SolrIndexEditorProvider;
import org.apache.jackrabbit.oak.plugins.index.solr.server.DefaultSolrServerProvider;
@@ -41,7 +42,6 @@ import org.junit.rules.TestName;
import static java.util.Arrays.asList;
import static org.apache.jackrabbit.oak.api.Type.STRINGS;
import static org.junit.Assert.*;
-import static org.junit.Assume.assumeTrue;
/**
* General query extensive testcase for {@link SolrQueryIndex}
@@ -73,7 +73,7 @@ public class SolrIndexIT extends Abstrac
DefaultSolrConfigurationProvider oakSolrConfigurationProvider = new DefaultSolrConfigurationProvider();
return new Oak().with(new InitialContent())
.with(new OpenSecurityProvider())
- .with(new SolrQueryIndexProvider(solrServerProvider, oakSolrConfigurationProvider))
+ .with(new SolrQueryIndexProvider(solrServerProvider, oakSolrConfigurationProvider, new SimpleNodeAggregator()))
.with(new SolrIndexEditorProvider(solrServerProvider, oakSolrConfigurationProvider))
.createContentRepository();
} catch (Exception e) {
@@ -634,9 +634,33 @@ public class SolrIndexIT extends Abstrac
Iterator<String> result = executeQuery(xpath, XPATH).iterator();
assertTrue(result.hasNext());
- assertEquals("/test/content/sample1/jcr:content", result.next());
+ assertEquals("/test/content/sample1", result.next());
assertTrue(result.hasNext());
- assertEquals("/test/content/sample2/jcr:content", result.next());
+ assertEquals("/test/content/sample2", result.next());
+ assertFalse(result.hasNext());
+ }
+
+ @Test
+ public void testJcrContentNodeChild() throws Exception {
+
+ Tree index = root.getTree("/oak:index/" + TEST_INDEX_NAME);
+ assertTrue(index.exists());
+
+ Tree test = root.getTree("/").addChild("test");
+ Tree content = test.addChild("content");
+ Tree content1 = content.addChild("sample1").addChild("jcr:content");
+ content1.setProperty("text", "bar");
+ Tree content2 = content.addChild("sample2").addChild("jcr:content");
+ content2.setProperty("foo", "bar");
+ root.commit();
+
+ String xpath = "/jcr:root/test/content//element(*, nt:base)[jcr:contains(., 'bar')]";
+
+ Iterator<String> result = executeQuery(xpath, XPATH).iterator();
+ assertTrue(result.hasNext());
+ assertEquals("/test/content/sample1", result.next());
+ assertTrue(result.hasNext());
+ assertEquals("/test/content/sample2", result.next());
assertFalse(result.hasNext());
}