Author: chetanm
Date: Thu Sep 15 07:19:17 2016
New Revision: 1760860
URL: http://svn.apache.org/viewvc?rev=1760860&view=rev
Log:
OAK-4412 - Lucene hybrid index
Preparing for supporting sync index
-- Refactored all calls which enabled sync/nrt index via direct manipulation of
builder to utility method
-- Introduced a new synonym for sync indexing 'nrt'. So async can have value
sync or nrt for it to be invoked as part of commit
Modified:
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinition.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorProvider.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinitionTest.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorProviderTest.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/TestUtil.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/DocumentQueueTest.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/HybridIndexTest.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LocalIndexWriterFactoryTest.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/NRTIndexFactoryTest.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/NRTIndexTest.java
Modified:
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinition.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinition.java?rev=1760860&r1=1760859&r2=1760860&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinition.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinition.java
Thu Sep 15 07:19:17 2016
@@ -230,7 +230,7 @@ public final class IndexDefinition imple
private final String indexPath;
- private final boolean nrt;
+ private final boolean nrtIndexMode;
@Nullable
private final String uid;
@@ -304,7 +304,7 @@ public final class IndexDefinition imple
this.secureFacets = defn.hasChildNode(FACETS) &&
getOptionalValue(defn.getChildNode(FACETS), PROP_SECURE_FACETS, true);
this.suggestEnabled = evaluateSuggestionEnabled();
this.spellcheckEnabled = evaluateSpellcheckEnabled();
- this.nrt = supportsNRTIndexing(defn);
+ this.nrtIndexMode = supportsNRTIndexing(defn);
}
public NodeState getDefinitionNodeState() {
@@ -437,7 +437,7 @@ public final class IndexDefinition imple
}
public boolean isNRTIndexingEnabled() {
- return nrt;
+ return nrtIndexMode;
}
@Override
@@ -1573,16 +1573,20 @@ public final class IndexDefinition imple
}
private static boolean supportsNRTIndexing(NodeState defn) {
- return supportsSyncIndexing(new ReadOnlyBuilder(defn));
+ return supportsIndexingMode(new ReadOnlyBuilder(defn), "nrt");
}
- public static boolean supportsSyncIndexing(NodeBuilder defn) {
+ public static boolean supportsSyncOrNRTIndexing(NodeBuilder defn) {
+ return supportsIndexingMode(defn, "nrt") || supportsIndexingMode(defn,
"sync");
+ }
+
+ private static boolean supportsIndexingMode(NodeBuilder defn, String mode)
{
PropertyState async =
defn.getProperty(IndexConstants.ASYNC_PROPERTY_NAME);
if (async == null){
return false;
}
//TODO [hybrid] make it a constant
- return Iterables.contains(async.getValue(Type.STRINGS), "sync");
+ return Iterables.contains(async.getValue(Type.STRINGS), mode);
}
}
Modified:
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorProvider.java?rev=1760860&r1=1760859&r2=1760860&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorProvider.java
Thu Sep 15 07:19:17 2016
@@ -102,7 +102,7 @@ public class LuceneIndexEditorProvider i
LuceneIndexWriterFactory writerFactory = indexWriterFactory;
IndexDefinition indexDefinition = null;
boolean asyncIndexing = true;
- if (!indexingContext.isAsync() &&
IndexDefinition.supportsSyncIndexing(definition)) {
+ if (!indexingContext.isAsync() &&
IndexDefinition.supportsSyncOrNRTIndexing(definition)) {
//Would not participate in reindexing. Only interested in
//incremental indexing
Modified:
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinitionTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinitionTest.java?rev=1760860&r1=1760859&r2=1760860&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinitionTest.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinitionTest.java
Thu Sep 15 07:19:17 2016
@@ -868,8 +868,8 @@ public class IndexDefinitionTest {
}
@Test
- public void sync() throws Exception{
- builder.setProperty(createProperty(IndexConstants.ASYNC_PROPERTY_NAME,
of("sync" , "async"), STRINGS));
+ public void nrt() throws Exception{
+ TestUtil.enableNRTIndexing(builder);
IndexDefinition idxDefn = new IndexDefinition(root,
builder.getNodeState());
assertTrue(idxDefn.isNRTIndexingEnabled());
}
Modified:
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorProviderTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorProviderTest.java?rev=1760860&r1=1760859&r2=1760860&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorProviderTest.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorProviderTest.java
Thu Sep 15 07:19:17 2016
@@ -119,7 +119,7 @@ public class LuceneIndexEditorProviderTe
private NodeState createIndexDefinition(String idxName) {
NodeBuilder idx =
newLucenePropertyIndexDefinition(builder.child("oak:index"),
idxName, ImmutableSet.of("foo"), "async");
- idx.setProperty(createProperty(IndexConstants.ASYNC_PROPERTY_NAME,
of("sync", "async"), STRINGS));
+ TestUtil.enableNRTIndexing(idx);
LuceneIndexEditorContext.configureUniqueId(idx);
IndexDefinition.updateDefinition(idx);
return idx.getNodeState();
Modified:
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/TestUtil.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/TestUtil.java?rev=1760860&r1=1760859&r2=1760860&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/TestUtil.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/TestUtil.java
Thu Sep 15 07:19:17 2016
@@ -37,6 +37,7 @@ import org.apache.jackrabbit.oak.api.Roo
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.IndexConstants;
import org.apache.jackrabbit.oak.plugins.index.lucene.util.LuceneIndexHelper;
import org.apache.jackrabbit.oak.plugins.memory.MemoryNodeStore;
import org.apache.jackrabbit.oak.plugins.memory.ModifiedNodeState;
@@ -219,4 +220,14 @@ public class TestUtil {
((JackrabbitRepository) repository).shutdown();
}
}
+
+ public static NodeBuilder enableNRTIndexing(NodeBuilder builder){
+ builder.setProperty(createProperty(IndexConstants.ASYNC_PROPERTY_NAME,
of("nrt" , "async"), STRINGS));
+ return builder;
+ }
+
+ public static Tree enableNRTIndexing(Tree tree){
+ tree.setProperty(createProperty(IndexConstants.ASYNC_PROPERTY_NAME,
of("nrt" , "async"), STRINGS));
+ return tree;
+ }
}
Modified:
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/DocumentQueueTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/DocumentQueueTest.java?rev=1760860&r1=1760859&r2=1760860&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/DocumentQueueTest.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/DocumentQueueTest.java
Thu Sep 15 07:19:17 2016
@@ -31,13 +31,13 @@ import com.google.common.collect.Immutab
import com.google.common.collect.ImmutableSet;
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.core.SimpleCommitContext;
-import org.apache.jackrabbit.oak.plugins.index.IndexConstants;
import org.apache.jackrabbit.oak.plugins.index.IndexEditorProvider;
import org.apache.jackrabbit.oak.plugins.index.IndexUpdateProvider;
import org.apache.jackrabbit.oak.plugins.index.lucene.IndexCopier;
import org.apache.jackrabbit.oak.plugins.index.lucene.IndexNode;
import org.apache.jackrabbit.oak.plugins.index.lucene.IndexTracker;
import
org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexEditorProvider;
+import org.apache.jackrabbit.oak.plugins.index.lucene.TestUtil;
import
org.apache.jackrabbit.oak.plugins.index.lucene.reader.DefaultIndexReaderFactory;
import org.apache.jackrabbit.oak.spi.commit.CommitContext;
import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
@@ -56,17 +56,17 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
-import static com.google.common.collect.ImmutableSet.of;
import static
com.google.common.util.concurrent.MoreExecutors.sameThreadExecutor;
-import static org.apache.jackrabbit.oak.api.Type.STRINGS;
import static
org.apache.jackrabbit.oak.plugins.index.lucene.FieldFactory.newPathField;
import static
org.apache.jackrabbit.oak.plugins.index.lucene.hybrid.LocalIndexObserverTest.NOOP_EXECUTOR;
import static
org.apache.jackrabbit.oak.plugins.index.lucene.util.LuceneIndexHelper.newLucenePropertyIndexDefinition;
import static
org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.EMPTY_NODE;
-import static
org.apache.jackrabbit.oak.plugins.memory.PropertyStates.createProperty;
import static
org.apache.jackrabbit.oak.plugins.nodetype.write.InitialContent.INITIAL_CONTENT;
import static
org.apache.jackrabbit.oak.spi.mount.Mounts.defaultMountInfoProvider;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
public class DocumentQueueTest {
@Rule
@@ -295,7 +295,7 @@ public class DocumentQueueTest {
private void createIndexDefinition(String idxName) {
NodeBuilder idx =
newLucenePropertyIndexDefinition(builder.child("oak:index"),
idxName, ImmutableSet.of("foo"), "async");
- idx.setProperty(createProperty(IndexConstants.ASYNC_PROPERTY_NAME,
of("sync" , "async"), STRINGS));
+ TestUtil.enableNRTIndexing(idx);
}
}
\ No newline at end of file
Modified:
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/HybridIndexTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/HybridIndexTest.java?rev=1760860&r1=1760859&r2=1760860&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/HybridIndexTest.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/HybridIndexTest.java
Thu Sep 15 07:19:17 2016
@@ -31,13 +31,11 @@ import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import com.google.common.base.Predicate;
-import com.google.common.collect.ImmutableSet;
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.commons.PathUtils;
import org.apache.jackrabbit.oak.plugins.index.AsyncIndexUpdate;
-import org.apache.jackrabbit.oak.plugins.index.IndexConstants;
import
org.apache.jackrabbit.oak.plugins.index.counter.NodeCounterEditorProvider;
import org.apache.jackrabbit.oak.plugins.index.lucene.IndexCopier;
import org.apache.jackrabbit.oak.plugins.index.lucene.IndexTracker;
@@ -67,9 +65,7 @@ import org.junit.rules.TemporaryFolder;
import static com.google.common.collect.ImmutableList.of;
import static
com.google.common.util.concurrent.MoreExecutors.sameThreadExecutor;
-import static org.apache.jackrabbit.oak.api.Type.STRINGS;
import static
org.apache.jackrabbit.oak.plugins.index.lucene.LucenePropertyIndexTest.createIndex;
-import static
org.apache.jackrabbit.oak.plugins.memory.PropertyStates.createProperty;
import static
org.apache.jackrabbit.oak.spi.mount.Mounts.defaultMountInfoProvider;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -133,7 +129,7 @@ public class HybridIndexTest extends Abs
public void hybridIndex() throws Exception{
String idxName = "hybridtest";
Tree idx = createIndex(root.getTree("/"), idxName,
Collections.singleton("foo"));
- idx.setProperty(createProperty(IndexConstants.ASYNC_PROPERTY_NAME,
ImmutableSet.of("sync" , "async"), STRINGS));
+ TestUtil.enableNRTIndexing(idx);
root.commit();
//Get initial indexing done as local indexing only work
@@ -169,7 +165,7 @@ public class HybridIndexTest extends Abs
public void noTextExtractionForSyncCommit() throws Exception{
String idxName = "hybridtest";
Tree idx = TestUtil.createFulltextIndex(root.getTree("/"), idxName);
- idx.setProperty(createProperty(IndexConstants.ASYNC_PROPERTY_NAME,
ImmutableSet.of("sync" , "async"), STRINGS));
+ TestUtil.enableNRTIndexing(idx);
root.commit();
runAsyncIndex();
Modified:
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LocalIndexWriterFactoryTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LocalIndexWriterFactoryTest.java?rev=1760860&r1=1760859&r2=1760860&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LocalIndexWriterFactoryTest.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LocalIndexWriterFactoryTest.java
Thu Sep 15 07:19:17 2016
@@ -29,6 +29,7 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.index.IndexEditorProvider;
import org.apache.jackrabbit.oak.plugins.index.IndexUpdateProvider;
import
org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexEditorProvider;
+import org.apache.jackrabbit.oak.plugins.index.lucene.TestUtil;
import org.apache.jackrabbit.oak.spi.commit.CommitContext;
import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
import org.apache.jackrabbit.oak.spi.commit.EditorHook;
@@ -176,7 +177,7 @@ public class LocalIndexWriterFactoryTest
private void createIndexDefinition(String idxName) {
NodeBuilder idx =
newLucenePropertyIndexDefinition(builder.child("oak:index"),
idxName, ImmutableSet.of("foo"), "async");
- idx.setProperty(createProperty(IndexConstants.ASYNC_PROPERTY_NAME,
of("sync" , "async"), STRINGS));
+ TestUtil.enableNRTIndexing(idx);
}
}
\ No newline at end of file
Modified:
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/NRTIndexFactoryTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/NRTIndexFactoryTest.java?rev=1760860&r1=1760859&r2=1760860&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/NRTIndexFactoryTest.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/NRTIndexFactoryTest.java
Thu Sep 15 07:19:17 2016
@@ -25,6 +25,7 @@ import java.io.IOException;
import org.apache.jackrabbit.oak.plugins.index.IndexConstants;
import org.apache.jackrabbit.oak.plugins.index.lucene.IndexCopier;
import org.apache.jackrabbit.oak.plugins.index.lucene.IndexDefinition;
+import org.apache.jackrabbit.oak.plugins.index.lucene.TestUtil;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.junit.Before;
@@ -32,12 +33,13 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
-import static com.google.common.collect.ImmutableSet.of;
import static
com.google.common.util.concurrent.MoreExecutors.sameThreadExecutor;
-import static org.apache.jackrabbit.oak.api.Type.STRINGS;
-import static
org.apache.jackrabbit.oak.plugins.memory.PropertyStates.createProperty;
import static
org.apache.jackrabbit.oak.plugins.nodetype.write.InitialContent.INITIAL_CONTENT;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
public class NRTIndexFactoryTest {
@Rule
@@ -105,7 +107,7 @@ public class NRTIndexFactoryTest {
private IndexDefinition getSyncIndexDefinition(String indexPath) {
builder.setProperty(IndexConstants.INDEX_PATH, indexPath);
- builder.setProperty(createProperty(IndexConstants.ASYNC_PROPERTY_NAME,
of("sync" , "async"), STRINGS));
+ TestUtil.enableNRTIndexing(builder);
return new IndexDefinition(root, builder.getNodeState());
}
Modified:
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/NRTIndexTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/NRTIndexTest.java?rev=1760860&r1=1760859&r2=1760860&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/NRTIndexTest.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/NRTIndexTest.java
Thu Sep 15 07:19:17 2016
@@ -27,6 +27,7 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.index.lucene.IndexCopier;
import org.apache.jackrabbit.oak.plugins.index.lucene.IndexDefinition;
import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexEditorContext;
+import org.apache.jackrabbit.oak.plugins.index.lucene.TestUtil;
import org.apache.jackrabbit.oak.plugins.index.lucene.reader.LuceneIndexReader;
import org.apache.jackrabbit.oak.plugins.index.lucene.writer.LuceneIndexWriter;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
@@ -38,13 +39,16 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
-import static com.google.common.collect.ImmutableSet.of;
import static
com.google.common.util.concurrent.MoreExecutors.sameThreadExecutor;
-import static org.apache.jackrabbit.oak.api.Type.STRINGS;
import static
org.apache.jackrabbit.oak.plugins.index.lucene.FieldFactory.newPathField;
-import static
org.apache.jackrabbit.oak.plugins.memory.PropertyStates.createProperty;
import static
org.apache.jackrabbit.oak.plugins.nodetype.write.InitialContent.INITIAL_CONTENT;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
public class NRTIndexTest {
@Rule
@@ -167,7 +171,7 @@ public class NRTIndexTest {
private IndexDefinition getSyncIndexDefinition(String indexPath) {
builder.setProperty(IndexConstants.INDEX_PATH, indexPath);
- builder.setProperty(createProperty(IndexConstants.ASYNC_PROPERTY_NAME,
of("sync" , "async"), STRINGS));
+ TestUtil.enableNRTIndexing(builder);
return new IndexDefinition(root, builder.getNodeState());
}
