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 mk...@apache.org on 2020/08/12 13:46:45 UTC
svn commit: r1880807 [4/4] - in /jackrabbit/oak/trunk:
oak-jcr/src/test/java/org/apache/jackrabbit/oak/query/
oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/
oak-search-elastic/ oak-search-elastic/src/test/java/org/apache/jackr...
Added: jackrabbit/oak/trunk/oak-search/src/test/java/org/apache/jackrabbit/oak/plugins/index/StrictPathRestrictionEnableCommonTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-search/src/test/java/org/apache/jackrabbit/oak/plugins/index/StrictPathRestrictionEnableCommonTest.java?rev=1880807&view=auto
==============================================================================
--- jackrabbit/oak/trunk/oak-search/src/test/java/org/apache/jackrabbit/oak/plugins/index/StrictPathRestrictionEnableCommonTest.java (added)
+++ jackrabbit/oak/trunk/oak-search/src/test/java/org/apache/jackrabbit/oak/plugins/index/StrictPathRestrictionEnableCommonTest.java Wed Aug 12 13:46:45 2020
@@ -0,0 +1,136 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.jackrabbit.oak.plugins.index;
+
+import org.apache.jackrabbit.JcrConstants;
+import org.apache.jackrabbit.oak.api.CommitFailedException;
+import org.apache.jackrabbit.oak.api.Tree;
+import org.apache.jackrabbit.oak.api.Type;
+import org.apache.jackrabbit.oak.plugins.index.search.FulltextIndexConstants;
+import org.apache.jackrabbit.oak.plugins.memory.PropertyStates;
+import org.apache.jackrabbit.oak.query.AbstractQueryTest;
+import org.apache.jackrabbit.oak.spi.state.NodeStore;
+import org.junit.Test;
+
+import javax.jcr.Node;
+import java.util.Set;
+
+import static com.google.common.collect.ImmutableSet.of;
+import static java.util.Arrays.asList;
+import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.INDEX_DEFINITIONS_NAME;
+import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.INDEX_DEFINITIONS_NODE_TYPE;
+import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.REINDEX_PROPERTY_NAME;
+import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.TYPE_PROPERTY_NAME;
+import static org.apache.jackrabbit.oak.plugins.memory.PropertyStates.createProperty;
+import static org.apache.jackrabbit.oak.spi.filter.PathFilter.PROP_EXCLUDED_PATHS;
+import static org.apache.jackrabbit.oak.spi.filter.PathFilter.PROP_INCLUDED_PATHS;
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThat;
+
+@SuppressWarnings("ArraysAsListWithZeroOrOneArgument")
+public abstract class StrictPathRestrictionEnableCommonTest extends AbstractQueryTest {
+
+ protected NodeStore nodeStore;
+ protected TestRepository repositoryOptionsUtil;
+ protected Node indexNode;
+ protected IndexOptions indexOptions;
+
+ @Override
+ protected void createTestIndexNode() throws Exception {
+ setTraversalEnabled(false);
+ }
+
+ @Test
+ public void pathIncludeWithPathRestrictionsEnabled() throws Exception {
+
+ Tree idx = createIndex("test1", of("propa", "propb"));
+ idx.setProperty(createProperty(PROP_INCLUDED_PATHS, of("/test/a"), Type.STRINGS));
+ root.commit();
+
+ Tree test = root.getTree("/").addChild("test");
+ test.addChild("a").setProperty("propa", 10);
+ test.addChild("a").addChild("b").setProperty("propa", 10);
+ test.addChild("c").setProperty("propa", 10);
+ root.commit();
+
+ assertEventually(() -> {
+ assertFalse(explain("select [jcr:path] from [nt:base] where [propa] = 10").contains(indexOptions.getIndexType() + ":test1"));
+ assertThat(explain("select [jcr:path] from [nt:base] where [propa] = 10 and isDescendantNode('/test/a')"), containsString(indexOptions.getIndexType() + ":test1"));
+ assertQuery("select [jcr:path] from [nt:base] where [propa] = 10 and isDescendantNode('/test/a')", asList("/test/a/b"));
+ });
+ }
+
+ @Test
+ public void pathExcludeWithPathRestrictionsEnabled() throws Exception {
+ Tree idx = createIndex("test1", of("propa", "propb"));
+ idx.setProperty(createProperty(PROP_EXCLUDED_PATHS, of("/test/a"), Type.STRINGS));
+ root.commit();
+
+ Tree test = root.getTree("/").addChild("test");
+ test.addChild("a").setProperty("propa", 10);
+ test.addChild("a").addChild("b").setProperty("propa", 10);
+ test.addChild("c").setProperty("propa", 10);
+ test.addChild("c").addChild("d").setProperty("propa", 10);
+ root.commit();
+
+ assertEventually(() -> {
+ assertFalse(explain("select [jcr:path] from [nt:base] where [propa] = 10").contains(indexOptions.getIndexType() + ":test1"));
+ assertThat(explain("select [jcr:path] from [nt:base] where [propa] = 10 and isDescendantNode('/test/c')"), containsString(indexOptions.getIndexType() + ":test1"));
+
+ assertQuery("select [jcr:path] from [nt:base] where [propa] = 10 and isDescendantNode('/test/c')", asList("/test/c/d"));
+ });
+ //Make some change and then check
+ Tree testc = root.getTree("/").getChild("test").getChild("c");
+ testc.addChild("e").addChild("f").setProperty("propa", 10);
+ root.commit();
+ assertEventually(() -> {
+ assertQuery("select [jcr:path] from [nt:base] where [propa] = 10 and isDescendantNode('/test/c')", asList("/test/c/d", "/test/c/e/f"));
+ assertThat(explain("select [jcr:path] from [nt:base] where [propa] = 10 and isDescendantNode('/test/c') and not(isDescendantNode('/test/c/e'))"), containsString(indexOptions.getIndexType() + ":test1"));
+ assertQuery("select [jcr:path] from [nt:base] where [propa] = 10 and isDescendantNode('/test/c') and not(isDescendantNode('/test/c/e'))", asList("/test/c/d"));
+ });
+ }
+
+ private String explain(String query) {
+ String explain = "explain " + query;
+ return executeQuery(explain, "JCR-SQL2").get(0);
+ }
+
+ private Tree createIndex(String name, Set<String> propNames) throws CommitFailedException {
+ Tree index = root.getTree("/");
+ return createIndex(index, name, propNames);
+ }
+
+ public Tree createIndex(Tree index, String name, Set<String> propNames) throws CommitFailedException {
+ Tree def = index.addChild(INDEX_DEFINITIONS_NAME).addChild(name);
+ def.setProperty(JcrConstants.JCR_PRIMARYTYPE,
+ INDEX_DEFINITIONS_NODE_TYPE, Type.NAME);
+ def.setProperty(TYPE_PROPERTY_NAME, indexOptions.getIndexType());
+ def.setProperty(REINDEX_PROPERTY_NAME, true);
+ def.setProperty(FulltextIndexConstants.FULL_TEXT_ENABLED, false);
+ def.setProperty(PropertyStates.createProperty(FulltextIndexConstants.INCLUDE_PROPERTY_NAMES, propNames, Type.STRINGS));
+ return index.getChild(INDEX_DEFINITIONS_NAME).getChild(name);
+ }
+
+ private static void assertEventually(Runnable r) {
+ TestUtils.assertEventually(r, 3000 * 3);
+ }
+
+}
Propchange: jackrabbit/oak/trunk/oak-search/src/test/java/org/apache/jackrabbit/oak/plugins/index/StrictPathRestrictionEnableCommonTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: jackrabbit/oak/trunk/oak-search/src/test/java/org/apache/jackrabbit/oak/plugins/index/StrictPathRestrictionWarnCommonTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-search/src/test/java/org/apache/jackrabbit/oak/plugins/index/StrictPathRestrictionWarnCommonTest.java?rev=1880807&view=auto
==============================================================================
--- jackrabbit/oak/trunk/oak-search/src/test/java/org/apache/jackrabbit/oak/plugins/index/StrictPathRestrictionWarnCommonTest.java (added)
+++ jackrabbit/oak/trunk/oak-search/src/test/java/org/apache/jackrabbit/oak/plugins/index/StrictPathRestrictionWarnCommonTest.java Wed Aug 12 13:46:45 2020
@@ -0,0 +1,172 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.jackrabbit.oak.plugins.index;
+
+import ch.qos.logback.classic.LoggerContext;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.read.ListAppender;
+import org.apache.jackrabbit.JcrConstants;
+import org.apache.jackrabbit.oak.api.CommitFailedException;
+import org.apache.jackrabbit.oak.api.Tree;
+import org.apache.jackrabbit.oak.api.Type;
+import org.apache.jackrabbit.oak.plugins.index.search.FulltextIndexConstants;
+import org.apache.jackrabbit.oak.plugins.memory.PropertyStates;
+import org.apache.jackrabbit.oak.query.AbstractQueryTest;
+import org.apache.jackrabbit.oak.spi.state.NodeStore;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.slf4j.LoggerFactory;
+
+import javax.jcr.Node;
+import java.util.Set;
+
+import static com.google.common.collect.ImmutableSet.of;
+import static java.util.Arrays.asList;
+import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.INDEX_DEFINITIONS_NAME;
+import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.INDEX_DEFINITIONS_NODE_TYPE;
+import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.REINDEX_PROPERTY_NAME;
+import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.TYPE_PROPERTY_NAME;
+import static org.apache.jackrabbit.oak.plugins.memory.PropertyStates.createProperty;
+import static org.apache.jackrabbit.oak.spi.filter.PathFilter.PROP_EXCLUDED_PATHS;
+import static org.apache.jackrabbit.oak.spi.filter.PathFilter.PROP_INCLUDED_PATHS;
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
+@SuppressWarnings("ArraysAsListWithZeroOrOneArgument")
+public abstract class StrictPathRestrictionWarnCommonTest extends AbstractQueryTest {
+
+ protected ListAppender<ILoggingEvent> listAppender = null;
+
+ protected NodeStore nodeStore;
+ protected TestRepository repositoryOptionsUtil;
+ protected Node indexNode;
+ protected IndexOptions indexOptions;
+
+ private final String warnMessage = "Index definition of index used have path restrictions and query won't return nodes from " +
+ "those restricted paths";
+
+ private final String queryImplLogger = "org.apache.jackrabbit.oak.query.QueryImpl";
+
+ @Before
+ public void loggingAppenderStart() {
+ LoggerContext context = (LoggerContext) LoggerFactory.getILoggerFactory();
+ listAppender = new ListAppender<>();
+ listAppender.start();
+ context.getLogger(queryImplLogger).addAppender(listAppender);
+ }
+
+ @After
+ public void loggingAppenderStop() {
+ listAppender.stop();
+ }
+
+ @Override
+ protected void createTestIndexNode() throws Exception {
+ setTraversalEnabled(false);
+ }
+
+ @Test
+ public void pathIncludeWithPathRestrictionsWarn() throws Exception {
+
+ Tree idx = createIndex("test1", of("propa", "propb"));
+ idx.setProperty(createProperty(PROP_INCLUDED_PATHS, of("/test/a"), Type.STRINGS));
+ //Do not provide type information
+ root.commit();
+
+ Tree test = root.getTree("/").addChild("test");
+ test.addChild("a").setProperty("propa", 10);
+ test.addChild("a").addChild("b").setProperty("propa", 10);
+ test.addChild("c").setProperty("propa", 10);
+ root.commit();
+
+ assertEventually(() -> {
+ assertThat(explain("select [jcr:path] from [nt:base] where [propa] = 10 and isDescendantNode('/test/a')"), containsString(indexOptions.getIndexType() + ":test1"));
+ assertQuery("select [jcr:path] from [nt:base] where [propa] = 10 and isDescendantNode('/test/a')", asList("/test/a/b"));
+ // List appender should not have any warn logs as we are searching under right descendant as per path restrictions
+ assertFalse(isWarnMessagePresent(listAppender));
+ assertTrue(explain("select [jcr:path] from [nt:base] where [propa] = 10").contains(indexOptions.getIndexType() + ":test1"));
+ // List appender now will have warn log as we are searching under root(/) but index definition have include path restriction.
+ assertTrue(isWarnMessagePresent(listAppender));
+ });
+ }
+
+ @Test
+ public void pathExcludeWithPathRestrictionsWarn() throws Exception {
+ Tree idx = createIndex("test1", of("propa", "propb"));
+ idx.setProperty(createProperty(PROP_EXCLUDED_PATHS, of("/test/a"), Type.STRINGS));
+ //Do not provide type information
+ root.commit();
+
+ Tree test = root.getTree("/").addChild("test");
+ test.addChild("a").setProperty("propa", 10);
+ test.addChild("a").addChild("b").setProperty("propa", 10);
+ test.addChild("c").setProperty("propa", 10);
+ test.addChild("c").addChild("d").setProperty("propa", 10);
+ root.commit();
+
+ assertEventually(() -> {
+ assertThat(explain("select [jcr:path] from [nt:base] where [propa] = 10 and isDescendantNode('/test/c')"), containsString(indexOptions.getIndexType() + ":test1"));
+ assertQuery("select [jcr:path] from [nt:base] where [propa] = 10 and isDescendantNode('/test/c')", asList("/test/c/d"));
+ // List appender should not have any warn logs as we are searching under right descendant as per path restrictions
+ assertFalse(isWarnMessagePresent(listAppender));
+ assertTrue(explain("select [jcr:path] from [nt:base] where [propa] = 10").contains(indexOptions.getIndexType() + ":test1"));
+ // List appender now will have warn log as we are searching under root(/) but index definition have exclude path restriction.
+ assertTrue(isWarnMessagePresent(listAppender));
+ });
+ }
+
+ private boolean isWarnMessagePresent(ListAppender<ILoggingEvent> listAppender) {
+ for (ILoggingEvent loggingEvent : listAppender.list) {
+ if (loggingEvent.getMessage().contains(warnMessage)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ private String explain(String query) {
+ String explain = "explain " + query;
+ return executeQuery(explain, "JCR-SQL2").get(0);
+ }
+
+ private Tree createIndex(String name, Set<String> propNames) throws CommitFailedException {
+ Tree index = root.getTree("/");
+ return createIndex(index, name, propNames);
+ }
+
+ public Tree createIndex(Tree index, String name, Set<String> propNames) throws CommitFailedException {
+ Tree def = index.addChild(INDEX_DEFINITIONS_NAME).addChild(name);
+ def.setProperty(JcrConstants.JCR_PRIMARYTYPE,
+ INDEX_DEFINITIONS_NODE_TYPE, Type.NAME);
+ def.setProperty(TYPE_PROPERTY_NAME, indexOptions.getIndexType());
+ def.setProperty(REINDEX_PROPERTY_NAME, true);
+ def.setProperty(FulltextIndexConstants.FULL_TEXT_ENABLED, false);
+ def.setProperty(PropertyStates.createProperty(FulltextIndexConstants.INCLUDE_PROPERTY_NAMES, propNames, Type.STRINGS));
+ return index.getChild(INDEX_DEFINITIONS_NAME).getChild(name);
+ }
+
+ private static void assertEventually(Runnable r) {
+ TestUtils.assertEventually(r, 3000 * 3);
+ }
+
+}
Propchange: jackrabbit/oak/trunk/oak-search/src/test/java/org/apache/jackrabbit/oak/plugins/index/StrictPathRestrictionWarnCommonTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: jackrabbit/oak/trunk/oak-search/src/test/java/org/apache/jackrabbit/oak/plugins/index/TestRepositoryBuilder.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-search/src/test/java/org/apache/jackrabbit/oak/plugins/index/TestRepositoryBuilder.java?rev=1880807&r1=1880806&r2=1880807&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-search/src/test/java/org/apache/jackrabbit/oak/plugins/index/TestRepositoryBuilder.java (original)
+++ jackrabbit/oak/trunk/oak-search/src/test/java/org/apache/jackrabbit/oak/plugins/index/TestRepositoryBuilder.java Wed Aug 12 13:46:45 2020
@@ -139,4 +139,8 @@ public abstract class TestRepositoryBuil
public void setQueryIndexProvider(QueryIndexProvider queryIndexProvider) {
this.queryIndexProvider = queryIndexProvider;
}
+
+ public void setQueryEngineSettings(QueryEngineSettings queryEngineSettings) {
+ this.queryEngineSettings = queryEngineSettings;
+ }
}
Added: jackrabbit/oak/trunk/oak-search/src/test/java/org/apache/jackrabbit/oak/plugins/index/TestUtil.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-search/src/test/java/org/apache/jackrabbit/oak/plugins/index/TestUtil.java?rev=1880807&view=auto
==============================================================================
--- jackrabbit/oak/trunk/oak-search/src/test/java/org/apache/jackrabbit/oak/plugins/index/TestUtil.java (added)
+++ jackrabbit/oak/trunk/oak-search/src/test/java/org/apache/jackrabbit/oak/plugins/index/TestUtil.java Wed Aug 12 13:46:45 2020
@@ -0,0 +1,243 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.jackrabbit.oak.plugins.index;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.jackrabbit.JcrConstants;
+import org.apache.jackrabbit.api.JackrabbitRepository;
+import org.apache.jackrabbit.oak.api.Blob;
+import org.apache.jackrabbit.oak.api.CommitFailedException;
+import org.apache.jackrabbit.oak.api.PropertyState;
+import org.apache.jackrabbit.oak.api.Root;
+import org.apache.jackrabbit.oak.api.Tree;
+import org.apache.jackrabbit.oak.api.Type;
+import org.apache.jackrabbit.oak.commons.PathUtils;
+import org.apache.jackrabbit.oak.plugins.index.search.FulltextIndexConstants;
+import org.apache.jackrabbit.oak.plugins.index.search.FulltextIndexConstants.IndexingMode;
+import org.apache.jackrabbit.oak.plugins.index.search.IndexFormatVersion;
+import org.apache.jackrabbit.oak.plugins.memory.MemoryNodeStore;
+import org.apache.jackrabbit.oak.plugins.memory.ModifiedNodeState;
+import org.apache.jackrabbit.oak.plugins.name.NamespaceEditorProvider;
+import org.apache.jackrabbit.oak.plugins.nodetype.TypeEditorProvider;
+import org.apache.jackrabbit.oak.plugins.nodetype.write.NodeTypeRegistry;
+import org.apache.jackrabbit.oak.plugins.tree.factories.RootFactory;
+import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
+import org.apache.jackrabbit.oak.spi.commit.CompositeEditorProvider;
+import org.apache.jackrabbit.oak.spi.commit.Editor;
+import org.apache.jackrabbit.oak.spi.commit.EditorHook;
+import org.apache.jackrabbit.oak.spi.commit.EditorProvider;
+import org.apache.jackrabbit.oak.spi.state.ApplyDiff;
+import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
+import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.apache.jackrabbit.oak.spi.state.NodeStore;
+
+import javax.jcr.Repository;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.collect.ImmutableSet.of;
+import static org.apache.jackrabbit.JcrConstants.JCR_CONTENT;
+import static org.apache.jackrabbit.oak.api.Type.STRINGS;
+import static org.apache.jackrabbit.oak.plugins.memory.PropertyStates.createProperty;
+
+public class TestUtil {
+ private static final AtomicInteger COUNTER = new AtomicInteger();
+
+ public static final String NT_TEST = "oak:TestNode";
+
+ public static final String TEST_NODE_TYPE = "[oak:TestNode]\n" + " - * (UNDEFINED) multiple\n"
+ + " - * (UNDEFINED)\n" + " + * (nt:base) = oak:TestNode VERSION";
+
+ public static void useV2(NodeBuilder idxNb) {
+ if (!IndexFormatVersion.getDefault().isAtLeast(IndexFormatVersion.V2)) {
+ idxNb.setProperty(FulltextIndexConstants.COMPAT_MODE, IndexFormatVersion.V2.getVersion());
+ }
+ }
+
+ public static void useV2(Tree idxTree) {
+ if (!IndexFormatVersion.getDefault().isAtLeast(IndexFormatVersion.V2)) {
+ idxTree.setProperty(FulltextIndexConstants.COMPAT_MODE, IndexFormatVersion.V2.getVersion());
+ }
+ }
+
+ public static Tree enableForFullText(Tree props, String propName) {
+ return enableForFullText(props, propName, false);
+ }
+
+ public static Tree enableForFullText(Tree props, String propName, boolean regex) {
+ Tree prop = props.addChild(unique("prop"));
+ prop.setProperty(FulltextIndexConstants.PROP_NAME, propName);
+ prop.setProperty(FulltextIndexConstants.PROP_PROPERTY_INDEX, true);
+ prop.setProperty(FulltextIndexConstants.PROP_IS_REGEX, regex);
+ prop.setProperty(FulltextIndexConstants.PROP_NODE_SCOPE_INDEX, true);
+ prop.setProperty(FulltextIndexConstants.PROP_ANALYZED, true);
+ prop.setProperty(FulltextIndexConstants.PROP_USE_IN_EXCERPT, true);
+ prop.setProperty(FulltextIndexConstants.PROP_USE_IN_SPELLCHECK, true);
+ return prop;
+ }
+
+ public static Tree enableForOrdered(Tree props, String propName) {
+ Tree prop = enablePropertyIndex(props, propName, false);
+ prop.setProperty("ordered", true);
+ return prop;
+ }
+
+ public static Tree enablePropertyIndex(Tree props, String propName, boolean regex) {
+ Tree prop = props.addChild(unique("prop"));
+ prop.setProperty(FulltextIndexConstants.PROP_NAME, propName);
+ prop.setProperty(FulltextIndexConstants.PROP_PROPERTY_INDEX, true);
+ prop.setProperty(FulltextIndexConstants.PROP_IS_REGEX, regex);
+ prop.setProperty(FulltextIndexConstants.PROP_NODE_SCOPE_INDEX, false);
+ prop.setProperty(FulltextIndexConstants.PROP_ANALYZED, false);
+ return prop;
+ }
+
+ public static Tree enableFunctionIndex(Tree props, String function) {
+ Tree prop = props.addChild(unique("prop"));
+ prop.setProperty(FulltextIndexConstants.PROP_FUNCTION, function);
+ return prop;
+ }
+
+ public static AggregatorBuilder newNodeAggregator(Tree indexDefn) {
+ return new AggregatorBuilder(indexDefn);
+ }
+
+ public static Tree newRulePropTree(Tree indexDefn, String typeName) {
+ Tree rules = indexDefn.addChild(FulltextIndexConstants.INDEX_RULES);
+ rules.setOrderableChildren(true);
+ Tree rule = rules.addChild(typeName);
+ Tree props = rule.addChild(FulltextIndexConstants.PROP_NODE);
+ props.setOrderableChildren(true);
+ return props;
+ }
+
+ public static NodeBuilder child(NodeBuilder nb, String path) {
+ for (String name : PathUtils.elements(checkNotNull(path))) {
+ nb = nb.child(name);
+ }
+ return nb;
+ }
+
+ static class AggregatorBuilder {
+ private final Tree aggs;
+
+ private AggregatorBuilder(Tree indexDefn) {
+ this.aggs = indexDefn.addChild(FulltextIndexConstants.AGGREGATES);
+ }
+
+ AggregatorBuilder newRuleWithName(String primaryType, List<String> includes) {
+ Tree agg = aggs.addChild(primaryType);
+ for (String include : includes) {
+ agg.addChild(unique("include")).setProperty(FulltextIndexConstants.AGG_PATH, include);
+ }
+ return this;
+ }
+ }
+
+ static String unique(String name) {
+ return name + COUNTER.getAndIncrement();
+ }
+
+ public static NodeBuilder registerTestNodeType(NodeBuilder builder) {
+ registerNodeType(builder, TEST_NODE_TYPE);
+ return builder;
+ }
+
+ public static void registerNodeType(NodeBuilder builder, String nodeTypeDefn) {
+ // Taken from
+ // org.apache.jackrabbit.oak.plugins.nodetype.write.InitialContent
+ NodeState base = ModifiedNodeState.squeeze(builder.getNodeState());
+ NodeStore store = new MemoryNodeStore(base);
+ Root root = RootFactory.createSystemRoot(store,
+ new EditorHook(new CompositeEditorProvider(new NamespaceEditorProvider(), new TypeEditorProvider())),
+ null, null, null);
+ NodeTypeRegistry.register(root, IOUtils.toInputStream(nodeTypeDefn), "test node types");
+ NodeState target = store.getRoot();
+ target.compareAgainstBaseState(base, new ApplyDiff(builder));
+ }
+
+ public static Tree createNodeWithType(Tree t, String nodeName, String typeName) {
+ t = t.addChild(nodeName);
+ t.setProperty(JcrConstants.JCR_PRIMARYTYPE, typeName, Type.NAME);
+ return t;
+ }
+
+ public static NodeBuilder createNodeWithType(NodeBuilder builder, String nodeName, String typeName) {
+ builder = builder.child(nodeName);
+ builder.setProperty(JcrConstants.JCR_PRIMARYTYPE, typeName, Type.NAME);
+ return builder;
+ }
+
+ public static Tree createFileNode(Tree tree, String name, Blob content, String mimeType) {
+ Tree fileNode = tree.addChild(name);
+ fileNode.setProperty(JcrConstants.JCR_PRIMARYTYPE, JcrConstants.NT_FILE, Type.NAME);
+ Tree jcrContent = fileNode.addChild(JCR_CONTENT);
+ jcrContent.setProperty(JcrConstants.JCR_DATA, content);
+ jcrContent.setProperty(JcrConstants.JCR_MIMETYPE, mimeType);
+ return jcrContent;
+ }
+
+ public static void shutdown(Repository repository) {
+ if (repository instanceof JackrabbitRepository) {
+ ((JackrabbitRepository) repository).shutdown();
+ }
+ }
+
+ public static NodeBuilder enableIndexingMode(NodeBuilder builder, IndexingMode indexingMode) {
+ builder.setProperty(createAsyncProperty(indexingMode));
+ return builder;
+ }
+
+ public static Tree enableIndexingMode(Tree tree, IndexingMode indexingMode) {
+ tree.setProperty(createAsyncProperty(indexingMode));
+ return tree;
+ }
+
+ private static PropertyState createAsyncProperty(String indexingMode) {
+ return createProperty(IndexConstants.ASYNC_PROPERTY_NAME, of(indexingMode, "async"), STRINGS);
+ }
+
+ private static PropertyState createAsyncProperty(IndexingMode indexingMode) {
+ switch (indexingMode) {
+ case NRT:
+ case SYNC:
+ return createAsyncProperty(indexingMode.asyncValueName());
+ case ASYNC:
+ return createProperty(IndexConstants.ASYNC_PROPERTY_NAME, of("async"), STRINGS);
+ default:
+ throw new IllegalArgumentException("Unknown mode " + indexingMode);
+ }
+ }
+
+ public static class OptionalEditorProvider implements EditorProvider {
+ public EditorProvider delegate;
+
+ @Override
+ public Editor getRootEditor(NodeState before, NodeState after, NodeBuilder builder, CommitInfo info)
+ throws CommitFailedException {
+ if (delegate != null) {
+ return delegate.getRootEditor(before, after, builder, info);
+ }
+ return null;
+ }
+
+ }
+}
Propchange: jackrabbit/oak/trunk/oak-search/src/test/java/org/apache/jackrabbit/oak/plugins/index/TestUtil.java
------------------------------------------------------------------------------
svn:eol-style = native