Author: mkataria
Date: Mon Jun 29 06:49:51 2020
New Revision: 1879319
URL: http://svn.apache.org/viewvc?rev=1879319&view=rev
Log:
OAK-9122: Bring IndexDefinitionBuilder's implementation in oak-search at par
with the one in oak-lucene and remove the oak-lucene implementation
Added:
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/LuceneIndexDefinitionBuilder.java
(with props)
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/LuceneIndexDefinitionBuilderTest.java
(with props)
Removed:
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/IndexDefinitionBuilderTest.java
Modified:
jackrabbit/oak/trunk/oak-benchmarks-lucene/src/main/java/org/apache/jackrabbit/oak/benchmark/HybridIndexTest.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/IndexDefinitionBuilder.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/composite/blueGreen/Persistence.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/AsyncIndexStatsUpdateCallbackTest.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/AsyncIndexUpdateCorruptMarkingTest.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/FunctionIndexTest.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlannerTest.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneDocumentMakerLargeStringPropertiesLogTest.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneDocumentMakerTest.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexDefinitionTest.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditor2Test.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexInfoProviderTest.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexPathRestrictionTest.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndexTest.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneWritesOnSegmentStatsTest.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/MultiplexingLucenePropertyIndexTest.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/ReopenedLuceneIndexTest.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/SecureFacetTest.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/FSDirectoryFactoryTest.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/IndexConsistencyCheckerTest.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/LuceneIndexDumperTest.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/LuceneIndexImporterTest.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/DelayedFacetReadTest.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/ExternalIndexObserverTest.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/FacetCacheTest.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/HybridIndexClusterIT.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/MultithreadedOldLuceneFacetProviderReadFailureTest.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/ReaderRefCountIT.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/HybridPropertyIndexLookupTest.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/HybridPropertyIndexStorageTest.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/LuceneIndexPropertyQueryTest.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/PropertyIndexCleanerTest.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/SynchronousPropertyIndexTest.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/UniquenessConstraintValidatorTest.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/writer/FailedIndexUpdateTest.java
jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/HybridIndexDisabledTest.groovy
jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/index/AbstractIndexCommandTest.java
jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/index/DocumentStoreIndexerIT.java
jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/index/ReindexIT.java
jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/index/indexer/document/LuceneIndexerTest.java
jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/indexversion/PurgeOldIndexVersionTest.java
jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/FulltextIndexConstants.java
jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/util/IndexDefinitionBuilder.java
Modified:
jackrabbit/oak/trunk/oak-benchmarks-lucene/src/main/java/org/apache/jackrabbit/oak/benchmark/HybridIndexTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-benchmarks-lucene/src/main/java/org/apache/jackrabbit/oak/benchmark/HybridIndexTest.java?rev=1879319&r1=1879318&r2=1879319&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-benchmarks-lucene/src/main/java/org/apache/jackrabbit/oak/benchmark/HybridIndexTest.java
(original)
+++
jackrabbit/oak/trunk/oak-benchmarks-lucene/src/main/java/org/apache/jackrabbit/oak/benchmark/HybridIndexTest.java
Mon Jun 29 06:49:51 2020
@@ -64,7 +64,6 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.index.IndexUtils;
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.LuceneIndexConstants;
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.hybrid.DocumentQueue;
@@ -73,9 +72,9 @@ import org.apache.jackrabbit.oak.plugins
import
org.apache.jackrabbit.oak.plugins.index.lucene.property.PropertyIndexCleaner;
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.PropertyRule;
+import
org.apache.jackrabbit.oak.plugins.index.lucene.util.LuceneIndexDefinitionBuilder;
import org.apache.jackrabbit.oak.plugins.index.search.FulltextIndexConstants;
+import
org.apache.jackrabbit.oak.plugins.index.search.util.IndexDefinitionBuilder;
import org.apache.jackrabbit.oak.spi.commit.BackgroundObserver;
import org.apache.jackrabbit.oak.spi.lifecycle.RepositoryInitializer;
import org.apache.jackrabbit.oak.spi.mount.MountInfoProvider;
@@ -469,10 +468,10 @@ public class HybridIndexTest extends Abs
public void initialize(@NotNull NodeBuilder builder) {
NodeBuilder oakIndex = IndexUtils.getOrCreateOakIndex(builder);
- IndexDefinitionBuilder defnBuilder = new IndexDefinitionBuilder();
+ LuceneIndexDefinitionBuilder defnBuilder = new
LuceneIndexDefinitionBuilder();
defnBuilder.evaluatePathRestrictions();
defnBuilder.async("async", indexingMode, "async");
- PropertyRule pr =
defnBuilder.indexRule("nt:base").property(indexedPropName).propertyIndex();
+ IndexDefinitionBuilder.PropertyRule pr =
defnBuilder.indexRule("nt:base").property(indexedPropName).propertyIndex();
if (syncIndexing) {
pr.sync();
}
@@ -494,7 +493,7 @@ public class HybridIndexTest extends Abs
public void initialize(@NotNull NodeBuilder builder) {
NodeBuilder oakIndex = IndexUtils.getOrCreateOakIndex(builder);
- IndexDefinitionBuilder defnBuilder = new IndexDefinitionBuilder();
+ LuceneIndexDefinitionBuilder defnBuilder = new
LuceneIndexDefinitionBuilder();
defnBuilder.async("async", "async");
defnBuilder.codec("Lucene46");
defnBuilder.indexRule("nt:base")
Modified:
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/IndexDefinitionBuilder.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/IndexDefinitionBuilder.java?rev=1879319&r1=1879318&r2=1879319&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/IndexDefinitionBuilder.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/IndexDefinitionBuilder.java
Mon Jun 29 06:49:51 2020
@@ -60,6 +60,10 @@ import static org.apache.jackrabbit.oak.
import static
org.apache.jackrabbit.oak.plugins.index.search.FulltextIndexConstants.FIELD_BOOST;
import static
org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.EMPTY_NODE;
+/**
+ * @deprecated As of release 1.32, replaced by {@link
LuceneIndexDefinitionBuilder}
+ */
+@Deprecated
public final class IndexDefinitionBuilder {
private final NodeBuilder builder;
private final Tree tree;
Added:
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/LuceneIndexDefinitionBuilder.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/LuceneIndexDefinitionBuilder.java?rev=1879319&view=auto
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/LuceneIndexDefinitionBuilder.java
(added)
+++
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/LuceneIndexDefinitionBuilder.java
Mon Jun 29 06:49:51 2020
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.jackrabbit.oak.plugins.index.lucene.util;
+
+import
org.apache.jackrabbit.oak.plugins.index.search.util.IndexDefinitionBuilder;
+import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
+
+import static
org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants.TYPE_LUCENE;
+
+public final class LuceneIndexDefinitionBuilder extends IndexDefinitionBuilder
{
+
+ public LuceneIndexDefinitionBuilder() {
+ super();
+ }
+
+ public LuceneIndexDefinitionBuilder(NodeBuilder nodeBuilder) {
+ super(nodeBuilder);
+ }
+
+ public LuceneIndexDefinitionBuilder(NodeBuilder nodeBuilder, boolean
autoManageReindexFlag) {
+ super(nodeBuilder, autoManageReindexFlag);
+ }
+
+ protected String getIndexType() {
+ return TYPE_LUCENE;
+ }
+
+}
Propchange:
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/LuceneIndexDefinitionBuilder.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/composite/blueGreen/Persistence.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/composite/blueGreen/Persistence.java?rev=1879319&r1=1879318&r2=1879319&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/composite/blueGreen/Persistence.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/composite/blueGreen/Persistence.java
Mon Jun 29 06:49:51 2020
@@ -65,12 +65,13 @@ import org.apache.jackrabbit.oak.plugins
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.util.IndexDefinitionBuilder;
+import
org.apache.jackrabbit.oak.plugins.index.lucene.util.LuceneIndexDefinitionBuilder;
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.property.PropertyIndexProvider;
import
org.apache.jackrabbit.oak.plugins.index.reference.ReferenceEditorProvider;
import
org.apache.jackrabbit.oak.plugins.index.reference.ReferenceIndexProvider;
+import
org.apache.jackrabbit.oak.plugins.index.search.util.IndexDefinitionBuilder;
import org.apache.jackrabbit.oak.plugins.name.NameValidatorProvider;
import org.apache.jackrabbit.oak.plugins.name.NamespaceEditorProvider;
import org.apache.jackrabbit.oak.plugins.nodetype.TypeEditorProvider;
@@ -344,13 +345,13 @@ public class Persistence {
String indexName = "lucene";
if (!index.hasChildNode(indexName)) {
Set<String> INCLUDE_PROPS = ImmutableSet.of("test");
- IndexDefinitionBuilder indexBuilder = new
IndexDefinitionBuilder(index.child(indexName))
+ IndexDefinitionBuilder indexBuilder = new
LuceneIndexDefinitionBuilder(index.child(indexName))
.codec("Lucene46")
.excludedPaths("/libs");
indexBuilder.async(FULLTEXT_ASYNC,
IndexConstants.INDEXING_MODE_NRT);
indexBuilder.aggregateRule("nt:file", "jcr:content");
indexBuilder.indexRule("rep:Token");
- IndexDefinitionBuilder.IndexRule indexRules =
indexBuilder.indexRule("nt:base");
+ LuceneIndexDefinitionBuilder.IndexRule indexRules =
indexBuilder.indexRule("nt:base");
indexRules.includePropertyTypes("String", "Binary");
for (String includeProp : INCLUDE_PROPS) {
indexRules.property(includeProp).propertyIndex();
Modified:
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/AsyncIndexStatsUpdateCallbackTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/AsyncIndexStatsUpdateCallbackTest.java?rev=1879319&r1=1879318&r2=1879319&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/AsyncIndexStatsUpdateCallbackTest.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/AsyncIndexStatsUpdateCallbackTest.java
Mon Jun 29 06:49:51 2020
@@ -29,14 +29,9 @@ import org.apache.jackrabbit.oak.commons
import org.apache.jackrabbit.oak.plugins.index.AsyncIndexUpdate;
import
org.apache.jackrabbit.oak.plugins.index.counter.NodeCounterEditorProvider;
import
org.apache.jackrabbit.oak.plugins.index.lucene.directory.ActiveDeletedBlobCollectorFactory;
-import
org.apache.jackrabbit.oak.plugins.index.lucene.util.IndexDefinitionBuilder;
-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.lucene.util.LuceneIndexDefinitionBuilder;
import org.apache.jackrabbit.oak.plugins.memory.MemoryNodeStore;
-import org.apache.jackrabbit.oak.plugins.metric.MetricStatisticsProvider;
-import org.apache.jackrabbit.oak.spi.commit.Observer;
import org.apache.jackrabbit.oak.spi.mount.Mounts;
-import org.apache.jackrabbit.oak.spi.query.QueryIndexProvider;
import org.apache.jackrabbit.oak.spi.security.OpenSecurityProvider;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
import org.apache.jackrabbit.oak.stats.StatisticsProvider;
@@ -107,7 +102,7 @@ public class AsyncIndexStatsUpdateCallba
@Test
public void testCallbackWorksAsScheduled() throws Exception {
luceneIndexEditorProvider.withAsyncIndexesSizeStatsUpdate(asyncIndexesSizeStatsUpdate);
- IndexDefinitionBuilder idxb = new IndexDefinitionBuilder();
+ LuceneIndexDefinitionBuilder idxb = new LuceneIndexDefinitionBuilder();
idxb.indexRule("nt:base")
.property("foo").analyzed().nodeScopeIndex().ordered().useInExcerpt().propertyIndex();
idxb.build(root.getTree("/oak:index").addChild("lucenePropertyIndex"));
@@ -134,7 +129,7 @@ public class AsyncIndexStatsUpdateCallba
@Test
public void testNOOPDonotPerformCallbackStatsUpdate() throws Exception {
luceneIndexEditorProvider.withAsyncIndexesSizeStatsUpdate(AsyncIndexesSizeStatsUpdate.NOOP);
- IndexDefinitionBuilder idxb = new IndexDefinitionBuilder();
+ LuceneIndexDefinitionBuilder idxb = new LuceneIndexDefinitionBuilder();
idxb.indexRule("nt:base")
.property("foo").analyzed().nodeScopeIndex().ordered().useInExcerpt().propertyIndex();
idxb.build(root.getTree("/oak:index").addChild("lucenePropertyIndex"));
Modified:
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/AsyncIndexUpdateCorruptMarkingTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/AsyncIndexUpdateCorruptMarkingTest.java?rev=1879319&r1=1879318&r2=1879319&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/AsyncIndexUpdateCorruptMarkingTest.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/AsyncIndexUpdateCorruptMarkingTest.java
Mon Jun 29 06:49:51 2020
@@ -27,7 +27,7 @@ import org.apache.jackrabbit.oak.api.Roo
import org.apache.jackrabbit.oak.plugins.index.AsyncIndexUpdate;
import org.apache.jackrabbit.oak.plugins.index.TrackingCorruptIndexHandler;
import
org.apache.jackrabbit.oak.plugins.index.counter.NodeCounterEditorProvider;
-import
org.apache.jackrabbit.oak.plugins.index.lucene.util.IndexDefinitionBuilder;
+import
org.apache.jackrabbit.oak.plugins.index.lucene.util.LuceneIndexDefinitionBuilder;
import org.apache.jackrabbit.oak.plugins.index.nodetype.NodeTypeIndexProvider;
import
org.apache.jackrabbit.oak.plugins.index.property.PropertyIndexEditorProvider;
import org.apache.jackrabbit.oak.plugins.memory.MemoryNodeStore;
@@ -97,7 +97,7 @@ public class AsyncIndexUpdateCorruptMark
@Test
public void testLuceneIndexSegmentStats() throws Exception {
- IndexDefinitionBuilder idxb = new IndexDefinitionBuilder();
+ LuceneIndexDefinitionBuilder idxb = new LuceneIndexDefinitionBuilder();
idxb.indexRule("nt:base")
.property("foo").analyzed().nodeScopeIndex().ordered().useInExcerpt().propertyIndex();
idxb.build(root.getTree("/oak:index").addChild("lucenePropertyIndex"));
Modified:
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/FunctionIndexTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/FunctionIndexTest.java?rev=1879319&r1=1879318&r2=1879319&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/FunctionIndexTest.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/FunctionIndexTest.java
Mon Jun 29 06:49:51 2020
@@ -45,10 +45,11 @@ import org.apache.jackrabbit.oak.api.Res
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.api.Type;
import org.apache.jackrabbit.oak.commons.junit.LogCustomizer;
-import
org.apache.jackrabbit.oak.plugins.index.lucene.util.IndexDefinitionBuilder;
+import
org.apache.jackrabbit.oak.plugins.index.lucene.util.LuceneIndexDefinitionBuilder;
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.util.IndexDefinitionBuilder;
import org.apache.jackrabbit.oak.plugins.memory.MemoryNodeStore;
import org.apache.jackrabbit.oak.plugins.memory.PropertyStates;
import org.apache.jackrabbit.oak.InitialContentHelper;
@@ -916,7 +917,7 @@ public class FunctionIndexTest extends A
@Test
public void coalesce() throws Exception{
- IndexDefinitionBuilder idxb = new IndexDefinitionBuilder().noAsync();
+ IndexDefinitionBuilder idxb = new
LuceneIndexDefinitionBuilder().noAsync();
idxb.indexRule("nt:base").property("foo", null).function(
"lower(coalesce([jcr:content/foo2],
coalesce([jcr:content/foo], localname())))"
);
@@ -942,7 +943,7 @@ public class FunctionIndexTest extends A
@Test
public void coalesceOrdering() throws Exception{
- IndexDefinitionBuilder idxb = new IndexDefinitionBuilder().noAsync();
+ IndexDefinitionBuilder idxb = new
LuceneIndexDefinitionBuilder().noAsync();
idxb.indexRule("nt:base").property("foo", null).function(
"coalesce([jcr:content/foo2], [jcr:content/foo])"
).ordered();
Modified:
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlannerTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlannerTest.java?rev=1879319&r1=1879318&r2=1879319&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlannerTest.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlannerTest.java
Mon Jun 29 06:49:51 2020
@@ -65,7 +65,7 @@ import org.apache.jackrabbit.oak.plugins
import
org.apache.jackrabbit.oak.plugins.index.lucene.reader.DefaultIndexReader;
import org.apache.jackrabbit.oak.plugins.index.lucene.reader.LuceneIndexReader;
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.LuceneIndexDefinitionBuilder;
import org.apache.jackrabbit.oak.plugins.index.search.FulltextIndexConstants;
import org.apache.jackrabbit.oak.plugins.index.search.IndexDefinition;
import org.apache.jackrabbit.oak.plugins.index.search.spi.query.FulltextIndex;
@@ -79,7 +79,6 @@ import org.apache.jackrabbit.oak.query.a
import org.apache.jackrabbit.oak.query.ast.NodeTypeInfoProvider;
import org.apache.jackrabbit.oak.query.ast.Operator;
import org.apache.jackrabbit.oak.query.ast.SelectorImpl;
-import org.apache.jackrabbit.oak.spi.query.QueryConstants;
import org.apache.jackrabbit.oak.spi.query.fulltext.FullTextAnd;
import org.apache.jackrabbit.oak.spi.query.fulltext.FullTextContains;
import org.apache.jackrabbit.oak.spi.query.fulltext.FullTextExpression;
@@ -532,7 +531,7 @@ public class IndexPlannerTest {
@Test
public void indexedButZeroWeightProps() throws Exception{
- IndexDefinitionBuilder defnb = new IndexDefinitionBuilder();
+ LuceneIndexDefinitionBuilder defnb = new
LuceneIndexDefinitionBuilder();
defnb.indexRule("nt:base").property("foo").propertyIndex();
defnb.indexRule("nt:base").property("bar").propertyIndex().weight(0);
@@ -828,7 +827,7 @@ public class IndexPlannerTest {
@Test
public void valuePattern_Equals() throws Exception{
- IndexDefinitionBuilder defnb = new IndexDefinitionBuilder();
+ LuceneIndexDefinitionBuilder defnb = new
LuceneIndexDefinitionBuilder();
defnb.indexRule("nt:base")
.property("foo")
.propertyIndex()
@@ -851,7 +850,7 @@ public class IndexPlannerTest {
@Test
public void valuePattern_StartsWith() throws Exception{
- IndexDefinitionBuilder defnb = new IndexDefinitionBuilder();
+ LuceneIndexDefinitionBuilder defnb = new
LuceneIndexDefinitionBuilder();
defnb.indexRule("nt:base")
.property("foo")
.propertyIndex()
@@ -877,7 +876,7 @@ public class IndexPlannerTest {
@Test
public void relativeProperty_Basics() throws Exception{
- IndexDefinitionBuilder defnb = new IndexDefinitionBuilder();
+ LuceneIndexDefinitionBuilder defnb = new
LuceneIndexDefinitionBuilder();
defnb.indexRule("nt:base").property("foo").propertyIndex();
defnb.indexRule("nt:base").property("jcr:content/bar").propertyIndex();
@@ -907,7 +906,7 @@ public class IndexPlannerTest {
@Test
public void relativeProperty_Non_NtBase() throws Exception {
- IndexDefinitionBuilder defnb = new IndexDefinitionBuilder();
+ LuceneIndexDefinitionBuilder defnb = new
LuceneIndexDefinitionBuilder();
defnb.indexRule("nt:unstructured").property("foo").propertyIndex();
LuceneIndexDefinition defn = new LuceneIndexDefinition(root,
defnb.build(), "/foo");
@@ -925,7 +924,7 @@ public class IndexPlannerTest {
@Test
public void relativeProperty_WithFulltext() throws Exception {
- IndexDefinitionBuilder defnb = new IndexDefinitionBuilder();
+ LuceneIndexDefinitionBuilder defnb = new
LuceneIndexDefinitionBuilder();
defnb.indexRule("nt:base").property("foo").propertyIndex();
defnb.indexRule("nt:base").property("bar").analyzed();
@@ -949,7 +948,7 @@ public class IndexPlannerTest {
@Test
public void relativeProperty_FullText() throws Exception{
- IndexDefinitionBuilder defnb = new IndexDefinitionBuilder();
+ LuceneIndexDefinitionBuilder defnb = new
LuceneIndexDefinitionBuilder();
defnb.indexRule("nt:base").property("foo").propertyIndex();
defnb.aggregateRule("nt:base").include("*");
@@ -969,7 +968,7 @@ public class IndexPlannerTest {
@Test
public void relativeProperty_MultipleMatch() throws Exception{
- IndexDefinitionBuilder defnb = new IndexDefinitionBuilder();
+ LuceneIndexDefinitionBuilder defnb = new
LuceneIndexDefinitionBuilder();
defnb.indexRule("nt:base").property("foo").propertyIndex();
defnb.indexRule("nt:base").property("bar").propertyIndex();
defnb.indexRule("nt:base").property("baz").propertyIndex();
@@ -1019,7 +1018,7 @@ public class IndexPlannerTest {
@Test
public void syncIndex_uniqueIndex() throws Exception{
- IndexDefinitionBuilder defnb = new IndexDefinitionBuilder();
+ LuceneIndexDefinitionBuilder defnb = new
LuceneIndexDefinitionBuilder();
defnb.indexRule("nt:base").property("foo").propertyIndex().unique();
LuceneIndexDefinition defn = new LuceneIndexDefinition(root,
defnb.build(), "/foo");
@@ -1042,7 +1041,7 @@ public class IndexPlannerTest {
@Test
public void syncIndex_uniqueAndRelative() throws Exception{
- IndexDefinitionBuilder defnb = new IndexDefinitionBuilder();
+ LuceneIndexDefinitionBuilder defnb = new
LuceneIndexDefinitionBuilder();
defnb.indexRule("nt:base").property("foo").propertyIndex().unique();
LuceneIndexDefinition defn = new LuceneIndexDefinition(root,
defnb.build(), "/foo");
@@ -1065,7 +1064,7 @@ public class IndexPlannerTest {
@Test
public void syncIndex_nonUnique() throws Exception{
- IndexDefinitionBuilder defnb = new IndexDefinitionBuilder();
+ LuceneIndexDefinitionBuilder defnb = new
LuceneIndexDefinitionBuilder();
defnb.indexRule("nt:base").property("foo").propertyIndex().sync();
LuceneIndexDefinition defn = new LuceneIndexDefinition(root,
defnb.build(), "/foo");
@@ -1091,7 +1090,7 @@ public class IndexPlannerTest {
*/
@Test
public void syncIndex_nonUniqueAndUniqueBoth() throws Exception{
- IndexDefinitionBuilder defnb = new IndexDefinitionBuilder();
+ LuceneIndexDefinitionBuilder defnb = new
LuceneIndexDefinitionBuilder();
defnb.indexRule("nt:base").property("foo").propertyIndex().unique();
defnb.indexRule("nt:base").property("bar").propertyIndex().sync();
@@ -1116,7 +1115,7 @@ public class IndexPlannerTest {
@Test
public void syncIndex_NotUsedWithSort() throws Exception{
- IndexDefinitionBuilder defnb = new IndexDefinitionBuilder();
+ LuceneIndexDefinitionBuilder defnb = new
LuceneIndexDefinitionBuilder();
defnb.indexRule("nt:base").property("foo").propertyIndex().sync();
defnb.indexRule("nt:base").property("bar").propertyIndex().ordered();
@@ -1139,7 +1138,7 @@ public class IndexPlannerTest {
@Test
public void syncIndex_NotUsedWithFulltext() throws Exception{
- IndexDefinitionBuilder defnb = new IndexDefinitionBuilder();
+ LuceneIndexDefinitionBuilder defnb = new
LuceneIndexDefinitionBuilder();
defnb.indexRule("nt:base").property("foo").propertyIndex().sync();
defnb.indexRule("nt:base").property("bar").analyzed();
@@ -1180,7 +1179,7 @@ public class IndexPlannerTest {
TestUtil.registerNodeType(builder, testNodeTypeDefn);
root = builder.getNodeState();
- IndexDefinitionBuilder defnb = new IndexDefinitionBuilder();
+ LuceneIndexDefinitionBuilder defnb = new
LuceneIndexDefinitionBuilder();
defnb.nodeTypeIndex();
defnb.indexRule("oak:TestSuperType");
@@ -1212,7 +1211,7 @@ public class IndexPlannerTest {
TestUtil.registerNodeType(builder, testNodeTypeDefn);
root = builder.getNodeState();
- IndexDefinitionBuilder defnb = new IndexDefinitionBuilder();
+ LuceneIndexDefinitionBuilder defnb = new
LuceneIndexDefinitionBuilder();
defnb.nodeTypeIndex();
defnb.indexRule("oak:TestMixA");
@@ -1234,7 +1233,7 @@ public class IndexPlannerTest {
TestUtil.registerNodeType(builder, testNodeTypeDefn);
root = builder.getNodeState();
- IndexDefinitionBuilder defnb = new IndexDefinitionBuilder();
+ LuceneIndexDefinitionBuilder defnb = new
LuceneIndexDefinitionBuilder();
defnb.nodeTypeIndex();
defnb.indexRule("oak:TestSuperType").sync();
@@ -1397,7 +1396,7 @@ public class IndexPlannerTest {
@Test
public void weightedPropDefs() throws Exception {
String indexPath = "/test";
- IndexDefinitionBuilder idxBuilder = new
IndexDefinitionBuilder(child(builder, indexPath));
+ LuceneIndexDefinitionBuilder idxBuilder = new
LuceneIndexDefinitionBuilder(child(builder, indexPath));
idxBuilder.indexRule("nt:base").property("foo").propertyIndex().weight(500)
.enclosingRule().property("foo1").propertyIndex().weight(20)
.enclosingRule().property("foo2").propertyIndex().weight(0)
@@ -1471,7 +1470,7 @@ public class IndexPlannerTest {
@Test
public void weightedRegexPropDefs() throws Exception {
String indexPath = "/test";
- IndexDefinitionBuilder idxBuilder = new
IndexDefinitionBuilder(child(builder, indexPath));
+ LuceneIndexDefinitionBuilder idxBuilder = new
LuceneIndexDefinitionBuilder(child(builder, indexPath));
idxBuilder.indexRule("nt:base").property("foo").propertyIndex()
.enclosingRule().property("bar", "bar.*",
true).propertyIndex().weight(20)
;
@@ -1516,7 +1515,7 @@ public class IndexPlannerTest {
@Test
public void overflowingWeight() throws Exception {
String indexPath = "/test";
- IndexDefinitionBuilder idxBuilder = new
IndexDefinitionBuilder(child(builder, indexPath));
+ LuceneIndexDefinitionBuilder idxBuilder = new
LuceneIndexDefinitionBuilder(child(builder, indexPath));
idxBuilder.indexRule("nt:base").property("foo").propertyIndex().weight(Integer.MAX_VALUE/2)
.enclosingRule().property("foo1").propertyIndex()
;
@@ -1556,7 +1555,7 @@ public class IndexPlannerTest {
@Test
public void functionPropDef() throws Exception {
String indexPath = "/test";
- IndexDefinitionBuilder idxBuilder = new
IndexDefinitionBuilder(child(builder, indexPath));
+ LuceneIndexDefinitionBuilder idxBuilder = new
LuceneIndexDefinitionBuilder(child(builder, indexPath));
idxBuilder.indexRule("nt:base").property("foo").propertyIndex();
Tree fooPD =
idxBuilder.getBuilderTree().getChild("indexRules").getChild("nt:base")
.getChild("properties").getChild("foo");
@@ -1584,7 +1583,7 @@ public class IndexPlannerTest {
@Test
public void fullTextWithPropRestriction() throws Exception{
String indexPath = "/test";
- IndexDefinitionBuilder idxBuilder = new
IndexDefinitionBuilder(child(builder, indexPath));
+ LuceneIndexDefinitionBuilder idxBuilder = new
LuceneIndexDefinitionBuilder(child(builder, indexPath));
idxBuilder.indexRule("nt:base").property("foo").nodeScopeIndex()
.enclosingRule().property("foo1").propertyIndex()
.enclosingRule().property("foo2").analyzed();
@@ -1627,7 +1626,7 @@ public class IndexPlannerTest {
try {
LuceneIndexStatistics.failReadingFields = true;
String indexPath = "/test";
- IndexDefinitionBuilder idxBuilder = new
IndexDefinitionBuilder(child(builder, indexPath));
+ LuceneIndexDefinitionBuilder idxBuilder = new
LuceneIndexDefinitionBuilder(child(builder, indexPath));
idxBuilder.indexRule("nt:base").property("foo").propertyIndex();
idxBuilder.indexRule("nt:base").property("bar").propertyIndex();
NodeState defn = idxBuilder.build();
@@ -1668,7 +1667,7 @@ public class IndexPlannerTest {
try {
LuceneIndexStatistics.failReadingSyntheticallyFalliableField =
true;
String indexPath = "/test";
- IndexDefinitionBuilder idxBuilder = new
IndexDefinitionBuilder(child(builder, indexPath));
+ LuceneIndexDefinitionBuilder idxBuilder = new
LuceneIndexDefinitionBuilder(child(builder, indexPath));
idxBuilder.indexRule("nt:base").property("foo").propertyIndex();
idxBuilder.indexRule("nt:base").property("foo1").propertyIndex();
idxBuilder.indexRule("nt:base").property(SYNTHETICALLY_FALLIABLE_FIELD).propertyIndex();
@@ -1725,7 +1724,7 @@ public class IndexPlannerTest {
public void costForPathTransformation() throws Exception {
LuceneIndexStatistics.failReadingSyntheticallyFalliableField = true;
String indexPath = "/test";
- IndexDefinitionBuilder idxBuilder = new
IndexDefinitionBuilder(child(builder, indexPath));
+ LuceneIndexDefinitionBuilder idxBuilder = new
LuceneIndexDefinitionBuilder(child(builder, indexPath));
idxBuilder.indexRule("nt:base").property("foo").propertyIndex();
idxBuilder.indexRule("nt:base").property("foo1").propertyIndex();
idxBuilder.indexRule("nt:base").property("foo2").propertyIndex();
@@ -1780,7 +1779,7 @@ public class IndexPlannerTest {
@Test
public void facetGetsPlanned() throws Exception {
- IndexDefinitionBuilder defnb = new IndexDefinitionBuilder();
+ LuceneIndexDefinitionBuilder defnb = new
LuceneIndexDefinitionBuilder();
defnb.indexRule("nt:base").property("foo").propertyIndex();
defnb.indexRule("nt:base").property("facet").getBuilderTree().setProperty(FACETS,
true);
@@ -1800,7 +1799,7 @@ public class IndexPlannerTest {
@Test
public void facetGetsPlanned2() throws Exception {
- IndexDefinitionBuilder defnb = new IndexDefinitionBuilder();
+ LuceneIndexDefinitionBuilder defnb = new
LuceneIndexDefinitionBuilder();
defnb.indexRule("nt:base").property("foo").propertyIndex();
defnb.indexRule("nt:base").property("facet1").getBuilderTree().setProperty(FACETS,
true);
defnb.indexRule("nt:base").property("rel/facet2").getBuilderTree().setProperty(FACETS,
true);
@@ -1822,7 +1821,7 @@ public class IndexPlannerTest {
@Test
public void noFacetPropIndexed() throws Exception {
- IndexDefinitionBuilder defnb = new IndexDefinitionBuilder();
+ LuceneIndexDefinitionBuilder defnb = new
LuceneIndexDefinitionBuilder();
defnb.indexRule("nt:base").property("foo").propertyIndex();
LuceneIndexDefinition defn = new LuceneIndexDefinition(root,
defnb.build(), "/foo");
@@ -1841,7 +1840,7 @@ public class IndexPlannerTest {
@Test
public void someFacetPropIndexed() throws Exception {
- IndexDefinitionBuilder defnb = new IndexDefinitionBuilder();
+ LuceneIndexDefinitionBuilder defnb = new
LuceneIndexDefinitionBuilder();
defnb.indexRule("nt:base").property("foo").propertyIndex();
defnb.indexRule("nt:base").property("facet").getBuilderTree().setProperty(FACETS,
true);
Modified:
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneDocumentMakerLargeStringPropertiesLogTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneDocumentMakerLargeStringPropertiesLogTest.java?rev=1879319&r1=1879318&r2=1879319&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneDocumentMakerLargeStringPropertiesLogTest.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneDocumentMakerLargeStringPropertiesLogTest.java
Mon Jun 29 06:49:51 2020
@@ -22,7 +22,7 @@ import ch.qos.logback.classic.spi.ILoggi
import ch.qos.logback.core.read.ListAppender;
import org.apache.jackrabbit.oak.api.Type;
import org.apache.jackrabbit.oak.commons.junit.TemporarySystemProperty;
-import
org.apache.jackrabbit.oak.plugins.index.lucene.util.IndexDefinitionBuilder;
+import
org.apache.jackrabbit.oak.plugins.index.lucene.util.LuceneIndexDefinitionBuilder;
import
org.apache.jackrabbit.oak.plugins.index.search.spi.editor.FulltextDocumentMaker;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
@@ -74,7 +74,7 @@ public class LuceneDocumentMakerLargeStr
private LuceneDocumentMaker addPropertyAccordingToType(NodeBuilder test,
Type type, String... str) throws IOException {
NodeState root = INITIAL_CONTENT;
- IndexDefinitionBuilder builder = new IndexDefinitionBuilder();
+ LuceneIndexDefinitionBuilder builder = new
LuceneIndexDefinitionBuilder();
builder.indexRule("nt:base")
.property("foo")
.propertyIndex()
Modified:
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneDocumentMakerTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneDocumentMakerTest.java?rev=1879319&r1=1879318&r2=1879319&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneDocumentMakerTest.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneDocumentMakerTest.java
Mon Jun 29 06:49:51 2020
@@ -20,9 +20,7 @@
package org.apache.jackrabbit.oak.plugins.index.lucene;
import org.apache.jackrabbit.oak.api.Type;
-import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneDocumentMaker;
-import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexDefinition;
-import
org.apache.jackrabbit.oak.plugins.index.lucene.util.IndexDefinitionBuilder;
+import
org.apache.jackrabbit.oak.plugins.index.lucene.util.LuceneIndexDefinitionBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.junit.Test;
@@ -35,7 +33,7 @@ import static org.junit.Assert.assertNul
public class LuceneDocumentMakerTest {
private NodeState root = INITIAL_CONTENT;
- private IndexDefinitionBuilder builder = new IndexDefinitionBuilder();
+ private LuceneIndexDefinitionBuilder builder = new
LuceneIndexDefinitionBuilder();
@Test
public void excludeSingleProperty() throws Exception{
Modified:
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexDefinitionTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexDefinitionTest.java?rev=1879319&r1=1879318&r2=1879319&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexDefinitionTest.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexDefinitionTest.java
Mon Jun 29 06:49:51 2020
@@ -28,7 +28,7 @@ import com.google.common.collect.Immutab
import org.apache.jackrabbit.JcrConstants;
import org.apache.jackrabbit.oak.api.Type;
import org.apache.jackrabbit.oak.plugins.index.IndexConstants;
-import
org.apache.jackrabbit.oak.plugins.index.lucene.util.IndexDefinitionBuilder;
+import
org.apache.jackrabbit.oak.plugins.index.lucene.util.LuceneIndexDefinitionBuilder;
import org.apache.jackrabbit.oak.plugins.index.lucene.util.TokenizerChain;
import
org.apache.jackrabbit.oak.plugins.index.lucene.writer.CommitMitigatingTieredMergePolicy;
import org.apache.jackrabbit.oak.plugins.index.search.Aggregate;
@@ -989,7 +989,7 @@ public class LuceneIndexDefinitionTest {
@Test
public void uniqueIsSync() throws Exception{
- IndexDefinitionBuilder defnb = new IndexDefinitionBuilder();
+ LuceneIndexDefinitionBuilder defnb = new
LuceneIndexDefinitionBuilder();
defnb.indexRule("nt:base").property("foo").unique();
IndexDefinition defn = IndexDefinition.newBuilder(root, defnb.build(),
"/foo").build();
@@ -1000,7 +1000,7 @@ public class LuceneIndexDefinitionTest {
@Test
public void syncIsProperty() throws Exception{
- IndexDefinitionBuilder defnb = new IndexDefinitionBuilder();
+ LuceneIndexDefinitionBuilder defnb = new
LuceneIndexDefinitionBuilder();
defnb.indexRule("nt:base").property("foo").sync();
IndexDefinition defn = IndexDefinition.newBuilder(root, defnb.build(),
"/foo").build();
@@ -1010,7 +1010,7 @@ public class LuceneIndexDefinitionTest {
@Test
public void syncPropertyDefinitions() throws Exception{
- IndexDefinitionBuilder defnb = new IndexDefinitionBuilder();
+ LuceneIndexDefinitionBuilder defnb = new
LuceneIndexDefinitionBuilder();
defnb.indexRule("nt:base").property("foo").sync();
IndexDefinition defn = IndexDefinition.newBuilder(root, defnb.build(),
"/foo").build();
@@ -1038,7 +1038,7 @@ public class LuceneIndexDefinitionTest {
root = builder.getNodeState();
- IndexDefinitionBuilder defnb = new IndexDefinitionBuilder();
+ LuceneIndexDefinitionBuilder defnb = new
LuceneIndexDefinitionBuilder();
defnb.nodeTypeIndex();
defnb.indexRule("oak:TestSuperType");
@@ -1063,7 +1063,7 @@ public class LuceneIndexDefinitionTest {
TestUtil.registerNodeType(builder, testNodeTypeDefn);
root = builder.getNodeState();
- IndexDefinitionBuilder defnb = new IndexDefinitionBuilder();
+ LuceneIndexDefinitionBuilder defnb = new
LuceneIndexDefinitionBuilder();
defnb.nodeTypeIndex();
defnb.indexRule("oak:TestSuperType").sync();
@@ -1085,7 +1085,7 @@ public class LuceneIndexDefinitionTest {
TestUtil.registerNodeType(builder, testNodeTypeDefn);
root = builder.getNodeState();
- IndexDefinitionBuilder defnb = new IndexDefinitionBuilder();
+ LuceneIndexDefinitionBuilder defnb = new
LuceneIndexDefinitionBuilder();
defnb.nodeTypeIndex();
defnb.indexRule("oak:TestSuperType").sync();
defnb.indexRule("oak:TestSuperType").property("foo").propertyIndex();
@@ -1106,7 +1106,7 @@ public class LuceneIndexDefinitionTest {
TestUtil.registerNodeType(builder, testNodeTypeDefn);
root = builder.getNodeState();
- IndexDefinitionBuilder defnb = new IndexDefinitionBuilder();
+ LuceneIndexDefinitionBuilder defnb = new
LuceneIndexDefinitionBuilder();
defnb.nodeTypeIndex();
defnb.indexRule("oak:TestSuperType").sync();
defnb.aggregateRule("oak:TestSuperType").include("*");
@@ -1129,7 +1129,7 @@ public class LuceneIndexDefinitionTest {
root = builder.getNodeState();
- IndexDefinitionBuilder defnb = new IndexDefinitionBuilder();
+ LuceneIndexDefinitionBuilder defnb = new
LuceneIndexDefinitionBuilder();
defnb.nodeTypeIndex();
defnb.indexRule("oak:TestMixA");
@@ -1152,7 +1152,7 @@ public class LuceneIndexDefinitionTest {
root = builder.getNodeState();
- IndexDefinitionBuilder defnb = new IndexDefinitionBuilder();
+ LuceneIndexDefinitionBuilder defnb = new
LuceneIndexDefinitionBuilder();
defnb.indexRule("oak:TestMixA").property(JcrConstants.JCR_PRIMARYTYPE).propertyIndex();
defnb.indexRule("oak:TestSuperType").property(JcrConstants.JCR_PRIMARYTYPE).propertyIndex().sync();
@@ -1172,7 +1172,7 @@ public class LuceneIndexDefinitionTest {
@Test
public void relativeNodeNames_None() {
- IndexDefinitionBuilder defnb = new IndexDefinitionBuilder();
+ LuceneIndexDefinitionBuilder defnb = new
LuceneIndexDefinitionBuilder();
defnb.indexRule("nt:base").property("foo").propertyIndex();
IndexDefinition defn = IndexDefinition.newBuilder(root, defnb.build(),
"/foo").build();
@@ -1182,7 +1182,7 @@ public class LuceneIndexDefinitionTest {
@Test
public void relativeNodeNames_RelativeProp() {
- IndexDefinitionBuilder defnb = new IndexDefinitionBuilder();
+ LuceneIndexDefinitionBuilder defnb = new
LuceneIndexDefinitionBuilder();
defnb.indexRule("nt:base").property("jcr:content/foo").propertyIndex();
defnb.indexRule("nt:base").property("bar").propertyIndex();
@@ -1193,7 +1193,7 @@ public class LuceneIndexDefinitionTest {
@Test
public void relativeNodeNames_Aggregate() {
- IndexDefinitionBuilder defnb = new IndexDefinitionBuilder();
+ LuceneIndexDefinitionBuilder defnb = new
LuceneIndexDefinitionBuilder();
defnb.indexRule("nt:base").property("jcr:content/foo").propertyIndex();
defnb.aggregateRule("nt:base").include("jcr:content/metadata");
defnb.aggregateRule("nt:base").include("jcr:content/metadata/type/*");
@@ -1206,7 +1206,7 @@ public class LuceneIndexDefinitionTest {
@Test
public void regexAllProps() {
- IndexDefinitionBuilder builder = new IndexDefinitionBuilder();
+ LuceneIndexDefinitionBuilder builder = new
LuceneIndexDefinitionBuilder();
builder.indexRule("nt:base").property("p");
builder.indexRule("nt:base").property("all",
FulltextIndexConstants.REGEX_ALL_PROPS, true);
Modified:
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditor2Test.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditor2Test.java?rev=1879319&r1=1879318&r2=1879319&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditor2Test.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditor2Test.java
Mon Jun 29 06:49:51 2020
@@ -33,7 +33,7 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.index.IndexUpdateCallback;
import org.apache.jackrabbit.oak.plugins.index.IndexUpdateProvider;
import org.apache.jackrabbit.oak.plugins.index.IndexingContext;
-import
org.apache.jackrabbit.oak.plugins.index.lucene.util.IndexDefinitionBuilder;
+import
org.apache.jackrabbit.oak.plugins.index.lucene.util.LuceneIndexDefinitionBuilder;
import org.apache.jackrabbit.oak.plugins.index.lucene.writer.LuceneIndexWriter;
import org.apache.jackrabbit.oak.plugins.index.search.ExtractedTextCache;
import org.apache.jackrabbit.oak.plugins.index.search.IndexDefinition;
@@ -74,7 +74,7 @@ public class LuceneIndexEditor2Test {
@Test
public void basics() throws Exception{
- IndexDefinitionBuilder defnb = new IndexDefinitionBuilder();
+ LuceneIndexDefinitionBuilder defnb = new
LuceneIndexDefinitionBuilder();
defnb.indexRule("nt:base").property("foo").propertyIndex();
NodeState defnState = defnb.build();
@@ -93,7 +93,7 @@ public class LuceneIndexEditor2Test {
@Test
public void simplePropertyUpdateCallback() throws Exception{
- IndexDefinitionBuilder defnb = new IndexDefinitionBuilder();
+ LuceneIndexDefinitionBuilder defnb = new
LuceneIndexDefinitionBuilder();
defnb.indexRule("nt:base").property("foo").propertyIndex();
NodeState defnState = defnb.build();
@@ -141,7 +141,7 @@ public class LuceneIndexEditor2Test {
@Test
public void relativeProperties() throws Exception{
- IndexDefinitionBuilder defnb = new IndexDefinitionBuilder();
+ LuceneIndexDefinitionBuilder defnb = new
LuceneIndexDefinitionBuilder();
defnb.indexRule("nt:base").property("jcr:content/metadata/foo").propertyIndex();
defnb.aggregateRule("nt:base").include("*");
@@ -186,7 +186,7 @@ public class LuceneIndexEditor2Test {
propCallback.reset();
}
- private void updateBefore(IndexDefinitionBuilder defnb) {
+ private void updateBefore(LuceneIndexDefinitionBuilder defnb) {
NodeBuilder builder = before.builder();
NodeBuilder cb = TestUtil.child(builder,
PathUtils.getParentPath(indexPath));
cb.setChildNode(PathUtils.getName(indexPath), defnb.build());
Modified:
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexInfoProviderTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexInfoProviderTest.java?rev=1879319&r1=1879318&r2=1879319&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexInfoProviderTest.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexInfoProviderTest.java
Mon Jun 29 06:49:51 2020
@@ -24,7 +24,7 @@ import java.io.File;
import org.apache.jackrabbit.oak.plugins.index.AsyncIndexInfo;
import org.apache.jackrabbit.oak.plugins.index.AsyncIndexInfoService;
import org.apache.jackrabbit.oak.plugins.index.IndexInfo;
-import
org.apache.jackrabbit.oak.plugins.index.lucene.util.IndexDefinitionBuilder;
+import
org.apache.jackrabbit.oak.plugins.index.lucene.util.LuceneIndexDefinitionBuilder;
import org.apache.jackrabbit.oak.plugins.memory.MemoryNodeStore;
import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
import org.apache.jackrabbit.oak.spi.commit.EmptyHook;
@@ -59,7 +59,7 @@ public class LuceneIndexInfoProviderTest
@Test
public void info() throws Exception {
- IndexDefinitionBuilder defnBuilder = new IndexDefinitionBuilder();
+ LuceneIndexDefinitionBuilder defnBuilder = new
LuceneIndexDefinitionBuilder();
NodeBuilder builder = store.getRoot().builder();
builder.child("oak:index").setChildNode("fooIndex",
defnBuilder.build());
Modified:
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexPathRestrictionTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexPathRestrictionTest.java?rev=1879319&r1=1879318&r2=1879319&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexPathRestrictionTest.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexPathRestrictionTest.java
Mon Jun 29 06:49:51 2020
@@ -20,7 +20,8 @@ import com.google.common.collect.Sets;
import org.apache.jackrabbit.oak.InitialContentHelper;
import org.apache.jackrabbit.oak.plugins.index.IndexConstants;
import org.apache.jackrabbit.oak.plugins.index.IndexUpdateProvider;
-import
org.apache.jackrabbit.oak.plugins.index.lucene.util.IndexDefinitionBuilder;
+import
org.apache.jackrabbit.oak.plugins.index.lucene.util.LuceneIndexDefinitionBuilder;
+import
org.apache.jackrabbit.oak.plugins.index.search.util.IndexDefinitionBuilder;
import org.apache.jackrabbit.oak.plugins.memory.PropertyValues;
import org.apache.jackrabbit.oak.query.NodeStateNodeTypeInfoProvider;
import org.apache.jackrabbit.oak.query.QueryEngineSettings;
@@ -73,7 +74,7 @@ public class LuceneIndexPathRestrictionT
@Test
public void pathTranformationWithNoPathRestriction() throws Exception {
IndexDefinitionBuilder idxBuilder =
- new
IndexDefinitionBuilder(rootBuilder.child(IndexConstants.INDEX_DEFINITIONS_NAME).child("fooIndex"))
+ new
LuceneIndexDefinitionBuilder(rootBuilder.child(IndexConstants.INDEX_DEFINITIONS_NAME).child("fooIndex"))
.noAsync().evaluatePathRestrictions();
idxBuilder.indexRule("nt:base").property("foo").propertyIndex();
idxBuilder.build();
@@ -106,7 +107,7 @@ public class LuceneIndexPathRestrictionT
@Test
public void pathTranformationWithAllChildrenPathRestriction() throws
Exception {
IndexDefinitionBuilder idxBuilder =
- new
IndexDefinitionBuilder(rootBuilder.child(IndexConstants.INDEX_DEFINITIONS_NAME).child("fooIndex"))
+ new
LuceneIndexDefinitionBuilder(rootBuilder.child(IndexConstants.INDEX_DEFINITIONS_NAME).child("fooIndex"))
.noAsync().evaluatePathRestrictions();
idxBuilder.indexRule("nt:base").property("foo").propertyIndex();
idxBuilder.build();
@@ -142,7 +143,7 @@ public class LuceneIndexPathRestrictionT
@Test
public void pathTranformationWithDirectChildrenPathRestriction() throws
Exception {
IndexDefinitionBuilder idxBuilder =
- new
IndexDefinitionBuilder(rootBuilder.child(IndexConstants.INDEX_DEFINITIONS_NAME).child("fooIndex"))
+ new
LuceneIndexDefinitionBuilder(rootBuilder.child(IndexConstants.INDEX_DEFINITIONS_NAME).child("fooIndex"))
.noAsync().evaluatePathRestrictions();
idxBuilder.indexRule("nt:base").property("foo").propertyIndex();
idxBuilder.build();
@@ -178,7 +179,7 @@ public class LuceneIndexPathRestrictionT
@Test
public void pathTranformationWithExactPathRestriction() throws Exception {
IndexDefinitionBuilder idxBuilder =
- new
IndexDefinitionBuilder(rootBuilder.child(IndexConstants.INDEX_DEFINITIONS_NAME).child("fooIndex"))
+ new
LuceneIndexDefinitionBuilder(rootBuilder.child(IndexConstants.INDEX_DEFINITIONS_NAME).child("fooIndex"))
.noAsync().evaluatePathRestrictions();
idxBuilder.indexRule("nt:base").property("foo").propertyIndex();
idxBuilder.build();
@@ -214,7 +215,7 @@ public class LuceneIndexPathRestrictionT
@Test
public void pathTranformationWithParentFilter() throws Exception {
IndexDefinitionBuilder idxBuilder =
- new
IndexDefinitionBuilder(rootBuilder.child(IndexConstants.INDEX_DEFINITIONS_NAME).child("fooIndex"))
+ new
LuceneIndexDefinitionBuilder(rootBuilder.child(IndexConstants.INDEX_DEFINITIONS_NAME).child("fooIndex"))
.noAsync().evaluatePathRestrictions();
idxBuilder.indexRule("nt:base").property("foo").propertyIndex();
idxBuilder.build();
Modified:
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndexTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndexTest.java?rev=1879319&r1=1879318&r2=1879319&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndexTest.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndexTest.java
Mon Jun 29 06:49:51 2020
@@ -71,7 +71,7 @@ import org.apache.jackrabbit.oak.plugins
import
org.apache.jackrabbit.oak.plugins.index.fulltext.ExtractedText.ExtractionResult;
import
org.apache.jackrabbit.oak.plugins.index.fulltext.PreExtractedTextProvider;
import
org.apache.jackrabbit.oak.plugins.index.lucene.directory.CopyOnReadDirectory;
-import
org.apache.jackrabbit.oak.plugins.index.lucene.util.IndexDefinitionBuilder;
+import
org.apache.jackrabbit.oak.plugins.index.lucene.util.LuceneIndexDefinitionBuilder;
import org.apache.jackrabbit.oak.plugins.index.lucene.util.fv.SimSearchUtils;
import org.apache.jackrabbit.oak.plugins.index.nodetype.NodeTypeIndexProvider;
import
org.apache.jackrabbit.oak.plugins.index.property.PropertyIndexEditorProvider;
@@ -79,6 +79,7 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.index.search.FulltextIndexConstants;
import org.apache.jackrabbit.oak.plugins.index.search.IndexDefinition;
import org.apache.jackrabbit.oak.plugins.index.search.IndexFormatVersion;
+import
org.apache.jackrabbit.oak.plugins.index.search.util.IndexDefinitionBuilder;
import org.apache.jackrabbit.oak.plugins.memory.ArrayBasedBlob;
import org.apache.jackrabbit.oak.plugins.memory.MemoryNodeStore;
import org.apache.jackrabbit.oak.plugins.memory.PropertyStates;
@@ -760,7 +761,7 @@ public class LucenePropertyIndexTest ext
@Test
public void orderByScoreAcrossUnion() throws Exception {
Tree idx =
root.getTree("/").addChild(INDEX_DEFINITIONS_NAME).addChild("test-index");
- IndexDefinitionBuilder builder = new IndexDefinitionBuilder();
+ IndexDefinitionBuilder builder = new LuceneIndexDefinitionBuilder();
builder.evaluatePathRestrictions();
builder.indexRule("nt:base")
.property("foo").analyzed().propertyIndex().nodeScopeIndex()
@@ -928,8 +929,8 @@ public class LucenePropertyIndexTest ext
public void sortOnNodeName() throws Exception {
Tree rootTree = root.getTree("/").addChild("test");
- IndexDefinitionBuilder fnNameFunctionIndex = new
IndexDefinitionBuilder().noAsync();
- IndexDefinitionBuilder.PropertyRule rule =
fnNameFunctionIndex.indexRule("nt:base")
+ IndexDefinitionBuilder fnNameFunctionIndex = new
LuceneIndexDefinitionBuilder().noAsync();
+ LuceneIndexDefinitionBuilder.PropertyRule rule =
fnNameFunctionIndex.indexRule("nt:base")
.property("nodeName", null)
.propertyIndex()
.ordered();
@@ -983,7 +984,7 @@ public class LucenePropertyIndexTest ext
public void sortOnLocalName() throws Exception {
Tree rootTree = root.getTree("/").addChild("test");
- IndexDefinitionBuilder fnNameFunctionIndex = new
IndexDefinitionBuilder().noAsync();
+ IndexDefinitionBuilder fnNameFunctionIndex = new
LuceneIndexDefinitionBuilder().noAsync();
IndexDefinitionBuilder.PropertyRule rule =
fnNameFunctionIndex.indexRule("nt:base")
.property("nodeName", null)
.propertyIndex()
@@ -2695,7 +2696,7 @@ public class LucenePropertyIndexTest ext
//Flush the changes to nodetypes
root.commit();
- IndexDefinitionBuilder idxb = new IndexDefinitionBuilder().noAsync();
+ IndexDefinitionBuilder idxb = new
LuceneIndexDefinitionBuilder().noAsync();
idxb.indexRule("oak:TestSuperType").property(JcrConstants.JCR_PRIMARYTYPE).propertyIndex();
idxb.indexRule("oak:TestMixA").property(JcrConstants.JCR_MIXINTYPES).propertyIndex();
idxb.indexRule("oak:TestMixA").property(JcrConstants.JCR_PRIMARYTYPE).propertyIndex();
@@ -2739,7 +2740,7 @@ public class LucenePropertyIndexTest ext
//Flush the changes to nodetypes
root.commit();
- IndexDefinitionBuilder idxb = new IndexDefinitionBuilder().noAsync();
+ IndexDefinitionBuilder idxb = new
LuceneIndexDefinitionBuilder().noAsync();
idxb.nodeTypeIndex();
idxb.indexRule("oak:TestSuperType");
idxb.indexRule("oak:TestMixA");
@@ -2764,7 +2765,7 @@ public class LucenePropertyIndexTest ext
@Test
public void indexDefinitionModifiedPostReindex() throws Exception{
- IndexDefinitionBuilder idxb = new IndexDefinitionBuilder().noAsync();
+ IndexDefinitionBuilder idxb = new
LuceneIndexDefinitionBuilder().noAsync();
idxb.indexRule("nt:base").property("foo").propertyIndex();
Tree idx = root.getTree("/").getChild("oak:index").addChild("test1");
idxb.build(idx);
@@ -2793,7 +2794,7 @@ public class LucenePropertyIndexTest ext
@Test
public void refreshIndexDefinition() throws Exception{
- IndexDefinitionBuilder idxb = new IndexDefinitionBuilder().noAsync();
+ IndexDefinitionBuilder idxb = new
LuceneIndexDefinitionBuilder().noAsync();
idxb.indexRule("nt:base").property("foo").propertyIndex();
Tree idx = root.getTree("/").getChild("oak:index").addChild("test1");
idxb.build(idx);
@@ -2828,7 +2829,7 @@ public class LucenePropertyIndexTest ext
@Test
public void updateOldIndexDefinition() throws Exception{
- IndexDefinitionBuilder idxb = new IndexDefinitionBuilder().noAsync();
+ IndexDefinitionBuilder idxb = new
LuceneIndexDefinitionBuilder().noAsync();
idxb.indexRule("nt:base").property("foo").propertyIndex();
Tree idx = root.getTree("/").getChild("oak:index").addChild("test1");
idxb.build(idx);
@@ -2859,7 +2860,7 @@ public class LucenePropertyIndexTest ext
public void disableIndexDefnStorage() throws Exception{
IndexDefinition.setDisableStoredIndexDefinition(true);
- IndexDefinitionBuilder idxb = new IndexDefinitionBuilder().noAsync();
+ IndexDefinitionBuilder idxb = new
LuceneIndexDefinitionBuilder().noAsync();
idxb.indexRule("nt:base").property("foo").propertyIndex();
Tree idx = root.getTree("/").getChild("oak:index").addChild("test1");
idxb.build(idx);
@@ -2875,7 +2876,7 @@ public class LucenePropertyIndexTest ext
@Test
public void storedIndexDefinitionDiff() throws Exception{
- IndexDefinitionBuilder idxb = new IndexDefinitionBuilder().noAsync();
+ IndexDefinitionBuilder idxb = new
LuceneIndexDefinitionBuilder().noAsync();
idxb.indexRule("nt:base").property("foo").propertyIndex();
Tree idx = root.getTree("/").getChild("oak:index").addChild("test1");
idxb.build(idx);
@@ -2902,7 +2903,7 @@ public class LucenePropertyIndexTest ext
@Test
public void relativeProperties() throws Exception{
- IndexDefinitionBuilder idxb = new IndexDefinitionBuilder().noAsync();
+ IndexDefinitionBuilder idxb = new
LuceneIndexDefinitionBuilder().noAsync();
idxb.indexRule("nt:base").property("foo").propertyIndex();
Tree idx = root.getTree("/").getChild("oak:index").addChild("test1");
@@ -2927,7 +2928,7 @@ public class LucenePropertyIndexTest ext
@Test
public void testRepSimilarWithBinaryFeatureVectors() throws Exception {
- IndexDefinitionBuilder idxb = new IndexDefinitionBuilder().noAsync();
+ IndexDefinitionBuilder idxb = new
LuceneIndexDefinitionBuilder().noAsync();
idxb.indexRule("nt:base").property("fv").useInSimilarity().nodeScopeIndex().propertyIndex();
Tree idx = root.getTree("/").getChild("oak:index").addChild("test1");
@@ -2983,7 +2984,7 @@ public class LucenePropertyIndexTest ext
@Test
public void testRepSimilarWithStringFeatureVectors() throws Exception {
- IndexDefinitionBuilder idxb = new IndexDefinitionBuilder().noAsync();
+ IndexDefinitionBuilder idxb = new
LuceneIndexDefinitionBuilder().noAsync();
idxb.indexRule("nt:base").property("fv").useInSimilarity().nodeScopeIndex().propertyIndex();
Tree idx = root.getTree("/").getChild("oak:index").addChild("test1");
@@ -3027,7 +3028,7 @@ public class LucenePropertyIndexTest ext
@Test
public void testRepSimilarWithBinaryFeatureVectorsAndRerank() throws
Exception {
- IndexDefinitionBuilder idxb = new IndexDefinitionBuilder().noAsync();
+ IndexDefinitionBuilder idxb = new
LuceneIndexDefinitionBuilder().noAsync();
idxb.indexRule("nt:base").property("fv").useInSimilarity(true).nodeScopeIndex().propertyIndex();
Tree idx = root.getTree("/").getChild("oak:index").addChild("test1");
@@ -3083,7 +3084,7 @@ public class LucenePropertyIndexTest ext
@Test
public void testRepSimilarWithStringFeatureVectorsAndRerank() throws
Exception {
- IndexDefinitionBuilder idxb = new IndexDefinitionBuilder().noAsync();
+ IndexDefinitionBuilder idxb = new
LuceneIndexDefinitionBuilder().noAsync();
idxb.indexRule("nt:base").property("fv").useInSimilarity(true).nodeScopeIndex().propertyIndex();
Tree idx = root.getTree("/").getChild("oak:index").addChild("test1");
@@ -3127,7 +3128,7 @@ public class LucenePropertyIndexTest ext
@Test
public void injectRandomSeedDuringReindex() throws Exception{
- IndexDefinitionBuilder idxb = new IndexDefinitionBuilder().noAsync();
+ IndexDefinitionBuilder idxb = new
LuceneIndexDefinitionBuilder().noAsync();
idxb.indexRule("nt:base").property("foo").propertyIndex();
Tree idx = root.getTree("/").getChild("oak:index").addChild("test1");
idxb.build(idx);
@@ -3148,7 +3149,7 @@ public class LucenePropertyIndexTest ext
@Test
public void injectRandomSeedDuringRefresh() throws Exception{
- IndexDefinitionBuilder idxb = new IndexDefinitionBuilder().noAsync();
+ IndexDefinitionBuilder idxb = new
LuceneIndexDefinitionBuilder().noAsync();
idxb.indexRule("nt:base").property("foo").propertyIndex();
Tree idx = root.getTree("/").getChild("oak:index").addChild("test1");
idxb.build(idx);
@@ -3173,7 +3174,7 @@ public class LucenePropertyIndexTest ext
@Test
public void injectRandomSeedDuringUpdate() throws Exception{
- IndexDefinitionBuilder idxb = new IndexDefinitionBuilder().noAsync();
+ IndexDefinitionBuilder idxb = new
LuceneIndexDefinitionBuilder().noAsync();
idxb.indexRule("nt:base").property("foo").propertyIndex();
Tree idx = root.getTree("/").getChild("oak:index").addChild("test1");
idxb.build(idx);
@@ -3197,7 +3198,7 @@ public class LucenePropertyIndexTest ext
@Test
public void injectGarbageSeed() throws Exception {
- IndexDefinitionBuilder idxb = new IndexDefinitionBuilder().noAsync();
+ IndexDefinitionBuilder idxb = new
LuceneIndexDefinitionBuilder().noAsync();
idxb.indexRule("nt:base").property("foo").propertyIndex();
Tree idx = root.getTree("/").getChild("oak:index").addChild("test1");
idxb.build(idx);
@@ -3224,7 +3225,7 @@ public class LucenePropertyIndexTest ext
@Test
public void injectStringLongSeed() throws Exception {
- IndexDefinitionBuilder idxb = new IndexDefinitionBuilder().noAsync();
+ IndexDefinitionBuilder idxb = new
LuceneIndexDefinitionBuilder().noAsync();
idxb.indexRule("nt:base").property("foo").propertyIndex();
Tree idx = root.getTree("/").getChild("oak:index").addChild("test1");
idxb.build(idx);
@@ -3245,7 +3246,7 @@ public class LucenePropertyIndexTest ext
@Test
public void pathTransformationWithWildcardInRelativePathFragment() throws
Exception {
- IndexDefinitionBuilder idxBuilder = new
IndexDefinitionBuilder().noAsync();
+ IndexDefinitionBuilder idxBuilder = new
LuceneIndexDefinitionBuilder().noAsync();
idxBuilder.indexRule("nt:base").property("foo").propertyIndex();
Tree idx =
root.getTree("/").getChild("oak:index").addChild("fooIndex");
idxBuilder.build(idx);
@@ -3315,7 +3316,7 @@ public class LucenePropertyIndexTest ext
// we're interested in how many constraint could the index resolve..
so those results would be super-set of
// what we see here
- IndexDefinitionBuilder idxBuilder = new IndexDefinitionBuilder()
+ IndexDefinitionBuilder idxBuilder = new LuceneIndexDefinitionBuilder()
.noAsync().evaluatePathRestrictions();
idxBuilder.indexRule("nt:base").property("foo").propertyIndex();
Tree idx =
root.getTree("/").getChild("oak:index").addChild("fooIndex");
Modified:
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneWritesOnSegmentStatsTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneWritesOnSegmentStatsTest.java?rev=1879319&r1=1879318&r2=1879319&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneWritesOnSegmentStatsTest.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneWritesOnSegmentStatsTest.java
Mon Jun 29 06:49:51 2020
@@ -43,11 +43,12 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.blob.datastore.DataStoreBlobStore;
import org.apache.jackrabbit.oak.plugins.blob.datastore.OakFileDataStore;
import
org.apache.jackrabbit.oak.plugins.index.lucene.directory.CopyOnReadDirectory;
-import
org.apache.jackrabbit.oak.plugins.index.lucene.util.IndexDefinitionBuilder;
+import
org.apache.jackrabbit.oak.plugins.index.lucene.util.LuceneIndexDefinitionBuilder;
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.ExtractedTextCache;
import org.apache.jackrabbit.oak.plugins.index.search.IndexDefinition;
+import
org.apache.jackrabbit.oak.plugins.index.search.util.IndexDefinitionBuilder;
import org.apache.jackrabbit.oak.query.AbstractQueryTest;
import org.apache.jackrabbit.oak.segment.SegmentNodeStoreBuilders;
import org.apache.jackrabbit.oak.segment.file.FileStore;
@@ -276,7 +277,7 @@ public class LuceneWritesOnSegmentStatsT
@Test
public void testLuceneIndexSegmentStats() throws Exception {
- IndexDefinitionBuilder idxb = new
IndexDefinitionBuilder().noAsync().codec(codec).mergePolicy(mergePolicy);
+ IndexDefinitionBuilder idxb = new
LuceneIndexDefinitionBuilder().noAsync().codec(codec).mergePolicy(mergePolicy);
idxb.indexRule("nt:base").property("foo").analyzed().nodeScopeIndex().ordered().useInExcerpt().propertyIndex();
idxb.indexRule("nt:base").property("bin").analyzed().nodeScopeIndex().ordered().useInExcerpt().propertyIndex();
Tree idx =
root.getTree("/").getChild("oak:index").addChild("lucenePropertyIndex");
Modified:
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/MultiplexingLucenePropertyIndexTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/MultiplexingLucenePropertyIndexTest.java?rev=1879319&r1=1879318&r2=1879319&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/MultiplexingLucenePropertyIndexTest.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/MultiplexingLucenePropertyIndexTest.java
Mon Jun 29 06:49:51 2020
@@ -57,7 +57,7 @@ import org.apache.jackrabbit.oak.plugins
import
org.apache.jackrabbit.oak.plugins.index.lucene.reader.DefaultIndexReaderFactory;
import org.apache.jackrabbit.oak.plugins.index.lucene.reader.LuceneIndexReader;
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.LuceneIndexDefinitionBuilder;
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;
@@ -67,6 +67,7 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.index.search.FulltextIndexConstants;
import org.apache.jackrabbit.oak.plugins.index.search.ExtractedTextCache;
import
org.apache.jackrabbit.oak.plugins.index.search.spi.query.FulltextIndexPlanner;
+import
org.apache.jackrabbit.oak.plugins.index.search.util.IndexDefinitionBuilder;
import org.apache.jackrabbit.oak.plugins.memory.MemoryNodeStore;
import org.apache.jackrabbit.oak.plugins.memory.PropertyValues;
import org.apache.jackrabbit.oak.query.AbstractQueryTest;
@@ -141,7 +142,7 @@ public class MultiplexingLucenePropertyI
@Test
public void emptyIndex() throws Exception {
NodeBuilder defnBuilder = builder.child("oak:index").child("foo");
- IndexDefinitionBuilder idxBuilder = new
IndexDefinitionBuilder(defnBuilder).noAsync();
+ IndexDefinitionBuilder idxBuilder = new
LuceneIndexDefinitionBuilder(defnBuilder).noAsync();
idxBuilder.indexRule("nt:base").property("propa").propertyIndex();
idxBuilder.build();
Modified:
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/ReopenedLuceneIndexTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/ReopenedLuceneIndexTest.java?rev=1879319&r1=1879318&r2=1879319&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/ReopenedLuceneIndexTest.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/ReopenedLuceneIndexTest.java
Mon Jun 29 06:49:51 2020
@@ -29,7 +29,7 @@ import org.apache.jackrabbit.oak.api.Roo
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.commons.concurrent.ExecutorCloser;
import org.apache.jackrabbit.oak.commons.junit.TemporarySystemProperty;
-import
org.apache.jackrabbit.oak.plugins.index.lucene.util.IndexDefinitionBuilder;
+import
org.apache.jackrabbit.oak.plugins.index.lucene.util.LuceneIndexDefinitionBuilder;
import org.apache.jackrabbit.oak.plugins.index.search.IndexDefinition;
import org.apache.jackrabbit.oak.plugins.memory.MemoryNodeStore;
import org.apache.jackrabbit.oak.query.QueryEngineSettings;
@@ -157,14 +157,14 @@ public class ReopenedLuceneIndexTest {
}
private void createIndex() throws CommitFailedException {
- IndexDefinitionBuilder idxBuilderV1 = new IndexDefinitionBuilder();
+ LuceneIndexDefinitionBuilder idxBuilderV1 = new
LuceneIndexDefinitionBuilder();
idxBuilderV1.noAsync().evaluatePathRestrictions()
.indexRule("nt:base")
.property("cons").nodeScopeIndex()
// to make a change in index but we won't query for this
.enclosingRule().property("foo").propertyIndex();
- IndexDefinitionBuilder idxBuilderV2 = new IndexDefinitionBuilder();
+ LuceneIndexDefinitionBuilder idxBuilderV2 = new
LuceneIndexDefinitionBuilder();
idxBuilderV2.noAsync().evaluatePathRestrictions()
.indexRule("nt:base")
.property("cons").propertyIndex()
Modified:
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/SecureFacetTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/SecureFacetTest.java?rev=1879319&r1=1879318&r2=1879319&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/SecureFacetTest.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/SecureFacetTest.java
Mon Jun 29 06:49:51 2020
@@ -25,7 +25,7 @@ import org.apache.jackrabbit.commons.jac
import org.apache.jackrabbit.oak.Oak;
import org.apache.jackrabbit.oak.commons.concurrent.ExecutorCloser;
import org.apache.jackrabbit.oak.jcr.Jcr;
-import
org.apache.jackrabbit.oak.plugins.index.lucene.util.IndexDefinitionBuilder;
+import
org.apache.jackrabbit.oak.plugins.index.lucene.util.LuceneIndexDefinitionBuilder;
import org.apache.jackrabbit.oak.plugins.index.search.IndexDefinition;
import org.apache.jackrabbit.oak.plugins.memory.MemoryNodeStore;
import org.apache.jackrabbit.oak.query.facet.FacetResult;
@@ -114,7 +114,7 @@ public class SecureFacetTest {
}
private void createIndex() throws RepositoryException {
- IndexDefinitionBuilder idxBuilder = new IndexDefinitionBuilder();
+ LuceneIndexDefinitionBuilder idxBuilder = new
LuceneIndexDefinitionBuilder();
idxBuilder.noAsync().evaluatePathRestrictions()
.indexRule("nt:base")
.property("cons")
Modified:
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/FSDirectoryFactoryTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/FSDirectoryFactoryTest.java?rev=1879319&r1=1879318&r2=1879319&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/FSDirectoryFactoryTest.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/FSDirectoryFactoryTest.java
Mon Jun 29 06:49:51 2020
@@ -26,7 +26,7 @@ import java.util.stream.Collectors;
import org.apache.commons.io.filefilter.DirectoryFileFilter;
import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexDefinition;
-import
org.apache.jackrabbit.oak.plugins.index.lucene.util.IndexDefinitionBuilder;
+import
org.apache.jackrabbit.oak.plugins.index.lucene.util.LuceneIndexDefinitionBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.apache.lucene.store.Directory;
@@ -44,7 +44,7 @@ public class FSDirectoryFactoryTest {
public TemporaryFolder temporaryFolder = new TemporaryFolder(new
File("target"));
private NodeState root = INITIAL_CONTENT;
- private NodeBuilder idx = new IndexDefinitionBuilder().build().builder();
+ private NodeBuilder idx = new
LuceneIndexDefinitionBuilder().build().builder();
@Test
public void singleIndex() throws Exception{
Modified:
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/IndexConsistencyCheckerTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/IndexConsistencyCheckerTest.java?rev=1879319&r1=1879318&r2=1879319&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/IndexConsistencyCheckerTest.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/IndexConsistencyCheckerTest.java
Mon Jun 29 06:49:51 2020
@@ -34,9 +34,8 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.index.lucene.OakAnalyzer;
import
org.apache.jackrabbit.oak.plugins.index.lucene.directory.IndexConsistencyChecker.Level;
import
org.apache.jackrabbit.oak.plugins.index.lucene.directory.IndexConsistencyChecker.Result;
-import
org.apache.jackrabbit.oak.plugins.index.lucene.util.IndexDefinitionBuilder;
+import
org.apache.jackrabbit.oak.plugins.index.lucene.util.LuceneIndexDefinitionBuilder;
import
org.apache.jackrabbit.oak.plugins.index.lucene.writer.MultiplexersLucene;
-import org.apache.jackrabbit.oak.plugins.index.search.IndexDefinition;
import org.apache.jackrabbit.oak.plugins.memory.ArrayBasedBlob;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
@@ -60,7 +59,7 @@ import static org.junit.Assert.assertTru
public class IndexConsistencyCheckerTest {
private NodeState rootState = InitialContentHelper.INITIAL_CONTENT;
- private NodeBuilder idx = new IndexDefinitionBuilder().build().builder();
+ private NodeBuilder idx = new
LuceneIndexDefinitionBuilder().build().builder();
@Rule
Modified:
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/LuceneIndexDumperTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/LuceneIndexDumperTest.java?rev=1879319&r1=1879318&r2=1879319&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/LuceneIndexDumperTest.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/LuceneIndexDumperTest.java
Mon Jun 29 06:49:51 2020
@@ -23,7 +23,7 @@ import java.io.File;
import org.apache.jackrabbit.oak.InitialContentHelper;
import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexDefinition;
-import
org.apache.jackrabbit.oak.plugins.index.lucene.util.IndexDefinitionBuilder;
+import
org.apache.jackrabbit.oak.plugins.index.lucene.util.LuceneIndexDefinitionBuilder;
import
org.apache.jackrabbit.oak.plugins.index.lucene.writer.MultiplexersLucene;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
@@ -39,7 +39,7 @@ import static org.junit.Assert.assertNot
public class LuceneIndexDumperTest {
private NodeState rootState = InitialContentHelper.INITIAL_CONTENT;
- private NodeBuilder idx = new IndexDefinitionBuilder().build().builder();
+ private NodeBuilder idx = new
LuceneIndexDefinitionBuilder().build().builder();
@Rule
public final TemporaryFolder temporaryFolder = new TemporaryFolder(new
File("target"));
Modified:
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/LuceneIndexImporterTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/LuceneIndexImporterTest.java?rev=1879319&r1=1879318&r2=1879319&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/LuceneIndexImporterTest.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/LuceneIndexImporterTest.java
Mon Jun 29 06:49:51 2020
@@ -29,7 +29,7 @@ import com.google.common.collect.Immutab
import org.apache.jackrabbit.oak.InitialContentHelper;
import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexDefinition;
import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexEditorContext;
-import
org.apache.jackrabbit.oak.plugins.index.lucene.util.IndexDefinitionBuilder;
+import
org.apache.jackrabbit.oak.plugins.index.lucene.util.LuceneIndexDefinitionBuilder;
import
org.apache.jackrabbit.oak.plugins.index.lucene.writer.MultiplexersLucene;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
@@ -48,7 +48,7 @@ import static org.junit.Assert.*;
public class LuceneIndexImporterTest {
private NodeState rootState = InitialContentHelper.INITIAL_CONTENT;
- private NodeBuilder idx = new IndexDefinitionBuilder().build().builder();
+ private NodeBuilder idx = new
LuceneIndexDefinitionBuilder().build().builder();
@Rule
public final TemporaryFolder temporaryFolder = new TemporaryFolder(new
File("target"));
