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

[chetanm]

Author: chetanm
Date: Wed May 31 05:54:01 2017
New Revision: 1796979

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

Specify an explicit subdirectory for storing the output results

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/IndexOptions.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=1796979&r1=1796978&r2=1796979&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:54:01 2017
@@ -159,7 +159,9 @@ public class IndexCommand implements Com
     }
 
     private static void setupDirectories(IndexOptions indexOpts) throws 
IOException {
-        FileUtils.cleanDirectory(indexOpts.getOutDir());
+        if (indexOpts.getOutDir().exists()) {
+            FileUtils.cleanDirectory(indexOpts.getOutDir());
+        }
         cleanWorkDir(indexOpts.getWorkDir());
     }
 

Modified: 
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/IndexOptions.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/IndexOptions.java?rev=1796979&r1=1796978&r2=1796979&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/IndexOptions.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/IndexOptions.java
 Wed May 31 05:54:01 2017
@@ -64,7 +64,7 @@ public class IndexOptions implements Opt
         workDirOpt = parser.accepts("index-temp-dir", "Directory used for 
storing temporary files")
                 .withRequiredArg().ofType(File.class).defaultsTo(new 
File("temp"));
         outputDirOpt = parser.accepts("index-out-dir", "Directory used for 
output files")
-                .withRequiredArg().ofType(File.class).defaultsTo(new 
File("."));
+                .withRequiredArg().ofType(File.class).defaultsTo(new 
File("indexing-result"));
 
         stats = parser.accepts("index-info", "Collects and dumps various 
statistics related to the indexes");
         definitions = parser.accepts("index-definitions", "Collects and dumps 
index definitions");