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 2017/02/06 15:11:20 UTC
svn commit: r1781915 - in /jackrabbit/oak/branches/1.6: ./
oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/
oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/
oak-lucene/src/test/java/org/apache/jackra...
Author: tommaso
Date: Mon Feb 6 15:11:20 2017
New Revision: 1781915
URL: http://svn.apache.org/viewvc?rev=1781915&view=rev
Log:
OAK-5536 - mv facets configs for relative properties are persisted in separate descendants of facets node, fixed facet indexing when participating in aggregation (branch 1.6)
Modified:
jackrabbit/oak/branches/1.6/ (props changed)
jackrabbit/oak/branches/1.6/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneDocumentMaker.java
jackrabbit/oak/branches/1.6/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/NodeStateFacetsConfig.java
jackrabbit/oak/branches/1.6/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/NodeStateFacetsConfigTest.java
Propchange: jackrabbit/oak/branches/1.6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 6 15:11:20 2017
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1781068,1781075,1781386,1781846
+/jackrabbit/oak/trunk:1781068,1781075,1781386,1781846,1781907
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.6/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneDocumentMaker.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneDocumentMaker.java?rev=1781915&r1=1781914&r2=1781915&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.6/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneDocumentMaker.java (original)
+++ jackrabbit/oak/branches/1.6/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneDocumentMaker.java Mon Feb 6 15:11:20 2017
@@ -130,7 +130,9 @@ public class LuceneDocumentMaker {
facet |= pd.facet;
}
- dirty |= indexAggregates(path, fields, state);
+ boolean[] dirties = indexAggregates(path, fields, state);
+ dirty |= dirties[0]; // any (aggregate) indexing happened
+ facet |= dirties[1]; // facet indexing during (index-time) aggregation
dirty |= indexNullCheckEnabledProps(path, fields, state);
dirty |= indexFunctionRestrictions(path, fields, state);
dirty |= indexNotNullCheckEnabledProps(path, fields, state);
@@ -521,9 +523,18 @@ public class LuceneDocumentMaker {
return node;
}
- private boolean indexAggregates(final String path, final List<Field> fields,
+ /**
+ * index aggregates on a certain path
+ * @param path the path of the node
+ * @param fields the list of fields
+ * @param state the node state
+ * @return an array of booleans whose first element is {@code true} if any indexing has happened
+ * and the second element is {@code true} if facets on any (aggregate) property have been indexed
+ */
+ private boolean[] indexAggregates(final String path, final List<Field> fields,
final NodeState state) {
final AtomicBoolean dirtyFlag = new AtomicBoolean();
+ final AtomicBoolean facetFlag = new AtomicBoolean();
indexingRule.getAggregate().collectAggregates(state, new Aggregate.ResultCollector() {
@Override
public void onResult(Aggregate.NodeIncludeResult result) {
@@ -543,12 +554,15 @@ public class LuceneDocumentMaker {
dirty |= indexProperty(path, fields, state, result.propertyState,
result.propertyPath, result.pd);
+ if (result.pd.facet) {
+ facetFlag.set(true);
+ }
if (dirty) {
dirtyFlag.set(true);
}
}
});
- return dirtyFlag.get();
+ return new boolean[]{dirtyFlag.get(), facetFlag.get()};
}
/**
* Create the fulltext field from the aggregated nodes. If result is for aggregate for a relative node
Modified: jackrabbit/oak/branches/1.6/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/NodeStateFacetsConfig.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/NodeStateFacetsConfig.java?rev=1781915&r1=1781914&r2=1781915&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.6/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/NodeStateFacetsConfig.java (original)
+++ jackrabbit/oak/branches/1.6/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/NodeStateFacetsConfig.java Mon Feb 6 15:11:20 2017
@@ -18,7 +18,9 @@
*/
package org.apache.jackrabbit.oak.plugins.index.lucene.util;
+import org.apache.jackrabbit.JcrConstants;
import org.apache.jackrabbit.oak.api.Type;
+import org.apache.jackrabbit.oak.commons.PathUtils;
import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.lucene.facet.FacetsConfig;
@@ -34,8 +36,22 @@ class NodeStateFacetsConfig extends Face
NodeStateFacetsConfig(NodeBuilder nodeBuilder) {
this.nodeBuilder = nodeBuilder.child(LuceneIndexConstants.FACETS);
- for (String child : this.nodeBuilder.getChildNodeNames()) {
- super.setMultiValued(child, this.nodeBuilder.child(child).getProperty(MULTIVALUED).getValue(Type.BOOLEAN));
+ if (!this.nodeBuilder.hasProperty(JcrConstants.JCR_PRIMARYTYPE)) {
+ this.nodeBuilder.setProperty(JcrConstants.JCR_PRIMARYTYPE, JcrConstants.NT_UNSTRUCTURED, Type.NAME);
+ }
+ NodeBuilder current = this.nodeBuilder;
+ String prefix = "";
+ readMVFacets(current, prefix);
+ }
+
+ private void readMVFacets(NodeBuilder current, String prefix) {
+ for (String childName : current.getChildNodeNames()) {
+ NodeBuilder child = current.child(childName);
+ super.setMultiValued(childName, child.getProperty(MULTIVALUED).getValue(Type.BOOLEAN));
+ if (prefix.length() > 0) {
+ super.setMultiValued(prefix + "/" + childName, child.getProperty(MULTIVALUED).getValue(Type.BOOLEAN));
+ readMVFacets(child, childName);
+ }
}
}
@@ -43,7 +59,15 @@ class NodeStateFacetsConfig extends Face
public synchronized void setMultiValued(String dimName, boolean v) {
super.setMultiValued(dimName, v);
if (v) {
- nodeBuilder.child(dimName).setProperty(MULTIVALUED, true);
+ NodeBuilder current = this.nodeBuilder;
+ for (String p : PathUtils.elements(dimName)) {
+ NodeBuilder child = current.child(p);
+ if (!child.hasProperty(JcrConstants.JCR_PRIMARYTYPE)) {
+ child.setProperty(JcrConstants.JCR_PRIMARYTYPE, JcrConstants.NT_UNSTRUCTURED, Type.NAME);
+ }
+ child.setProperty(MULTIVALUED, true);
+ current = child;
+ }
}
}
}
Modified: jackrabbit/oak/branches/1.6/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/NodeStateFacetsConfigTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/NodeStateFacetsConfigTest.java?rev=1781915&r1=1781914&r2=1781915&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.6/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/NodeStateFacetsConfigTest.java (original)
+++ jackrabbit/oak/branches/1.6/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/NodeStateFacetsConfigTest.java Mon Feb 6 15:11:20 2017
@@ -51,4 +51,17 @@ public class NodeStateFacetsConfigTest {
assertTrue(dimConfig2.multiValued);
}
+ @Test
+ public void testMultivaluedRelativeDimConfig() throws Exception {
+ NodeStateFacetsConfig nodeStateFacetsConfig = new NodeStateFacetsConfig(builder);
+ String dimension = "jcr:content/text";
+ nodeStateFacetsConfig.setMultiValued(dimension, true);
+ FacetsConfig.DimConfig dimConfig = nodeStateFacetsConfig.getDimConfig(dimension);
+ assertNotNull(dimConfig);
+ assertTrue(dimConfig.multiValued);
+
+ NodeStateFacetsConfig nodeStateFacetsConfig2 = new NodeStateFacetsConfig(builder);
+ assertTrue(nodeStateFacetsConfig.getDimConfig(dimension).multiValued);
+ }
+
}
\ No newline at end of file