Modified: jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/OakDirectoryTestBase.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/OakDirectoryTestBase.java?rev=1841926&r1=1841925&r2=1841926&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/OakDirectoryTestBase.java (original) +++ jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/OakDirectoryTestBase.java Tue Sep 25 12:24:15 2018 @@ -24,15 +24,14 @@ import static org.apache.commons.io.File import static org.apache.commons.io.FileUtils.ONE_MB; import static org.apache.jackrabbit.JcrConstants.JCR_DATA; import static org.apache.jackrabbit.oak.InitialContentHelper.INITIAL_CONTENT; -import static org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants.INDEX_DATA_CHILD_NAME; import static org.apache.jackrabbit.oak.plugins.index.lucene.directory.OakDirectory.PROP_BLOB_SIZE; import static org.apache.jackrabbit.oak.plugins.index.lucene.directory.OakDirectory.PROP_UNIQUE_KEY; import static org.apache.jackrabbit.oak.plugins.index.lucene.directory.OakDirectory.PROP_UNSAFE_FOR_ACTIVE_DELETION; import static org.apache.jackrabbit.oak.plugins.index.lucene.directory.OakDirectory.UNIQUE_KEY_SIZE; +import static org.apache.jackrabbit.oak.plugins.index.search.FulltextIndexConstants.INDEX_DATA_CHILD_NAME; import static org.hamcrest.CoreMatchers.containsString; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; @@ -61,8 +60,10 @@ import org.apache.jackrabbit.oak.api.Pro import org.apache.jackrabbit.oak.api.Type; import org.apache.jackrabbit.oak.plugins.blob.BlobStoreBlob; import org.apache.jackrabbit.oak.plugins.blob.datastore.DataStoreBlobStore; -import org.apache.jackrabbit.oak.plugins.index.lucene.IndexDefinition; import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants; +import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexDefinition; +import org.apache.jackrabbit.oak.plugins.index.search.FulltextIndexConstants; +import org.apache.jackrabbit.oak.plugins.index.search.IndexDefinition; import org.apache.jackrabbit.oak.plugins.memory.ArrayBasedBlob; import org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState; import org.apache.jackrabbit.oak.plugins.memory.PropertyStates; @@ -106,7 +107,7 @@ abstract public class OakDirectoryTestBa @Test public void testCompatibility() throws Exception{ - builder.setProperty(LuceneIndexConstants.BLOB_SIZE, OakBufferedIndexFile.DEFAULT_BLOB_SIZE); + builder.setProperty(FulltextIndexConstants.BLOB_SIZE, OakBufferedIndexFile.DEFAULT_BLOB_SIZE); Directory dir = createDir(builder, false, "/foo"); byte[] data = assertWrites(dir, OakBufferedIndexFile.DEFAULT_BLOB_SIZE); @@ -370,7 +371,7 @@ abstract public class OakDirectoryTestBa .withBlobStore(getBlackHoleBlobStore()) .build(); SegmentNodeStore nodeStore = SegmentNodeStoreBuilders.builder(store).build(); - IndexDefinition defn = new IndexDefinition(INITIAL_CONTENT, EmptyNodeState.EMPTY_NODE, "/foo"); + LuceneIndexDefinition defn = new LuceneIndexDefinition(INITIAL_CONTENT, EmptyNodeState.EMPTY_NODE, "/foo"); Directory directory = getOakDirectoryBuilder(nodeStore.getRoot().builder(), defn).setReadOnly(false).build(); long expectedSize = ONE_GB * 2 + ONE_MB; @@ -431,7 +432,7 @@ abstract public class OakDirectoryTestBa int blobSize = minFileSize + 1000; builder = nodeStore.getRoot().builder(); - builder.setProperty(LuceneIndexConstants.BLOB_SIZE, blobSize); + builder.setProperty(FulltextIndexConstants.BLOB_SIZE, blobSize); Directory dir = createDir(builder, false, indexPath); blobStore.startFailing(); @@ -480,7 +481,7 @@ abstract public class OakDirectoryTestBa final AtomicBoolean identifiableBlob = new AtomicBoolean(false); - IndexDefinition def = new IndexDefinition(root, builder.getNodeState(), "/foo"); + LuceneIndexDefinition def = new LuceneIndexDefinition(root, builder.getNodeState(), "/foo"); BlobFactory factory = new BlobFactory() { @Override public Blob createBlob(InputStream in) throws IOException { @@ -535,7 +536,7 @@ abstract public class OakDirectoryTestBa // OAK-7066 @Test public void dontMarkInlinedBlobsFromDataStoreAsDeleted() throws Exception { - IndexDefinition def = new IndexDefinition(root, builder.getNodeState(), "/foo"); + LuceneIndexDefinition def = new LuceneIndexDefinition(root, builder.getNodeState(), "/foo"); final Set<String> deletedFiles = newHashSet(); @@ -581,7 +582,7 @@ abstract public class OakDirectoryTestBa // OAK-7066 @Test public void markAllBlobsFromBlobStoreAsDeleted() throws Exception { - IndexDefinition def = new IndexDefinition(root, builder.getNodeState(), "/foo"); + LuceneIndexDefinition def = new LuceneIndexDefinition(root, builder.getNodeState(), "/foo"); final Set<String> deletedFiles = newHashSet(); @@ -627,7 +628,7 @@ abstract public class OakDirectoryTestBa public void blobsCreatedWhenActiveDeletionIsUnsafe() throws Exception { final int fileSize = 1; - IndexDefinition def = new IndexDefinition(root, builder.getNodeState(), "/foo"); + LuceneIndexDefinition def = new LuceneIndexDefinition(root, builder.getNodeState(), "/foo"); BlobFactory factory = in -> { ByteArrayOutputStream out = new ByteArrayOutputStream(); IOUtils.copy(in, out); @@ -676,7 +677,7 @@ abstract public class OakDirectoryTestBa @Test public void dontReportFilesMarkedUnsafeForActiveDeletion() throws Exception { AtomicInteger blobIdSuffix = new AtomicInteger(); - IndexDefinition def = new IndexDefinition(root, builder.getNodeState(), "/foo"); + LuceneIndexDefinition def = new LuceneIndexDefinition(root, builder.getNodeState(), "/foo"); BlobFactory factory = in -> { ByteArrayOutputStream out = new ByteArrayOutputStream(); IOUtils.copy(in, out); @@ -736,7 +737,7 @@ abstract public class OakDirectoryTestBa public void blobFactory() throws Exception { final AtomicInteger numBlobs = new AtomicInteger(); final int fileSize = 1024; - IndexDefinition def = new IndexDefinition(root, builder.getNodeState(), "/foo"); + LuceneIndexDefinition def = new LuceneIndexDefinition(root, builder.getNodeState(), "/foo"); BlobFactory factory = new BlobFactory() { @Override public Blob createBlob(InputStream in) throws IOException { @@ -794,10 +795,10 @@ abstract public class OakDirectoryTestBa } OakDirectoryBuilder getOakDirectoryBuilder(NodeBuilder builder, String indexPath) { - return getOakDirectoryBuilder(builder, new IndexDefinition(root, builder.getNodeState(), indexPath)); + return getOakDirectoryBuilder(builder, new LuceneIndexDefinition(root, builder.getNodeState(), indexPath)); } - abstract OakDirectoryBuilder getOakDirectoryBuilder(NodeBuilder builder, IndexDefinition indexDefinition); + abstract OakDirectoryBuilder getOakDirectoryBuilder(NodeBuilder builder, LuceneIndexDefinition indexDefinition); abstract MemoryBlobStore getBlackHoleBlobStore(); @@ -823,10 +824,10 @@ abstract public class OakDirectoryTestBa static class OakDirectoryBuilder { private final NodeBuilder builder; - private final IndexDefinition defn; + private final LuceneIndexDefinition defn; private final boolean streamingEnabled; - public OakDirectoryBuilder(NodeBuilder builder, IndexDefinition defn, boolean streamingEnabled) { + public OakDirectoryBuilder(NodeBuilder builder, LuceneIndexDefinition defn, boolean streamingEnabled) { this.builder = builder; this.defn = defn; this.streamingEnabled = streamingEnabled;
Modified: jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/StreamingOakDirectoryTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/StreamingOakDirectoryTest.java?rev=1841926&r1=1841925&r2=1841926&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/StreamingOakDirectoryTest.java (original) +++ jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/StreamingOakDirectoryTest.java Tue Sep 25 12:24:15 2018 @@ -22,7 +22,7 @@ package org.apache.jackrabbit.oak.plugin import org.apache.jackrabbit.oak.api.Blob; import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.commons.StringUtils; -import org.apache.jackrabbit.oak.plugins.index.lucene.IndexDefinition; +import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexDefinition; import org.apache.jackrabbit.oak.spi.blob.MemoryBlobStore; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; @@ -40,7 +40,7 @@ public class StreamingOakDirectoryTest e } @Override - OakDirectoryBuilder getOakDirectoryBuilder(NodeBuilder builder, IndexDefinition indexDefinition) { + OakDirectoryBuilder getOakDirectoryBuilder(NodeBuilder builder, LuceneIndexDefinition indexDefinition) { return new OakDirectoryBuilder(builder, indexDefinition, true); } 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=1841926&r1=1841925&r2=1841926&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 Tue Sep 25 12:24:15 2018 @@ -35,12 +35,12 @@ import org.apache.jackrabbit.oak.api.Com 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.LuceneIndexConstants.IndexingMode; -import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexEditorProvider; +import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexNode; import org.apache.jackrabbit.oak.plugins.index.lucene.TestUtil; +import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexEditorProvider; import org.apache.jackrabbit.oak.plugins.index.lucene.reader.DefaultIndexReaderFactory; +import org.apache.jackrabbit.oak.plugins.index.search.FulltextIndexConstants; import org.apache.jackrabbit.oak.spi.commit.CommitContext; import org.apache.jackrabbit.oak.spi.commit.CommitInfo; import org.apache.jackrabbit.oak.spi.commit.EditorHook; @@ -132,7 +132,7 @@ public class DocumentQueueTest { @Test public void noIssueIfNoWriter() throws Exception{ - NodeState indexed = createAndPopulateAsyncIndex(IndexingMode.NRT); + NodeState indexed = createAndPopulateAsyncIndex(FulltextIndexConstants.IndexingMode.NRT); DocumentQueue queue = new DocumentQueue(2, tracker, sameThreadExecutor()); tracker.update(indexed); @@ -142,7 +142,7 @@ public class DocumentQueueTest { @Test public void updateDocument() throws Exception{ IndexTracker tracker = createTracker(); - NodeState indexed = createAndPopulateAsyncIndex(IndexingMode.NRT); + NodeState indexed = createAndPopulateAsyncIndex(FulltextIndexConstants.IndexingMode.NRT); tracker.update(indexed); DocumentQueue queue = new DocumentQueue(2, tracker, sameThreadExecutor()); @@ -159,7 +159,7 @@ public class DocumentQueueTest { @Test public void indexRefresh() throws Exception{ tracker = createTracker(); - NodeState indexed = createAndPopulateAsyncIndex(IndexingMode.NRT); + NodeState indexed = createAndPopulateAsyncIndex(FulltextIndexConstants.IndexingMode.NRT); tracker.update(indexed); clock.waitUntil(refreshDelta); @@ -222,7 +222,7 @@ public class DocumentQueueTest { public void addAllSync() throws Exception{ ListMultimap<String, LuceneDoc> docs = ArrayListMultimap.create(); tracker = createTracker(); - NodeState indexed = createAndPopulateAsyncIndex(IndexingMode.SYNC); + NodeState indexed = createAndPopulateAsyncIndex(FulltextIndexConstants.IndexingMode.SYNC); tracker.update(indexed); DocumentQueue queue = new DocumentQueue(2, tracker, sameThreadExecutor()); @@ -254,7 +254,7 @@ public class DocumentQueueTest { new DefaultIndexReaderFactory(defaultMountInfoProvider(), indexCopier), indexFactory ); - NodeState indexed = createAndPopulateAsyncIndex(IndexingMode.NRT); + NodeState indexed = createAndPopulateAsyncIndex(FulltextIndexConstants.IndexingMode.NRT); tracker.update(indexed); DocumentQueue queue = new DocumentQueue(1000, tracker, executor); @@ -279,7 +279,7 @@ public class DocumentQueueTest { System.out.printf("%n[nrt] Time taken for %d is %s with waits %d%n", numDocs, w, waitCount); - indexed = createAndPopulateAsyncIndex(IndexingMode.SYNC); + indexed = createAndPopulateAsyncIndex(FulltextIndexConstants.IndexingMode.SYNC); tracker.update(indexed); queue = new DocumentQueue(1000, tracker, executor); @@ -302,7 +302,7 @@ public class DocumentQueueTest { } private TopDocs doSearch(String fooValue) throws IOException { - IndexNode indexNode = tracker.acquireIndexNode("/oak:index/fooIndex"); + LuceneIndexNode indexNode = tracker.acquireIndexNode("/oak:index/fooIndex"); try { return indexNode.getSearcher().search(new TermQuery(new Term("foo", fooValue)), 10); } finally { @@ -331,7 +331,7 @@ public class DocumentQueueTest { ); } - private NodeState createAndPopulateAsyncIndex(IndexingMode indexingMode) throws CommitFailedException { + private NodeState createAndPopulateAsyncIndex(FulltextIndexConstants.IndexingMode indexingMode) throws CommitFailedException { createIndexDefinition("fooIndex", indexingMode); //Have some stuff to be indexed @@ -346,7 +346,7 @@ public class DocumentQueueTest { return info; } - private void createIndexDefinition(String idxName, IndexingMode indexingMode) { + private void createIndexDefinition(String idxName, FulltextIndexConstants.IndexingMode indexingMode) { NodeBuilder idx = newLucenePropertyIndexDefinition(builder.child("oak:index"), idxName, ImmutableSet.of("foo"), "async"); //Disable compression Modified: jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/ExternalIndexObserverTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/ExternalIndexObserverTest.java?rev=1841926&r1=1841925&r2=1841926&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/ExternalIndexObserverTest.java (original) +++ jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/ExternalIndexObserverTest.java Tue Sep 25 12:24:15 2018 @@ -23,8 +23,8 @@ import com.google.common.collect.HashMul import com.google.common.collect.ImmutableMap; import com.google.common.collect.Multimap; import com.google.common.util.concurrent.MoreExecutors; -import org.apache.jackrabbit.oak.plugins.index.lucene.IndexDefinition; import org.apache.jackrabbit.oak.plugins.index.lucene.IndexTracker; +import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexDefinition; import org.apache.jackrabbit.oak.plugins.index.lucene.util.IndexDefinitionBuilder; import org.apache.jackrabbit.oak.spi.commit.CommitContext; import org.apache.jackrabbit.oak.spi.commit.CommitInfo; @@ -193,11 +193,11 @@ public class ExternalIndexObserverTest { ImmutableMap.<String, Object>of(CommitContext.NAME, commitContext), true); } - private static IndexDefinition createNRTIndex(String ruleName) { + private static LuceneIndexDefinition createNRTIndex(String ruleName) { IndexDefinitionBuilder idx = new IndexDefinitionBuilder(); idx.indexRule(ruleName).property("foo").propertyIndex(); idx.async("async", "sync"); - return new IndexDefinition(INITIAL_CONTENT, idx.build(), "/oak:index/foo"); + return new LuceneIndexDefinition(INITIAL_CONTENT, idx.build(), "/oak:index/foo"); } } \ 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=1841926&r1=1841925&r2=1841926&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 Tue Sep 25 12:24:15 2018 @@ -59,21 +59,20 @@ import org.apache.jackrabbit.oak.plugins 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.IndexDefinition; import org.apache.jackrabbit.oak.plugins.index.lucene.IndexTracker; -import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants; -import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants.IndexingMode; -import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexEditorProvider; -import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexProvider; import org.apache.jackrabbit.oak.plugins.index.lucene.LucenePropertyIndex; import org.apache.jackrabbit.oak.plugins.index.lucene.TestUtil; import org.apache.jackrabbit.oak.plugins.index.lucene.TestUtil.OptionalEditorProvider; +import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexEditorProvider; +import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexProvider; import org.apache.jackrabbit.oak.plugins.index.lucene.reader.DefaultIndexReaderFactory; import org.apache.jackrabbit.oak.plugins.index.lucene.reader.LuceneIndexReaderFactory; import org.apache.jackrabbit.oak.plugins.index.lucene.util.IndexDefinitionBuilder; import org.apache.jackrabbit.oak.plugins.index.lucene.util.IndexDefinitionBuilder.IndexRule; import org.apache.jackrabbit.oak.plugins.index.nodetype.NodeTypeIndexProvider; import org.apache.jackrabbit.oak.plugins.index.property.PropertyIndexEditorProvider; +import org.apache.jackrabbit.oak.plugins.index.search.FulltextIndexConstants; +import org.apache.jackrabbit.oak.plugins.index.search.IndexDefinition; import org.apache.jackrabbit.oak.plugins.memory.ArrayBasedBlob; import org.apache.jackrabbit.oak.plugins.memory.MemoryNodeStore; import org.apache.jackrabbit.oak.plugins.nodetype.TypeEditorProvider; @@ -96,7 +95,6 @@ import org.apache.lucene.store.SimpleFSD import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.junit.After; -import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; @@ -185,7 +183,7 @@ public class HybridIndexTest extends Abs public void hybridIndex() throws Exception{ String idxName = "hybridtest"; Tree idx = createIndex(root.getTree("/"), idxName, Collections.singleton("foo")); - TestUtil.enableIndexingMode(idx, IndexingMode.NRT); + TestUtil.enableIndexingMode(idx, FulltextIndexConstants.IndexingMode.NRT); root.commit(); //Get initial indexing done as local indexing only work @@ -221,7 +219,7 @@ public class HybridIndexTest extends Abs public void noTextExtractionForSyncCommit() throws Exception{ String idxName = "hybridtest"; Tree idx = createFulltextIndex(root.getTree("/"), idxName); - TestUtil.enableIndexingMode(idx, IndexingMode.NRT); + TestUtil.enableIndexingMode(idx, FulltextIndexConstants.IndexingMode.NRT); root.commit(); runAsyncIndex(); @@ -246,7 +244,7 @@ public class HybridIndexTest extends Abs public void hybridIndexSync() throws Exception{ String idxName = "hybridtest"; Tree idx = createIndex(root.getTree("/"), idxName, Collections.singleton("foo")); - TestUtil.enableIndexingMode(idx, IndexingMode.SYNC); + TestUtil.enableIndexingMode(idx, FulltextIndexConstants.IndexingMode.SYNC); root.commit(); //Get initial indexing done as local indexing only work @@ -269,7 +267,7 @@ public class HybridIndexTest extends Abs public void usageBeforeFirstIndex() throws Exception{ String idxName = "hybridtest"; Tree idx = createIndex(root.getTree("/"), idxName, Collections.singleton("foo")); - TestUtil.enableIndexingMode(idx, IndexingMode.SYNC); + TestUtil.enableIndexingMode(idx, FulltextIndexConstants.IndexingMode.SYNC); root.commit(); createPath("/a").setProperty("foo", "bar"); @@ -294,7 +292,7 @@ public class HybridIndexTest extends Abs public void newNodeTypesFoundLater() throws Exception{ String idxName = "hybridtest"; Tree idx = createIndex(root.getTree("/"), idxName, ImmutableSet.of("foo", "bar")); - TestUtil.enableIndexingMode(idx, IndexingMode.SYNC); + TestUtil.enableIndexingMode(idx, FulltextIndexConstants.IndexingMode.SYNC); root.commit(); setTraversalEnabled(false); @@ -371,7 +369,7 @@ public class HybridIndexTest extends Abs }); String idxName = "hybridtest"; Tree idx = createIndex(root.getTree("/"), idxName, Collections.singleton("foo")); - TestUtil.enableIndexingMode(idx, IndexingMode.SYNC); + TestUtil.enableIndexingMode(idx, FulltextIndexConstants.IndexingMode.SYNC); root.commit(); runAsyncIndex(); @@ -394,7 +392,7 @@ public class HybridIndexTest extends Abs public void paging() throws Exception{ String idxName = "hybridtest"; Tree idx = createIndex(root.getTree("/"), idxName, Collections.singleton("foo")); - TestUtil.enableIndexingMode(idx, IndexingMode.SYNC); + TestUtil.enableIndexingMode(idx, FulltextIndexConstants.IndexingMode.SYNC); root.commit(); runAsyncIndex(); @@ -521,7 +519,7 @@ public class HybridIndexTest extends Abs IndexDefinitionBuilder idx = new IndexDefinitionBuilder(); idx.evaluatePathRestrictions(); idx.indexRule("nt:base") - .property(LuceneIndexConstants.REGEX_ALL_PROPS, true) + .property(FulltextIndexConstants.REGEX_ALL_PROPS, true) .analyzed() .nodeScopeIndex() .useInExcerpt(); 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=1841926&r1=1841925&r2=1841926&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 Tue Sep 25 12:24:15 2018 @@ -27,10 +27,10 @@ import com.google.common.collect.Lists; import org.apache.jackrabbit.oak.api.CommitFailedException; import org.apache.jackrabbit.oak.plugins.index.IndexUpdateProvider; import org.apache.jackrabbit.oak.plugins.index.lucene.IndexTracker; -import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants.IndexingMode; -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.LuceneIndexEditorProvider; import org.apache.jackrabbit.oak.plugins.index.lucene.util.IndexDefinitionBuilder; +import org.apache.jackrabbit.oak.plugins.index.search.FulltextIndexConstants; import org.apache.jackrabbit.oak.spi.commit.CommitContext; import org.apache.jackrabbit.oak.spi.commit.CommitInfo; import org.apache.jackrabbit.oak.spi.commit.EditorHook; @@ -78,7 +78,7 @@ public class LocalIndexWriterFactoryTest @Test public void ignoreReindexCase() throws Exception{ - createIndexDefinition("fooIndex", IndexingMode.NRT); + createIndexDefinition("fooIndex", FulltextIndexConstants.IndexingMode.NRT); builder.child("a").setProperty("foo", "bar"); NodeState after = builder.getNodeState(); @@ -92,7 +92,7 @@ public class LocalIndexWriterFactoryTest @Test public void localIndexWriter() throws Exception{ - NodeState indexed = createAndPopulateAsyncIndex(IndexingMode.NRT); + NodeState indexed = createAndPopulateAsyncIndex(FulltextIndexConstants.IndexingMode.NRT); builder = indexed.builder(); builder.child("b").setProperty("foo", "bar"); builder.child("c").setProperty("foo", "bar"); @@ -109,7 +109,7 @@ public class LocalIndexWriterFactoryTest @Test public void mutlipleIndex() throws Exception{ - NodeState indexed = createAndPopulateTwoAsyncIndex(IndexingMode.NRT); + NodeState indexed = createAndPopulateTwoAsyncIndex(FulltextIndexConstants.IndexingMode.NRT); builder = indexed.builder(); builder.child("b").setProperty("foo", "bar"); builder.child("c").setProperty("bar", "foo"); @@ -130,7 +130,7 @@ public class LocalIndexWriterFactoryTest @Test public void syncIndexing() throws Exception{ - NodeState indexed = createAndPopulateAsyncIndex(IndexingMode.SYNC); + NodeState indexed = createAndPopulateAsyncIndex(FulltextIndexConstants.IndexingMode.SYNC); builder = indexed.builder(); builder.child("b").setProperty("foo", "bar"); builder.child("c").setProperty("foo", "bar"); @@ -146,7 +146,7 @@ public class LocalIndexWriterFactoryTest @Test public void inMemoryDocLimit() throws Exception{ - NodeState indexed = createAndPopulateAsyncIndex(IndexingMode.NRT); + NodeState indexed = createAndPopulateAsyncIndex(FulltextIndexConstants.IndexingMode.NRT); editorProvider.setInMemoryDocsLimit(5); editorProvider.setIndexingQueue(new DocumentQueue(1, tracker, sameThreadExecutor())); builder = indexed.builder(); @@ -161,7 +161,7 @@ public class LocalIndexWriterFactoryTest assertEquals(5 + 1, getIndexedDocList(holder, "/oak:index/fooIndex").size()); } - private NodeState createAndPopulateAsyncIndex(IndexingMode indexingMode) throws CommitFailedException { + private NodeState createAndPopulateAsyncIndex(FulltextIndexConstants.IndexingMode indexingMode) throws CommitFailedException { createIndexDefinition("fooIndex", indexingMode); //Have some stuff to be indexed @@ -170,7 +170,7 @@ public class LocalIndexWriterFactoryTest return asyncHook.processCommit(EMPTY_NODE, after, newCommitInfo()); } - private NodeState createAndPopulateTwoAsyncIndex(IndexingMode indexingMode) throws CommitFailedException { + private NodeState createAndPopulateTwoAsyncIndex(FulltextIndexConstants.IndexingMode indexingMode) throws CommitFailedException { createIndexDefinition("fooIndex", indexingMode); createIndexDefinition("barIndex", indexingMode); @@ -196,7 +196,7 @@ public class LocalIndexWriterFactoryTest return info; } - private void createIndexDefinition(String idxName, IndexingMode indexingMode) { + private void createIndexDefinition(String idxName, FulltextIndexConstants.IndexingMode indexingMode) { IndexDefinitionBuilder idx = new IndexDefinitionBuilder(); TestUtil.enableIndexingMode(idx.getBuilderTree(), indexingMode); idx.indexRule("nt:base").property("foo").propertyIndex(); 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=1841926&r1=1841925&r2=1841926&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 Tue Sep 25 12:24:15 2018 @@ -23,10 +23,10 @@ import java.io.File; import java.io.IOException; 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.LuceneIndexConstants.IndexingMode; -import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexEditorContext; +import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexDefinition; import org.apache.jackrabbit.oak.plugins.index.lucene.TestUtil; +import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexEditorContext; +import org.apache.jackrabbit.oak.plugins.index.search.FulltextIndexConstants; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.jackrabbit.oak.stats.StatisticsProvider; @@ -64,13 +64,13 @@ public class NRTIndexFactoryTest { @Test public void noIndexForAsync() throws Exception{ - IndexDefinition idxDefn = new IndexDefinition(root, builder.getNodeState(), "/foo"); + LuceneIndexDefinition idxDefn = new LuceneIndexDefinition(root, builder.getNodeState(), "/foo"); assertNull(indexFactory.createIndex(idxDefn)); } @Test public void indexCreationNRT() throws Exception{ - IndexDefinition idxDefn = getIndexDefinition("/foo", IndexingMode.SYNC); + LuceneIndexDefinition idxDefn = getIndexDefinition("/foo", FulltextIndexConstants.IndexingMode.SYNC); NRTIndex idx1 = indexFactory.createIndex(idxDefn); assertNotNull(idx1); @@ -79,7 +79,7 @@ public class NRTIndexFactoryTest { @Test public void indexCreationSync() throws Exception{ - IndexDefinition idxDefn = getNRTIndexDefinition("/foo"); + LuceneIndexDefinition idxDefn = getNRTIndexDefinition("/foo"); NRTIndex idx1 = indexFactory.createIndex(idxDefn); assertNotNull(idx1); @@ -88,7 +88,7 @@ public class NRTIndexFactoryTest { @Test public void indexCreationAndCloser() throws Exception{ - IndexDefinition idxDefn = getNRTIndexDefinition("/foo"); + LuceneIndexDefinition idxDefn = getNRTIndexDefinition("/foo"); NRTIndex idx1 = indexFactory.createIndex(idxDefn); assertNotNull(idx1); @@ -124,7 +124,7 @@ public class NRTIndexFactoryTest { @Test public void indexCreationAndCloserWithUpdate() throws Exception{ - IndexDefinition idxDefn = getNRTIndexDefinition("/foo"); + LuceneIndexDefinition idxDefn = getNRTIndexDefinition("/foo"); Document d = new Document(); d.add(newPathField("/a/b")); @@ -146,7 +146,7 @@ public class NRTIndexFactoryTest { @Test public void closeIndexOnClose() throws Exception{ - IndexDefinition idxDefn = getNRTIndexDefinition("/foo"); + LuceneIndexDefinition idxDefn = getNRTIndexDefinition("/foo"); NRTIndex idx1 = indexFactory.createIndex(idxDefn); NRTIndex idx2 = indexFactory.createIndex(idxDefn); @@ -158,13 +158,13 @@ public class NRTIndexFactoryTest { assertTrue(idx2.isClosed()); } - private IndexDefinition getNRTIndexDefinition(String indexPath) { - return getIndexDefinition(indexPath, IndexingMode.NRT); + private LuceneIndexDefinition getNRTIndexDefinition(String indexPath) { + return getIndexDefinition(indexPath, FulltextIndexConstants.IndexingMode.NRT); } - private IndexDefinition getIndexDefinition(String indexPath, IndexingMode indexingMode) { + private LuceneIndexDefinition getIndexDefinition(String indexPath, FulltextIndexConstants.IndexingMode indexingMode) { TestUtil.enableIndexingMode(builder, indexingMode); LuceneIndexEditorContext.configureUniqueId(builder); - return new IndexDefinition(root, builder.getNodeState(), indexPath); + return new LuceneIndexDefinition(root, builder.getNodeState(), indexPath); } } \ No newline at end of file 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=1841926&r1=1841925&r2=1841926&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 Tue Sep 25 12:24:15 2018 @@ -24,12 +24,12 @@ import java.io.IOException; import java.util.List; 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.LuceneIndexConstants.IndexingMode; -import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexEditorContext; +import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexDefinition; import org.apache.jackrabbit.oak.plugins.index.lucene.TestUtil; +import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexEditorContext; 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.plugins.index.search.FulltextIndexConstants; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.jackrabbit.oak.stats.StatisticsProvider; @@ -78,7 +78,7 @@ public class NRTIndexTest { @Test public void getReaderWithoutWriter() throws Exception{ - IndexDefinition idxDefn = getSyncIndexDefinition("/foo"); + LuceneIndexDefinition idxDefn = getSyncIndexDefinition("/foo"); NRTIndex idx1 = indexFactory.createIndex(idxDefn); List<LuceneIndexReader> readers = idx1.getReaders(); @@ -94,7 +94,7 @@ public class NRTIndexTest { @Test public void writerCreation() throws Exception{ - IndexDefinition idxDefn = getSyncIndexDefinition("/foo"); + LuceneIndexDefinition idxDefn = getSyncIndexDefinition("/foo"); NRTIndex idx = indexFactory.createIndex(idxDefn); LuceneIndexWriter writer = idx.getWriter(); @@ -109,7 +109,7 @@ public class NRTIndexTest { @Test public void dirDeletedUponClose() throws Exception{ - IndexDefinition idxDefn = getSyncIndexDefinition("/foo"); + LuceneIndexDefinition idxDefn = getSyncIndexDefinition("/foo"); NRTIndex idx = indexFactory.createIndex(idxDefn); LuceneIndexWriter writer = idx.getWriter(); File indexDir = idx.getIndexDir(); @@ -136,7 +136,7 @@ public class NRTIndexTest { @Test public void multipleUpdateForSamePath() throws Exception{ - IndexDefinition idxDefn = getSyncIndexDefinition("/foo"); + LuceneIndexDefinition idxDefn = getSyncIndexDefinition("/foo"); NRTIndex idx = indexFactory.createIndex(idxDefn); LuceneIndexWriter writer = idx.getWriter(); @@ -155,7 +155,7 @@ public class NRTIndexTest { @Test public void previousIndexInitialized() throws Exception{ - IndexDefinition idxDefn = getSyncIndexDefinition("/foo"); + LuceneIndexDefinition idxDefn = getSyncIndexDefinition("/foo"); NRTIndex idx1 = indexFactory.createIndex(idxDefn); LuceneIndexWriter w1 = idx1.getWriter(); @@ -174,7 +174,7 @@ public class NRTIndexTest { @Test public void sameReaderIfNoChange() throws Exception{ - IndexDefinition idxDefn = getSyncIndexDefinition("/foo"); + LuceneIndexDefinition idxDefn = getSyncIndexDefinition("/foo"); NRTIndex idx1 = indexFactory.createIndex(idxDefn); LuceneIndexWriter w1 = idx1.getWriter(); @@ -192,10 +192,10 @@ public class NRTIndexTest { assertNotSame(readers2, readers3); } - private IndexDefinition getSyncIndexDefinition(String indexPath) { - TestUtil.enableIndexingMode(builder, IndexingMode.NRT); + private LuceneIndexDefinition getSyncIndexDefinition(String indexPath) { + TestUtil.enableIndexingMode(builder, FulltextIndexConstants.IndexingMode.NRT); - return new IndexDefinition(root, builder.getNodeState(), indexPath); + return new LuceneIndexDefinition(root, builder.getNodeState(), indexPath); } Modified: jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/ReaderRefCountIT.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/ReaderRefCountIT.java?rev=1841926&r1=1841925&r2=1841926&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/ReaderRefCountIT.java (original) +++ jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/ReaderRefCountIT.java Tue Sep 25 12:24:15 2018 @@ -32,8 +32,8 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; 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.LuceneIndexNode; import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexEditorContext; import org.apache.jackrabbit.oak.plugins.index.lucene.reader.DefaultIndexReaderFactory; import org.apache.jackrabbit.oak.plugins.index.lucene.util.IndexDefinitionBuilder; @@ -44,7 +44,6 @@ import org.apache.jackrabbit.oak.stats.S import org.apache.lucene.document.Document; import org.apache.lucene.search.MatchAllDocsQuery; import org.junit.Before; -import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; @@ -157,7 +156,7 @@ public class ReaderRefCountIT { @Override public void run() { while(!stop.get()) { - IndexNode indexNode = tracker.acquireIndexNode(indexPath); + LuceneIndexNode indexNode = tracker.acquireIndexNode(indexPath); if (indexNode != null) { try { indexNode.getSearcher().search(new MatchAllDocsQuery(), 5); Modified: jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/HybridPropertyIndexLookupTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/HybridPropertyIndexLookupTest.java?rev=1841926&r1=1841925&r2=1841926&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/HybridPropertyIndexLookupTest.java (original) +++ jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/HybridPropertyIndexLookupTest.java Tue Sep 25 12:24:15 2018 @@ -22,12 +22,10 @@ package org.apache.jackrabbit.oak.plugin import java.util.List; import com.google.common.collect.ImmutableList; -import com.google.common.collect.Iterators; import org.apache.jackrabbit.oak.commons.PathUtils; -import org.apache.jackrabbit.oak.plugins.index.Cursors; -import org.apache.jackrabbit.oak.plugins.index.lucene.IndexDefinition; -import org.apache.jackrabbit.oak.plugins.index.lucene.PropertyDefinition; import org.apache.jackrabbit.oak.plugins.index.lucene.util.IndexDefinitionBuilder; +import org.apache.jackrabbit.oak.plugins.index.search.IndexDefinition; +import org.apache.jackrabbit.oak.plugins.index.search.PropertyDefinition; import org.apache.jackrabbit.oak.query.NodeStateNodeTypeInfoProvider; import org.apache.jackrabbit.oak.query.QueryEngineSettings; import org.apache.jackrabbit.oak.query.ast.NodeTypeInfo; @@ -35,7 +33,6 @@ import org.apache.jackrabbit.oak.query.a import org.apache.jackrabbit.oak.query.ast.Operator; import org.apache.jackrabbit.oak.query.ast.SelectorImpl; import org.apache.jackrabbit.oak.query.index.FilterImpl; -import org.apache.jackrabbit.oak.spi.query.Cursor; import org.apache.jackrabbit.oak.spi.query.Filter; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeState; Modified: jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/HybridPropertyIndexStorageTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/HybridPropertyIndexStorageTest.java?rev=1841926&r1=1841925&r2=1841926&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/HybridPropertyIndexStorageTest.java (original) +++ jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/HybridPropertyIndexStorageTest.java Tue Sep 25 12:24:15 2018 @@ -22,20 +22,17 @@ package org.apache.jackrabbit.oak.plugin import java.util.List; import com.google.common.collect.ImmutableList; -import com.google.common.collect.Iterators; import org.apache.jackrabbit.oak.api.PropertyValue; -import org.apache.jackrabbit.oak.plugins.index.Cursors; -import org.apache.jackrabbit.oak.plugins.index.lucene.IndexDefinition; -import org.apache.jackrabbit.oak.plugins.index.lucene.PropertyDefinition; -import org.apache.jackrabbit.oak.plugins.index.lucene.PropertyUpdateCallback; import org.apache.jackrabbit.oak.plugins.index.lucene.util.IndexDefinitionBuilder; +import org.apache.jackrabbit.oak.plugins.index.search.IndexDefinition; +import org.apache.jackrabbit.oak.plugins.index.search.PropertyDefinition; +import org.apache.jackrabbit.oak.plugins.index.search.PropertyUpdateCallback; import org.apache.jackrabbit.oak.query.NodeStateNodeTypeInfoProvider; import org.apache.jackrabbit.oak.query.QueryEngineSettings; import org.apache.jackrabbit.oak.query.ast.NodeTypeInfo; import org.apache.jackrabbit.oak.query.ast.NodeTypeInfoProvider; import org.apache.jackrabbit.oak.query.ast.SelectorImpl; import org.apache.jackrabbit.oak.query.index.FilterImpl; -import org.apache.jackrabbit.oak.spi.query.Cursor; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeState; import org.junit.Test; Modified: jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/LuceneIndexDeprecatedTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/LuceneIndexDeprecatedTest.java?rev=1841926&r1=1841925&r2=1841926&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/LuceneIndexDeprecatedTest.java (original) +++ jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/LuceneIndexDeprecatedTest.java Tue Sep 25 12:24:15 2018 @@ -29,8 +29,8 @@ import org.apache.jackrabbit.oak.Initial import org.apache.jackrabbit.oak.plugins.index.IndexConstants; import org.apache.jackrabbit.oak.plugins.index.IndexUpdateProvider; 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.LucenePropertyIndex; +import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexEditorProvider; import org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState; import org.apache.jackrabbit.oak.plugins.memory.PropertyValues; import org.apache.jackrabbit.oak.query.NodeStateNodeTypeInfoProvider; @@ -41,7 +41,6 @@ import org.apache.jackrabbit.oak.query.a import org.apache.jackrabbit.oak.query.ast.SelectorImpl; import org.apache.jackrabbit.oak.query.index.FilterImpl; import org.apache.jackrabbit.oak.spi.commit.EditorHook; -import org.apache.jackrabbit.oak.spi.mount.Mounts; import org.apache.jackrabbit.oak.spi.query.QueryIndex.IndexPlan; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeState; Modified: jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/LuceneIndexDisabledTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/LuceneIndexDisabledTest.java?rev=1841926&r1=1841925&r2=1841926&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/LuceneIndexDisabledTest.java (original) +++ jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/LuceneIndexDisabledTest.java Tue Sep 25 12:24:15 2018 @@ -27,8 +27,8 @@ import org.apache.jackrabbit.oak.Initial import org.apache.jackrabbit.oak.plugins.index.IndexConstants; import org.apache.jackrabbit.oak.plugins.index.IndexUpdateProvider; 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.LucenePropertyIndex; +import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexEditorProvider; import org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState; import org.apache.jackrabbit.oak.plugins.memory.PropertyValues; import org.apache.jackrabbit.oak.query.NodeStateNodeTypeInfoProvider; Modified: jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/PropertyIndexCleanerTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/PropertyIndexCleanerTest.java?rev=1841926&r1=1841925&r2=1841926&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/PropertyIndexCleanerTest.java (original) +++ jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/PropertyIndexCleanerTest.java Tue Sep 25 12:24:15 2018 @@ -31,11 +31,11 @@ import org.apache.jackrabbit.oak.Initial import org.apache.jackrabbit.oak.api.CommitFailedException; import org.apache.jackrabbit.oak.plugins.index.AsyncIndexInfo; import org.apache.jackrabbit.oak.plugins.index.AsyncIndexInfoService; -import org.apache.jackrabbit.oak.plugins.index.lucene.IndexDefinition; -import org.apache.jackrabbit.oak.plugins.index.lucene.PropertyDefinition; -import org.apache.jackrabbit.oak.plugins.index.lucene.PropertyUpdateCallback; import org.apache.jackrabbit.oak.plugins.index.lucene.property.PropertyIndexCleaner.CleanupStats; import org.apache.jackrabbit.oak.plugins.index.lucene.util.IndexDefinitionBuilder; +import org.apache.jackrabbit.oak.plugins.index.search.IndexDefinition; +import org.apache.jackrabbit.oak.plugins.index.search.PropertyDefinition; +import org.apache.jackrabbit.oak.plugins.index.search.PropertyUpdateCallback; import org.apache.jackrabbit.oak.plugins.memory.MemoryNodeStore; import org.apache.jackrabbit.oak.plugins.memory.PropertyValues; import org.apache.jackrabbit.oak.query.index.FilterImpl; Modified: jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/SynchronousPropertyIndexTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/SynchronousPropertyIndexTest.java?rev=1841926&r1=1841925&r2=1841926&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/SynchronousPropertyIndexTest.java (original) +++ jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/SynchronousPropertyIndexTest.java Tue Sep 25 12:24:15 2018 @@ -46,9 +46,9 @@ import org.apache.jackrabbit.oak.plugins 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; +import org.apache.jackrabbit.oak.plugins.index.lucene.TestUtil; import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexEditorProvider; import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexProvider; -import org.apache.jackrabbit.oak.plugins.index.lucene.TestUtil; import org.apache.jackrabbit.oak.plugins.index.lucene.hybrid.IndexingQueue; import org.apache.jackrabbit.oak.plugins.index.lucene.hybrid.NRTIndexFactory; import org.apache.jackrabbit.oak.plugins.index.lucene.reader.DefaultIndexReaderFactory; Modified: jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/UniquenessConstraintValidatorTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/UniquenessConstraintValidatorTest.java?rev=1841926&r1=1841925&r2=1841926&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/UniquenessConstraintValidatorTest.java (original) +++ jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/UniquenessConstraintValidatorTest.java Tue Sep 25 12:24:15 2018 @@ -20,10 +20,10 @@ package org.apache.jackrabbit.oak.plugins.index.lucene.property; import org.apache.jackrabbit.oak.api.CommitFailedException; -import org.apache.jackrabbit.oak.plugins.index.lucene.IndexDefinition; -import org.apache.jackrabbit.oak.plugins.index.lucene.PropertyDefinition; -import org.apache.jackrabbit.oak.plugins.index.lucene.PropertyUpdateCallback; import org.apache.jackrabbit.oak.plugins.index.lucene.util.IndexDefinitionBuilder; +import org.apache.jackrabbit.oak.plugins.index.search.IndexDefinition; +import org.apache.jackrabbit.oak.plugins.index.search.PropertyDefinition; +import org.apache.jackrabbit.oak.plugins.index.search.PropertyUpdateCallback; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeState; import org.junit.Test; Modified: jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/reader/DefaultIndexReaderFactoryTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/reader/DefaultIndexReaderFactoryTest.java?rev=1841926&r1=1841925&r2=1841926&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/reader/DefaultIndexReaderFactoryTest.java (original) +++ jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/reader/DefaultIndexReaderFactoryTest.java Tue Sep 25 12:24:15 2018 @@ -26,15 +26,16 @@ import java.util.concurrent.atomic.Atomi import org.apache.jackrabbit.oak.plugins.blob.datastore.CachingFileDataStore; import org.apache.jackrabbit.oak.plugins.blob.datastore.DataStoreBlobStore; import org.apache.jackrabbit.oak.plugins.blob.datastore.DataStoreUtils; -import org.apache.jackrabbit.oak.plugins.index.lucene.FieldNames; -import org.apache.jackrabbit.oak.plugins.index.lucene.IndexDefinition; import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants; +import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexDefinition; +import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexWriterFactory; import org.apache.jackrabbit.oak.plugins.index.lucene.directory.DefaultDirectoryFactory; import org.apache.jackrabbit.oak.plugins.index.lucene.directory.DirectoryFactory; import org.apache.jackrabbit.oak.plugins.index.lucene.writer.DefaultIndexWriterFactory; import org.apache.jackrabbit.oak.plugins.index.lucene.writer.LuceneIndexWriter; import org.apache.jackrabbit.oak.plugins.index.lucene.writer.LuceneIndexWriterConfig; -import org.apache.jackrabbit.oak.plugins.index.lucene.writer.LuceneIndexWriterFactory; +import org.apache.jackrabbit.oak.plugins.index.search.FieldNames; +import org.apache.jackrabbit.oak.plugins.index.search.IndexDefinition; import org.apache.jackrabbit.oak.spi.mount.MountInfoProvider; import org.apache.jackrabbit.oak.spi.mount.Mounts; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; @@ -57,7 +58,7 @@ public class DefaultIndexReaderFactoryTe private NodeState root = INITIAL_CONTENT; private NodeBuilder builder = EMPTY_NODE.builder(); - private IndexDefinition defn = new IndexDefinition(root, builder.getNodeState(), "/foo"); + private LuceneIndexDefinition defn = new LuceneIndexDefinition(root, builder.getNodeState(), "/foo"); private MountInfoProvider mip = Mounts.newBuilder() .mount("foo", "/libs", "/apps").build(); private LuceneIndexWriterConfig writerConfig = new LuceneIndexWriterConfig(); @@ -143,7 +144,7 @@ public class DefaultIndexReaderFactoryTe public void suggesterDir() throws Exception{ LuceneIndexWriterFactory factory = newDirectoryFactory(); enabledSuggestorForSomeProp(); - defn = new IndexDefinition(root, builder.getNodeState(), "/foo"); + defn = new LuceneIndexDefinition(root, builder.getNodeState(), "/foo"); LuceneIndexWriter writer = factory.newInstance(defn, builder, true); Document doc = newDoc("/content/en"); @@ -177,7 +178,7 @@ public class DefaultIndexReaderFactoryTe public void multipleReaders_SingleSuggester() throws Exception{ LuceneIndexWriterFactory factory = newDirectoryFactory(); enabledSuggestorForSomeProp(); - defn = new IndexDefinition(root, builder.getNodeState(), "/foo"); + defn = new LuceneIndexDefinition(root, builder.getNodeState(), "/foo"); LuceneIndexWriter writer = factory.newInstance(defn, builder, true); //Suggester field is only present for document in default mount Modified: jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/IndexDefinitionBuilderTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/IndexDefinitionBuilderTest.java?rev=1841926&r1=1841925&r2=1841926&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/IndexDefinitionBuilderTest.java (original) +++ jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/IndexDefinitionBuilderTest.java Tue Sep 25 12:24:15 2018 @@ -27,7 +27,7 @@ import org.apache.jackrabbit.oak.api.Tre import org.apache.jackrabbit.oak.api.Type; import org.apache.jackrabbit.oak.core.ImmutableRoot; import org.apache.jackrabbit.oak.plugins.index.IndexConstants; -import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants; +import org.apache.jackrabbit.oak.plugins.index.search.FulltextIndexConstants; import org.apache.jackrabbit.oak.plugins.tree.factories.TreeFactory; import org.apache.jackrabbit.oak.spi.filter.PathFilter; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; @@ -38,7 +38,7 @@ import org.junit.Test; import static java.util.Arrays.asList; import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.REINDEX_PROPERTY_NAME; -import static org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants.AGGREGATES; +import static org.apache.jackrabbit.oak.plugins.index.search.FulltextIndexConstants.AGGREGATES; import static org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.EMPTY_NODE; import static org.junit.Assert.*; @@ -148,11 +148,11 @@ public class IndexDefinitionBuilderTest @Test public void regexProperty() throws Exception{ builder.indexRule("nt:base") - .property(LuceneIndexConstants.REGEX_ALL_PROPS, true); + .property(FulltextIndexConstants.REGEX_ALL_PROPS, true); NodeState state = builder.build(); assertTrue(NodeStateUtils.getNode(state, "indexRules/nt:base/properties/prop") - .getBoolean(LuceneIndexConstants.PROP_IS_REGEX)); + .getBoolean(FulltextIndexConstants.PROP_IS_REGEX)); } @Test @@ -288,8 +288,8 @@ public class IndexDefinitionBuilderTest assertTrue(state.getChildNode("indexRules").exists()); NodeState ntFileRule = state.getChildNode("indexRules").getChildNode("nt:file"); assertTrue(ntFileRule.exists()); - assertTrue(state.getBoolean(LuceneIndexConstants.PROP_INDEX_NODE_TYPE)); - assertFalse(ntFileRule.getBoolean(LuceneIndexConstants.PROP_SYNC)); + assertTrue(state.getBoolean(FulltextIndexConstants.PROP_INDEX_NODE_TYPE)); + assertFalse(ntFileRule.getBoolean(FulltextIndexConstants.PROP_SYNC)); } @Test @@ -301,8 +301,8 @@ public class IndexDefinitionBuilderTest assertTrue(state.getChildNode("indexRules").exists()); NodeState ntFileRule = state.getChildNode("indexRules").getChildNode("nt:file"); assertTrue(ntFileRule.exists()); - assertTrue(state.getBoolean(LuceneIndexConstants.PROP_INDEX_NODE_TYPE)); - assertTrue(ntFileRule.getBoolean(LuceneIndexConstants.PROP_SYNC)); + assertTrue(state.getBoolean(FulltextIndexConstants.PROP_INDEX_NODE_TYPE)); + assertTrue(ntFileRule.getBoolean(FulltextIndexConstants.PROP_SYNC)); } @Test Modified: jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/writer/DefaultIndexWriterTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/writer/DefaultIndexWriterTest.java?rev=1841926&r1=1841925&r2=1841926&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/writer/DefaultIndexWriterTest.java (original) +++ jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/writer/DefaultIndexWriterTest.java Tue Sep 25 12:24:15 2018 @@ -21,7 +21,7 @@ package org.apache.jackrabbit.oak.plugin import java.io.File; -import org.apache.jackrabbit.oak.plugins.index.lucene.IndexDefinition; +import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexDefinition; import org.apache.jackrabbit.oak.plugins.index.lucene.directory.DefaultDirectoryFactory; import org.apache.jackrabbit.oak.plugins.index.lucene.directory.FSDirectoryFactory; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; @@ -35,8 +35,8 @@ import org.junit.Test; import org.junit.rules.TemporaryFolder; import static org.apache.jackrabbit.oak.plugins.index.lucene.FieldFactory.newPathField; -import static org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants.INDEX_DATA_CHILD_NAME; import static org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants.SUGGEST_DATA_CHILD_NAME; +import static org.apache.jackrabbit.oak.plugins.index.search.FulltextIndexConstants.INDEX_DATA_CHILD_NAME; import static org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.EMPTY_NODE; import static org.apache.jackrabbit.oak.InitialContentHelper.INITIAL_CONTENT; import static org.hamcrest.Matchers.instanceOf; @@ -58,21 +58,21 @@ public class DefaultIndexWriterTest { @Test public void lazyInit() throws Exception { - IndexDefinition defn = new IndexDefinition(root, builder.getNodeState(), "/foo"); + LuceneIndexDefinition defn = new LuceneIndexDefinition(root, builder.getNodeState(), "/foo"); DefaultIndexWriter writer = createWriter(defn, false); assertFalse(writer.close(0)); } @Test public void writeInitializedUponReindex() throws Exception { - IndexDefinition defn = new IndexDefinition(root, builder.getNodeState(), "/foo"); + LuceneIndexDefinition defn = new LuceneIndexDefinition(root, builder.getNodeState(), "/foo"); DefaultIndexWriter writer = createWriter(defn, true); assertTrue(writer.close(0)); } @Test public void indexUpdated() throws Exception { - IndexDefinition defn = new IndexDefinition(root, builder.getNodeState(), "/foo"); + LuceneIndexDefinition defn = new LuceneIndexDefinition(root, builder.getNodeState(), "/foo"); DefaultIndexWriter writer = createWriter(defn, false); Document document = new Document(); @@ -85,7 +85,7 @@ public class DefaultIndexWriterTest { @Test public void indexWriterConfig_Scheduler_Remote() throws Exception{ - IndexDefinition defn = new IndexDefinition(root, builder.getNodeState(), "/foo"); + LuceneIndexDefinition defn = new LuceneIndexDefinition(root, builder.getNodeState(), "/foo"); DefaultIndexWriter writer = createWriter(defn, true); IndexWriter w = writer.getWriter(); @@ -95,7 +95,7 @@ public class DefaultIndexWriterTest { @Test public void indexWriterConfig_Scheduler_Local() throws Exception{ FSDirectoryFactory fsdir = new FSDirectoryFactory(folder.getRoot()); - IndexDefinition defn = new IndexDefinition(root, builder.getNodeState(), "/foo"); + LuceneIndexDefinition defn = new LuceneIndexDefinition(root, builder.getNodeState(), "/foo"); DefaultIndexWriter writer = new DefaultIndexWriter(defn, builder, fsdir, INDEX_DATA_CHILD_NAME, SUGGEST_DATA_CHILD_NAME, true, writerConfig); @@ -107,7 +107,7 @@ public class DefaultIndexWriterTest { public void configRAMSize() throws Exception{ writerConfig = new LuceneIndexWriterConfig(42); - IndexDefinition defn = new IndexDefinition(root, builder.getNodeState(), "/foo"); + LuceneIndexDefinition defn = new LuceneIndexDefinition(root, builder.getNodeState(), "/foo"); DefaultIndexWriter writer = createWriter(defn, true); IndexWriter w = writer.getWriter(); @@ -116,7 +116,7 @@ public class DefaultIndexWriterTest { @Test public void useAddForReindex() throws Exception{ - IndexDefinition defn = new IndexDefinition(root, builder.getNodeState(), "/foo"); + LuceneIndexDefinition defn = new LuceneIndexDefinition(root, builder.getNodeState(), "/foo"); DefaultIndexWriter writer = createWriter(defn, true); Document document = new Document(); @@ -130,7 +130,7 @@ public class DefaultIndexWriterTest { @Test public void useUpdateForNormalIndexing() throws Exception{ - IndexDefinition defn = new IndexDefinition(root, builder.getNodeState(), "/foo"); + LuceneIndexDefinition defn = new LuceneIndexDefinition(root, builder.getNodeState(), "/foo"); DefaultIndexWriter writer = createWriter(defn, false); Document document = new Document(); @@ -142,7 +142,7 @@ public class DefaultIndexWriterTest { writer.close(100); } - private DefaultIndexWriter createWriter(IndexDefinition defn, boolean reindex) { + private DefaultIndexWriter createWriter(LuceneIndexDefinition defn, boolean reindex) { return new DefaultIndexWriter(defn, builder, new DefaultDirectoryFactory(null, null), INDEX_DATA_CHILD_NAME, SUGGEST_DATA_CHILD_NAME, reindex, writerConfig); Modified: jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/writer/MultiplexersLuceneTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/writer/MultiplexersLuceneTest.java?rev=1841926&r1=1841925&r2=1841926&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/writer/MultiplexersLuceneTest.java (original) +++ jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/writer/MultiplexersLuceneTest.java Tue Sep 25 12:24:15 2018 @@ -20,6 +20,7 @@ package org.apache.jackrabbit.oak.plugins.index.lucene.writer; import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants; +import org.apache.jackrabbit.oak.plugins.index.search.FulltextIndexConstants; import org.apache.jackrabbit.oak.spi.mount.Mount; import org.apache.jackrabbit.oak.spi.mount.MountInfoProvider; import org.apache.jackrabbit.oak.spi.mount.Mounts; @@ -48,7 +49,7 @@ public class MultiplexersLuceneTest { @Test public void indexDir() throws Exception{ - assertEquals(LuceneIndexConstants.INDEX_DATA_CHILD_NAME, MultiplexersLucene.getIndexDirName(defaultMount)); + assertEquals(FulltextIndexConstants.INDEX_DATA_CHILD_NAME, MultiplexersLucene.getIndexDirName(defaultMount)); assertTrue(MultiplexersLucene.isIndexDirName(MultiplexersLucene.getIndexDirName(defaultMount))); assertFalse(MultiplexersLucene.isIndexDirName(MultiplexersLucene.getSuggestDirName(defaultMount))); } Modified: jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/writer/MultiplexingIndexWriterTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/writer/MultiplexingIndexWriterTest.java?rev=1841926&r1=1841925&r2=1841926&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/writer/MultiplexingIndexWriterTest.java (original) +++ jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/writer/MultiplexingIndexWriterTest.java Tue Sep 25 12:24:15 2018 @@ -28,7 +28,8 @@ import com.google.common.collect.Lists; import org.apache.jackrabbit.oak.plugins.blob.datastore.CachingFileDataStore; import org.apache.jackrabbit.oak.plugins.blob.datastore.DataStoreBlobStore; import org.apache.jackrabbit.oak.plugins.blob.datastore.DataStoreUtils; -import org.apache.jackrabbit.oak.plugins.index.lucene.IndexDefinition; +import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexDefinition; +import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexWriterFactory; import org.apache.jackrabbit.oak.plugins.index.lucene.directory.DefaultDirectoryFactory; import org.apache.jackrabbit.oak.plugins.index.lucene.directory.DirectoryFactory; import org.apache.jackrabbit.oak.plugins.index.lucene.directory.OakDirectory; @@ -61,7 +62,7 @@ public class MultiplexingIndexWriterTest private NodeState root = INITIAL_CONTENT; private NodeBuilder builder = EMPTY_NODE.builder(); - private IndexDefinition defn = new IndexDefinition(root, builder.getNodeState(), "/foo"); + private LuceneIndexDefinition defn = new LuceneIndexDefinition(root, builder.getNodeState(), "/foo"); private MountInfoProvider mip = Mounts.newBuilder() .mount("foo", "/libs", "/apps").build(); Modified: jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/LuceneSupportTest.groovy URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/LuceneSupportTest.groovy?rev=1841926&r1=1841925&r2=1841926&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/LuceneSupportTest.groovy (original) +++ jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/LuceneSupportTest.groovy Tue Sep 25 12:24:15 2018 @@ -22,8 +22,9 @@ package org.apache.jackrabbit.oak.run.os import org.apache.felix.connect.launch.PojoServiceRegistry import org.apache.jackrabbit.oak.plugins.index.aggregate.SimpleNodeAggregator -import org.apache.jackrabbit.oak.plugins.index.lucene.IndexFormatVersion -import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants +import org.apache.jackrabbit.oak.plugins.index.search.FulltextIndexConstants +import org.apache.jackrabbit.oak.plugins.index.search.IndexFormatVersion +import org.apache.jackrabbit.oak.plugins.index.search.util.IndexHelper import org.apache.jackrabbit.oak.plugins.index.lucene.util.LuceneIndexHelper import org.apache.jackrabbit.oak.spi.lifecycle.RepositoryInitializer import org.apache.jackrabbit.oak.spi.query.QueryIndex @@ -102,8 +103,8 @@ class LuceneSupportTest extends Abstract NodeBuilder index = builder.child(INDEX_DEFINITIONS_NAME); if (!index.hasChildNode("lucene")) { NodeBuilder nb = LuceneIndexHelper.newLuceneIndexDefinition( - index, "lucene", LuceneIndexHelper.JR_PROPERTY_INCLUDES, null, "async") - nb.setProperty(LuceneIndexConstants.COMPAT_MODE, IndexFormatVersion.V1.getVersion()); + index, "lucene", IndexHelper.JR_PROPERTY_INCLUDES, null, "async") + nb.setProperty(FulltextIndexConstants.COMPAT_MODE, IndexFormatVersion.V1.getVersion()); } } } Modified: jackrabbit/oak/trunk/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/commands/LuceneCommand.groovy URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/commands/LuceneCommand.groovy?rev=1841926&r1=1841925&r2=1841926&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/commands/LuceneCommand.groovy (original) +++ jackrabbit/oak/trunk/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/commands/LuceneCommand.groovy Tue Sep 25 12:24:15 2018 @@ -22,8 +22,9 @@ package org.apache.jackrabbit.oak.consol import com.google.common.base.Stopwatch import org.apache.jackrabbit.oak.commons.PathUtils import org.apache.jackrabbit.oak.console.ConsoleSession -import org.apache.jackrabbit.oak.plugins.index.lucene.IndexDefinition import org.apache.jackrabbit.oak.plugins.index.lucene.directory.OakDirectory +import org.apache.jackrabbit.oak.plugins.index.search.IndexDefinition +import org.apache.jackrabbit.oak.plugins.index.search.FulltextIndexConstants import org.apache.jackrabbit.oak.spi.commit.CommitInfo import org.apache.jackrabbit.oak.spi.commit.EmptyHook import org.apache.jackrabbit.oak.spi.state.NodeBuilder @@ -40,7 +41,6 @@ import org.apache.jackrabbit.oak.spi.sta import static com.google.common.base.Preconditions.checkNotNull -import static org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants.INDEX_DATA_CHILD_NAME class LuceneCommand extends ComplexCommandSupport { public static final String COMMAND_NAME = 'lucene' @@ -124,7 +124,7 @@ class LuceneCommand extends ComplexComma for (String element : PathUtils.elements(path)) { definition = definition.getChildNode(element); } - NodeState data = definition.getChildNode(INDEX_DATA_CHILD_NAME); + NodeState data = definition.getChildNode(FulltextIndexConstants.INDEX_DATA_CHILD_NAME); if (data.exists()) { //OakDirectory is package scope but Groovy allows us //to use it. Good or bad but its helpful debug scripts Modified: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/IndexHelper.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/IndexHelper.java?rev=1841926&r1=1841925&r2=1841926&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/IndexHelper.java (original) +++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/IndexHelper.java Tue Sep 25 12:24:15 2018 @@ -44,9 +44,9 @@ import org.apache.jackrabbit.oak.plugins import org.apache.jackrabbit.oak.plugins.index.datastore.DataStoreTextWriter; import org.apache.jackrabbit.oak.plugins.index.inventory.IndexDefinitionPrinter; import org.apache.jackrabbit.oak.plugins.index.inventory.IndexPrinter; -import org.apache.jackrabbit.oak.plugins.index.lucene.ExtractedTextCache; import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexInfoProvider; import org.apache.jackrabbit.oak.plugins.index.property.PropertyIndexInfoProvider; +import org.apache.jackrabbit.oak.plugins.index.search.ExtractedTextCache; import org.apache.jackrabbit.oak.spi.blob.BlobStore; import org.apache.jackrabbit.oak.spi.blob.GarbageCollectableBlobStore; import org.apache.jackrabbit.oak.spi.mount.MountInfoProvider; Modified: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/LuceneIndexer.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/LuceneIndexer.java?rev=1841926&r1=1841925&r2=1841926&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/LuceneIndexer.java (original) +++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/LuceneIndexer.java Tue Sep 25 12:24:15 2018 @@ -24,26 +24,25 @@ import java.util.Set; import org.apache.jackrabbit.oak.api.CommitFailedException; import org.apache.jackrabbit.oak.plugins.document.NodeDocument; -import org.apache.jackrabbit.oak.plugins.index.lucene.IndexDefinition; -import org.apache.jackrabbit.oak.plugins.index.lucene.IndexDefinition.IndexingRule; import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneDocumentMaker; -import org.apache.jackrabbit.oak.plugins.index.lucene.binary.BinaryTextExtractor; import org.apache.jackrabbit.oak.plugins.index.lucene.util.FacetHelper; import org.apache.jackrabbit.oak.plugins.index.lucene.writer.LuceneIndexWriter; import org.apache.jackrabbit.oak.plugins.index.progress.IndexingProgressReporter; +import org.apache.jackrabbit.oak.plugins.index.search.IndexDefinition; +import org.apache.jackrabbit.oak.plugins.index.search.spi.binary.FulltextBinaryTextExtractor; import org.apache.jackrabbit.oak.spi.filter.PathFilter; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.lucene.document.Document; public class LuceneIndexer implements NodeStateIndexer { private final IndexDefinition definition; - private final BinaryTextExtractor binaryTextExtractor; + private final FulltextBinaryTextExtractor binaryTextExtractor; private final NodeBuilder definitionBuilder; private final LuceneIndexWriter indexWriter; private final IndexingProgressReporter progressReporter; public LuceneIndexer(IndexDefinition definition, LuceneIndexWriter indexWriter, - NodeBuilder builder, BinaryTextExtractor binaryTextExtractor, + NodeBuilder builder, FulltextBinaryTextExtractor binaryTextExtractor, IndexingProgressReporter progressReporter) { this.definition = definition; this.binaryTextExtractor = binaryTextExtractor; @@ -69,7 +68,7 @@ public class LuceneIndexer implements No return false; } - IndexingRule indexingRule = definition.getApplicableIndexingRule(entry.getNodeState()); + IndexDefinition.IndexingRule indexingRule = definition.getApplicableIndexingRule(entry.getNodeState()); if (indexingRule == null) { return false; @@ -109,7 +108,7 @@ public class LuceneIndexer implements No indexWriter.updateDocument(path, doc); } - private LuceneDocumentMaker newDocumentMaker(IndexingRule indexingRule, String path) { + private LuceneDocumentMaker newDocumentMaker(IndexDefinition.IndexingRule indexingRule, String path) { return new LuceneDocumentMaker( binaryTextExtractor, () -> FacetHelper.getFacetsConfig(definitionBuilder), //TODO FacetsConfig handling Modified: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/LuceneIndexerProvider.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/LuceneIndexerProvider.java?rev=1841926&r1=1841925&r2=1841926&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/LuceneIndexerProvider.java (original) +++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/LuceneIndexerProvider.java Tue Sep 25 12:24:15 2018 @@ -25,16 +25,15 @@ import java.util.concurrent.TimeUnit; import org.apache.commons.io.FileUtils; import org.apache.jackrabbit.oak.index.IndexHelper; import org.apache.jackrabbit.oak.index.IndexerSupport; -import org.apache.jackrabbit.oak.plugins.index.lucene.ExtractedTextCache; -import org.apache.jackrabbit.oak.plugins.index.lucene.IndexDefinition; -import org.apache.jackrabbit.oak.plugins.index.lucene.binary.BinaryTextExtractor; +import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexWriterFactory; import org.apache.jackrabbit.oak.plugins.index.lucene.directory.DirectoryFactory; import org.apache.jackrabbit.oak.plugins.index.lucene.directory.FSDirectoryFactory; import org.apache.jackrabbit.oak.plugins.index.lucene.writer.DefaultIndexWriterFactory; import org.apache.jackrabbit.oak.plugins.index.lucene.writer.LuceneIndexWriter; -import org.apache.jackrabbit.oak.plugins.index.lucene.writer.LuceneIndexWriterConfig; -import org.apache.jackrabbit.oak.plugins.index.lucene.writer.LuceneIndexWriterFactory; import org.apache.jackrabbit.oak.plugins.index.progress.IndexingProgressReporter; +import org.apache.jackrabbit.oak.plugins.index.search.ExtractedTextCache; +import org.apache.jackrabbit.oak.plugins.index.search.IndexDefinition; +import org.apache.jackrabbit.oak.plugins.index.search.spi.binary.FulltextBinaryTextExtractor; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeState; import org.jetbrains.annotations.NotNull; @@ -67,7 +66,7 @@ public class LuceneIndexerProvider imple IndexDefinition idxDefinition = IndexDefinition.newBuilder(root, definition.getNodeState(), indexPath).reindex().build(); LuceneIndexWriter indexWriter = indexWriterFactory.newInstance(idxDefinition, definition, true); - BinaryTextExtractor textExtractor = new BinaryTextExtractor(textCache, idxDefinition, true); + FulltextBinaryTextExtractor textExtractor = new FulltextBinaryTextExtractor(textCache, idxDefinition, true); return new LuceneIndexer( idxDefinition, indexWriter, Modified: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/TextPopulator.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/TextPopulator.java?rev=1841926&r1=1841925&r2=1841926&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/TextPopulator.java (original) +++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/TextPopulator.java Tue Sep 25 12:24:15 2018 @@ -40,8 +40,8 @@ import java.io.IOException; import static com.google.common.base.Charsets.UTF_8; import static org.apache.jackrabbit.JcrConstants.JCR_PATH; -import static org.apache.jackrabbit.oak.plugins.index.lucene.FieldNames.FULLTEXT; -import static org.apache.jackrabbit.oak.plugins.index.lucene.FieldNames.PATH; +import static org.apache.jackrabbit.oak.plugins.index.search.FieldNames.FULLTEXT; +import static org.apache.jackrabbit.oak.plugins.index.search.FieldNames.PATH; import static org.apache.jackrabbit.oak.plugins.tika.CSVFileBinaryResourceProvider.FORMAT; class TextPopulator { Modified: jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/index/indexer/document/LuceneIndexerTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/index/indexer/document/LuceneIndexerTest.java?rev=1841926&r1=1841925&r2=1841926&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/index/indexer/document/LuceneIndexerTest.java (original) +++ jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/index/indexer/document/LuceneIndexerTest.java Tue Sep 25 12:24:15 2018 @@ -19,11 +19,11 @@ package org.apache.jackrabbit.oak.index.indexer.document; -import org.apache.jackrabbit.oak.plugins.index.lucene.IndexDefinition; -import org.apache.jackrabbit.oak.plugins.index.lucene.binary.BinaryTextExtractor; import org.apache.jackrabbit.oak.plugins.index.lucene.util.IndexDefinitionBuilder; import org.apache.jackrabbit.oak.plugins.index.lucene.writer.LuceneIndexWriter; import org.apache.jackrabbit.oak.plugins.index.progress.IndexingProgressReporter; +import org.apache.jackrabbit.oak.plugins.index.search.IndexDefinition; +import org.apache.jackrabbit.oak.plugins.index.search.spi.binary.FulltextBinaryTextExtractor; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeState; import org.junit.Test; @@ -47,7 +47,7 @@ public class LuceneIndexerTest { NodeBuilder builder = root.builder(); LuceneIndexer indexer = new LuceneIndexer(idxDefn, mock(LuceneIndexWriter.class), builder, - mock(BinaryTextExtractor.class), mock(IndexingProgressReporter.class)); + mock(FulltextBinaryTextExtractor.class), mock(IndexingProgressReporter.class)); NodeState testNode = EMPTY_NODE.builder().setProperty("foo","bar").getNodeState(); Modified: jackrabbit/oak/trunk/oak-search-mt/src/main/java/org/apache/jackrabbit/oak/plugins/index/mt/MTFulltextQueryTermsProvider.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-search-mt/src/main/java/org/apache/jackrabbit/oak/plugins/index/mt/MTFulltextQueryTermsProvider.java?rev=1841926&r1=1841925&r2=1841926&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-search-mt/src/main/java/org/apache/jackrabbit/oak/plugins/index/mt/MTFulltextQueryTermsProvider.java (original) +++ jackrabbit/oak/trunk/oak-search-mt/src/main/java/org/apache/jackrabbit/oak/plugins/index/mt/MTFulltextQueryTermsProvider.java Tue Sep 25 12:24:15 2018 @@ -22,9 +22,9 @@ import java.io.StringReader; import java.util.List; import java.util.Set; -import org.apache.jackrabbit.oak.plugins.index.lucene.FieldNames; import org.apache.jackrabbit.oak.plugins.index.lucene.OakAnalyzer; import org.apache.jackrabbit.oak.plugins.index.lucene.spi.FulltextQueryTermsProvider; +import org.apache.jackrabbit.oak.plugins.index.search.FieldNames; import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.joshua.decoder.Decoder; import org.apache.joshua.decoder.StructuredTranslation; Modified: jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/IndexDefinition.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/IndexDefinition.java?rev=1841926&r1=1841925&r2=1841926&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/IndexDefinition.java (original) +++ jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/IndexDefinition.java Tue Sep 25 12:24:15 2018 @@ -269,6 +269,8 @@ public class IndexDefinition implements private final String useIfExists; + private final boolean deprecated; + private final boolean testMode; public boolean isTestMode() { @@ -424,6 +426,7 @@ public class IndexDefinition implements this.syncIndexMode = supportsSyncIndexing(defn); this.syncPropertyIndexes = definedRules.stream().anyMatch(ir -> !ir.syncProps.isEmpty()); this.useIfExists = getOptionalValue(defn, IndexConstants.USE_IF_EXISTS, null); + this.deprecated = getOptionalValue(defn, IndexConstants.INDEX_DEPRECATED, false); } public NodeState getDefinitionNodeState() { @@ -521,6 +524,10 @@ public class IndexDefinition implements return numOfDocs; } + public boolean isDeprecated() { + return deprecated; + } + public IndexFormatVersion getVersion() { return version; }