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

[ch...@apache.org]

Author: chetanm
Date: Tue Jul 11 05:15:48 2017
New Revision: 1801558

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

-- Add attributes while creating checkpoint similar to ones added in AsyncIndexUpdate
-- If checkpoint is already provided then that one is used instead of
  creating a new one

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=1801558&r1=1801557&r2=1801558&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 Jul 11 05:15:48 2017
@@ -22,6 +22,7 @@ package org.apache.jackrabbit.oak.index;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Path;
+import java.util.Calendar;
 import java.util.concurrent.TimeUnit;
 
 import com.google.common.base.Stopwatch;
@@ -36,6 +37,7 @@ import org.apache.jackrabbit.oak.run.cli
 import org.apache.jackrabbit.oak.run.cli.NodeStoreFixtureProvider;
 import org.apache.jackrabbit.oak.run.cli.Options;
 import org.apache.jackrabbit.oak.run.commons.Command;
+import org.apache.jackrabbit.util.ISO8601;
 import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -186,9 +188,16 @@ public class IndexCommand implements Com
     }
 
     private String connectInReadWriteModeAndCreateCheckPoint(IndexOptions indexOpts) throws Exception {
+        String checkpoint = indexOpts.getCheckpoint();
+        if (checkpoint != null){
+            log.info("Using provided checkpoint [{}]", checkpoint);
+            return checkpoint;
+        }
+
         try (NodeStoreFixture fixture = NodeStoreFixtureProvider.create(opts)) {
-            return fixture.getStore().checkpoint(TimeUnit.DAYS.toMillis(100),
-                    ImmutableMap.of("creator", "oak-run-indexer"));
+            return fixture.getStore().checkpoint(TimeUnit.DAYS.toMillis(100), ImmutableMap.of(
+                    "creator", IndexCommand.class.getSimpleName(),
+                    "created", now()));
         }
     }
 
@@ -252,6 +261,10 @@ public class IndexCommand implements Com
         }
     }
 
+    private static String now() {
+        return ISO8601.format(Calendar.getInstance());
+    }
+
 
     static Path getPath(File file) {
         return file.toPath().normalize().toAbsolutePath();