Author: chetanm
Date: Mon Dec 5 09:58:23 2016
New Revision: 1772619
URL: http://svn.apache.org/viewvc?rev=1772619&view=rev
Log:
OAK-5220 - Remove usage of NodeBuilder in IndexDefinition
-- indexPath, indexFormatVersion and uid are now passed as parameter
-- indexPath is now a required parameter in IndexDefinition. Due to this lots
of code in test classes have to be changed to pass this extra param
-- indexFormatVersion and uid would now be set upon reindex. Otherwise they
would be determined from NodeState
Modified:
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinition.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexNode.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorContext.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/AggregateTest.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexCopierTest.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinitionTest.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlannerTest.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneBlobCacheTest.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorProviderTest.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorTest.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexTest.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/MultiplexingLucenePropertyIndexTest.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/OakDirectoryTest.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/IndexRootDirectoryTest.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/NRTIndexFactoryTest.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/NRTIndexTest.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/reader/DefaultIndexReaderFactoryTest.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/writer/DefaultIndexWriterTest.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/writer/MultiplexingIndexWriterTest.java
Modified:
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinition.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinition.java?rev=1772619&r1=1772618&r2=1772619&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinition.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinition.java
Mon Dec 5 09:58:23 2016
@@ -246,20 +246,60 @@ public final class IndexDefinition imple
@Nullable
private final String uid;
- public IndexDefinition(NodeState root, NodeBuilder defn) {
- this(root, defn.getBaseState(), defn);
+ //~--------------------------------------------------------< Builder >
+
+ public static Builder newBuilder(NodeState root, NodeState defn){
+ return new Builder(root, defn);
+ }
+
+ public static class Builder {
+ private final NodeState root;
+ private final NodeState defn;
+ private String indexPath;
+ private IndexFormatVersion version;
+ private String uid;
+
+ public Builder(NodeState root, NodeState defn) {
+ this.root = root;
+ this.defn = defn;
+ }
+
+ public Builder indexPath(String indexPath){
+ this.indexPath = indexPath;
+ return this;
+ }
+
+ public Builder version(IndexFormatVersion version){
+ this.version = version;
+ return this;
+ }
+
+ public Builder uid(String uid){
+ this.uid = uid;
+ return this;
+ }
+
+ public IndexDefinition build(){
+ if (version == null){
+ version = determineIndexFormatVersion(defn);
+ }
+ if (uid == null){
+ uid = determineUniqueId(defn);
+ }
+ return new IndexDefinition(root, defn, version, uid,
checkNotNull(indexPath));
+ }
}
- public IndexDefinition(NodeState root, NodeState defn) {
- this(root, defn, null);
+ public IndexDefinition(NodeState root, NodeState defn, String indexPath) {
+ this(root, defn, determineIndexFormatVersion(defn),
determineUniqueId(defn), indexPath);
}
- public IndexDefinition(NodeState root, NodeState defn, @Nullable
NodeBuilder defnb) {
+ private IndexDefinition(NodeState root, NodeState defn, IndexFormatVersion
version, String uid, String indexPath) {
this.root = root;
- this.version = determineIndexFormatVersion(defn, defnb);
- this.uid = determineUniqueId(defn, defnb);
+ this.version = checkNotNull(version);
+ this.uid = uid;
this.definition = defn;
- this.indexPath = determineIndexPath(defn, defnb);
+ this.indexPath = checkNotNull(indexPath);
this.indexName = indexPath;
this.blobSize = getOptionalValue(defn, BLOB_SIZE, DEFAULT_BLOB_SIZE);
@@ -716,7 +756,7 @@ public final class IndexDefinition imple
}
public String getIndexPathFromConfig() {
- return checkNotNull(indexPath, "Index path property [%s] not found",
IndexConstants.INDEX_PATH);
+ return indexPath;
}
private boolean evaluateSuggestAnalyzed(NodeState defn, boolean
defaultValue) {
@@ -1221,7 +1261,7 @@ public final class IndexDefinition imple
if (!hasIndexingRules(defn)){
NodeState rulesState = createIndexRules(defn).getNodeState();
indexDefn.setChildNode(LuceneIndexConstants.INDEX_RULES,
rulesState);
- indexDefn.setProperty(INDEX_VERSION,
determineIndexFormatVersion(defn, indexDefn).getVersion());
+ indexDefn.setProperty(INDEX_VERSION,
determineIndexFormatVersion(defn).getVersion());
indexDefn.removeProperty(DECLARING_NODE_TYPES);
indexDefn.removeProperty(INCLUDE_PROPERTY_NAMES);
@@ -1392,14 +1432,6 @@ public final class IndexDefinition imple
return codec;
}
- private static String determineIndexPath(NodeState defn, @Nullable
NodeBuilder defnb) {
- String indexPath = defn.getString(IndexConstants.INDEX_PATH);
- if (indexPath == null && defnb != null){
- indexPath = defnb.getString(IndexConstants.INDEX_PATH);
- }
- return indexPath;
- }
-
private static Set<String> getMultiProperty(NodeState definition, String
propName){
PropertyState pse = definition.getProperty(propName);
return pse != null ? ImmutableSet.copyOf(pse.getValue(Type.STRINGS)) :
Collections.<String>emptySet();
@@ -1507,11 +1539,7 @@ public final class IndexDefinition imple
nb.setProperty(JcrConstants.JCR_PRIMARYTYPE,
JcrConstants.NT_UNSTRUCTURED, Type.NAME);
}
- private static IndexFormatVersion determineIndexFormatVersion(NodeState
defn, NodeBuilder defnb) {
- if (defnb != null &&
!defnb.getChildNode(INDEX_DATA_CHILD_NAME).exists()){
- return determineVersionForFreshIndex(defnb);
- }
-
+ private static IndexFormatVersion determineIndexFormatVersion(NodeState
defn) {
//Compat mode version if specified has highest priority
if (defn.hasProperty(COMPAT_MODE)){
return versionFrom(defn.getProperty(COMPAT_MODE));
@@ -1590,21 +1618,8 @@ public final class IndexDefinition imple
}
@CheckForNull
- private static String determineUniqueId(NodeState defn, @Nullable
NodeBuilder defnb) {
- String uid = null;
-
- //Check in builder first as that would have latest value
- if (defnb != null){
- uid = defnb.getChildNode(STATUS_NODE).getString(PROP_UID);
- }
-
- //Fallback to NodeState
- if (uid == null){
- uid = defn.getChildNode(STATUS_NODE).getString(PROP_UID);
- }
-
- //uid can be null if an old format index has not received any update
- return uid;
+ private static String determineUniqueId(NodeState defn) {
+ return defn.getChildNode(STATUS_NODE).getString(PROP_UID);
}
public boolean getActiveDeleteEnabled() {
Modified:
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexNode.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexNode.java?rev=1772619&r1=1772618&r2=1772619&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexNode.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexNode.java
Mon Dec 5 09:58:23 2016
@@ -53,7 +53,7 @@ public class IndexNode {
static IndexNode open(String indexPath, NodeState root, NodeState
defnNodeState,
LuceneIndexReaderFactory readerFactory, @Nullable
NRTIndexFactory nrtFactory)
throws IOException {
- IndexDefinition definition = new IndexDefinition(root, defnNodeState);
+ IndexDefinition definition = new IndexDefinition(root, defnNodeState,
indexPath);
List<LuceneIndexReader> readers =
readerFactory.createReaders(definition, defnNodeState, indexPath);
NRTIndex nrtIndex = nrtFactory != null ?
nrtFactory.createIndex(definition) : null;
if (!readers.isEmpty()){
Modified:
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorContext.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorContext.java?rev=1772619&r1=1772618&r2=1772619&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorContext.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorContext.java
Mon Dec 5 09:58:23 2016
@@ -110,7 +110,8 @@ public class LuceneIndexEditorContext {
this.indexingContext = checkNotNull(indexingContext);
this.definitionBuilder = definition;
this.indexWriterFactory = indexWriterFactory;
- this.definition = indexDefinition != null ? indexDefinition : new
IndexDefinition(root, definition);
+ this.definition = indexDefinition != null ? indexDefinition :
+ new IndexDefinition(root,
definition.getBaseState(),indexingContext.getIndexPath());
this.indexedNodes = 0;
this.updateCallback = updateCallback;
this.extractedTextCache = extractedTextCache;
@@ -181,10 +182,15 @@ public class LuceneIndexEditorContext {
reindex = true;
IndexFormatVersion version =
IndexDefinition.determineVersionForFreshIndex(definitionBuilder);
definitionBuilder.setProperty(IndexDefinition.INDEX_VERSION,
version.getVersion());
- configureUniqueId(definitionBuilder);
+ String uid = configureUniqueId(definitionBuilder);
//Refresh the index definition based on update builder state
- definition = new IndexDefinition(root, definitionBuilder);
+ definition = IndexDefinition
+ .newBuilder(root, definitionBuilder.getBaseState())
+ .indexPath(indexingContext.getIndexPath())
+ .version(version)
+ .uid(uid)
+ .build();
}
public long incIndexedNodes() {
@@ -244,10 +250,10 @@ public class LuceneIndexEditorContext {
return reindex;
}
- public static void configureUniqueId(NodeBuilder definition) {
+ public static String configureUniqueId(NodeBuilder definition) {
NodeBuilder status = definition.child(IndexDefinition.STATUS_NODE);
- if (!status.hasProperty(IndexDefinition.PROP_UID)) {
- String uid;
+ String uid = status.getString(IndexDefinition.PROP_UID);
+ if (uid == null) {
try {
uid = String.valueOf(Clock.SIMPLE.getTimeIncreasing());
} catch (InterruptedException e) {
@@ -256,6 +262,7 @@ public class LuceneIndexEditorContext {
}
status.setProperty(IndexDefinition.PROP_UID, uid);
}
+ return uid;
}
private static Parser initializeTikaParser(IndexDefinition definition) {
Modified:
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/AggregateTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/AggregateTest.java?rev=1772619&r1=1772618&r2=1772619&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/AggregateTest.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/AggregateTest.java
Mon Dec 5 09:58:23 2016
@@ -346,7 +346,7 @@ public class AggregateTest {
child(rules, "nt:folder/properties/p1")
.setProperty(LuceneIndexConstants.PROP_NAME, "a/p1");
- IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState());
+ IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState(), "/foo");
Aggregate ag =
defn.getApplicableIndexingRule("nt:folder").getAggregate();
NodeBuilder nb = newNode("nt:folder");
@@ -367,7 +367,7 @@ public class AggregateTest {
.setProperty(LuceneIndexConstants.PROP_NAME, "a/foo.*")
.setProperty(LuceneIndexConstants.PROP_IS_REGEX, true);
- IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState());
+ IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState(), "/foo");
Aggregate ag =
defn.getApplicableIndexingRule("nt:folder").getAggregate();
NodeBuilder nb = newNode("nt:folder");
@@ -389,7 +389,7 @@ public class AggregateTest {
NodeBuilder aggFolder = aggregates.child("nt:folder");
aggFolder.child("i1").setProperty(LuceneIndexConstants.AGG_PATH, "*");
- IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState());
+ IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState(), "/foo");
Aggregate agg = defn.getAggregate("nt:folder");
assertNotNull(agg);
assertEquals(1, agg.getIncludes().size());
@@ -404,7 +404,7 @@ public class AggregateTest {
aggFolder.child("i1").setProperty(LuceneIndexConstants.AGG_PRIMARY_TYPE,
"nt:file");
aggFolder.child("i1").setProperty(LuceneIndexConstants.AGG_RELATIVE_NODE, true);
- IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState());
+ IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState(), "/foo");
Aggregate agg = defn.getAggregate("nt:folder");
assertNotNull(agg);
assertEquals(42, agg.reAggregationLimit);
Modified:
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexCopierTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexCopierTest.java?rev=1772619&r1=1772618&r2=1772619&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexCopierTest.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexCopierTest.java
Mon Dec 5 09:58:23 2016
@@ -62,7 +62,6 @@ import org.apache.lucene.store.IndexInpu
import org.apache.lucene.store.IndexOutput;
import org.apache.lucene.store.RAMDirectory;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
@@ -105,7 +104,7 @@ public class IndexCopierTest {
@Test
public void basicTest() throws Exception{
Directory baseDir = new RAMDirectory();
- IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState());
+ IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState(), "/foo");
IndexCopier c1 = new RAMIndexCopier(baseDir, sameThreadExecutor(),
getWorkDir());
Directory remote = new RAMDirectory();
@@ -138,7 +137,7 @@ public class IndexCopierTest {
super.sync(names);
}
};
- IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState());
+ IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState(), "/foo");
IndexCopier c1 = new RAMIndexCopier(baseDir, sameThreadExecutor(),
getWorkDir(), true);
Directory remote = new RAMDirectory();
@@ -166,7 +165,7 @@ public class IndexCopierTest {
@Test
public void nonExistentFile() throws Exception{
Directory baseDir = new RAMDirectory();
- IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState());
+ IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState(), "/foo");
CollectingExecutor executor = new CollectingExecutor();
IndexCopier c1 = new RAMIndexCopier(baseDir, executor, getWorkDir(),
true);
@@ -185,7 +184,7 @@ public class IndexCopierTest {
@Test
public void basicTestWithFS() throws Exception{
- IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState());
+ IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState(), "/foo");
IndexCopier c1 = new IndexCopier(sameThreadExecutor(), getWorkDir());
Directory remote = new RAMDirectory();
@@ -215,7 +214,7 @@ public class IndexCopierTest {
@Test
public void multiDirNames() throws Exception{
- IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState());
+ IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState(), "/foo");
IndexCopier c1 = new IndexCopier(sameThreadExecutor(), getWorkDir());
Directory remote = new CloseSafeDir();
@@ -234,7 +233,7 @@ public class IndexCopierTest {
@Test
public void deleteOldPostReindex() throws Exception{
- IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState());
+ IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState(), "/foo");
IndexCopier c1 = new IndexCopier(sameThreadExecutor(), getWorkDir());
Directory remote = new CloseSafeDir();
@@ -251,7 +250,7 @@ public class IndexCopierTest {
assertTrue(new File(indexDir, "t1").exists());
doReindex(builder);
- defn = new IndexDefinition(root, builder.getNodeState());
+ defn = new IndexDefinition(root, builder.getNodeState(), "/foo");
//Close old version
w1.close();
@@ -275,7 +274,7 @@ public class IndexCopierTest {
@Test
public void concurrentRead() throws Exception{
Directory baseDir = new RAMDirectory();
- IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState());
+ IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState(), "/foo");
CollectingExecutor executor = new CollectingExecutor();
IndexCopier c1 = new RAMIndexCopier(baseDir, executor, getWorkDir());
@@ -313,7 +312,7 @@ public class IndexCopierTest {
@Test
public void copyInProgressStats() throws Exception{
Directory baseDir = new RAMDirectory();
- IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState());
+ IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState(), "/foo");
final List<ListenableFuture<?>> submittedTasks = Lists.newArrayList();
ExecutorService executor = new ForwardingListeningExecutorService() {
@@ -384,7 +383,7 @@ public class IndexCopierTest {
@Test
public void reuseLocalDir() throws Exception{
Directory baseDir = new RAMDirectory();
- IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState());
+ IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState(), "/foo");
IndexCopier c1 = new RAMIndexCopier(baseDir, sameThreadExecutor(),
getWorkDir());
TestRAMDirectory remote = new TestRAMDirectory();
@@ -419,7 +418,7 @@ public class IndexCopierTest {
@Test
public void deleteCorruptedFile() throws Exception{
Directory baseDir = new RAMDirectory();
- IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState());
+ IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState(), "/foo");
RAMIndexCopier c1 = new RAMIndexCopier(baseDir, sameThreadExecutor(),
getWorkDir());
Directory remote = new RAMDirectory(){
@@ -453,7 +452,7 @@ public class IndexCopierTest {
Directory baseDir = new CloseSafeDir();
- IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState());
+ IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState(), "/foo");
IndexCopier c1 = new RAMIndexCopier(baseDir, sameThreadExecutor(),
getWorkDir());
Directory r1 = new RAMDirectory();
@@ -496,7 +495,7 @@ public class IndexCopierTest {
}
};
- IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState());
+ IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState(), "/foo");
IndexCopier c1 = new RAMIndexCopier(baseDir, sameThreadExecutor(),
getWorkDir());
Directory r1 = new RAMDirectory();
@@ -547,7 +546,7 @@ public class IndexCopierTest {
public void deletedOnlyFilesForOlderVersion() throws Exception{
Directory baseDir = new CloseSafeDir();
- IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState());
+ IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState(), "/foo");
IndexCopier copier = new RAMIndexCopier(baseDir, sameThreadExecutor(),
getWorkDir());
//1. Open a local and read t1 from remote
@@ -577,7 +576,7 @@ public class IndexCopierTest {
IndexCopier copier = new IndexCopier(sameThreadExecutor(),
getWorkDir());
- IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState());
+ IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState(), "/foo");
Directory dir = copier.wrapForWrite(defn, remote, false,
INDEX_DATA_CHILD_NAME);
byte[] t1 = writeFile(dir, "t1");
@@ -596,7 +595,7 @@ public class IndexCopierTest {
IndexCopier copier = new IndexCopier(sameThreadExecutor(),
getWorkDir());
builder.setProperty(IndexConstants.INDEX_PATH, "foo");
- IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState());
+ IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState(), "/foo");
Directory dir = copier.wrapForWrite(defn, remote, false,
INDEX_DATA_CHILD_NAME);
byte[] t1 = writeFile(dir, "t1");
@@ -617,7 +616,7 @@ public class IndexCopierTest {
@Test
public void copyOnWriteBasics() throws Exception{
Directory baseDir = new CloseSafeDir();
- IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState());
+ IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState(), "/foo");
IndexCopier copier = new RAMIndexCopier(baseDir, sameThreadExecutor(),
getWorkDir());
Directory remote = new RAMDirectory();
@@ -677,7 +676,7 @@ public class IndexCopierTest {
@Test
public void cowExistingLocalFileNotDeleted() throws Exception{
Directory baseDir = new CloseSafeDir();
- IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState());
+ IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState(), "/foo");
IndexCopier copier = new RAMIndexCopier(baseDir, sameThreadExecutor(),
getWorkDir());
Directory remote = new CloseSafeDir();
@@ -721,7 +720,7 @@ public class IndexCopierTest {
return super.openInput(name, context);
}
};
- IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState());
+ IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState(), "/foo");
IndexCopier copier = new RAMIndexCopier(baseDir, sameThreadExecutor(),
getWorkDir());
final Set<String> readRemotes = newHashSet();
@@ -758,7 +757,7 @@ public class IndexCopierTest {
public void cowCopyDoneOnClose() throws Exception{
final CollectingExecutor executor = new CollectingExecutor();
Directory baseDir = new CloseSafeDir();
- IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState());
+ IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState(), "/foo");
IndexCopier copier = new RAMIndexCopier(baseDir, executor,
getWorkDir());
Directory remote = new CloseSafeDir();
@@ -820,7 +819,7 @@ public class IndexCopierTest {
public void cowCopyDoneOnCloseExceptionHandling() throws Exception{
final CollectingExecutor executor = new CollectingExecutor();
Directory baseDir = new CloseSafeDir();
- IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState());
+ IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState(), "/foo");
IndexCopier copier = new RAMIndexCopier(baseDir, executor,
getWorkDir());
Directory remote = new CloseSafeDir();
@@ -879,7 +878,7 @@ public class IndexCopierTest {
public void cowFailureInCopy() throws Exception{
ExecutorService executorService = Executors.newFixedThreadPool(2);
Directory baseDir = new CloseSafeDir();
- IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState());
+ IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState(), "/foo");
IndexCopier copier = new RAMIndexCopier(baseDir, executorService,
getWorkDir());
final Set<String> toFail = Sets.newHashSet();
@@ -912,7 +911,7 @@ public class IndexCopierTest {
public void cowPoolClosedWithTaskInQueue() throws Exception{
ExecutorService executorService = Executors.newFixedThreadPool(2);
Directory baseDir = new CloseSafeDir();
- IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState());
+ IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState(), "/foo");
IndexCopier copier = new RAMIndexCopier(baseDir, executorService,
getWorkDir());
final Set<String> toPause = Sets.newHashSet();
@@ -975,7 +974,7 @@ public class IndexCopierTest {
Directory baseDir = new CloseSafeDir();
String indexPath = "/foo";
builder.setProperty(IndexConstants.INDEX_PATH, indexPath);
- IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState());
+ IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState(), "/foo");
IndexCopier copier = new RAMIndexCopier(baseDir, executor,
getWorkDir(), true);
Directory remote = new CloseSafeDir();
@@ -1026,7 +1025,7 @@ public class IndexCopierTest {
@Test
public void directoryContentMismatch_COR() throws Exception{
Directory baseDir = new CloseSafeDir();
- IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState());
+ IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState(), "/foo");
IndexCopier copier = new RAMIndexCopier(baseDir, sameThreadExecutor(),
getWorkDir(), true);
Directory remote = new RAMDirectory();
Modified:
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinitionTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinitionTest.java?rev=1772619&r1=1772618&r2=1772619&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinitionTest.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinitionTest.java
Mon Dec 5 09:58:23 2016
@@ -74,14 +74,14 @@ public class IndexDefinitionTest {
@Test
public void defaultConfig() throws Exception{
- IndexDefinition idxDefn = new IndexDefinition(root,
builder.getNodeState());
+ IndexDefinition idxDefn = new IndexDefinition(root,
builder.getNodeState(), "/foo");
assertTrue(idxDefn.saveDirListing());
assertFalse(idxDefn.isNRTIndexingEnabled());
}
@Test
public void fullTextEnabled() throws Exception{
- IndexDefinition idxDefn = new IndexDefinition(root,
builder.getNodeState());
+ IndexDefinition idxDefn = new IndexDefinition(root,
builder.getNodeState(), "/foo");
IndexingRule rule = idxDefn.getApplicableIndexingRule(NT_BASE);
assertTrue("By default fulltext is enabled",
idxDefn.isFullTextEnabled());
assertTrue("By default everything is indexed", rule.isIndexed("foo"));
@@ -97,7 +97,7 @@ public class IndexDefinitionTest {
builder.setProperty(createProperty(INCLUDE_PROPERTY_TYPES,
of(TYPENAME_LONG), STRINGS));
builder.setProperty(createProperty(INCLUDE_PROPERTY_NAMES, of("foo" ,
"bar"), STRINGS));
builder.setProperty(LuceneIndexConstants.FULL_TEXT_ENABLED, false);
- IndexDefinition idxDefn = new IndexDefinition(root,
builder.getNodeState());
+ IndexDefinition idxDefn = new IndexDefinition(root,
builder.getNodeState(), "/foo");
IndexingRule rule = idxDefn.getApplicableIndexingRule(NT_BASE);
assertFalse(idxDefn.isFullTextEnabled());
assertFalse("If fulltext disabled then nothing stored",
rule.getConfig("foo").stored);
@@ -116,7 +116,7 @@ public class IndexDefinitionTest {
public void propertyDefinition() throws Exception{
builder.child(PROP_NODE).child("foo").setProperty(LuceneIndexConstants.PROP_TYPE,
PropertyType.TYPENAME_DATE);
builder.setProperty(createProperty(INCLUDE_PROPERTY_NAMES, of("foo" ,
"bar"), STRINGS));
- IndexDefinition idxDefn = new IndexDefinition(root,
builder.getNodeState());
+ IndexDefinition idxDefn = new IndexDefinition(root,
builder.getNodeState(), "/foo");
IndexingRule rule = idxDefn.getApplicableIndexingRule(NT_BASE);
assertTrue(rule.isIndexed("foo"));
@@ -128,7 +128,7 @@ public class IndexDefinitionTest {
@Test
public void propertyDefinitionWithExcludes() throws Exception{
builder.child(PROP_NODE).child("foo").setProperty(LuceneIndexConstants.PROP_TYPE,
PropertyType.TYPENAME_DATE);
- IndexDefinition idxDefn = new IndexDefinition(root,
builder.getNodeState());
+ IndexDefinition idxDefn = new IndexDefinition(root,
builder.getNodeState(), "/foo");
IndexingRule rule = idxDefn.getApplicableIndexingRule(NT_BASE);
assertTrue(rule.isIndexed("foo"));
assertTrue(rule.isIndexed("bar"));
@@ -138,17 +138,17 @@ public class IndexDefinitionTest {
@Test
public void codecConfig() throws Exception{
- IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState());
+ IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState(), "/foo");
assertNotNull(defn.getCodec());
assertEquals(oakCodec.getName(), defn.getCodec().getName());
builder.setProperty(LuceneIndexConstants.FULL_TEXT_ENABLED, false);
- defn = new IndexDefinition(root, builder.getNodeState());
+ defn = new IndexDefinition(root, builder.getNodeState(), "/foo");
assertNull(defn.getCodec());
Codec simple = Codec.getDefault();
builder.setProperty(LuceneIndexConstants.CODEC_NAME, simple.getName());
- defn = new IndexDefinition(root, builder.getNodeState());
+ defn = new IndexDefinition(root, builder.getNodeState(), "/foo");
assertNotNull(defn.getCodec());
assertEquals(simple.getName(), defn.getCodec().getName());
}
@@ -158,7 +158,7 @@ public class IndexDefinitionTest {
builder.child(PROP_NODE).child("foo1").child("bar").setProperty(LuceneIndexConstants.PROP_TYPE,
PropertyType.TYPENAME_DATE);
builder.child(PROP_NODE).child("foo2").child("bar2").child("baz").setProperty(LuceneIndexConstants.PROP_TYPE,
PropertyType.TYPENAME_LONG);
builder.setProperty(createProperty(INCLUDE_PROPERTY_NAMES, of("foo",
"foo1/bar", "foo2/bar2/baz"), STRINGS));
- IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState());
+ IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState(), "/foo");
IndexingRule rule =
defn.getApplicableIndexingRule(asState(newNode("nt:folder")));
assertNotNull(rule.getConfig("foo1/bar"));
assertEquals(PropertyType.DATE, rule.getConfig("foo1/bar").getType());
@@ -175,7 +175,7 @@ public class IndexDefinitionTest {
.setProperty(LuceneIndexConstants.FIELD_BOOST, 3.0)
.setProperty(LuceneIndexConstants.PROP_TYPE,
PropertyType.TYPENAME_BOOLEAN);
- IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState());
+ IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState(), "/foo");
assertNull(defn.getApplicableIndexingRule(asState(newNode("nt:base"))));
@@ -197,7 +197,7 @@ public class IndexDefinitionTest {
builder.setProperty(PROP_NAME, "testIndex");
rules.child("nt:hierarchyNode").setProperty(LuceneIndexConstants.FIELD_BOOST,
2.0);
- IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState());
+ IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState(), "/foo");
assertNull(defn.getApplicableIndexingRule(asState(newNode("nt:base"))));
assertNotNull(defn.getApplicableIndexingRule(asState(newNode("nt:hierarchyNode"))));
@@ -211,7 +211,7 @@ public class IndexDefinitionTest {
TestUtil.child(rules, "mix:title/properties/jcr:title")
.setProperty(LuceneIndexConstants.FIELD_BOOST, 3.0);
- IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState());
+ IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState(), "/foo");
assertNotNull(defn.getApplicableIndexingRule(asState(newNode("nt:folder",
"mix:title"))));
assertNull(defn.getApplicableIndexingRule(asState(newNode("nt:folder"))));
@@ -224,7 +224,7 @@ public class IndexDefinitionTest {
TestUtil.child(rules, "mix:mimeType/properties/jcr:mimeType")
.setProperty(LuceneIndexConstants.FIELD_BOOST, 3.0);
- IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState());
+ IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState(), "/foo");
assertNotNull(defn.getApplicableIndexingRule(asState(newNode("nt:folder",
"mix:mimeType"))));
assertNull(defn.getApplicableIndexingRule(asState(newNode("nt:folder"))));
@@ -241,7 +241,7 @@ public class IndexDefinitionTest {
.setProperty(LuceneIndexConstants.FIELD_BOOST, 2.0)
.setProperty(LuceneIndexConstants.RULE_INHERITED, false);
- IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState());
+ IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState(), "/foo");
assertNull(defn.getApplicableIndexingRule(asState(newNode("nt:base"))));
assertNotNull(defn.getApplicableIndexingRule(asState(newNode("nt:hierarchyNode"))));
@@ -256,7 +256,7 @@ public class IndexDefinitionTest {
rules.child("nt:hierarchyNode").setProperty(LuceneIndexConstants.FIELD_BOOST,
2.0);
rules.child("nt:base").setProperty(LuceneIndexConstants.FIELD_BOOST,
3.0);
- IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState());
+ IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState(), "/foo");
assertEquals(3.0, getRule(defn, "nt:base").boost, 0);
assertEquals(2.0, getRule(defn, "nt:hierarchyNode").boost, 0);
@@ -269,7 +269,7 @@ public class IndexDefinitionTest {
rules.child("nt:hierarchyNode").setProperty(LuceneIndexConstants.FIELD_BOOST,
2.0);
rules.child("nt:base").setProperty(LuceneIndexConstants.FIELD_BOOST,
3.0);
- IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState());
+ IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState(), "/foo");
//As nt:base is defined earlier it would supercede everything
assertEquals(3.0, getRule(defn, "nt:base").boost, 0);
@@ -288,7 +288,7 @@ public class IndexDefinitionTest {
.setProperty(LuceneIndexConstants.PROP_IS_REGEX, true)
.setProperty(LuceneIndexConstants.FIELD_BOOST, 4.0);
- IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState());
+ IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState(), "/foo");
IndexingRule rule1 =
defn.getApplicableIndexingRule(asState(newNode("nt:folder")));
assertNotNull(rule1);
@@ -314,7 +314,7 @@ public class IndexDefinitionTest {
.setProperty(LuceneIndexConstants.FIELD_BOOST, 4.0);
- IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState());
+ IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState(), "/foo");
IndexingRule rule1 =
defn.getApplicableIndexingRule(asState(newNode("nt:folder")));
assertNotNull(rule1);
@@ -342,7 +342,7 @@ public class IndexDefinitionTest {
rules.child("nt:folder").child(PROP_NODE).setProperty(OAK_CHILD_ORDER,
ImmutableList.of("prop2", "prop1"), NAMES);
- IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState());
+ IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState(), "/foo");
IndexingRule rule1 =
defn.getApplicableIndexingRule(asState(newNode("nt:folder")));
assertNotNull(rule1);
@@ -357,7 +357,7 @@ public class IndexDefinitionTest {
//Order it correctly to get expected result
rules.child("nt:folder").child(PROP_NODE).setProperty(OAK_CHILD_ORDER,
ImmutableList.of("prop1", "prop2"), NAMES);
- defn = new IndexDefinition(root, builder.getNodeState());
+ defn = new IndexDefinition(root, builder.getNodeState(), "/foo");
rule1 = defn.getApplicableIndexingRule(asState(newNode("nt:folder")));
assertEquals(3.0f, rule1.getConfig("fooProp").boost, 0);
}
@@ -373,7 +373,7 @@ public class IndexDefinitionTest {
.setProperty(LuceneIndexConstants.PROP_NAME, "BAR")
.setProperty(LuceneIndexConstants.PROP_PROPERTY_INDEX, true);
- IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState());
+ IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState(), "/foo");
IndexingRule rule1 =
defn.getApplicableIndexingRule(asState(newNode("nt:folder")));
assertNotNull(rule1);
@@ -394,7 +394,7 @@ public class IndexDefinitionTest {
.setProperty(LuceneIndexConstants.PROP_IS_REGEX, true)
.setProperty(LuceneIndexConstants.PROP_ANALYZED, true);
- IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState());
+ IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState(), "/foo");
IndexingRule rule =
defn.getApplicableIndexingRule(asState(newNode("nt:folder")));
assertFalse(rule.getConfig("foo").skipTokenization("foo"));
@@ -409,7 +409,7 @@ public class IndexDefinitionTest {
//Simulate condition that index exists
defnb.child(INDEX_DATA_CHILD_NAME);
- IndexDefinition defn = new IndexDefinition(root, defnb.getNodeState());
+ IndexDefinition defn = new IndexDefinition(root, defnb.getNodeState(),
"/foo");
assertEquals(IndexFormatVersion.V1, defn.getVersion());
}
@@ -423,7 +423,7 @@ public class IndexDefinitionTest {
defnb = defnb.getNodeState().builder();
IndexDefinition.updateDefinition(defnb);
- IndexDefinition defn = new IndexDefinition(root, defnb.getNodeState());
+ IndexDefinition defn = new IndexDefinition(root, defnb.getNodeState(),
"/foo");
assertEquals(IndexFormatVersion.V1, defn.getVersion());
}
@@ -431,7 +431,7 @@ public class IndexDefinitionTest {
public void versionPropertyIsV2() throws Exception{
NodeBuilder defnb = newLucenePropertyIndexDefinition(builder, "test",
of("foo"), "async");
- IndexDefinition defn = new IndexDefinition(root, defnb.getNodeState());
+ IndexDefinition defn = new IndexDefinition(root, defnb.getNodeState(),
"/foo");
assertEquals(IndexFormatVersion.V2, defn.getVersion());
}
@@ -440,7 +440,7 @@ public class IndexDefinitionTest {
NodeBuilder defnb =
newLuceneIndexDefinition(builder.child(INDEX_DEFINITIONS_NAME),
"lucene", of(TYPENAME_STRING));
- IndexDefinition defn = new IndexDefinition(root, defnb.getNodeState());
+ IndexDefinition defn = new IndexDefinition(root, defnb.getNodeState(),
"/foo");
assertEquals(IndexFormatVersion.getDefault(), defn.getVersion());
}
@@ -450,7 +450,7 @@ public class IndexDefinitionTest {
"lucene", of(TYPENAME_STRING));
defnb.setProperty(LuceneIndexConstants.COMPAT_MODE,
IndexFormatVersion.V1.getVersion());
- IndexDefinition defn = new IndexDefinition(root, defnb.getNodeState());
+ IndexDefinition defn = new IndexDefinition(root, defnb.getNodeState(),
"/foo");
assertEquals(IndexFormatVersion.V1, defn.getVersion());
}
@@ -458,11 +458,11 @@ public class IndexDefinitionTest {
public void formatUpdate() throws Exception{
NodeBuilder defnb =
newLuceneIndexDefinition(builder.child(INDEX_DEFINITIONS_NAME),
"lucene", of(TYPENAME_STRING), of("foo", "Bar"), "async");
- IndexDefinition defn = new IndexDefinition(root, defnb.getNodeState());
+ IndexDefinition defn = new IndexDefinition(root, defnb.getNodeState(),
"/foo");
assertTrue(defn.isOfOldFormat());
NodeBuilder updated =
IndexDefinition.updateDefinition(defnb.getNodeState().builder());
- IndexDefinition defn2 = new IndexDefinition(root,
updated.getNodeState());
+ IndexDefinition defn2 = new IndexDefinition(root,
updated.getNodeState(), "/foo");
assertFalse(defn2.isOfOldFormat());
IndexingRule rule =
defn2.getApplicableIndexingRule(asState(newNode("nt:base")));
@@ -475,11 +475,11 @@ public class IndexDefinitionTest {
public void propertyRegExAndRelativeProperty() throws Exception{
NodeBuilder defnb =
newLuceneIndexDefinition(builder.child(INDEX_DEFINITIONS_NAME),
"lucene", of(TYPENAME_STRING), of("foo"), "async");
- IndexDefinition defn = new IndexDefinition(root, defnb.getNodeState());
+ IndexDefinition defn = new IndexDefinition(root, defnb.getNodeState(),
"/foo");
assertTrue(defn.isOfOldFormat());
NodeBuilder updated =
IndexDefinition.updateDefinition(defnb.getNodeState().builder());
- IndexDefinition defn2 = new IndexDefinition(root,
updated.getNodeState());
+ IndexDefinition defn2 = new IndexDefinition(root,
updated.getNodeState(), "/foo");
IndexingRule rule =
defn2.getApplicableIndexingRule(asState(newNode("nt:base")));
assertNotNull(rule.getConfig("foo"));
@@ -490,14 +490,14 @@ public class IndexDefinitionTest {
public void fulltextEnabledAndAggregate() throws Exception{
NodeBuilder defnb =
newLucenePropertyIndexDefinition(builder.child(INDEX_DEFINITIONS_NAME),
"lucene", of("foo"), "async");
- IndexDefinition defn = new IndexDefinition(root, defnb.getNodeState());
+ IndexDefinition defn = new IndexDefinition(root, defnb.getNodeState(),
"/foo");
assertFalse(defn.isFullTextEnabled());
NodeBuilder aggregates = defnb.child(LuceneIndexConstants.AGGREGATES);
NodeBuilder aggFolder = aggregates.child("nt:base");
aggFolder.child("i1").setProperty(LuceneIndexConstants.AGG_PATH, "*");
- defn = new IndexDefinition(root, defnb.getNodeState());
+ defn = new IndexDefinition(root, defnb.getNodeState(), "/foo");
assertTrue(defn.isFullTextEnabled());
}
@@ -505,7 +505,7 @@ public class IndexDefinitionTest {
public void costConfig() throws Exception{
NodeBuilder defnb =
newLucenePropertyIndexDefinition(builder.child(INDEX_DEFINITIONS_NAME),
"lucene", of("foo"), "async");
- IndexDefinition defn = new IndexDefinition(root, defnb.getNodeState());
+ IndexDefinition defn = new IndexDefinition(root, defnb.getNodeState(),
"/foo");
assertEquals(1.0, defn.getCostPerEntry(), 0);
assertEquals(1.0, defn.getCostPerExecution(), 0);
assertEquals(IndexDefinition.DEFAULT_ENTRY_COUNT,
defn.getEntryCount());
@@ -515,7 +515,7 @@ public class IndexDefinitionTest {
defnb.setProperty(LuceneIndexConstants.COST_PER_EXECUTION, 3.0);
defnb.setProperty(IndexConstants.ENTRY_COUNT_PROPERTY_NAME, 500);
- IndexDefinition defn2 = new IndexDefinition(root,
defnb.getNodeState());
+ IndexDefinition defn2 = new IndexDefinition(root,
defnb.getNodeState(), "/foo");
assertEquals(2.0, defn2.getCostPerEntry(), 0);
assertEquals(3.0, defn2.getCostPerExecution(), 0);
assertEquals(500, defn2.getEntryCount());
@@ -525,14 +525,14 @@ public class IndexDefinitionTest {
public void fulltextCost() throws Exception{
NodeBuilder defnb =
newLucenePropertyIndexDefinition(builder.child(INDEX_DEFINITIONS_NAME),
"lucene", of("foo"), "async");
- IndexDefinition defn = new IndexDefinition(root, defnb.getNodeState());
+ IndexDefinition defn = new IndexDefinition(root, defnb.getNodeState(),
"/foo");
assertEquals(300, defn.getFulltextEntryCount(300));
assertEquals(IndexDefinition.DEFAULT_ENTRY_COUNT + 100,
defn.getFulltextEntryCount(IndexDefinition.DEFAULT_ENTRY_COUNT
+ 100));
//Once count is explicitly defined then it would influence the cost
defnb.setProperty(IndexConstants.ENTRY_COUNT_PROPERTY_NAME, 100);
- defn = new IndexDefinition(root, defnb.getNodeState());
+ defn = new IndexDefinition(root, defnb.getNodeState(), "/foo");
assertEquals(100, defn.getFulltextEntryCount(300));
assertEquals(50, defn.getFulltextEntryCount(50));
}
@@ -547,7 +547,7 @@ public class IndexDefinitionTest {
defnb.child(ANALYZERS).child(ANL_DEFAULT)
.child(LuceneIndexConstants.ANL_TOKENIZER)
.setProperty(LuceneIndexConstants.ANL_NAME, "whitespace");
- IndexDefinition defn = new IndexDefinition(root, defnb.getNodeState());
+ IndexDefinition defn = new IndexDefinition(root, defnb.getNodeState(),
"/foo");
assertEquals(TokenizerChain.class.getName(),
defn.getAnalyzer().getClass().getName());
}
@@ -555,14 +555,14 @@ public class IndexDefinitionTest {
public void customTikaConfig() throws Exception{
NodeBuilder defnb =
newLuceneIndexDefinition(builder.child(INDEX_DEFINITIONS_NAME),
"lucene", of(TYPENAME_STRING));
- IndexDefinition defn = new IndexDefinition(root, defnb.getNodeState());
+ IndexDefinition defn = new IndexDefinition(root, defnb.getNodeState(),
"/foo");
assertFalse(defn.hasCustomTikaConfig());
defnb.child(LuceneIndexConstants.TIKA)
.child(LuceneIndexConstants.TIKA_CONFIG)
.child(JcrConstants.JCR_CONTENT)
.setProperty(JcrConstants.JCR_DATA, "hello".getBytes());
- defn = new IndexDefinition(root, defnb.getNodeState());
+ defn = new IndexDefinition(root, defnb.getNodeState(), "/foo");
assertTrue(defn.hasCustomTikaConfig());
}
@@ -570,21 +570,21 @@ public class IndexDefinitionTest {
public void maxExtractLength() throws Exception{
NodeBuilder defnb =
newLuceneIndexDefinition(builder.child(INDEX_DEFINITIONS_NAME),
"lucene", of(TYPENAME_STRING));
- IndexDefinition defn = new IndexDefinition(root, defnb.getNodeState());
+ IndexDefinition defn = new IndexDefinition(root, defnb.getNodeState(),
"/foo");
assertEquals(-IndexDefinition.DEFAULT_MAX_EXTRACT_LENGTH *
IndexDefinition.DEFAULT_MAX_FIELD_LENGTH,
defn.getMaxExtractLength());
defnb.child(TIKA).setProperty(LuceneIndexConstants.TIKA_MAX_EXTRACT_LENGTH,
1000);
- defn = new IndexDefinition(root, defnb.getNodeState());
+ defn = new IndexDefinition(root, defnb.getNodeState(), "/foo");
assertEquals(1000, defn.getMaxExtractLength());
}
@Test(expected = IllegalStateException.class)
public void nullCheckEnabledWithNtBase() throws Exception{
builder.child(PROP_NODE).child("foo").setProperty(LuceneIndexConstants.PROP_NULL_CHECK_ENABLED,
true);
- IndexDefinition idxDefn = new IndexDefinition(root,
builder.getNodeState());
+ IndexDefinition idxDefn = new IndexDefinition(root,
builder.getNodeState(), "/foo");
}
@Test(expected = IllegalStateException.class)
@@ -596,7 +596,7 @@ public class IndexDefinitionTest {
.setProperty(LuceneIndexConstants.PROP_IS_REGEX, true)
.setProperty(LuceneIndexConstants.PROP_NULL_CHECK_ENABLED,
true);
root = registerTestNodeType(builder).getNodeState();
- IndexDefinition idxDefn = new IndexDefinition(root,
builder.getNodeState());
+ IndexDefinition idxDefn = new IndexDefinition(root,
builder.getNodeState(), "/foo");
}
@Test
@@ -606,7 +606,7 @@ public class IndexDefinitionTest {
.setProperty(LuceneIndexConstants.PROP_NAME, "foo")
.setProperty(LuceneIndexConstants.PROP_NULL_CHECK_ENABLED,
true);
root = registerTestNodeType(builder).getNodeState();
- IndexDefinition idxDefn = new IndexDefinition(root,
builder.getNodeState());
+ IndexDefinition idxDefn = new IndexDefinition(root,
builder.getNodeState(), "/foo");
assertTrue(!idxDefn.getApplicableIndexingRule(TestUtil.NT_TEST).getNullCheckEnabledProperties().isEmpty());
}
@@ -617,7 +617,7 @@ public class IndexDefinitionTest {
.setProperty(LuceneIndexConstants.PROP_NAME, "foo")
.setProperty(LuceneIndexConstants.PROP_NOT_NULL_CHECK_ENABLED,
true);
root = registerTestNodeType(builder).getNodeState();
- IndexDefinition idxDefn = new IndexDefinition(root,
builder.getNodeState());
+ IndexDefinition idxDefn = new IndexDefinition(root,
builder.getNodeState(), "/foo");
assertTrue(!idxDefn.getApplicableIndexingRule(TestUtil.NT_TEST).getNotNullCheckEnabledProperties().isEmpty());
}
@@ -627,27 +627,27 @@ public class IndexDefinitionTest {
int suggestFreq = 40;
//default config
NodeBuilder indexRoot = builder;
- IndexDefinition idxDefn = new IndexDefinition(root,
indexRoot.getNodeState());
+ IndexDefinition idxDefn = new IndexDefinition(root,
indexRoot.getNodeState(), "/foo");
assertEquals("Default config", 10,
idxDefn.getSuggesterUpdateFrequencyMinutes());
//namespaced config shadows old method
indexRoot = builder.child("shadowConfigRoot");
indexRoot.setProperty(LuceneIndexConstants.SUGGEST_UPDATE_FREQUENCY_MINUTES,
suggestFreq);
indexRoot.child(LuceneIndexConstants.SUGGESTION_CONFIG);
- idxDefn = new IndexDefinition(root, indexRoot.getNodeState());
+ idxDefn = new IndexDefinition(root, indexRoot.getNodeState(), "/foo");
assertEquals("Namespaced config node should shadow global config",
10, idxDefn.getSuggesterUpdateFrequencyMinutes());
//config for backward config
indexRoot = builder.child("backwardCompatibilityRoot");
indexRoot.setProperty(LuceneIndexConstants.SUGGEST_UPDATE_FREQUENCY_MINUTES,
suggestFreq);
- idxDefn = new IndexDefinition(root, indexRoot.getNodeState());
+ idxDefn = new IndexDefinition(root, indexRoot.getNodeState(), "/foo");
assertEquals("Backward compatibility config", suggestFreq,
idxDefn.getSuggesterUpdateFrequencyMinutes());
indexRoot = builder.child("indexRoot");
indexRoot.child(LuceneIndexConstants.SUGGESTION_CONFIG)
.setProperty(LuceneIndexConstants.SUGGEST_UPDATE_FREQUENCY_MINUTES,
suggestFreq);
- idxDefn = new IndexDefinition(root, indexRoot.getNodeState());
+ idxDefn = new IndexDefinition(root, indexRoot.getNodeState(), "/foo");
assertEquals("Set config", suggestFreq,
idxDefn.getSuggesterUpdateFrequencyMinutes());
}
@@ -656,26 +656,26 @@ public class IndexDefinitionTest {
public void testSuggestAnalyzed() throws Exception {
//default config
NodeBuilder indexRoot = builder;
- IndexDefinition idxDefn = new IndexDefinition(root,
indexRoot.getNodeState());
+ IndexDefinition idxDefn = new IndexDefinition(root,
indexRoot.getNodeState(), "/foo");
assertFalse("Default config", idxDefn.isSuggestAnalyzed());
//namespaced config shadows old method
indexRoot = builder.child("shadowConfigRoot");
indexRoot.setProperty(LuceneIndexConstants.SUGGEST_ANALYZED, true);
indexRoot.child(LuceneIndexConstants.SUGGESTION_CONFIG);
- idxDefn = new IndexDefinition(root, indexRoot.getNodeState());
+ idxDefn = new IndexDefinition(root, indexRoot.getNodeState(), "/foo");
assertFalse("Namespaced config node should shadow global config",
idxDefn.isSuggestAnalyzed());
//config for backward config
indexRoot = builder.child("backwardCompatibilityRoot");
indexRoot.setProperty(LuceneIndexConstants.SUGGEST_ANALYZED, true);
- idxDefn = new IndexDefinition(root, indexRoot.getNodeState());
+ idxDefn = new IndexDefinition(root, indexRoot.getNodeState(), "/foo");
assertTrue("Backward compatibility config",
idxDefn.isSuggestAnalyzed());
indexRoot = builder.child("indexRoot");
indexRoot.child(LuceneIndexConstants.SUGGESTION_CONFIG)
.setProperty(LuceneIndexConstants.SUGGEST_ANALYZED, true);
- idxDefn = new IndexDefinition(root, indexRoot.getNodeState());
+ idxDefn = new IndexDefinition(root, indexRoot.getNodeState(), "/foo");
assertTrue("Set config", idxDefn.isSuggestAnalyzed());
}
@@ -686,7 +686,7 @@ public class IndexDefinitionTest {
.setProperty(LuceneIndexConstants.PROP_NAME, "foo")
.setProperty(LuceneIndexConstants.PROP_USE_IN_SUGGEST, true);
root = registerTestNodeType(builder).getNodeState();
- IndexDefinition idxDefn = new IndexDefinition(root,
builder.getNodeState());
+ IndexDefinition idxDefn = new IndexDefinition(root,
builder.getNodeState(), "/foo");
assertTrue(idxDefn.isSuggestEnabled());
}
@@ -699,7 +699,7 @@ public class IndexDefinitionTest {
.setProperty(LuceneIndexConstants.PROP_IS_REGEX, true)
.setProperty(LuceneIndexConstants.PROP_USE_IN_SUGGEST, true);
root = registerTestNodeType(builder).getNodeState();
- IndexDefinition idxDefn = new IndexDefinition(root,
builder.getNodeState());
+ IndexDefinition idxDefn = new IndexDefinition(root,
builder.getNodeState(), "/foo");
assertTrue(idxDefn.isSuggestEnabled());
}
@@ -709,7 +709,7 @@ public class IndexDefinitionTest {
TestUtil.child(rules, "oak:TestNode/properties/prop2")
.setProperty(LuceneIndexConstants.PROP_NAME, "foo");
root = registerTestNodeType(builder).getNodeState();
- IndexDefinition idxDefn = new IndexDefinition(root,
builder.getNodeState());
+ IndexDefinition idxDefn = new IndexDefinition(root,
builder.getNodeState(), "/foo");
assertFalse(idxDefn.isSuggestEnabled());
}
@@ -727,7 +727,7 @@ public class IndexDefinitionTest {
.setProperty(LuceneIndexConstants.PROP_PROPERTY_INDEX, true)
.setProperty(LuceneIndexConstants.PROP_NODE_SCOPE_INDEX, true);
- IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState());
+ IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState(), "/foo");
IndexingRule rule1 =
defn.getApplicableIndexingRule(asState(newNode("nt:folder")));
assertNotNull(rule1);
@@ -749,14 +749,14 @@ public class IndexDefinitionTest {
.setProperty(LuceneIndexConstants.PROP_ANALYZED, true)
.setProperty(LuceneIndexConstants.PROP_IS_REGEX, true);
- IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState());
+ IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState(), "/foo");
IndexingRule rule =
defn.getApplicableIndexingRule(asState(newNode("nt:folder")));
assertNotNull(rule);
assertFalse(rule.isNodeFullTextIndexed());
TestUtil.child(rules, "nt:folder/properties/prop1")
.setProperty(LuceneIndexConstants.PROP_NODE_SCOPE_INDEX, true);
- defn = new IndexDefinition(root, builder.getNodeState());
+ defn = new IndexDefinition(root, builder.getNodeState(), "/foo");
rule = defn.getApplicableIndexingRule(asState(newNode("nt:folder")));
assertTrue(rule.isNodeFullTextIndexed());
assertTrue(rule.indexesAllNodesOfMatchingType());
@@ -770,14 +770,14 @@ public class IndexDefinitionTest {
.setProperty(LuceneIndexConstants.PROP_NAME, "foo")
.setProperty(LuceneIndexConstants.PROP_ANALYZED, true);
- IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState());
+ IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState(), "/foo");
IndexingRule rule =
defn.getApplicableIndexingRule(asState(newNode("nt:folder")));
assertNotNull(rule);
assertFalse(rule.isNodeFullTextIndexed());
TestUtil.child(rules, "nt:folder/properties/prop1")
.setProperty(LuceneIndexConstants.PROP_NODE_SCOPE_INDEX, true);
- defn = new IndexDefinition(root, builder.getNodeState());
+ defn = new IndexDefinition(root, builder.getNodeState(), "/foo");
rule = defn.getApplicableIndexingRule(asState(newNode("nt:folder")));
assertTrue(rule.isNodeFullTextIndexed());
assertTrue(rule.indexesAllNodesOfMatchingType());
@@ -795,7 +795,7 @@ public class IndexDefinitionTest {
NodeBuilder aggFolder = aggregates.child("nt:folder");
aggFolder.child("i1").setProperty(LuceneIndexConstants.AGG_PATH, "*");
- IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState());
+ IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState(), "/foo");
IndexingRule rule =
defn.getApplicableIndexingRule(asState(newNode("nt:folder")));
assertNotNull(rule);
assertTrue(rule.isNodeFullTextIndexed());
@@ -817,7 +817,7 @@ public class IndexDefinitionTest {
.setProperty(LuceneIndexConstants.PROP_NODE_SCOPE_INDEX, true)
.setProperty(LuceneIndexConstants.PROP_ORDERED, true)
.setProperty(LuceneIndexConstants.PROP_ANALYZED, true);
- IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState());
+ IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState(), "/foo");
IndexingRule rule =
defn.getApplicableIndexingRule(asState(newNode("nt:folder")));
assertNotNull(rule);
@@ -838,17 +838,17 @@ public class IndexDefinitionTest {
@Test
public void costPerEntryForOlderVersion() throws Exception{
builder.setProperty(LuceneIndexConstants.COMPAT_MODE, 2);
- IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState());
+ IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState(), "/foo");
assertEquals(1.0, defn.getCostPerEntry(), 0.0);
builder.setProperty(LuceneIndexConstants.COMPAT_MODE, 1);
- defn = new IndexDefinition(root, builder.getNodeState());
+ defn = new IndexDefinition(root, builder.getNodeState(), "/foo");
assertEquals(1.5, defn.getCostPerEntry(), 0.0);
}
@Test
public void uniqueId() throws Exception{
- IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState());
+ IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState(), "/foo");
assertNull(defn.getUniqueId());
//Check that uniqueId is properly seeded
@@ -857,26 +857,21 @@ public class IndexDefinitionTest {
assertNotNull(uid);
//Assert via NodeState
- defn = new IndexDefinition(root, builder.getNodeState());
+ defn = new IndexDefinition(root, builder.getNodeState(), "/foo");
assertEquals(uid, defn.getUniqueId());
-
- //Assert via NodeBuilder
- defn = new IndexDefinition(root, EMPTY_NODE, builder);
- assertEquals(uid, defn.getUniqueId());
-
}
@Test
public void nrt() throws Exception{
TestUtil.enableIndexingMode(builder, IndexingMode.NRT);
- IndexDefinition idxDefn = new IndexDefinition(root,
builder.getNodeState());
+ IndexDefinition idxDefn = new IndexDefinition(root,
builder.getNodeState(), "/foo");
assertTrue(idxDefn.isNRTIndexingEnabled());
}
@Test
public void sync() throws Exception{
TestUtil.enableIndexingMode(builder, IndexingMode.SYNC);
- IndexDefinition idxDefn = new IndexDefinition(root,
builder.getNodeState());
+ IndexDefinition idxDefn = new IndexDefinition(root,
builder.getNodeState(), "/foo");
assertFalse(idxDefn.isNRTIndexingEnabled());
assertTrue(idxDefn.isSyncIndexingEnabled());
}
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=1772619&r1=1772618&r2=1772619&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 Dec 5 09:58:23 2016
@@ -94,7 +94,7 @@ public class IndexPlannerTest {
public void planForSortField() throws Exception{
NodeBuilder defn = newLucenePropertyIndexDefinition(builder, "test",
of("foo"), "async");
defn.setProperty(createProperty(ORDERED_PROP_NAMES, of("foo"),
STRINGS));
- IndexNode node = createIndexNode(new IndexDefinition(root,
defn.getNodeState()));
+ IndexNode node = createIndexNode(new IndexDefinition(root,
defn.getNodeState(), "/foo"));
IndexPlanner planner = new IndexPlanner(node, "/foo",
createFilter("nt:base"),
ImmutableList.of(new OrderEntry("foo", Type.LONG,
OrderEntry.Order.ASCENDING)));
assertNotNull(planner.getPlan());
@@ -104,7 +104,7 @@ public class IndexPlannerTest {
@Test
public void noPlanForSortOnlyByScore() throws Exception{
NodeBuilder defn = newLucenePropertyIndexDefinition(builder, "test",
of("foo"), "async");
- IndexNode node = createIndexNode(new IndexDefinition(root,
defn.getNodeState()));
+ IndexNode node = createIndexNode(new IndexDefinition(root,
defn.getNodeState(), "/foo"));
IndexPlanner planner = new IndexPlanner(node, "/foo",
createFilter("nt:file"),
ImmutableList.of(new OrderEntry("jcr:score", Type.LONG,
OrderEntry.Order.ASCENDING)));
assertNull(planner.getPlan());
@@ -113,7 +113,7 @@ public class IndexPlannerTest {
@Test
public void fullTextQueryNonFulltextIndex() throws Exception{
NodeBuilder defn = newLucenePropertyIndexDefinition(builder, "test",
of("foo"), "async");
- IndexNode node = createIndexNode(new IndexDefinition(root,
defn.getNodeState()));
+ IndexNode node = createIndexNode(new IndexDefinition(root,
defn.getNodeState(), "/foo"));
FilterImpl filter = createFilter("nt:base");
filter.setFullTextConstraint(FullTextParser.parse(".", "mountain"));
IndexPlanner planner = new IndexPlanner(node, "/foo", filter,
Collections.<OrderEntry>emptyList());
@@ -124,7 +124,7 @@ public class IndexPlannerTest {
public void noApplicableRule() throws Exception{
NodeBuilder defn = newLucenePropertyIndexDefinition(builder, "test",
of("foo"), "async");
defn.setProperty(createProperty(IndexConstants.DECLARING_NODE_TYPES,
of("nt:folder"), STRINGS));
- IndexNode node = createIndexNode(new IndexDefinition(root,
defn.getNodeState()));
+ IndexNode node = createIndexNode(new IndexDefinition(root,
defn.getNodeState(), "/foo"));
FilterImpl filter = createFilter("nt:base");
filter.restrictProperty("foo", Operator.EQUAL,
PropertyValues.newString("bar"));
IndexPlanner planner = new IndexPlanner(node, "/foo", filter,
Collections.<OrderEntry>emptyList());
@@ -142,7 +142,7 @@ public class IndexPlannerTest {
//as nt:folder extends nt:hierarchyNode we should get a plan
NodeBuilder defn = newLucenePropertyIndexDefinition(builder, "test",
of("foo"), "async");
defn.setProperty(createProperty(IndexConstants.DECLARING_NODE_TYPES,
of("nt:hierarchyNode"), STRINGS));
- IndexNode node = createIndexNode(new IndexDefinition(root,
defn.getNodeState()));
+ IndexNode node = createIndexNode(new IndexDefinition(root,
defn.getNodeState(), "/foo"));
FilterImpl filter = createFilter("nt:folder");
filter.restrictProperty("foo", Operator.EQUAL,
PropertyValues.newString("bar"));
IndexPlanner planner = new IndexPlanner(node, "/foo", filter,
Collections.<OrderEntry>emptyList());
@@ -152,7 +152,7 @@ public class IndexPlannerTest {
@Test
public void noMatchingProperty() throws Exception{
NodeBuilder defn = newLucenePropertyIndexDefinition(builder, "test",
of("foo"), "async");
- IndexNode node = createIndexNode(new IndexDefinition(root,
defn.getNodeState()));
+ IndexNode node = createIndexNode(new IndexDefinition(root,
defn.getNodeState(), "/foo"));
FilterImpl filter = createFilter("nt:base");
filter.restrictProperty("bar", Operator.EQUAL,
PropertyValues.newString("bar"));
IndexPlanner planner = new IndexPlanner(node, "/foo", filter,
Collections.<OrderEntry>emptyList());
@@ -161,7 +161,7 @@ public class IndexPlannerTest {
@Test
public void matchingProperty() throws Exception{
NodeBuilder defn = newLucenePropertyIndexDefinition(builder, "test",
of("foo"), "async");
- IndexNode node = createIndexNode(new IndexDefinition(root,
defn.getNodeState()));
+ IndexNode node = createIndexNode(new IndexDefinition(root,
defn.getNodeState(), "/foo"));
FilterImpl filter = createFilter("nt:base");
filter.restrictProperty("foo", Operator.EQUAL,
PropertyValues.newString("bar"));
IndexPlanner planner = new IndexPlanner(node, "/foo", filter,
Collections.<OrderEntry>emptyList());
@@ -175,7 +175,7 @@ public class IndexPlannerTest {
public void purePropertyIndexAndPathRestriction() throws Exception{
NodeBuilder defn = newLucenePropertyIndexDefinition(builder, "test",
of("foo"), "async");
defn.setProperty(LuceneIndexConstants.EVALUATE_PATH_RESTRICTION, true);
- IndexNode node = createIndexNode(new IndexDefinition(root,
defn.getNodeState()));
+ IndexNode node = createIndexNode(new IndexDefinition(root,
defn.getNodeState(), "/foo"));
FilterImpl filter = createFilter("nt:base");
filter.restrictPath("/content", Filter.PathRestriction.ALL_CHILDREN);
IndexPlanner planner = new IndexPlanner(node, "/foo", filter,
Collections.<OrderEntry>emptyList());
@@ -191,7 +191,7 @@ public class IndexPlannerTest {
NodeBuilder foob = getNode(defn, "indexRules/nt:base/properties/foo");
foob.setProperty(LuceneIndexConstants.PROP_NODE_SCOPE_INDEX, true);
- IndexNode node = createIndexNode(new IndexDefinition(root,
defn.getNodeState()));
+ IndexNode node = createIndexNode(new IndexDefinition(root,
defn.getNodeState(), "/foo"));
FilterImpl filter = createFilter("nt:base");
filter.restrictPath("/content", Filter.PathRestriction.ALL_CHILDREN);
IndexPlanner planner = new IndexPlanner(node, "/foo", filter,
Collections.<OrderEntry>emptyList());
@@ -211,7 +211,7 @@ public class IndexPlannerTest {
NodeBuilder foob = getNode(defn, "indexRules/nt:file/properties/foo");
foob.setProperty(LuceneIndexConstants.PROP_NODE_SCOPE_INDEX, true);
- IndexNode node = createIndexNode(new IndexDefinition(root,
defn.getNodeState()));
+ IndexNode node = createIndexNode(new IndexDefinition(root,
defn.getNodeState(),"/foo"));
FilterImpl filter = createFilter("nt:file");
IndexPlanner planner = new IndexPlanner(node, "/foo", filter,
Collections.<OrderEntry>emptyList());
@@ -231,7 +231,7 @@ public class IndexPlannerTest {
FilterImpl filter = createFilter("nt:file");
filter.restrictPath("/", Filter.PathRestriction.ALL_CHILDREN);
- IndexNode node = createIndexNode(new IndexDefinition(root,
defn.getNodeState()));
+ IndexNode node = createIndexNode(new IndexDefinition(root,
defn.getNodeState(), "/foo"));
IndexPlanner planner = new IndexPlanner(node, "/foo", filter,
Collections.<OrderEntry>emptyList());
// /jcr:root//element(*, nt:file)
@@ -245,7 +245,7 @@ public class IndexPlannerTest {
defn.setProperty(LuceneIndexConstants.EVALUATE_PATH_RESTRICTION, true);
defn.setProperty(IndexConstants.DECLARING_NODE_TYPES, of("nt:file"),
NAMES);
- IndexNode node = createIndexNode(new IndexDefinition(root,
defn.getNodeState()));
+ IndexNode node = createIndexNode(new IndexDefinition(root,
defn.getNodeState(), "/foo"));
FilterImpl filter = createFilter("nt:file");
IndexPlanner planner = new IndexPlanner(node, "/foo", filter,
Collections.<OrderEntry>emptyList());
@@ -261,7 +261,7 @@ public class IndexPlannerTest {
NodeBuilder foob = getNode(defn, "indexRules/nt:base/properties/foo");
foob.setProperty(LuceneIndexConstants.PROP_NODE_SCOPE_INDEX, true);
- IndexNode node = createIndexNode(new IndexDefinition(root,
defn.getNodeState()));
+ IndexNode node = createIndexNode(new IndexDefinition(root,
defn.getNodeState(), "/foo"));
FilterImpl filter = createFilter("nt:file");
IndexPlanner planner = new IndexPlanner(node, "/foo", filter,
Collections.<OrderEntry>emptyList());
@@ -279,7 +279,7 @@ public class IndexPlannerTest {
NodeBuilder foob = getNode(defn, "indexRules/nt:file/properties/foo");
foob.setProperty(LuceneIndexConstants.PROP_NODE_SCOPE_INDEX, true);
- IndexNode node = createIndexNode(new IndexDefinition(root,
defn.getNodeState()));
+ IndexNode node = createIndexNode(new IndexDefinition(root,
defn.getNodeState(), "/foo"));
FilterImpl filter = createFilter("nt:file");
IndexPlanner planner = new IndexPlanner(node, "/foo", filter,
Collections.<OrderEntry>emptyList());
@@ -298,7 +298,7 @@ public class IndexPlannerTest {
//as a fresh indexing case
nb.child(INDEX_DATA_CHILD_NAME);
- IndexNode node = createIndexNode(new IndexDefinition(root,
nb.getNodeState()));
+ IndexNode node = createIndexNode(new IndexDefinition(root,
nb.getNodeState(), "/foo"));
FilterImpl filter = createFilter("nt:base");
filter.setFullTextConstraint(FullTextParser.parse(".", "mountain"));
IndexPlanner planner = new IndexPlanner(node, "/foo", filter,
Collections.<OrderEntry>emptyList());
@@ -310,7 +310,7 @@ public class IndexPlannerTest {
NodeBuilder defn = newLucenePropertyIndexDefinition(builder, "test",
of("foo"), "async");
long numofDocs = IndexDefinition.DEFAULT_ENTRY_COUNT + 1000;
- IndexDefinition idxDefn = new IndexDefinition(root,
defn.getNodeState());
+ IndexDefinition idxDefn = new IndexDefinition(root,
defn.getNodeState(), "/foo");
IndexNode node = createIndexNode(idxDefn, numofDocs);
FilterImpl filter = createFilter("nt:base");
filter.restrictProperty("foo", Operator.EQUAL,
PropertyValues.newString("bar"));
@@ -331,7 +331,7 @@ public class IndexPlannerTest {
defn.setProperty(LuceneIndexConstants.COST_PER_EXECUTION, 3.0);
long numofDocs = IndexDefinition.DEFAULT_ENTRY_COUNT - 100;
- IndexNode node = createIndexNode(new IndexDefinition(root,
defn.getNodeState()), numofDocs);
+ IndexNode node = createIndexNode(new IndexDefinition(root,
defn.getNodeState(), "/foo"), numofDocs);
FilterImpl filter = createFilter("nt:base");
filter.restrictProperty("foo", Operator.EQUAL,
PropertyValues.newString("bar"));
IndexPlanner planner = new IndexPlanner(node, "/foo", filter,
Collections.<OrderEntry>emptyList());
@@ -351,7 +351,7 @@ public class IndexPlannerTest {
TestUtil.useV2(defn);
long numofDocs = IndexDefinition.DEFAULT_ENTRY_COUNT + 1000;
- IndexNode node = createIndexNode(new IndexDefinition(root,
defn.getNodeState()), numofDocs);
+ IndexNode node = createIndexNode(new IndexDefinition(root,
defn.getNodeState(), "/foo"), numofDocs);
FilterImpl filter = createFilter("nt:base");
filter.setFullTextConstraint(FullTextParser.parse(".", "mountain"));
IndexPlanner planner = new IndexPlanner(node, "/foo", filter,
Collections.<OrderEntry>emptyList());
@@ -365,7 +365,7 @@ public class IndexPlannerTest {
public void nullPropertyCheck() throws Exception{
NodeBuilder defn = newLucenePropertyIndexDefinition(builder, "test",
of("foo"), "async");
- IndexNode node = createIndexNode(new IndexDefinition(root,
defn.getNodeState()));
+ IndexNode node = createIndexNode(new IndexDefinition(root,
defn.getNodeState(), "/foo"));
FilterImpl filter = createFilter("nt:base");
filter.restrictProperty("foo", Operator.EQUAL, null);
IndexPlanner planner = new IndexPlanner(node, "/foo", filter,
Collections.<OrderEntry>emptyList());
@@ -383,7 +383,7 @@ public class IndexPlannerTest {
.setProperty(LuceneIndexConstants.PROP_NULL_CHECK_ENABLED,
true)
.setProperty(LuceneIndexConstants.PROP_PROPERTY_INDEX, true);
- IndexDefinition idxDefn = new IndexDefinition(root,
builder.getNodeState().getChildNode("test"));
+ IndexDefinition idxDefn = new IndexDefinition(root,
builder.getNodeState().getChildNode("test"), "/foo");
IndexNode node = createIndexNode(idxDefn);
FilterImpl filter = createFilter(NT_TEST);
@@ -401,7 +401,7 @@ public class IndexPlannerTest {
public void noPathRestHasQueryPath() throws Exception{
NodeBuilder defn = newLucenePropertyIndexDefinition(builder, "test",
of("foo"), "async");
defn.setProperty(createProperty(IndexConstants.QUERY_PATHS,
of("/test/a"), Type.STRINGS));
- IndexNode node = createIndexNode(new IndexDefinition(root,
defn.getNodeState()));
+ IndexNode node = createIndexNode(new IndexDefinition(root,
defn.getNodeState(), "/foo"));
FilterImpl filter = createFilter("nt:base");
filter.restrictProperty("foo", Operator.EQUAL,
PropertyValues.newString("bar"));
@@ -414,7 +414,7 @@ public class IndexPlannerTest {
public void hasPathRestHasMatchingQueryPaths() throws Exception{
NodeBuilder defn = newLucenePropertyIndexDefinition(builder, "test",
of("foo"), "async");
defn.setProperty(createProperty(IndexConstants.QUERY_PATHS,
of("/test/a", "/test/b"), Type.STRINGS));
- IndexNode node = createIndexNode(new IndexDefinition(root,
defn.getNodeState()));
+ IndexNode node = createIndexNode(new IndexDefinition(root,
defn.getNodeState(), "/foo"));
FilterImpl filter = createFilter("nt:base");
filter.restrictPath("/test/a", Filter.PathRestriction.ALL_CHILDREN);
@@ -426,7 +426,7 @@ public class IndexPlannerTest {
@Test
public void hasPathRestHasNoExplicitQueryPaths() throws Exception{
NodeBuilder defn = newLucenePropertyIndexDefinition(builder, "test",
of("foo"), "async");
- IndexNode node = createIndexNode(new IndexDefinition(root,
defn.getNodeState()));
+ IndexNode node = createIndexNode(new IndexDefinition(root,
defn.getNodeState(), "/foo"));
FilterImpl filter = createFilter("nt:base");
filter.restrictPath("/test2", Filter.PathRestriction.ALL_CHILDREN);
@@ -444,7 +444,7 @@ public class IndexPlannerTest {
NodeBuilder foob = getNode(defn, "indexRules/nt:base/properties/foo");
foob.setProperty(LuceneIndexConstants.PROP_ANALYZED, true);
- IndexNode node = createIndexNode(new IndexDefinition(root,
defn.getNodeState()));
+ IndexNode node = createIndexNode(new IndexDefinition(root,
defn.getNodeState(), "/foo"));
FilterImpl filter = createFilter("nt:base");
filter.setFullTextConstraint(FullTextParser.parse(".", "mountain"));
IndexPlanner planner = new IndexPlanner(node, "/foo", filter,
Collections.<OrderEntry>emptyList());
@@ -463,7 +463,7 @@ public class IndexPlannerTest {
NodeBuilder foob = getNode(defn, "indexRules/nt:file/properties/foo");
foob.setProperty(LuceneIndexConstants.PROP_ANALYZED, true);
- IndexNode node = createIndexNode(new IndexDefinition(root,
defn.getNodeState()));
+ IndexNode node = createIndexNode(new IndexDefinition(root,
defn.getNodeState(), "/foo"));
FilterImpl filter = createFilter("nt:file");
filter.restrictPath("/foo", Filter.PathRestriction.ALL_CHILDREN);
IndexPlanner planner = new IndexPlanner(node, "/foo", filter,
Collections.<OrderEntry>emptyList());
@@ -731,7 +731,7 @@ public class IndexPlannerTest {
}
private IndexPlanner createPlannerForFulltext(NodeState defn,
FullTextExpression exp) throws IOException {
- IndexNode node = createIndexNode(new IndexDefinition(root, defn));
+ IndexNode node = createIndexNode(new IndexDefinition(root, defn,
"/foo"));
FilterImpl filter = createFilter("nt:base");
filter.setFullTextConstraint(exp);
return new IndexPlanner(node, "/foo", filter,
Collections.<OrderEntry>emptyList());
@@ -752,7 +752,7 @@ public class IndexPlannerTest {
foob.setProperty(LuceneIndexConstants.PROP_USE_IN_SPELLCHECK,
true);
}
- IndexDefinition indexDefinition = new IndexDefinition(root,
defn.getNodeState());
+ IndexDefinition indexDefinition = new IndexDefinition(root,
defn.getNodeState(), "/foo");
return createIndexNode(indexDefinition);
}
Modified:
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneBlobCacheTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneBlobCacheTest.java?rev=1772619&r1=1772618&r2=1772619&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneBlobCacheTest.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneBlobCacheTest.java
Mon Dec 5 09:58:23 2016
@@ -111,7 +111,7 @@ public class LuceneBlobCacheTest {
private Directory createDir(NodeBuilder builder, boolean readOnly){
return new OakDirectory(builder,
- new IndexDefinition(root, builder.getNodeState()), readOnly);
+ new IndexDefinition(root, builder.getNodeState(), "/foo"),
readOnly);
}
byte[] randomBytes(int size) {
Modified:
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorProviderTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorProviderTest.java?rev=1772619&r1=1772618&r2=1772619&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorProviderTest.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorProviderTest.java
Mon Dec 5 09:58:23 2016
@@ -25,7 +25,6 @@ import org.apache.commons.lang3.reflect.
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.core.SimpleCommitContext;
import org.apache.jackrabbit.oak.plugins.index.ContextAwareCallback;
-import org.apache.jackrabbit.oak.plugins.index.IndexConstants;
import org.apache.jackrabbit.oak.plugins.index.IndexUpdateCallback;
import org.apache.jackrabbit.oak.plugins.index.IndexingContext;
import
org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants.IndexingMode;
@@ -38,7 +37,6 @@ import org.apache.jackrabbit.oak.spi.sta
import org.junit.Test;
import static com.google.common.collect.ImmutableSet.of;
-import static org.apache.jackrabbit.oak.api.Type.STRINGS;
import static
org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants.TYPE_LUCENE;
import static
org.apache.jackrabbit.oak.plugins.index.lucene.util.LuceneIndexHelper.newLucenePropertyIndexDefinition;
import static
org.apache.jackrabbit.oak.plugins.memory.PropertyStates.createProperty;
@@ -90,7 +88,7 @@ public class LuceneIndexEditorProviderTe
//from tracker with a marker property
NodeBuilder testBuilder = createIndexDefinition("fooIndex").builder();
testBuilder.setProperty("foo", "bar");
- IndexDefinition defn = new IndexDefinition(root,
testBuilder.getNodeState());
+ IndexDefinition defn = new IndexDefinition(root,
testBuilder.getNodeState(), "/foo");
when(tracker.getIndexDefinition("/oak:index/fooIndex")).thenReturn(defn);
IndexUpdateCallback callback = new TestCallback("/oak:index/fooIndex",
newCommitInfo(), false, false);
Modified:
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorTest.java?rev=1772619&r1=1772618&r2=1772619&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorTest.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorTest.java
Mon Dec 5 09:58:23 2016
@@ -137,7 +137,7 @@ public class LuceneIndexEditorTest {
NodeBuilder index = builder.child(INDEX_DEFINITIONS_NAME);
NodeBuilder idxnb = newLuceneIndexDefinitionV2(index, "lucene",
of(TYPENAME_STRING));
- IndexDefinition defn = new IndexDefinition(root, idxnb.getNodeState());
+ IndexDefinition defn = new IndexDefinition(root, idxnb.getNodeState(),
"/foo");
NodeState before = builder.getNodeState();
builder.child("test").setProperty("foo", "fox is jumping");
builder.child("test").setProperty("price", 100);
@@ -193,7 +193,7 @@ public class LuceneIndexEditorTest {
of(TYPENAME_STRING));
nb.setProperty(LuceneIndexConstants.FULL_TEXT_ENABLED, false);
nb.setProperty(createProperty(INCLUDE_PROPERTY_NAMES, of("foo",
"price", "weight", "bool", "creationTime"), STRINGS));
- IndexDefinition defn = new IndexDefinition(root, nb.getNodeState());
+ IndexDefinition defn = new IndexDefinition(root, nb.getNodeState(),
"/foo");
NodeState before = builder.getNodeState();
builder.child("test").setProperty("foo", "fox is jumping");
builder.child("test").setProperty("bar", "kite is flying");
@@ -376,7 +376,7 @@ public class LuceneIndexEditorTest {
indexed = HOOK.processCommit(before, after, CommitInfo.EMPTY);
assertEquals(IndexFormatVersion.V1, new IndexDefinition(root,
-
indexed.getChildNode(INDEX_DEFINITIONS_NAME).getChildNode("lucene")).getVersion());
+
indexed.getChildNode(INDEX_DEFINITIONS_NAME).getChildNode("lucene"),
"/foo").getVersion());
//3. Trigger a reindex and version should switch to current
builder = indexed.builder();
@@ -385,7 +385,7 @@ public class LuceneIndexEditorTest {
after = builder.getNodeState();
indexed = HOOK.processCommit(before, after, CommitInfo.EMPTY);
assertEquals(IndexFormatVersion.getDefault(), new IndexDefinition(root,
-
indexed.getChildNode(INDEX_DEFINITIONS_NAME).getChildNode("lucene")).getVersion());
+
indexed.getChildNode(INDEX_DEFINITIONS_NAME).getChildNode("lucene"),
"/foo").getVersion());
}
@@ -398,7 +398,7 @@ public class LuceneIndexEditorTest {
//1. Trigger a index so that next index step does not see it as a
fresh index
NodeState indexed = HOOK.processCommit(EMPTY_NODE,
builder.getNodeState(), CommitInfo.EMPTY);
- IndexDefinition defn = new IndexDefinition(root,
indexed.getChildNode(INDEX_DEFINITIONS_NAME).getChildNode("lucene"));
+ IndexDefinition defn = new IndexDefinition(root,
indexed.getChildNode(INDEX_DEFINITIONS_NAME).getChildNode("lucene"), "/foo");
assertFalse(defn.isOfOldFormat());
}
@@ -473,7 +473,7 @@ public class LuceneIndexEditorTest {
private int numDocs(Mount m) throws IOException {
String indexDirName = MultiplexersLucene.getIndexDirName(m);
NodeBuilder defnBuilder =
builder.child(INDEX_DEFINITIONS_NAME).child("lucene");
- Directory d = new OakDirectory(defnBuilder, indexDirName, new
IndexDefinition(root, defnBuilder.getNodeState()), true);
+ Directory d = new OakDirectory(defnBuilder, indexDirName, new
IndexDefinition(root, defnBuilder.getNodeState(), "/foo"), true);
IndexReader r = DirectoryReader.open(d);
return r.numDocs();
}
