You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by ch...@apache.org on 2017/07/11 08:45:40 UTC
svn commit: r1801571 - in /jackrabbit/oak/trunk/oak-lucene/src:
main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/LuceneIndexImporter.java
test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/LuceneIndexImporterTest.java
Author: chetanm
Date: Tue Jul 11 08:45:40 2017
New Revision: 1801571
URL: http://svn.apache.org/viewvc?rev=1801571&view=rev
Log:
OAK-6271 - Support for importing index files
Fix the test logic to properly check that previous state is cleaned
Modified:
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/LuceneIndexImporter.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/LuceneIndexImporterTest.java
Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/LuceneIndexImporter.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/LuceneIndexImporter.java?rev=1801571&r1=1801570&r2=1801571&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/LuceneIndexImporter.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/LuceneIndexImporter.java Tue Jul 11 08:45:40 2017
@@ -54,7 +54,7 @@ public class LuceneIndexImporter impleme
//TODO The indexFormatVersion would be considered latest. Need to be revisited
//if off line indexing uses older Lucene
- definitionBuilder.getChildNode(IndexDefinition.STATUS_NODE);
+ definitionBuilder.getChildNode(IndexDefinition.STATUS_NODE).remove();
ReindexOperations reindexOps = new ReindexOperations(root, definitionBuilder, localIndex.getJcrPath());
IndexDefinition definition = reindexOps.apply(true);
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=1801571&r1=1801570&r2=1801571&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 Tue Jul 11 08:45:40 2017
@@ -82,17 +82,17 @@ public class LuceneIndexImporterTest {
dumper.dump();
LuceneIndexImporter importer = new LuceneIndexImporter();
- NodeBuilder newBuilder = baseIndexState.builder();
+ NodeBuilder newIdxBuilder = indexState.builder().getChildNode("oak:index").getChildNode("fooIndex");
//Add a file to builder to check if existing hidden nodes are removed or not
- Directory dir3 = new OakDirectory(newBuilder, dirName, defn, false);
+ Directory dir3 = new OakDirectory(newIdxBuilder, dirName, defn, false);
createFile(dir3, "foo2.txt", "Test content");
dir3.close();
- importer.importIndex(rootState, newBuilder, dumper.getIndexDir());
+ importer.importIndex(rootState, newIdxBuilder, dumper.getIndexDir());
NodeState exportedIndexState = indexState.getChildNode("oak:index").getChildNode("fooIndex");
- NodeState importedIndexState = newBuilder.getNodeState();
+ NodeState importedIndexState = newIdxBuilder.getNodeState();
assertDirectoryEquals(defn, exportedIndexState, importedIndexState, dirName);