Index: oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/Jcr.java =================================================================== --- oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/Jcr.java (revision 1401764) +++ oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/Jcr.java (working copy) @@ -16,6 +16,8 @@ */ package org.apache.jackrabbit.oak.jcr; +import static com.google.common.base.Preconditions.checkNotNull; + import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; @@ -26,10 +28,11 @@ import org.apache.jackrabbit.oak.Oak; import org.apache.jackrabbit.oak.plugins.commit.AnnotatingConflictHandler; import org.apache.jackrabbit.oak.plugins.commit.ConflictValidatorProvider; -import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneHook; +import org.apache.jackrabbit.oak.plugins.index.CompositeIndexHookProvider; +import org.apache.jackrabbit.oak.plugins.index.IndexHookManager; +import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexHookProvider; import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexProvider; -import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneReindexHook; -import org.apache.jackrabbit.oak.plugins.index.property.PropertyIndexHook; +import org.apache.jackrabbit.oak.plugins.index.property.PropertyIndexHookProvider; import org.apache.jackrabbit.oak.plugins.index.property.PropertyIndexProvider; import org.apache.jackrabbit.oak.plugins.name.NameValidatorProvider; import org.apache.jackrabbit.oak.plugins.name.NamespaceValidatorProvider; @@ -45,9 +48,6 @@ import org.apache.jackrabbit.oak.spi.query.QueryIndexProvider; import org.apache.jackrabbit.oak.spi.security.SecurityProvider; -import static com.google.common.base.Preconditions.checkNotNull; -import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.DEFAULT_INDEX_HOME; - public class Jcr { private final Oak oak; @@ -71,13 +71,14 @@ with(new TypeValidatorProvider()); with(new ConflictValidatorProvider()); - with(new PropertyIndexHook()); - with(new LuceneReindexHook(DEFAULT_INDEX_HOME)); - with(new LuceneHook(DEFAULT_INDEX_HOME)); + with(new IndexHookManager( + new CompositeIndexHookProvider( + new PropertyIndexHookProvider(), + new LuceneIndexHookProvider()))); with(new AnnotatingConflictHandler()); with(new PropertyIndexProvider()); - with(new LuceneIndexProvider(DEFAULT_INDEX_HOME)); + with(new LuceneIndexProvider()); } public Jcr() { Index: oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java =================================================================== --- oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java (revision 1401764) +++ oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java (working copy) @@ -19,6 +19,7 @@ import java.io.InputStream; import java.util.Properties; import java.util.concurrent.Executors; + import javax.jcr.Repository; import org.apache.jackrabbit.mk.api.MicroKernel; @@ -28,9 +29,10 @@ import org.apache.jackrabbit.oak.http.OakServlet; import org.apache.jackrabbit.oak.jcr.RepositoryImpl; import org.apache.jackrabbit.oak.plugins.commit.ConflictValidatorProvider; -import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneHook; -import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneReindexHook; -import org.apache.jackrabbit.oak.plugins.index.property.PropertyIndexHook; +import org.apache.jackrabbit.oak.plugins.index.CompositeIndexHookProvider; +import org.apache.jackrabbit.oak.plugins.index.IndexHookManager; +import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexHookProvider; +import org.apache.jackrabbit.oak.plugins.index.property.PropertyIndexHookProvider; import org.apache.jackrabbit.oak.plugins.name.NameValidatorProvider; import org.apache.jackrabbit.oak.plugins.name.NamespaceValidatorProvider; import org.apache.jackrabbit.oak.plugins.nodetype.DefaultTypeEditor; @@ -48,8 +50,6 @@ import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.servlet.ServletHolder; -import static org.apache.jackrabbit.oak.plugins.index.IndexUtils.DEFAULT_INDEX_HOME; - public class Main { public static final int PORT = 8080; @@ -204,9 +204,10 @@ return new CompositeHook( new DefaultTypeEditor(), new ValidatingHook(createDefaultValidatorProvider()), - new PropertyIndexHook(), - new LuceneReindexHook(DEFAULT_INDEX_HOME), - new LuceneHook(DEFAULT_INDEX_HOME)); + new IndexHookManager( + new CompositeIndexHookProvider( + new PropertyIndexHookProvider(), + new LuceneIndexHookProvider()))); } private static ValidatorProvider createDefaultValidatorProvider() { Index: oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexHookProvider.java =================================================================== --- oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexHookProvider.java (revision 0) +++ oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexHookProvider.java (revision 0) @@ -0,0 +1,32 @@ +/* + * 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 java.util.List; + +import javax.annotation.CheckForNull; +import javax.annotation.Nonnull; + +import org.apache.jackrabbit.oak.spi.state.NodeBuilder; + +public interface IndexHookProvider { + + @CheckForNull + @Nonnull + List getIndexHooks(String type, NodeBuilder builder); + +} Property changes on: oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexHookProvider.java ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision Rev URL Index: oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexHookManager.java =================================================================== --- oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexHookManager.java (revision 0) +++ oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexHookManager.java (revision 0) @@ -0,0 +1,215 @@ +/* + * 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 static org.apache.jackrabbit.JcrConstants.JCR_PRIMARYTYPE; +import static org.apache.jackrabbit.oak.commons.PathUtils.concat; +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.TYPE_PROPERTY_NAME; +import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.TYPE_UNKNOWN; +import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.REINDEX_PROPERTY_NAME; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.apache.jackrabbit.oak.api.CommitFailedException; +import org.apache.jackrabbit.oak.api.PropertyState; +import org.apache.jackrabbit.oak.api.Type; +import org.apache.jackrabbit.oak.plugins.memory.MemoryNodeState; +import org.apache.jackrabbit.oak.spi.commit.CommitHook; +import org.apache.jackrabbit.oak.spi.state.NodeBuilder; +import org.apache.jackrabbit.oak.spi.state.NodeState; +import org.apache.jackrabbit.oak.spi.state.NodeStateDiff; +import org.apache.jackrabbit.oak.spi.state.NodeStateUtils; + +public class IndexHookManager implements CommitHook { + + private final IndexHookProvider provider; + + public IndexHookManager(IndexHookProvider provider) { + this.provider = provider; + } + + @Override + public NodeState processCommit(NodeState before, NodeState after) + throws CommitFailedException { + NodeBuilder builder = after.builder(); + + // , + Map changedDefs = new HashMap(); + // , + Map existingDefs = new HashMap(); + + IndexDefDiff diff = new IndexDefDiff(builder, changedDefs, existingDefs); + after.compareAgainstBaseState(before, diff); + + // , + Map allDefs = new HashMap( + changedDefs); + allDefs.putAll(existingDefs); + + // , > + Map> updates = new HashMap>(); + for (String def : allDefs.keySet()) { + NodeBuilder cb = allDefs.get(def); + String type = TYPE_UNKNOWN; + PropertyState typePS = cb.getProperty(TYPE_PROPERTY_NAME); + if (typePS != null && !typePS.isArray()) { + type = typePS.getValue(Type.STRING); + } + Map defs = updates.get(type); + if (defs == null) { + defs = new HashMap(); + updates.put(type, defs); + } + defs.put(def, cb); + } + + // commit + for (String type : updates.keySet()) { + Map indexDefs = updates.get(type); + for (String p : indexDefs.keySet()) { + List hooks = provider.getIndexHooks(type, + indexDefs.get(p)); + for (IndexHook hook : hooks) { + boolean reindex = changedDefs.keySet().contains(p); + if (reindex) { + hook.processCommit(MemoryNodeState.EMPTY_NODE, after); + } else { + hook.processCommit(before, after); + } + } + } + } + return builder.getNodeState(); + } + + protected static class IndexDefDiff implements NodeStateDiff { + + private final IndexDefDiff parent; + + private final NodeBuilder node; + + private final String name; + + private String path; + + private final Map updates; + private final Map existing; + + public IndexDefDiff(IndexDefDiff parent, NodeBuilder node, String name, + String path, Map updates, + Map existing) { + this.parent = parent; + this.node = node; + this.name = name; + this.path = path; + this.updates = updates; + this.existing = existing; + + if (node != null + && isIndexNodeType(node.getProperty(JCR_PRIMARYTYPE))) { + resetReindexFlag(node); + this.updates.put(getPath(), node); + this.existing.remove(getPath()); + } + + if (node != null && node.hasChildNode(INDEX_DEFINITIONS_NAME)) { + NodeBuilder index = node.child(INDEX_DEFINITIONS_NAME); + for (String indexName : index.getChildNodeNames()) { + String indexPath = concat(getPath(), + INDEX_DEFINITIONS_NAME, indexName); + NodeBuilder indexChild = index.child(indexName); + if (isIndexNodeType(indexChild.getProperty(JCR_PRIMARYTYPE))) { + resetReindexFlag(indexChild); + this.existing.put(indexPath, indexChild); + } + } + } + } + + public IndexDefDiff(NodeBuilder root, Map updates, + Map existing) { + this(null, root, null, "/", updates, existing); + } + + public IndexDefDiff(IndexDefDiff parent, String name) { + this(parent, getChildNode(parent.node, name), name, null, + parent.updates, parent.existing); + } + + private static NodeBuilder getChildNode(NodeBuilder node, String name) { + if (node != null && node.hasChildNode(name)) { + return node.child(name); + } else { + return null; + } + } + + private String getPath() { + if (path == null) { // => parent != null + path = concat(parent.getPath(), name); + } + return path; + } + + @Override + public void propertyAdded(PropertyState after) { + } + + @Override + public void propertyChanged(PropertyState before, PropertyState after) { + } + + @Override + public void propertyDeleted(PropertyState before) { + } + + @Override + public void childNodeAdded(String name, NodeState after) { + childNodeChanged(name, MemoryNodeState.EMPTY_NODE, after); + } + + @Override + public void childNodeChanged(String name, NodeState before, + NodeState after) { + if (NodeStateUtils.isHidden(name)) { + return; + } + after.compareAgainstBaseState(before, new IndexDefDiff(this, name)); + } + + @Override + public void childNodeDeleted(String name, NodeState before) { + } + + private boolean isIndexNodeType(PropertyState ps) { + return ps != null + && !ps.isArray() + && ps.getValue(Type.STRING).equals( + INDEX_DEFINITIONS_NODE_TYPE); + } + + private void resetReindexFlag(NodeBuilder builder) { + if (builder.getProperty(REINDEX_PROPERTY_NAME) != null) { + builder.setProperty(REINDEX_PROPERTY_NAME, false); + } + } + } +} Property changes on: oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexHookManager.java ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision Rev URL Index: oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexConstants.java =================================================================== --- oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexConstants.java (revision 1401764) +++ oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexConstants.java (working copy) @@ -28,9 +28,4 @@ String REINDEX_PROPERTY_NAME = "reindex"; - String INDEX_DATA_CHILD_NAME = ":data"; - - //TODO remove this property as soon as the index manager is in - String DEFAULT_INDEX_HOME = "/"; - } Index: oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneHook.java =================================================================== --- oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneHook.java (revision 1401764) +++ oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneHook.java (working copy) @@ -16,35 +16,31 @@ */ package org.apache.jackrabbit.oak.plugins.index.lucene; -import static org.apache.jackrabbit.oak.plugins.index.IndexUtils.buildIndexDefinitions; - -import java.util.ArrayList; -import java.util.List; - import org.apache.jackrabbit.oak.api.CommitFailedException; -import org.apache.jackrabbit.oak.plugins.index.IndexDefinition; -import org.apache.jackrabbit.oak.spi.commit.CommitHook; -import org.apache.jackrabbit.oak.spi.commit.CompositeHook; +import org.apache.jackrabbit.oak.plugins.index.IndexHook; +import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeState; -public class LuceneHook implements CommitHook, LuceneIndexConstants { +/** + * {@link IndexHook} implementation that is responsible for keeping the + * {@link LuceneIndex} up to date + * + * @see LuceneIndex + * + */ +public class LuceneHook implements IndexHook { - private final String indexConfigPath; + private final NodeBuilder builder; - public LuceneHook(String indexConfigPath) { - this.indexConfigPath = indexConfigPath; + public LuceneHook(NodeBuilder builder) { + this.builder = builder; } @Override public NodeState processCommit(NodeState before, NodeState after) throws CommitFailedException { - List hooks = new ArrayList(); - List indexDefinitions = buildIndexDefinitions(after, - indexConfigPath, TYPE_LUCENE); - for (IndexDefinition def : indexDefinitions) { - hooks.add(new LuceneEditor(def.getPath())); - } - return CompositeHook.compose(hooks).processCommit(before, after); + new LuceneEditor(builder).processCommit(before, after); + return after; } } Index: oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProvider.java =================================================================== --- oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProvider.java (revision 1401764) +++ oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProvider.java (working copy) @@ -19,12 +19,10 @@ import static org.apache.jackrabbit.oak.plugins.index.IndexUtils.buildIndexDefinitions; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import javax.annotation.Nonnull; -import org.apache.jackrabbit.oak.commons.PathUtils; import org.apache.jackrabbit.oak.plugins.index.IndexDefinition; import org.apache.jackrabbit.oak.spi.query.QueryIndex; import org.apache.jackrabbit.oak.spi.query.QueryIndexProvider; @@ -41,21 +39,11 @@ private static final Logger LOG = LoggerFactory .getLogger(LuceneIndexProvider.class); - private final String indexPath; - - public LuceneIndexProvider(String indexPath) { - this.indexPath = indexPath; - } - @Override @Nonnull public List getQueryIndexes(NodeState nodeState) { - if (!PathUtils.isValid(indexPath)) { - LOG.warn("index path is not valid {}", indexPath); - return Collections. emptyList(); - } List tempIndexes = new ArrayList(); - for (IndexDefinition child : buildIndexDefinitions(nodeState, - indexPath, TYPE_LUCENE)) { + for (IndexDefinition child : buildIndexDefinitions(nodeState, "/", + TYPE_LUCENE)) { LOG.debug("found a lucene index definition {}", child); tempIndexes.add(new LuceneIndex(child)); } Index: oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexHookProvider.java =================================================================== --- oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexHookProvider.java (revision 0) +++ oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexHookProvider.java (revision 0) @@ -0,0 +1,39 @@ +/* + * 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.lucene; + +import java.util.List; + +import org.apache.jackrabbit.oak.plugins.index.IndexHook; +import org.apache.jackrabbit.oak.plugins.index.IndexHookProvider; +import org.apache.jackrabbit.oak.spi.state.NodeBuilder; + +import com.google.common.collect.ImmutableList; + +public class LuceneIndexHookProvider implements IndexHookProvider, + LuceneIndexConstants { + + @Override + public List getIndexHooks(String type, + NodeBuilder builder) { + if (TYPE_LUCENE.equals(type)) { + return ImmutableList.of(new LuceneHook(builder)); + } + return ImmutableList.of(); + } + +} Property changes on: oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexHookProvider.java ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision Rev URL Index: oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneReindexHook.java =================================================================== --- oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneReindexHook.java (revision 1401764) +++ oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneReindexHook.java (working copy) @@ -1,86 +0,0 @@ -/* - * 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.lucene; - -import static org.apache.jackrabbit.oak.plugins.index.IndexUtils.buildIndexDefinitions; - -import java.util.ArrayList; -import java.util.List; - -import org.apache.jackrabbit.oak.api.CommitFailedException; -import org.apache.jackrabbit.oak.plugins.index.IndexDefinition; -import org.apache.jackrabbit.oak.plugins.memory.MemoryNodeState; -import org.apache.jackrabbit.oak.spi.commit.CommitHook; -import org.apache.jackrabbit.oak.spi.commit.CompositeHook; -import org.apache.jackrabbit.oak.spi.state.NodeState; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * A {@link CommitHook} that handles re-indexing and initial indexing of the - * content. - * - * Currently it triggers a full reindex on any detected index definition change - * OR on the {@link IndexDefinition#isReindex()} flag - * - */ -public class LuceneReindexHook implements CommitHook, LuceneIndexConstants { - - private static final Logger LOG = LoggerFactory - .getLogger(LuceneReindexHook.class); - - private final String indexConfigPath; - - public LuceneReindexHook(String indexConfigPath) { - this.indexConfigPath = indexConfigPath; - } - - @Override - public NodeState processCommit(NodeState before, NodeState after) - throws CommitFailedException { - - List defsBefore = buildIndexDefinitions(before, - indexConfigPath, TYPE_LUCENE); - List defsAfter = buildIndexDefinitions(after, - indexConfigPath, TYPE_LUCENE); - - // TODO add a more fine-grained change verifier - List defsChanged = new ArrayList(); - for (IndexDefinition def : defsAfter) { - if (!defsBefore.contains(def)) { - defsChanged.add(def); - } - } - if (defsChanged.isEmpty()) { - return after; - } - LOG.debug("found {} updated index definitions ({})", - defsChanged.size(), defsChanged); - LOG.debug("reindexing repository content"); - long t = System.currentTimeMillis(); - // TODO buffer content reindex - List hooks = new ArrayList(); - for (IndexDefinition def : defsChanged) { - hooks.add(new LuceneEditor(def.getPath())); - } - NodeState done = CompositeHook.compose(hooks).processCommit( - MemoryNodeState.EMPTY_NODE, after); - LOG.debug("done reindexing repository content in {} ms.", - System.currentTimeMillis() - t); - return done; - } -} Index: oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneEditor.java =================================================================== --- oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneEditor.java (revision 1401764) +++ oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneEditor.java (working copy) @@ -17,7 +17,6 @@ package org.apache.jackrabbit.oak.plugins.index.lucene; import static org.apache.jackrabbit.oak.commons.PathUtils.concat; -import static org.apache.jackrabbit.oak.commons.PathUtils.elements; import static org.apache.jackrabbit.oak.plugins.index.lucene.FieldFactory.newPathField; import static org.apache.jackrabbit.oak.plugins.index.lucene.FieldFactory.newPropertyField; import static org.apache.jackrabbit.oak.plugins.index.lucene.TermFactory.newPathTerm; @@ -71,23 +70,17 @@ } } - private final String path; + private final NodeBuilder root; - public LuceneEditor(String path) { - this.path = path; + public LuceneEditor(NodeBuilder root) { + this.root = root; } @Override public NodeState processCommit(NodeState before, NodeState after) throws CommitFailedException { - NodeBuilder rootBuilder = after.builder(); - NodeBuilder builder = rootBuilder; - for (String name : elements(path)) { - builder = builder.child(name); - } - builder = builder.child(INDEX_DATA_CHILD_NAME); - Directory directory = new ReadWriteOakDirectory(builder); - + Directory directory = new ReadWriteOakDirectory( + root.child(INDEX_DATA_CHILD_NAME)); try { IndexWriter writer = new IndexWriter(directory, config); try { @@ -96,9 +89,8 @@ diff.postProcess(after); } finally { writer.close(); - builder.setProperty(REINDEX_PROPERTY_NAME, false); } - return rootBuilder.getNodeState(); + return after; } catch (IOException e) { e.printStackTrace(); throw new CommitFailedException( Index: oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexConstants.java =================================================================== --- oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexConstants.java (revision 1401764) +++ oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexConstants.java (working copy) @@ -22,6 +22,6 @@ String TYPE_LUCENE = "lucene"; - String DEFAULT_INDEX_NAME = "default-lucene"; + String INDEX_DATA_CHILD_NAME = ":data"; } Index: oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexHook.java =================================================================== --- oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexHook.java (revision 1401764) +++ oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexHook.java (working copy) @@ -22,27 +22,31 @@ import javax.annotation.Nonnull; import org.apache.jackrabbit.oak.api.CommitFailedException; -import org.apache.jackrabbit.oak.spi.commit.CommitHook; +import org.apache.jackrabbit.oak.plugins.index.IndexHook; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeState; import com.google.common.collect.Maps; /** - * {@link CommitHook} implementation that is responsible for keeping the + * {@link IndexHook} implementation that is responsible for keeping the * {@link PropertyIndex} up to date * * @see PropertyIndex * @see PropertyIndexLookup * */ -public class PropertyIndexHook implements CommitHook { +public class PropertyIndexHook implements IndexHook { + + private final NodeBuilder builder; + + public PropertyIndexHook(NodeBuilder builder) { + this.builder = builder; + } @Override @Nonnull public NodeState processCommit(NodeState before, NodeState after) throws CommitFailedException { - NodeBuilder builder = after.builder(); - Map> indexes = Maps.newHashMap(); PropertyIndexDiff diff = new PropertyIndexDiff(builder, indexes); after.compareAgainstBaseState(before, diff); @@ -53,7 +57,7 @@ } } - return builder.getNodeState(); + return after; } Index: oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexDiff.java =================================================================== --- oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexDiff.java (revision 1401764) +++ oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexDiff.java (working copy) @@ -16,7 +16,9 @@ */ package org.apache.jackrabbit.oak.plugins.index.property; +import static org.apache.jackrabbit.JcrConstants.JCR_PRIMARYTYPE; 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.commons.PathUtils.concat; import java.util.List; @@ -61,21 +63,13 @@ this.path = path; this.updates = updates; + if (node != null && isIndexNodeType(node.getProperty(JCR_PRIMARYTYPE))) { + update(node, name); + } if (node != null && node.hasChildNode(INDEX_DEFINITIONS_NAME)) { NodeBuilder index = node.child(INDEX_DEFINITIONS_NAME); for (String indexName : index.getChildNodeNames()) { - NodeBuilder indexChild = index.child(indexName); - PropertyState ps = indexChild.getProperty("propertyNames"); - Iterable propertyNames = ps != null ? ps - .getValue(Type.STRINGS) : ImmutableList.of(indexName); - for (String pname : propertyNames) { - List list = this.updates.get(pname); - if (list == null) { - list = Lists.newArrayList(); - this.updates.put(pname, list); - } - list.add(new PropertyIndexUpdate(getPath(), indexChild)); - } + update(index.child(indexName), indexName); } } } @@ -114,6 +108,25 @@ } } + private void update(NodeBuilder builder, String indexName) { + PropertyState ps = builder.getProperty("propertyNames"); + Iterable propertyNames = ps != null ? ps.getValue(Type.STRINGS) + : ImmutableList.of(indexName); + for (String pname : propertyNames) { + List list = this.updates.get(pname); + if (list == null) { + list = Lists.newArrayList(); + this.updates.put(pname, list); + } + list.add(new PropertyIndexUpdate(getPath(), builder)); + } + } + + private boolean isIndexNodeType(PropertyState ps) { + return ps != null && !ps.isArray() + && ps.getValue(Type.STRING).equals(INDEX_DEFINITIONS_NODE_TYPE); + } + //-----------------------------------------------------< NodeStateDiff >-- @Override Index: oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexHookProvider.java =================================================================== --- oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexHookProvider.java (revision 0) +++ oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexHookProvider.java (revision 0) @@ -0,0 +1,40 @@ +/* + * 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.property; + +import java.util.List; + +import org.apache.jackrabbit.oak.plugins.index.IndexHook; +import org.apache.jackrabbit.oak.plugins.index.IndexHookProvider; +import org.apache.jackrabbit.oak.spi.state.NodeBuilder; + +import com.google.common.collect.ImmutableList; + +public class PropertyIndexHookProvider implements IndexHookProvider { + + private static final String TYPE = "property"; + + @Override + public List getIndexHooks(String type, + NodeBuilder builder) { + if (TYPE.equals(type)) { + return ImmutableList.of(new PropertyIndexHook(builder)); + } + return ImmutableList.of(); + } + +} \ No newline at end of file Property changes on: oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexHookProvider.java ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision Rev URL Index: oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/CompositeIndexHookProvider.java =================================================================== --- oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/CompositeIndexHookProvider.java (revision 0) +++ oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/CompositeIndexHookProvider.java (revision 0) @@ -0,0 +1,71 @@ +/* + * 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 java.util.Arrays; +import java.util.Collection; +import java.util.List; + +import javax.annotation.Nonnull; + +import org.apache.jackrabbit.oak.spi.state.NodeBuilder; + +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; + +public class CompositeIndexHookProvider implements IndexHookProvider { + + @Nonnull + public static IndexHookProvider compose( + @Nonnull Collection providers) { + if (providers.isEmpty()) { + return new IndexHookProvider() { + @Override + public List getIndexHooks(String type, + NodeBuilder builder) { + return ImmutableList.of(); + } + }; + } else if (providers.size() == 1) { + return providers.iterator().next(); + } else { + return new CompositeIndexHookProvider( + ImmutableList.copyOf(providers)); + } + } + + private final List providers; + + private CompositeIndexHookProvider(List providers) { + this.providers = providers; + } + + public CompositeIndexHookProvider(IndexHookProvider... providers) { + this(Arrays.asList(providers)); + } + + @Override + @Nonnull + public List getIndexHooks(String type, + NodeBuilder builder) { + List indexes = Lists.newArrayList(); + for (IndexHookProvider provider : providers) { + indexes.addAll(provider.getIndexHooks(type, builder)); + } + return indexes; + } +} Index: oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexHook.java =================================================================== --- oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexHook.java (revision 0) +++ oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexHook.java (revision 0) @@ -0,0 +1,23 @@ +/* + * 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.oak.spi.commit.CommitHook; + +public interface IndexHook extends CommitHook { + +} Index: oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/InitialContent.java =================================================================== --- oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/InitialContent.java (revision 1401764) +++ oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/InitialContent.java (working copy) @@ -91,6 +91,7 @@ NodeBuilder index = root.child("oak:index"); index.child("uuid") .setProperty("jcr:primaryType", "oak:queryIndexDefinition", Type.NAME) + .setProperty("type", "property") .setProperty("propertyNames", "jcr:uuid") .setProperty("unique", true); index.child("primaryType") @@ -100,10 +101,12 @@ // FIXME: rep:principalName only needs to be unique if defined with user/group nodes -> add defining nt-info to uniqueness constraint otherwise ac-editing will fail. index.child("authorizableId") .setProperty("jcr:primaryType", "oak:queryIndexDefinition", Type.NAME) + .setProperty("type", "property") .setProperty("propertyNames", "rep:authorizableId") .setProperty("unique", true); index.child("principalName") .setProperty("jcr:primaryType", "oak:queryIndexDefinition", Type.NAME) + .setProperty("type", "property") .setProperty("propertyNames", "rep:principalName") .setProperty("unique", true); } Index: oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexQueryTest.java =================================================================== --- oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexQueryTest.java (revision 1401764) +++ oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexQueryTest.java (working copy) @@ -18,6 +18,7 @@ import org.apache.jackrabbit.oak.Oak; import org.apache.jackrabbit.oak.api.ContentRepository; +import org.apache.jackrabbit.oak.plugins.index.IndexHookManager; import org.apache.jackrabbit.oak.plugins.nodetype.InitialContent; import org.apache.jackrabbit.oak.query.AbstractQueryTest; @@ -32,7 +33,7 @@ return new Oak() .with(new InitialContent()) .with(new PropertyIndexProvider()) - .with(new PropertyIndexHook()) + .with(new IndexHookManager(new PropertyIndexHookProvider())) .createContentRepository(); } Index: oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexTest.java =================================================================== --- oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexTest.java (revision 1401764) +++ oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexTest.java (working copy) @@ -61,7 +61,7 @@ // ... then see how adding an index affects the code lookup = new PropertyIndexLookup( - new PropertyIndexHook().processCommit(before, after)); + new PropertyIndexHook(builder).processCommit(before, after)); long withIndex = System.nanoTime(); assertEquals(ImmutableSet.of("a", "b"), lookup.find("foo", "abc")); assertEquals(ImmutableSet.of("b"), lookup.find("foo", "def")); @@ -105,7 +105,7 @@ // ... then see how adding an index affects the code lookup = new PropertyIndexLookup( - new PropertyIndexHook().processCommit(before, after)); + new PropertyIndexHook(builder).processCommit(before, after)); long withIndex = System.nanoTime(); assertEquals(ImmutableSet.of("a", "b"), lookup.find("foo", "abc")); assertEquals(ImmutableSet.of("b"), lookup.find("foo", "def")); Index: oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexQueryTest.java =================================================================== --- oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexQueryTest.java (revision 1401764) +++ oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexQueryTest.java (working copy) @@ -19,6 +19,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.plugins.index.IndexHookManager; import org.apache.jackrabbit.oak.plugins.nodetype.InitialContent; import org.apache.jackrabbit.oak.query.AbstractQueryTest; @@ -39,9 +40,8 @@ protected ContentRepository createRepository() { return new Oak() .with(new InitialContent()) - .with(new LuceneIndexProvider(TEST_INDEX_HOME)) - .with(new LuceneReindexHook(TEST_INDEX_HOME)) - .with(new LuceneHook(TEST_INDEX_HOME)) + .with(new LuceneIndexProvider()) + .with(new IndexHookManager(new LuceneIndexHookProvider())) .createContentRepository(); } Index: oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexTest.java =================================================================== --- oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexTest.java (revision 1401764) +++ oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexTest.java (working copy) @@ -20,52 +20,42 @@ import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; -import javax.security.auth.Subject; - -import org.apache.jackrabbit.mk.core.MicroKernelImpl; -import org.apache.jackrabbit.oak.api.Root; -import org.apache.jackrabbit.oak.api.Tree; -import org.apache.jackrabbit.oak.core.RootImpl; -import org.apache.jackrabbit.oak.kernel.KernelNodeStore; import org.apache.jackrabbit.oak.plugins.index.IndexDefinition; import org.apache.jackrabbit.oak.plugins.index.IndexDefinitionImpl; +import org.apache.jackrabbit.oak.plugins.memory.MemoryNodeState; import org.apache.jackrabbit.oak.query.ast.Operator; import org.apache.jackrabbit.oak.query.index.FilterImpl; -import org.apache.jackrabbit.oak.security.authorization.AccessControlProviderImpl; -import org.apache.jackrabbit.oak.spi.query.CompositeQueryIndexProvider; import org.apache.jackrabbit.oak.spi.query.Cursor; import org.apache.jackrabbit.oak.spi.query.Filter; import org.apache.jackrabbit.oak.spi.query.PropertyValues; import org.apache.jackrabbit.oak.spi.query.QueryIndex; +import org.apache.jackrabbit.oak.spi.state.NodeBuilder; +import org.apache.jackrabbit.oak.spi.state.NodeState; import org.junit.Test; public class LuceneIndexTest implements LuceneIndexConstants { - private static String DEFAULT_INDEX_NAME = "default-lucene"; - @Test public void testLucene() throws Exception { - KernelNodeStore store = new KernelNodeStore(new MicroKernelImpl()); + NodeState root = MemoryNodeState.EMPTY_NODE; - IndexDefinition testID = new IndexDefinitionImpl(DEFAULT_INDEX_NAME, - TYPE_LUCENE, "/" + INDEX_DEFINITIONS_NAME + "/" - + DEFAULT_INDEX_NAME); + NodeBuilder builder = root.builder(); + NodeBuilder index = builder.child("oak:index").child("lucene"); + IndexDefinition testDef = new IndexDefinitionImpl("lucene", + TYPE_LUCENE, "/oak:index/lucene"); - store.setHook(new LuceneEditor(testID.getPath())); - Root root = new RootImpl(store, null, new Subject(), - new AccessControlProviderImpl(), - new CompositeQueryIndexProvider()); + NodeState before = builder.getNodeState(); + builder.setProperty("foo", "bar"); + NodeState after = builder.getNodeState(); - Tree tree = root.getTree("/"); - tree.setProperty("foo", "bar"); - root.commit(); + new LuceneEditor(index).processCommit(before, after); - QueryIndex index = new LuceneIndex(testID); + QueryIndex queryIndex = new LuceneIndex(testDef); FilterImpl filter = new FilterImpl(null); filter.restrictPath("/", Filter.PathRestriction.EXACT); filter.restrictProperty("foo", Operator.EQUAL, PropertyValues.newString("bar")); - Cursor cursor = index.query(filter, store.getRoot()); + Cursor cursor = queryIndex.query(filter, builder.getNodeState()); assertTrue(cursor.next()); assertEquals("/", cursor.currentRow().getPath()); assertFalse(cursor.next()); Index: oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/IndexHookManagerTest.java =================================================================== --- oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/IndexHookManagerTest.java (revision 0) +++ oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/IndexHookManagerTest.java (revision 0) @@ -0,0 +1,95 @@ +/* + * 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 static org.apache.jackrabbit.JcrConstants.JCR_PRIMARYTYPE; +import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.INDEX_DEFINITIONS_NODE_TYPE; +import static org.junit.Assert.assertTrue; + +import java.util.HashMap; +import java.util.Map; +import java.util.Set; + +import org.apache.jackrabbit.oak.api.Type; +import org.apache.jackrabbit.oak.plugins.index.IndexHookManager.IndexDefDiff; +import org.apache.jackrabbit.oak.plugins.memory.MemoryNodeState; +import org.apache.jackrabbit.oak.spi.state.NodeBuilder; +import org.apache.jackrabbit.oak.spi.state.NodeState; +import org.junit.Test; + +public class IndexHookManagerTest { + + @Test + public void test() throws Exception { + NodeState root = MemoryNodeState.EMPTY_NODE; + + NodeBuilder builder = root.builder(); + // this index is on the current update branch, it should be seen by the + // diff + builder.child("oak:index") + .child("existing") + .setProperty(JCR_PRIMARYTYPE, INDEX_DEFINITIONS_NODE_TYPE, + Type.NAME); + // this index is NOT the current update branch, it should NOT be seen by + // the diff + builder.child("newchild") + .child("other") + .child("oak:index") + .child("existing2") + .setProperty(JCR_PRIMARYTYPE, INDEX_DEFINITIONS_NODE_TYPE, + Type.NAME); + + NodeState before = builder.getNodeState(); + // Add index definition + builder.child("oak:index") + .child("foo") + .setProperty(JCR_PRIMARYTYPE, INDEX_DEFINITIONS_NODE_TYPE, + Type.NAME); + builder.child("test") + .child("other") + .child("oak:index") + .child("index2") + .setProperty(JCR_PRIMARYTYPE, INDEX_DEFINITIONS_NODE_TYPE, + Type.NAME); + NodeState after = builder.getNodeState(); + + // , + Map changedDefs = new HashMap(); + // , + Map existingDefs = new HashMap(); + + IndexDefDiff diff = new IndexDefDiff(builder, changedDefs, existingDefs); + after.compareAgainstBaseState(before, diff); + + Set updates = changedDefs.keySet(); + String[] expected = new String[] { "/oak:index/foo", + "/test/other/oak:index/index2" }; + for (String def : expected) { + assertTrue("Expected to find " + def, updates.remove(def)); + } + assertTrue(updates.isEmpty()); + + Set existing = existingDefs.keySet(); + String[] expectedE = new String[] { "/oak:index/existing", }; + for (String def : expectedE) { + assertTrue("Expected to find " + def, existing.remove(def)); + } + assertTrue(existing.isEmpty()); + + } + +} Property changes on: oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/IndexHookManagerTest.java ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision Rev URL Index: oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/old/QueryTest.java =================================================================== --- oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/old/QueryTest.java (revision 1401764) +++ oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/old/QueryTest.java (working copy) @@ -19,8 +19,6 @@ import org.apache.jackrabbit.mk.index.IndexWrapper; import org.apache.jackrabbit.oak.Oak; import org.apache.jackrabbit.oak.api.ContentRepository; -import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneHook; -import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneReindexHook; import org.apache.jackrabbit.oak.plugins.nodetype.InitialContent; import org.apache.jackrabbit.oak.query.AbstractQueryTest; import org.apache.jackrabbit.oak.spi.commit.CommitHook; @@ -45,8 +43,6 @@ .with(new InitialContent()) .with((QueryIndexProvider) indexer) .with((CommitHook) indexer) - .with(new LuceneReindexHook(TEST_INDEX_HOME)) - .with(new LuceneHook(TEST_INDEX_HOME)) .createContentRepository(); } Index: oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserProviderTest.java =================================================================== --- oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserProviderTest.java (revision 1401764) +++ oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserProviderTest.java (working copy) @@ -24,7 +24,8 @@ import org.apache.jackrabbit.oak.api.CommitFailedException; import org.apache.jackrabbit.oak.api.Root; import org.apache.jackrabbit.oak.api.Tree; -import org.apache.jackrabbit.oak.plugins.index.property.PropertyIndexHook; +import org.apache.jackrabbit.oak.plugins.index.IndexHookManager; +import org.apache.jackrabbit.oak.plugins.index.property.PropertyIndexHookProvider; import org.apache.jackrabbit.oak.plugins.nodetype.InitialContent; import org.apache.jackrabbit.oak.spi.security.ConfigurationParameters; import org.apache.jackrabbit.oak.spi.security.user.UserConstants; @@ -61,7 +62,7 @@ public void setUp() throws Exception { root = new Oak() .with(new InitialContent()) - .with(new PropertyIndexHook()) + .with(new IndexHookManager(new PropertyIndexHookProvider())) .createRoot(); defaultConfig = new ConfigurationParameters(); Index: oak-core/pom.xml =================================================================== --- oak-core/pom.xml (revision 1401764) +++ oak-core/pom.xml (working copy) @@ -48,6 +48,7 @@ org.apache.jackrabbit.oak.plugins.value, org.apache.jackrabbit.oak.plugins.commit, org.apache.jackrabbit.oak.plugins.identifier, + org.apache.jackrabbit.oak.plugins.index, org.apache.jackrabbit.oak.plugins.index.lucene, org.apache.jackrabbit.oak.plugins.index.property, org.apache.jackrabbit.oak.plugins.memory,