Changeset 4135

Timestamp:

2010-07-12 11:46:09 (3 years ago)

Author:

bruno

Message:

Import tool: support an option such that only the schema part of the import file is imported. Introduce commons-cli for options parsing (syntax slightly changed). Support reading multiple import files.

Location:

projects/lily/trunk/tools/import

Files:

• README.txt (modified) (1 diff)
• pom.xml (modified) (1 diff)
• src/main/java/org/lilycms/tools/import_/JsonImportTool.java (modified) (5 diffs)

projects/lily/trunk/tools/import/README.txt

@@ -13 +13 @@
 In a source setting, you can run this tool with maven:
 
-mvn exec:java -Dexec.args="sample.json localhost:2181"
+mvn exec:java -Dexec.args="-z localhost:2181 sample.json"

projects/lily/trunk/tools/import/pom.xml

@@ -52 +52 @@
       <artifactId>lily-client</artifactId>
     </dependency>
+    <dependency>
+      <groupId>commons-cli</groupId>
+      <artifactId>commons-cli</artifactId>
+      <version>1.2</version>
+    </dependency>
   </dependencies>
 

projects/lily/trunk/tools/import/src/main/java/org/lilycms/tools/import_/JsonImportTool.java

@@ -1 +1 @@
 package org.lilycms.tools.import_;
 
+import org.apache.commons.cli.*;
 import org.codehaus.jackson.JsonFactory;
 import org.codehaus.jackson.JsonNode;
@@ -11 +12 @@
 import org.lilycms.repository.api.*;
 import org.lilycms.repoutil.VersionTag;
+import org.lilycms.util.io.Closer;
 
 import static org.lilycms.repoutil.JsonUtil.*;
@@ -24 +26 @@
     private TypeManager typeManager;
 
+    private static final String DEFAULT_ZK_CONNECT = "localhost:2181";
+
     public static void main(String[] args) throws Exception {
-        if (args.length != 2) {
-            System.out.println("Specify two arguments: file to import, zookeeper connect string");
+        Options cliOptions = new Options();
+
+        Option zkOption = OptionBuilder
+                .withArgName("quorum")
+                .hasArg()
+                .withDescription("Zookeeper quorum: hostname1:port,hostname2:port,...")
+                .withLongOpt("zookeeper")
+                .create("z");
+        cliOptions.addOption(zkOption);
+
+        Option schemaOnlyOption = OptionBuilder
+                .withDescription("Only import the field types and record types, not the records.")
+                .withLongOpt("schema-only")
+                .create("s");
+        cliOptions.addOption(schemaOnlyOption);
+
+        Option helpOption = new Option("h", "help", false, "Shows help");
+        cliOptions.addOption(helpOption);
+
+        CommandLineParser parser = new PosixParser();
+        CommandLine cmd = null;
+        boolean showHelp = false;
+        try {
+            cmd = parser.parse(cliOptions, args);
+        } catch (ParseException e) {
+            showHelp = true;
+        }
+
+        if (showHelp || cmd.hasOption(helpOption.getOpt())) {
+            printHelp(cliOptions);
             System.exit(1);
         }
 
-        String fileName = args[0];
-        String zookeeperConnectString = args[1];
+        if (cmd.getArgList().size() < 1) {
+            System.out.println("No import file specified!");
+            System.exit(1);
+        }
+
+        String zookeeperConnectString;
+        if (!cmd.hasOption(zkOption.getOpt())) {
+            System.out.println("Zookeeper quorum not specified, using default: " + DEFAULT_ZK_CONNECT);
+            zookeeperConnectString = DEFAULT_ZK_CONNECT;
+        } else {
+            zookeeperConnectString = cmd.getOptionValue(zkOption.getOpt());
+        }
+
+        boolean schemaOnly = cmd.hasOption(schemaOnlyOption.getOpt());
 
         Client client = new Client(zookeeperConnectString);
 
-        InputStream is = new FileInputStream(fileName);
-        load(client.getRepository(), is);
-    }
-
-    public static void load(Repository repository, InputStream is) throws Exception {
-        load(repository, new DefaultImportListener(), is);
-    }
-
-    public static void load(Repository repository, ImportListener importListener, InputStream is) throws Exception {
-        new JsonImportTool(repository, importListener).load(is);
+        for (String arg : (List<String>)cmd.getArgList()) {
+            System.out.println("----------------------------------------------------------------------");
+            System.out.println("Importing " + arg);
+            InputStream is = new FileInputStream(arg);
+            try {
+                load(client.getRepository(), is, schemaOnly);
+            } finally {
+                Closer.close(is);
+            }
+        }
+    }
+
+    private static void printHelp(Options cliOptions) {
+        HelpFormatter help = new HelpFormatter();
+        help.setArgName("[import file]");
+        help.printHelp("lily-import", cliOptions, true);
+    }
+
+    public static void load(Repository repository, InputStream is, boolean schemaOnly) throws Exception {
+        load(repository, new DefaultImportListener(), is, schemaOnly);
+    }
+
+    public static void load(Repository repository, ImportListener importListener, InputStream is, boolean schemaOnly)
+            throws Exception {
+        new JsonImportTool(repository, importListener).load(is, schemaOnly);
     }
 
@@ -57 +116 @@
     }
 
-    public void load(InputStream is) throws Exception {
+    public void load(InputStream is, boolean schemaOnly) throws Exception {
         // A combination of the Jackson streaming and tree APIs is used: we move streaming through the
         // whole of the file, but use the tree API to load individual items (field types, records, ...).
@@ -109 +168 @@
                 }
             } else if (fieldName.equals("records")) {
-                if (current == JsonToken.START_ARRAY) {
-                    while (jp.nextToken() != JsonToken.END_ARRAY) {
-                        importRecord(jp.readValueAsTree());
+                if (!schemaOnly) {
+                    if (current == JsonToken.START_ARRAY) {
+                        while (jp.nextToken() != JsonToken.END_ARRAY) {
+                            importRecord(jp.readValueAsTree());
+                        }
+                    } else {
+                        System.out.println("Error: records property should be an array. Skipping.");
+                        jp.skipChildren();
                     }
                 } else {
-                    System.out.println("Error: records property should be an array. Skipping.");
-                    jp.skipChildren();
+                    jp.skipChildren();                    
                 }
             }