Author: chetanm
Date: Mon Dec 5 09:58:05 2016
New Revision: 1772618
URL: http://svn.apache.org/viewvc?rev=1772618&view=rev
Log:
OAK-5220 - Remove usage of NodeBuilder in IndexDefinition
Use constructor which uses NodeState
Modified:
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
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=1772618&r1=1772617&r2=1772618&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:05 2016
@@ -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), true);
+ Directory d = new OakDirectory(defnBuilder, indexDirName, new
IndexDefinition(root, defnBuilder.getNodeState()), true);
IndexReader r = DirectoryReader.open(d);
return r.numDocs();
}
Modified:
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexTest.java?rev=1772618&r1=1772617&r2=1772618&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexTest.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexTest.java
Mon Dec 5 09:58:05 2016
@@ -350,8 +350,8 @@ public class LuceneIndexTest {
//Ensure that Lucene actually removes deleted docs
NodeBuilder idx =
builder.child(INDEX_DEFINITIONS_NAME).child("lucene");
- purgeDeletedDocs(idx, new IndexDefinition(root, idx));
- int numDeletes = getDeletedDocCount(idx, new IndexDefinition(root,
idx));
+ purgeDeletedDocs(idx, new IndexDefinition(root, idx.getNodeState()));
+ int numDeletes = getDeletedDocCount(idx, new IndexDefinition(root,
idx.getNodeState()));
Assert.assertEquals(0, numDeletes);
//Update the IndexSearcher
