Modified: jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/editor/FulltextIndexEditorContext.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/editor/FulltextIndexEditorContext.java?rev=1879989&r1=1879988&r2=1879989&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/editor/FulltextIndexEditorContext.java (original) +++ jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/editor/FulltextIndexEditorContext.java Fri Jul 17 08:28:19 2020 @@ -48,9 +48,7 @@ import org.slf4j.LoggerFactory; import static com.google.common.base.Preconditions.checkNotNull; import static org.apache.jackrabbit.oak.plugins.index.search.FulltextIndexConstants.PROP_RANDOM_SEED; import static org.apache.jackrabbit.oak.plugins.index.search.FulltextIndexConstants.PROP_REFRESH_DEFN; -import static org.apache.jackrabbit.oak.plugins.index.search.FulltextIndexConstants.REGEX_ALL_PROPS; import static org.apache.jackrabbit.oak.plugins.index.search.IndexDefinition.INDEX_DEFINITION_NODE; -import static org.apache.jackrabbit.oak.plugins.index.search.IndexDefinition.REINDEX_COMPLETION_TIMESTAMP; import static org.apache.jackrabbit.oak.plugins.index.search.IndexDefinition.STATUS_NODE; /** @@ -99,7 +97,7 @@ public abstract class FulltextIndexEdito protected FulltextIndexEditorContext(NodeState root, NodeBuilder definition, @Nullable IndexDefinition indexDefinition, IndexUpdateCallback updateCallback, - FulltextIndexWriterFactory indexWriterFactory, + FulltextIndexWriterFactory<D> indexWriterFactory, ExtractedTextCache extractedTextCache, IndexingContext indexingContext, boolean asyncIndexing) { this.root = root; @@ -133,7 +131,7 @@ public abstract class FulltextIndexEdito if (writer == null) { //Lazy initialization so as to ensure that definition is based //on latest NodeBuilder state specially in case of reindexing - writer = indexWriterFactory.newInstance(definition, definitionBuilder, reindex); + writer = indexWriterFactory.newInstance(definition, definitionBuilder, indexingContext.getCommitInfo(), reindex); } return writer; }
Modified: jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/editor/FulltextIndexWriterFactory.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/editor/FulltextIndexWriterFactory.java?rev=1879989&r1=1879988&r2=1879989&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/editor/FulltextIndexWriterFactory.java (original) +++ jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/editor/FulltextIndexWriterFactory.java Fri Jul 17 08:28:19 2020 @@ -20,6 +20,7 @@ package org.apache.jackrabbit.oak.plugins.index.search.spi.editor; import org.apache.jackrabbit.oak.plugins.index.search.IndexDefinition; +import org.apache.jackrabbit.oak.spi.commit.CommitInfo; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; /** @@ -31,9 +32,11 @@ public interface FulltextIndexWriterFact * create a new index writer instance * @param definition the index definition * @param definitionBuilder the node builder associated with the index definition + * @param commitInfo metadata associated with the commit for this writer * @param reindex whether or not reindex should be performed * @return an index writer */ - FulltextIndexWriter<D> newInstance(IndexDefinition definition, NodeBuilder definitionBuilder, boolean reindex); + FulltextIndexWriter<D> newInstance(IndexDefinition definition, NodeBuilder definitionBuilder, + CommitInfo commitInfo, boolean reindex); }
