[incubator-iotdb] branch master updated: update import/export script (#150)

[do...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

dope pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git


The following commit(s) were added to refs/heads/master by this push:
     new 4d5082b  update import/export script (#150)
4d5082b is described below

commit 4d5082b91af79aa96ade9150b5c4d200f2406beb
Author: XuYi <My...@users.noreply.github.com>
AuthorDate: Mon Apr 15 19:34:22 2019 +0800

    update import/export script (#150)
---
 .../src/main/java/org/apache/iotdb/cli/tool/AbstractCsvTool.java   | 3 +--
 iotdb-cli/src/main/java/org/apache/iotdb/cli/tool/ExportCsv.java   | 5 ++---
 iotdb-cli/src/main/java/org/apache/iotdb/cli/tool/ImportCsv.java   | 7 +++----
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/iotdb-cli/src/main/java/org/apache/iotdb/cli/tool/AbstractCsvTool.java b/iotdb-cli/src/main/java/org/apache/iotdb/cli/tool/AbstractCsvTool.java
index badb8be..5045f7a 100644
--- a/iotdb-cli/src/main/java/org/apache/iotdb/cli/tool/AbstractCsvTool.java
+++ b/iotdb-cli/src/main/java/org/apache/iotdb/cli/tool/AbstractCsvTool.java
@@ -49,8 +49,7 @@ public abstract class AbstractCsvTool {
   protected static final String TIME_ZONE_ARGS = "tz";
   protected static final String TIME_ZONE_NAME = "timeZone";
   protected static final int MAX_HELP_CONSOLE_WIDTH = 92;
-  protected static final String DEFAULT_TIME_FORMAT = "ISO8601";
-  protected static final String[] SUPPORT_TIME_FORMAT = new String[]{DEFAULT_TIME_FORMAT, "default",
+  protected static final String[] SUPPORT_TIME_FORMAT = new String[]{"default",
       "long",
       "number", "timestamp", "yyyy-MM-dd HH:mm:ss", "yyyy/MM/dd HH:mm:ss", "yyyy.MM.dd HH:mm:ss",
       "yyyy-MM-dd'T'HH:mm:ss", "yyyy/MM/dd'T'HH:mm:ss", "yyyy.MM.dd'T'HH:mm:ss",
diff --git a/iotdb-cli/src/main/java/org/apache/iotdb/cli/tool/ExportCsv.java b/iotdb-cli/src/main/java/org/apache/iotdb/cli/tool/ExportCsv.java
index 33c0283..3d103d0 100644
--- a/iotdb-cli/src/main/java/org/apache/iotdb/cli/tool/ExportCsv.java
+++ b/iotdb-cli/src/main/java/org/apache/iotdb/cli/tool/ExportCsv.java
@@ -150,7 +150,7 @@ public class ExportCsv extends AbstractCsvTool {
     targetDirectory = checkRequiredArg(TARGET_FILE_ARGS, TARGET_FILE_NAME, commandLine);
     timeFormat = commandLine.getOptionValue(TIME_FORMAT_ARGS);
     if (timeFormat == null) {
-      timeFormat = DEFAULT_TIME_FORMAT;
+      timeFormat = "default";
     }
     timeZoneID = commandLine.getOptionValue(TIME_ZONE_ARGS);
     if (!targetDirectory.endsWith(File.separator)) {
@@ -295,11 +295,10 @@ public class ExportCsv extends AbstractCsvTool {
   private static void writeTime(ResultSet rs, BufferedWriter bw) throws SQLException, IOException {
     ZonedDateTime dateTime;
     switch (timeFormat) {
-      case DEFAULT_TIME_FORMAT:
       case "default":
         dateTime = ZonedDateTime.ofInstant(Instant.ofEpochMilli(rs.getLong(1)),
             zoneId);
-        bw.write(dateTime.toString() + ",");
+        bw.write(dateTime.format(DateTimeFormatter.ISO_OFFSET_DATE_TIME) + ",");
         break;
       case "timestamp":
       case "long":
diff --git a/iotdb-cli/src/main/java/org/apache/iotdb/cli/tool/ImportCsv.java b/iotdb-cli/src/main/java/org/apache/iotdb/cli/tool/ImportCsv.java
index 4ad30fe..6414d92 100644
--- a/iotdb-cli/src/main/java/org/apache/iotdb/cli/tool/ImportCsv.java
+++ b/iotdb-cli/src/main/java/org/apache/iotdb/cli/tool/ImportCsv.java
@@ -46,6 +46,7 @@ import org.apache.commons.cli.ParseException;
 import org.apache.commons.io.FileUtils;
 import org.apache.iotdb.cli.exception.ArgsErrorException;
 import org.apache.iotdb.jdbc.Config;
+import org.apache.iotdb.jdbc.Constant;
 import org.apache.iotdb.jdbc.IoTDBConnection;
 import org.apache.thrift.TException;
 import org.slf4j.Logger;
@@ -301,11 +302,9 @@ public class ImportCsv extends AbstractCsvTool {
     DatabaseMetaData databaseMetaData = connection.getMetaData();
 
     for (int i = 1; i < strHeadInfo.length; i++) {
-      ResultSet resultSet = databaseMetaData.getColumns(null,
-          null, strHeadInfo[i], null);
+      ResultSet resultSet = databaseMetaData.getColumns(Constant.CATALOG_TIMESERIES, strHeadInfo[i], null, null);
       if (resultSet.next()) {
-        timeseriesDataType.put(resultSet.getString(1),
-            resultSet.getString(2));
+        timeseriesDataType.put(strHeadInfo[i], resultSet.getString(2));
       } else {
         String errorInfo = String.format("Database cannot find %s in %s, stop import!",
             strHeadInfo[i], file.getAbsolutePath());