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/05/31 05:28:21 UTC

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

Author: chetanm
Date: Wed May 31 05:28:21 2017
New Revision: 1796976

URL: http://svn.apache.org/viewvc?rev=1796976&view=rev
Log:
OAK-6081 - Indexing tooling via oak-run

Clean output directory at start

Modified:
    jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/IndexCommand.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=1796976&r1=1796975&r2=1796976&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 Wed May 31 05:28:21 2017
@@ -72,7 +72,7 @@ public class IndexCommand implements Com
         NodeStoreFixture fixture = NodeStoreFixtureProvider.create(opts);
         try (Closer closer = Closer.create()) {
             closer.register(fixture);
-            cleanWorkDir(indexOpts.getWorkDir());
+            setupDirectories(indexOpts);
             StatisticsProvider statisticsProvider = WhiteboardUtils.getService(fixture.getWhiteboard(), StatisticsProvider.class);
             execute(fixture.getStore(), fixture.getBlobStore(), statisticsProvider, indexOpts, closer);
             tellReportPaths();
@@ -158,6 +158,11 @@ public class IndexCommand implements Com
         }
     }
 
+    private static void setupDirectories(IndexOptions indexOpts) throws IOException {
+        FileUtils.cleanDirectory(indexOpts.getOutDir());
+        cleanWorkDir(indexOpts.getWorkDir());
+    }
+
     private static void cleanWorkDir(File workDir) throws IOException {
         //TODO Do not clean if restarting
         String[] dirListing = workDir.list();