svn commit: r1801438 - in /jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index: IndexCommand.java IndexHelper.java

[chetanm]

Author: chetanm
Date: Mon Jul 10 10:33:41 2017
New Revision: 1801438

URL: http://svn.apache.org/viewvc?rev=1801438&view=rev
Log:
OAK-6271 - Support for importing index files

Pass the Whiteboard itself to IndexHelper. This would later used to fetch
other objects like MongoDocumentStore etc

Modified:
    
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/IndexCommand.java
    
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/IndexHelper.java

Modified: 
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/IndexCommand.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/IndexCommand.java?rev=1801438&r1=1801437&r2=1801438&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/IndexCommand.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/IndexCommand.java
 Mon Jul 10 10:33:41 2017
@@ -35,8 +35,7 @@ import org.apache.jackrabbit.oak.run.cli
 import org.apache.jackrabbit.oak.run.commons.Command;
 import org.apache.jackrabbit.oak.spi.blob.BlobStore;
 import org.apache.jackrabbit.oak.spi.state.NodeStore;
-import org.apache.jackrabbit.oak.spi.whiteboard.WhiteboardUtils;
-import org.apache.jackrabbit.oak.stats.StatisticsProvider;
+import org.apache.jackrabbit.oak.spi.whiteboard.Whiteboard;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -76,8 +75,7 @@ public class IndexCommand implements Com
         NodeStoreFixture fixture = NodeStoreFixtureProvider.create(opts);
         try (Closer closer = Closer.create()) {
             closer.register(fixture);
-            StatisticsProvider statisticsProvider = 
WhiteboardUtils.getService(fixture.getWhiteboard(), StatisticsProvider.class);
-            execute(fixture.getStore(), fixture.getBlobStore(), 
statisticsProvider, indexOpts, closer);
+            execute(fixture.getStore(), fixture.getBlobStore(), 
fixture.getWhiteboard(), indexOpts, closer);
             tellReportPaths();
         }
     }
@@ -96,9 +94,9 @@ public class IndexCommand implements Com
         }
     }
 
-    private void execute(NodeStore store, BlobStore blobStore, 
StatisticsProvider statisticsProvider,
+    private void execute(NodeStore store, BlobStore blobStore, Whiteboard 
whiteboard,
                          IndexOptions indexOpts, Closer closer) throws 
IOException, CommitFailedException {
-        IndexHelper indexHelper = new IndexHelper(store, blobStore, 
statisticsProvider, indexOpts.getOutDir(),
+        IndexHelper indexHelper = new IndexHelper(store, blobStore, 
whiteboard, indexOpts.getOutDir(),
                 indexOpts.getWorkDir(), indexOpts.getIndexPaths());
 
         configurePreExtractionSupport(indexOpts, indexHelper);

Modified: 
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/IndexHelper.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/IndexHelper.java?rev=1801438&r1=1801437&r2=1801438&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/IndexHelper.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/IndexHelper.java
 Mon Jul 10 10:33:41 2017
@@ -55,11 +55,15 @@ import org.apache.jackrabbit.oak.spi.blo
 import org.apache.jackrabbit.oak.spi.mount.MountInfoProvider;
 import org.apache.jackrabbit.oak.spi.mount.Mounts;
 import org.apache.jackrabbit.oak.spi.state.NodeStore;
+import org.apache.jackrabbit.oak.spi.whiteboard.Whiteboard;
+import org.apache.jackrabbit.oak.spi.whiteboard.WhiteboardUtils;
 import org.apache.jackrabbit.oak.stats.StatisticsProvider;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-class IndexHelper implements Closeable{
+import static com.google.common.base.Preconditions.checkNotNull;
+
+public class IndexHelper implements Closeable{
     private final Logger log = LoggerFactory.getLogger(getClass());
     private final NodeStore store;
     private final File outputDir;
@@ -68,6 +72,7 @@ class IndexHelper implements Closeable{
     private IndexPathService indexPathService;
     private AsyncIndexInfoService asyncIndexInfoService;
     private final List<String> indexPaths;
+    private final Whiteboard whiteboard;
     private LuceneIndexHelper luceneIndexHelper;
     private Executor executor;
     private final Closer closer = Closer.create();
@@ -75,11 +80,12 @@ class IndexHelper implements Closeable{
     private final StatisticsProvider statisticsProvider;
     private ExtractedTextCache extractedTextCache;
 
-    IndexHelper(NodeStore store, BlobStore blobStore, StatisticsProvider 
statisticsProvider,
+    IndexHelper(NodeStore store, BlobStore blobStore, Whiteboard whiteboard,
                 File outputDir, File workDir, List<String> indexPaths) {
         this.store = store;
         this.blobStore = blobStore;
-        this.statisticsProvider = statisticsProvider;
+        this.whiteboard = whiteboard;
+        this.statisticsProvider = 
checkNotNull(WhiteboardUtils.getService(whiteboard, StatisticsProvider.class));
         this.outputDir = outputDir;
         this.workDir = workDir;
         this.indexPaths = ImmutableList.copyOf(indexPaths);