svn commit: r1860564 - in /jackrabbit/oak/trunk/oak-run: README.md src/main/java/org/apache/jackrabbit/oak/run/ResetClusterIdCommand.java

[re...@apache.org]

Author: reschke
Date: Mon Jun  3 14:16:46 2019
New Revision: 1860564

URL: http://svn.apache.org/viewvc?rev=1860564&view=rev
Log:
OAK-8349: RDBDocumentStore*: "reset clusterId tool" in oak-run

Modified:
    jackrabbit/oak/trunk/oak-run/README.md
    jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/ResetClusterIdCommand.java

Modified: jackrabbit/oak/trunk/oak-run/README.md
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/README.md?rev=1860564&r1=1860563&r2=1860564&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/README.md (original)
+++ jackrabbit/oak/trunk/oak-run/README.md Mon Jun  3 14:16:46 2019
@@ -624,7 +624,7 @@ Reset Cluster Id
 Resets the cluster id generated internally. Use the following command after stopping the server
 
     $ java -jar oak-run-*.jar resetclusterid \
-            { /path/to/oak/repository | mongodb://host:port/database }
+            { /path/to/oak/repository | mongodb://host:port/database | jdbc:...}
 
 The cluster id will be removed and will be generated on next server start up.
 

Modified: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/ResetClusterIdCommand.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/ResetClusterIdCommand.java?rev=1860564&r1=1860563&r2=1860564&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/ResetClusterIdCommand.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/ResetClusterIdCommand.java Mon Jun  3 14:16:46 2019
@@ -19,9 +19,6 @@ package org.apache.jackrabbit.oak.run;
 import org.apache.jackrabbit.oak.api.CommitFailedException;
 import org.apache.jackrabbit.oak.api.Type;
 import org.apache.jackrabbit.oak.run.commons.Command;
-import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore;
-import org.apache.jackrabbit.oak.segment.SegmentNodeStoreBuilders;
-import org.apache.jackrabbit.oak.segment.file.FileStore;
 import org.apache.jackrabbit.oak.spi.cluster.ClusterRepositoryInfo;
 import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
 import org.apache.jackrabbit.oak.spi.commit.EmptyHook;
@@ -29,17 +26,6 @@ import org.apache.jackrabbit.oak.spi.sta
 import org.apache.jackrabbit.oak.spi.state.NodeStore;
 
 import com.google.common.io.Closer;
-import com.mongodb.MongoClient;
-import com.mongodb.MongoClientURI;
-import com.mongodb.MongoURI;
-
-import joptsimple.OptionParser;
-import joptsimple.OptionSet;
-
-import static org.apache.jackrabbit.oak.plugins.document.mongo.MongoDocumentNodeStoreBuilder.newMongoDocumentNodeStoreBuilder;
-import static org.apache.jackrabbit.oak.segment.file.FileStoreBuilder.fileStoreBuilder;
-
-import java.io.File;
 
 /**
  * OFFLINE utility to delete the clusterId stored as hidden
@@ -87,35 +73,12 @@ class ResetClusterIdCommand implements C
 
     @Override
     public void execute(String... args) throws Exception {
-        OptionParser parser = new OptionParser();
-        OptionSet options = parser.parse(args);
-
-        if (options.nonOptionArguments().isEmpty()) {
-            System.out.println("usage: resetclusterid {<path>|<mongo-uri>}");
-            System.exit(1);
-        }
-
-        String source = options.nonOptionArguments().get(0).toString();
+        String help = "resetclusterid {<path>|<mongo-uri>|<jdbc-uri>}";
+        Utils.NodeStoreOptions opts = new Utils.NodeStoreOptions(help).parse(args);
 
         Closer closer = Closer.create();
         try {
-            NodeStore store;
-            if (args[0].startsWith(MongoURI.MONGODB_PREFIX)) {
-                MongoClientURI uri = new MongoClientURI(source);
-                MongoClient client = new MongoClient(uri);
-                final DocumentNodeStore dns = newMongoDocumentNodeStoreBuilder()
-                        .setMongoDB(client, uri.getDatabase())
-                        .build();
-                closer.register(Utils.asCloseable(dns));
-                store = dns;
-            } else {
-                FileStore fileStore = fileStoreBuilder(new File(source))
-                    .withStrictVersionCheck(true)
-                    .build();
-                closer.register(fileStore);
-                store = SegmentNodeStoreBuilders.builder(fileStore).build();
-            }
-
+            NodeStore store = Utils.bootstrapNodeStore(opts, closer);
             deleteClusterId(store);
         } catch (Throwable e) {
             throw closer.rethrow(e);
@@ -123,4 +86,4 @@ class ResetClusterIdCommand implements C
             closer.close();
         }
     }
-}
\ No newline at end of file
+}