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/10 08:47:04 UTC
svn commit: r1801423 -
/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/OutOfBandIndexer.java
Author: chetanm
Date: Mon Jul 10 08:47:04 2017
New Revision: 1801423
URL: http://svn.apache.org/viewvc?rev=1801423&view=rev
Log:
OAK-6271 - Support for importing index files
Switch to IndexerInfo to manage the meta files for exported indexes
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/OutOfBandIndexer.java
Modified: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/OutOfBandIndexer.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/OutOfBandIndexer.java?rev=1801423&r1=1801422&r2=1801423&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/OutOfBandIndexer.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/OutOfBandIndexer.java Mon Jul 10 08:47:04 2017
@@ -41,7 +41,7 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.index.IndexUpdate;
import org.apache.jackrabbit.oak.plugins.index.IndexUpdateCallback;
import org.apache.jackrabbit.oak.plugins.index.NodeTraversalCallback;
-import org.apache.jackrabbit.oak.plugins.index.counter.jmx.NodeCounter;
+import org.apache.jackrabbit.oak.plugins.index.importer.IndexerInfo;
import org.apache.jackrabbit.oak.plugins.index.lucene.directory.DirectoryFactory;
import org.apache.jackrabbit.oak.plugins.index.lucene.directory.FSDirectoryFactory;
import org.apache.jackrabbit.oak.plugins.index.progress.MetricRateEstimator;
@@ -85,12 +85,6 @@ public class OutOfBandIndexer implements
* stored
*/
public static final String LOCAL_INDEX_ROOT_DIR = "indexes";
- /**
- * File name stored in final index directory which contains meta
- * information like checkpoint details. This can be used by
- * importer while importing the indexes
- */
- private static final String INDEXER_META = "indexer-info.txt";
/**
* Checkpoint value which indicate that head state needs to be used
@@ -254,11 +248,7 @@ public class OutOfBandIndexer implements
}
private void writeMetaInfo() throws IOException {
- Properties props = new Properties();
- props.put("checkpoint", checkpoint);
- try (OutputStream os = FileUtils.openOutputStream(new File(getLocalIndexDir(), INDEXER_META))) {
- props.store(os, "Indexer info");
- }
+ new IndexerInfo(getLocalIndexDir(), checkpoint).save();
}
private File copyIndexFilesToOutput() throws IOException {