Author: catholicon
Date: Sun Aug 4 06:10:54 2019
New Revision: 1864358
URL: http://svn.apache.org/viewvc?rev=1864358&view=rev
Log:
OAK-8526: IndexDefinitionBuilder should support setting up index tags (backport
r1864349,r1864353 from trunk)
Modified:
jackrabbit/oak/branches/1.8/ (props changed)
jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/IndexDefinitionBuilder.java
jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/IndexDefinitionBuilderTest.java
Propchange: jackrabbit/oak/branches/1.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 4 06:10:54 2019
@@ -1,4 +1,4 @@
/jackrabbit/oak/branches/1.0:1665962
/jackrabbit/oak/branches/1.10:1854524
-/jackrabbit/oak/trunk:1820660-1820661,1820729,1820734,1820859,1820861,1820878,1820888,1820947,1821027,1821130,1821140-1821141,1821178,1821237,1821240,1821249,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821617,1821663,1821665,1821668,1821681,1821847,1821975-1821983,1822121,1822182,1822201,1822207,1822496,1822527,1822638,1822642,1822645,1822723,1822802,1822808,1822850,1822934,1823135,1823163,1823169,1823172,1823655,1823669,1824196,1824198,1824253,1824255,1824896,1824962,1825065,1825362,1825381,1825442,1825448,1825466,1825470-1825471,1825475,1825523,1825525,1825561,1825619-1825621,1825651,1825654,1825992,1826079,1826089-1826090,1826096,1826216,1826237,1826338,1826516,1826532,1826551,1826560,1826638,1826640,1826730,1826833,1826932,1826957,1827423,1827472,1827486,1827816,1827977,1828349,1828439,1828502,1828529,1828827,1828868,1828948,1829527,1829534,1829546,1829569,1829587,1829665,1829854,1829864,1829978,1829985,1829987,1829998,1830019,1830048
,1830160,1830171,1830197,1830209,1830239,1830347,1830748,1830911,1830923,1831157-1831158,1831163,1831190,1831374,1831560,1831689,1832258,1832376,1832379,1832535,1833308,1833347,1833702,1833833,1834109,1834112,1834117,1834287,1834291,1834302,1834312,1834326,1834328,1834336,1834428,1834468,1834483,1834610,1834648-1834649,1834681,1834823,1834857-1834858,1835056,1835060,1835062,1835518,1835521,1835635,1835642,1835780,1835819,1836082,1836121,1836167-1836168,1836170-1836187,1836189-1836196,1836206,1836487,1836493,1836548,1837057,1837274,1837296,1837326,1837475,1837503,1837547,1837569,1837596,1837600,1837657,1837718,1837998,1838076,1838637,1839549,1839570,1839637,1839746,1840019,1840024,1840031,1840226,1840455,1840462,1840574,1840769,1841314,1841352,1841909,1842089,1842240,1842677,1843175,1843222,1843231,1843398,1843618,1843621,1843637,1843652,1843669,1843905,1843911,1843994,1844070,1844110,1844325,1844549,1844625,1844627,1844642,1844728,1844775,1844932,1845135,1845336,1845405,1845415,1845
730-1845731,1845863,1845865,1846057,1846162,1846396,1846429,1846486,1846581,1846617,1847088,1847096,1848073,1848181-1848182,1848191,1848217,1848729,1848769,1848822-1848823,1850221,1850319,1850343,1850837,1850874,1851533-1851535,1851619,1852120,1852135,1852451,1852492-1852493,1852528,1852582,1852584,1852601,1853083,1853141,1853229,1853393,1853429,1853433,1853435,1853866,1853868,1853870,1853893,1853969,1853997,1854034,1854044,1854055,1854113,1854373,1854377,1854380,1854385,1854401,1854403,1854455,1854461-1854462,1854466,1854468,1854515,1854539,1854701,1854773-1854774,1854827,1854848,1854859,1854930,1855032,1855522,1855776,1855993,1856049,1856056,1856538,1856545,1856818,1857000,1857010,1857221,1857247,1857253,1857294,1857314,1857332,1857463,1857480,1857634,1857638,1857936,1858032,1858139,1858385,1858424,1858571,1858578,1858810,1858926,1859020,1859231,1859292,1859294,1859533,1859609,1859612,1859711,1859716,1859772,1859776,1859780,1859843,1859881,1860120,1860131,1860137,1860202,1860328,1
860548,1860564-1860565,1861626,1862044,1862728,1862881
+/jackrabbit/oak/trunk:1820660-1820661,1820729,1820734,1820859,1820861,1820878,1820888,1820947,1821027,1821130,1821140-1821141,1821178,1821237,1821240,1821249,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821617,1821663,1821665,1821668,1821681,1821847,1821975-1821983,1822121,1822182,1822201,1822207,1822496,1822527,1822638,1822642,1822645,1822723,1822802,1822808,1822850,1822934,1823135,1823163,1823169,1823172,1823655,1823669,1824196,1824198,1824253,1824255,1824896,1824962,1825065,1825362,1825381,1825442,1825448,1825466,1825470-1825471,1825475,1825523,1825525,1825561,1825619-1825621,1825651,1825654,1825992,1826079,1826089-1826090,1826096,1826216,1826237,1826338,1826516,1826532,1826551,1826560,1826638,1826640,1826730,1826833,1826932,1826957,1827423,1827472,1827486,1827816,1827977,1828349,1828439,1828502,1828529,1828827,1828868,1828948,1829527,1829534,1829546,1829569,1829587,1829665,1829854,1829864,1829978,1829985,1829987,1829998,1830019,1830048
,1830160,1830171,1830197,1830209,1830239,1830347,1830748,1830911,1830923,1831157-1831158,1831163,1831190,1831374,1831560,1831689,1832258,1832376,1832379,1832535,1833308,1833347,1833702,1833833,1834109,1834112,1834117,1834287,1834291,1834302,1834312,1834326,1834328,1834336,1834428,1834468,1834483,1834610,1834648-1834649,1834681,1834823,1834857-1834858,1835056,1835060,1835062,1835518,1835521,1835635,1835642,1835780,1835819,1836082,1836121,1836167-1836168,1836170-1836187,1836189-1836196,1836206,1836487,1836493,1836548,1837057,1837274,1837296,1837326,1837475,1837503,1837547,1837569,1837596,1837600,1837657,1837718,1837998,1838076,1838637,1839549,1839570,1839637,1839746,1840019,1840024,1840031,1840226,1840455,1840462,1840574,1840769,1841314,1841352,1841909,1842089,1842240,1842677,1843175,1843222,1843231,1843398,1843618,1843621,1843637,1843652,1843669,1843905,1843911,1843994,1844070,1844110,1844325,1844549,1844625,1844627,1844642,1844728,1844775,1844932,1845135,1845336,1845405,1845415,1845
730-1845731,1845863,1845865,1846057,1846162,1846396,1846429,1846486,1846581,1846617,1847088,1847096,1848073,1848181-1848182,1848191,1848217,1848729,1848769,1848822-1848823,1850221,1850319,1850343,1850837,1850874,1851533-1851535,1851619,1852120,1852135,1852451,1852492-1852493,1852528,1852582,1852584,1852601,1853083,1853141,1853229,1853393,1853429,1853433,1853435,1853866,1853868,1853870,1853893,1853969,1853997,1854034,1854044,1854055,1854113,1854373,1854377,1854380,1854385,1854401,1854403,1854455,1854461-1854462,1854466,1854468,1854515,1854539,1854701,1854773-1854774,1854827,1854848,1854859,1854930,1855032,1855522,1855776,1855993,1856049,1856056,1856538,1856545,1856818,1857000,1857010,1857221,1857247,1857253,1857294,1857314,1857332,1857463,1857480,1857634,1857638,1857936,1858032,1858139,1858385,1858424,1858571,1858578,1858810,1858926,1859020,1859231,1859292,1859294,1859533,1859609,1859612,1859711,1859716,1859772,1859776,1859780,1859843,1859881,1860120,1860131,1860137,1860202,1860328,1
860548,1860564-1860565,1861626,1862044,1862728,1862881,1864349,1864353
/jackrabbit/trunk:1345480
Modified:
jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/IndexDefinitionBuilder.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/IndexDefinitionBuilder.java?rev=1864358&r1=1864357&r2=1864358&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/IndexDefinitionBuilder.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/IndexDefinitionBuilder.java
Sun Aug 4 06:10:54 2019
@@ -19,14 +19,17 @@
package org.apache.jackrabbit.oak.plugins.index.lucene.util;
+import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.stream.StreamSupport;
import javax.jcr.Node;
import javax.jcr.PropertyType;
import javax.jcr.RepositoryException;
+import com.google.common.collect.Iterables;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import org.apache.jackrabbit.oak.api.PropertyState;
@@ -48,6 +51,7 @@ import static org.apache.jackrabbit.JcrC
import static org.apache.jackrabbit.JcrConstants.NT_UNSTRUCTURED;
import static org.apache.jackrabbit.oak.api.Type.NAME;
import static org.apache.jackrabbit.oak.api.Type.STRINGS;
+import static
org.apache.jackrabbit.oak.plugins.index.IndexConstants.INDEX_TAGS;
import static
org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants.FIELD_BOOST;
import static
org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.EMPTY_NODE;
@@ -129,6 +133,26 @@ public final class IndexDefinitionBuilde
return this;
}
+ public IndexDefinitionBuilder tags(String ... tagVals) {
+ tree.removeProperty(INDEX_TAGS);
+ tree.setProperty(INDEX_TAGS, asList(tagVals), STRINGS);
+ return this;
+ }
+
+ public IndexDefinitionBuilder addTags(String ... additionalTagVals) {
+ Set<String> currTags = Collections.emptySet();
+ if (tree.hasProperty(INDEX_TAGS)) {
+ currTags =
Sets.newHashSet(tree.getProperty(INDEX_TAGS).getValue(STRINGS));
+ }
+ Set<String> tagVals = Sets.newHashSet(Iterables.concat(currTags,
asList(additionalTagVals)));
+ boolean noAdditionalTags = currTags.containsAll(tagVals);
+ if (!noAdditionalTags) {
+ tree.removeProperty(INDEX_TAGS);
+ tree.setProperty(INDEX_TAGS, asList(Iterables.toArray(tagVals,
String.class)), STRINGS);
+ }
+ return this;
+ }
+
public IndexDefinitionBuilder nodeTypeIndex() {
tree.setProperty(LuceneIndexConstants.PROP_INDEX_NODE_TYPE, true);
return this;
@@ -572,7 +596,7 @@ public final class IndexDefinitionBuilde
LuceneIndexConstants.PROP_WEIGHT,
FIELD_BOOST,
IndexConstants.QUERY_PATHS,
- IndexConstants.INDEX_TAGS,
+ INDEX_TAGS,
LuceneIndexConstants.BLOB_SIZE,
LuceneIndexConstants.COST_PER_ENTRY,
LuceneIndexConstants.COST_PER_EXECUTION);
Modified:
jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/IndexDefinitionBuilderTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/IndexDefinitionBuilderTest.java?rev=1864358&r1=1864357&r2=1864358&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/IndexDefinitionBuilderTest.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/IndexDefinitionBuilderTest.java
Sun Aug 4 06:10:54 2019
@@ -21,6 +21,7 @@ package org.apache.jackrabbit.oak.plugin
import java.util.Iterator;
+import com.google.common.collect.Iterables;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Root;
import org.apache.jackrabbit.oak.api.Tree;
@@ -33,11 +34,13 @@ import org.apache.jackrabbit.oak.spi.fil
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.apache.jackrabbit.oak.spi.state.NodeStateUtils;
+import org.hamcrest.Matchers;
import org.junit.After;
import org.junit.Test;
import static com.google.common.collect.ImmutableList.of;
import static java.util.Arrays.asList;
+import static
org.apache.jackrabbit.oak.plugins.index.IndexConstants.INDEX_TAGS;
import static
org.apache.jackrabbit.oak.plugins.index.IndexConstants.REINDEX_PROPERTY_NAME;
import static
org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants.AGGREGATES;
import static
org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants.FIELD_BOOST;
@@ -301,7 +304,7 @@ public class IndexDefinitionBuilderTest
nodeBuilder.setProperty(REINDEX_PROPERTY_NAME, false);
builder = new IndexDefinitionBuilder(nodeBuilder);
-
builder.getBuilderTree().setProperty(stringProperty(IndexConstants.INDEX_TAGS,
of("foo1", "foo2")));
+ builder.tags("foo1", "foo2");
currentNodeState = builder.build();
assertFalse(currentNodeState.getBoolean(REINDEX_PROPERTY_NAME));
@@ -311,7 +314,7 @@ public class IndexDefinitionBuilderTest
nodeBuilder.removeProperty(PROP_REFRESH_DEFN);
builder = new IndexDefinitionBuilder(nodeBuilder);
-
builder.getBuilderTree().setProperty(stringProperty(IndexConstants.INDEX_TAGS,
of("foo2", "foo3")));
+ builder.tags("foo2", "foo3");
currentNodeState = builder.build();
assertFalse(currentNodeState.getBoolean(REINDEX_PROPERTY_NAME));
assertTrue(currentNodeState.getBoolean(PROP_REFRESH_DEFN));
@@ -319,6 +322,15 @@ public class IndexDefinitionBuilderTest
nodeBuilder = currentNodeState.builder();
nodeBuilder.removeProperty(PROP_REFRESH_DEFN);
builder = new IndexDefinitionBuilder(nodeBuilder);
+
+ builder.addTags("foo2");
+ currentNodeState = builder.build();
+ assertFalse(currentNodeState.getBoolean(REINDEX_PROPERTY_NAME));
+ assertFalse(currentNodeState.getBoolean(PROP_REFRESH_DEFN));
+
+ nodeBuilder = currentNodeState.builder();
+ nodeBuilder.removeProperty(PROP_REFRESH_DEFN);
+ builder = new IndexDefinitionBuilder(nodeBuilder);
builder.getBuilderTree().removeProperty(IndexConstants.INDEX_TAGS);
currentNodeState = builder.build();
@@ -862,4 +874,65 @@ public class IndexDefinitionBuilderTest
assertFalse("Incorrectly existing facets property",
foo2.hasProperty(PROP_FACETS));
}
+
+ @Test
+ public void tags() {
+ NodeState state = EMPTY_NODE;
+
+ builder = new IndexDefinitionBuilder(state.builder());
+ builder.tags("foo");
+ state = builder.build();
+ Iterable<String> tags =
state.getProperty(INDEX_TAGS).getValue(Type.STRINGS);
+ assertEquals("Unexpected number of tags", 1, Iterables.size(tags));
+ assertThat(state.getProperty(INDEX_TAGS).getValue(Type.STRINGS),
+ Matchers.containsInAnyOrder("foo"));
+
+ builder = new IndexDefinitionBuilder(state.builder());
+ builder.addTags("foo");
+ state = builder.build();
+ tags = state.getProperty(INDEX_TAGS).getValue(Type.STRINGS);
+ assertEquals("Unexpected number of tags", 1, Iterables.size(tags));
+ assertThat(state.getProperty(INDEX_TAGS).getValue(Type.STRINGS),
+ Matchers.containsInAnyOrder("foo"));
+
+ builder = new IndexDefinitionBuilder(state.builder());
+ builder.addTags("foo", "foo1");
+ state = builder.build();
+ tags = state.getProperty(INDEX_TAGS).getValue(Type.STRINGS);
+ assertEquals("Unexpected number of tags", 2, Iterables.size(tags));
+ assertThat(state.getProperty(INDEX_TAGS).getValue(Type.STRINGS),
+ Matchers.containsInAnyOrder("foo", "foo1"));
+
+ builder = new IndexDefinitionBuilder(state.builder());
+ builder.addTags("foo2");
+ state = builder.build();
+ tags = state.getProperty(INDEX_TAGS).getValue(Type.STRINGS);
+ assertEquals("Unexpected number of tags", 3, Iterables.size(tags));
+ assertThat(state.getProperty(INDEX_TAGS).getValue(Type.STRINGS),
+ Matchers.containsInAnyOrder("foo", "foo1", "foo2"));
+
+ builder = new IndexDefinitionBuilder(state.builder());
+ builder.addTags("foo2", "foo3");
+ state = builder.build();
+ tags = state.getProperty(INDEX_TAGS).getValue(Type.STRINGS);
+ assertEquals("Unexpected number of tags", 4, Iterables.size(tags));
+ assertThat(state.getProperty(INDEX_TAGS).getValue(Type.STRINGS),
+ Matchers.containsInAnyOrder("foo", "foo1", "foo2", "foo3"));
+
+ builder = new IndexDefinitionBuilder(state.builder());
+ builder.tags("foo4");
+ state = builder.build();
+ tags = state.getProperty(INDEX_TAGS).getValue(Type.STRINGS);
+ assertEquals("Unexpected number of tags", 1, Iterables.size(tags));
+ assertThat(state.getProperty(INDEX_TAGS).getValue(Type.STRINGS),
+ Matchers.containsInAnyOrder("foo4"));
+
+ builder = new IndexDefinitionBuilder(EMPTY_NODE.builder());
+ builder.addTags("foo5");
+ state = builder.build();
+ tags = state.getProperty(INDEX_TAGS).getValue(Type.STRINGS);
+ assertEquals("Unexpected number of tags", 1, Iterables.size(tags));
+ assertThat(state.getProperty(INDEX_TAGS).getValue(Type.STRINGS),
+ Matchers.containsInAnyOrder("foo5"));
+ }
}
\ No newline at end of file
