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:30 UTC
svn commit: r1781916 - in /jackrabbit/oak/branches/1.4: ./
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:30 2017
New Revision: 1781916
URL: http://svn.apache.org/viewvc?rev=1781916&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.4)
Modified:
jackrabbit/oak/branches/1.4/ (props changed)
jackrabbit/oak/branches/1.4/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditor.java
jackrabbit/oak/branches/1.4/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/NodeStateFacetsConfig.java
jackrabbit/oak/branches/1.4/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/NodeStateFacetsConfigTest.java
Propchange: jackrabbit/oak/branches/1.4/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 6 15:11:30 2017
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1733615,1733875,1733913,1733929,1734230,1734254,1734279,1734941,1735052,1735081,1735109,1735141,1735267,1735405,1735484,1735549,1735564,1735588,1735622,1735638,1735919,1735983,1736176,1737309-1737310,1737334,1737349,1737998,1738004,1738136,1738138,1738207,1738234,1738252,1738775,1738795,1738833,1738950,1738957,1738963,1739712,1739760,1739867,1739894,1739959-1739960,1740114,1740116,1740250,1740333,1740349,1740360,1740625-1740626,1740774,1740837,1740879,1740971,1741016,1741032,1741339,1741343,1742077,1742117,1742125,1742363,1742520,1742888,1742916,1743097,1743172,1743343,1743674,1744265,1744292,1744589,1744670,1744672,1744959,1745038,1745127,1745197,1745336,1745368,1746086,1746117,1746342,1746345,1746408,1746696,1746981,1747198,1747200,1747341-1747342,1747380,1747387,1747406,1747492,1747512,1747654,1748505,1748553,1748722,1748870,1749275,1749350,1749424,1749443,1749464,1749475,1749645,1749662,1749815,1749872,1749875,1749899,1750052,1750076-1750077,1750287,1750457
,1750462,1750465,1750495,1750626,1750809,1750886-1750887,1751396,1751410,1751419,1751445-1751446,1751478,1751748,1751753,1751755,1751871,1752198,1752202,1752259,1752273-1752274,1752283,1752292,1752438,1752447-1752448,1752508,1752596,1752616,1752659,1752672,1753262,1753331-1753332,1753335-1753336,1753355,1753444,1754117,1754239,1755157,1755191,1756520,1756580,1757119,1757166,1758213,1758713,1759433,1759795,1759826,1760326,1760340,1760373,1760387,1760486,1760492,1760494,1760661-1760662,1761412,1761444,1761571,1761762,1761787,1761876,1762453,1762612,1762632,1762635,1763347,1763355-1763356,1763378,1763465,1763735,1764678,1764705,1764814,1764898,1765817,1765983,1766071,1766423,1766496,1766519,1766554,1766644,1767025,1767265,1767704,1768446,1768637,1769078,1770694,1770982,1771022,1771093,1771098,1771739,1771852,1771870,1771902,1772155,1772228,1772593,1772768,1773190,1774497,1775474,1775622,1775628,1775757,1778423,1778968,1779478,1780388,1780538,1780543,1781068,1781075,1781386,1781846
+/jackrabbit/oak/trunk:1733615,1733875,1733913,1733929,1734230,1734254,1734279,1734941,1735052,1735081,1735109,1735141,1735267,1735405,1735484,1735549,1735564,1735588,1735622,1735638,1735919,1735983,1736176,1737309-1737310,1737334,1737349,1737998,1738004,1738136,1738138,1738207,1738234,1738252,1738775,1738795,1738833,1738950,1738957,1738963,1739712,1739760,1739867,1739894,1739959-1739960,1740114,1740116,1740250,1740333,1740349,1740360,1740625-1740626,1740774,1740837,1740879,1740971,1741016,1741032,1741339,1741343,1742077,1742117,1742125,1742363,1742520,1742888,1742916,1743097,1743172,1743343,1743674,1744265,1744292,1744589,1744670,1744672,1744959,1745038,1745127,1745197,1745336,1745368,1746086,1746117,1746342,1746345,1746408,1746696,1746981,1747198,1747200,1747341-1747342,1747380,1747387,1747406,1747492,1747512,1747654,1748505,1748553,1748722,1748870,1749275,1749350,1749424,1749443,1749464,1749475,1749645,1749662,1749815,1749872,1749875,1749899,1750052,1750076-1750077,1750287,1750457
,1750462,1750465,1750495,1750626,1750809,1750886-1750887,1751396,1751410,1751419,1751445-1751446,1751478,1751748,1751753,1751755,1751871,1752198,1752202,1752259,1752273-1752274,1752283,1752292,1752438,1752447-1752448,1752508,1752596,1752616,1752659,1752672,1753262,1753331-1753332,1753335-1753336,1753355,1753444,1754117,1754239,1755157,1755191,1756520,1756580,1757119,1757166,1758213,1758713,1759433,1759795,1759826,1760326,1760340,1760373,1760387,1760486,1760492,1760494,1760661-1760662,1761412,1761444,1761571,1761762,1761787,1761876,1762453,1762612,1762632,1762635,1763347,1763355-1763356,1763378,1763465,1763735,1764678,1764705,1764814,1764898,1765817,1765983,1766071,1766423,1766496,1766519,1766554,1766644,1767025,1767265,1767704,1768446,1768637,1769078,1770694,1770982,1771022,1771093,1771098,1771739,1771852,1771870,1771902,1772155,1772228,1772593,1772768,1773190,1774497,1775474,1775622,1775628,1775757,1778423,1778968,1779478,1780388,1780538,1780543,1781068,1781075,1781386,1781846,1781
907
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.4/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditor.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditor.java?rev=1781916&r1=1781915&r2=1781916&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.4/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditor.java (original)
+++ jackrabbit/oak/branches/1.4/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditor.java Mon Feb 6 15:11:30 2017
@@ -45,7 +45,6 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState;
import org.apache.jackrabbit.oak.plugins.memory.StringPropertyState;
import org.apache.jackrabbit.oak.plugins.tree.TreeFactory;
-import org.apache.jackrabbit.oak.query.QueryImpl;
import org.apache.jackrabbit.oak.spi.commit.Editor;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
@@ -348,7 +347,10 @@ public class LuceneIndexEditor implement
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 |= indexNotNullCheckEnabledProps(path, fields, state);
@@ -770,9 +772,18 @@ public class LuceneIndexEditor implement
return MatcherState.NONE;
}
- 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) {
@@ -791,13 +802,15 @@ public class LuceneIndexEditor implement
}
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
@@ -998,7 +1011,7 @@ public class LuceneIndexEditor implement
int len = result.length();
context.recordTextExtractionStats(time, bytesRead, len);
if (log.isDebugEnabled()) {
- log.debug("Extracting {} took {} ms, {} bytes read, {} text size",
+ log.debug("Extracting {} took {} ms, {} bytes read, {} text size",
path, time, bytesRead, len);
}
}
Modified: jackrabbit/oak/branches/1.4/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.4/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/NodeStateFacetsConfig.java?rev=1781916&r1=1781915&r2=1781916&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.4/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/NodeStateFacetsConfig.java (original)
+++ jackrabbit/oak/branches/1.4/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/NodeStateFacetsConfig.java Mon Feb 6 15:11:30 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.4/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.4/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/NodeStateFacetsConfigTest.java?rev=1781916&r1=1781915&r2=1781916&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.4/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/NodeStateFacetsConfigTest.java (original)
+++ jackrabbit/oak/branches/1.4/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/NodeStateFacetsConfigTest.java Mon Feb 6 15:11:30 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