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

[ch...@apache.org]

Author: chetanm
Date: Tue May 23 09:39:47 2017
New Revision: 1795886

URL: http://svn.apache.org/viewvc?rev=1795886&view=rev
Log:
OAK-6210 - Provide a consistent and extensible way to handle oak-run options while creating NodeStore

Make use of StatisticsProvider

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=1795886&r1=1795885&r2=1795886&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 Tue May 23 09:39:47 2017
@@ -34,6 +34,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.stats.StatisticsProvider;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
@@ -67,7 +68,7 @@ public class IndexCommand implements Com
         try (Closer closer = Closer.create()) {
             closer.register(fixture);
 
-            execute(fixture.getStore(), fixture.getBlobStore(), indexOpts, closer);
+            execute(fixture.getStore(), fixture.getBlobStore(), fixture.getStatisticsProvider(), indexOpts, closer);
             tellReportPaths();
         }
     }
@@ -86,8 +87,9 @@ public class IndexCommand implements Com
         }
     }
 
-    private void execute(NodeStore store, BlobStore blobStore, IndexOptions indexOpts, Closer closer) throws IOException, CommitFailedException {
-        IndexHelper indexHelper = new IndexHelper(store, blobStore, indexOpts.getOutDir(),
+    private void execute(NodeStore store, BlobStore blobStore, StatisticsProvider statisticsProvider,
+                         IndexOptions indexOpts, Closer closer) throws IOException, CommitFailedException {
+        IndexHelper indexHelper = new IndexHelper(store, blobStore, statisticsProvider, indexOpts.getOutDir(),
                 indexOpts.getWorkDir(), indexOpts.getIndexPaths());
 
         closer.register(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=1795886&r1=1795885&r2=1795886&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 Tue May 23 09:39:47 2017
@@ -67,10 +67,13 @@ class IndexHelper implements Closeable{
     private Executor executor;
     private final Closer closer = Closer.create();
     private final BlobStore blobStore;
+    private final StatisticsProvider statisticsProvider;
 
-    IndexHelper(NodeStore store, BlobStore blobStore, File outputDir, File workDir, List<String> indexPaths) {
+    IndexHelper(NodeStore store, BlobStore blobStore, StatisticsProvider statisticsProvider,
+                File outputDir, File workDir, List<String> indexPaths) {
         this.store = store;
         this.blobStore = blobStore;
+        this.statisticsProvider = statisticsProvider;
         this.outputDir = outputDir;
         this.workDir = workDir;
         this.indexPaths = ImmutableList.copyOf(indexPaths);
@@ -125,7 +128,7 @@ class IndexHelper implements Closeable{
     }
 
     public StatisticsProvider getStatisticsProvider(){
-        return StatisticsProvider.NOOP; //TODO Wire in a real stats provider based on metric
+        return statisticsProvider;
     }
 
     public BlobStore getBlobStore() {