[IOTDB-4121] logical optimizations for ImportCsv (apache#6998)

Author: 2b3c511

cli/src/main/java/org/apache/iotdb/tool/ImportCsv.java

@@ -331,10 +331,12 @@ private static void writeDataAlignedByTime(
 
     Set<String> devices = deviceAndMeasurementNames.keySet();
     String devicesStr = StringUtils.join(devices, ",");
-    try {
-      queryType(devicesStr, headerTypeMap, "Time");
-    } catch (IoTDBConnectionException e) {
-      e.printStackTrace();
+    if (headerTypeMap.isEmpty()) {
+      try {
+        queryType(devicesStr, headerTypeMap, "Time");
+      } catch (IoTDBConnectionException e) {
+        e.printStackTrace();
+      }
     }
 
     List<String> deviceIds = new ArrayList<>();
@@ -501,7 +503,9 @@ record -> {
                 // query the data type in iotdb
                 if (!typeQueriedDevice.contains(deviceName.get())) {
                   try {
-                    hasResult = queryType(deviceName.get(), headerTypeMap, "Device");
+                    if (headerTypeMap.isEmpty()) {
+                      hasResult = queryType(deviceName.get(), headerTypeMap, "Device");
+                    }
                     typeQueriedDevice.add(deviceName.get());
                   } catch (IoTDBConnectionException e) {
                     e.printStackTrace();
@@ -829,7 +833,7 @@ private static Object typeTrans(String value, TSDataType type) {
           if (value.startsWith("\"") && value.endsWith("\"")) {
             return value.substring(1, value.length() - 1);
           }
-          return null;
+          return value;
         case BOOLEAN:
           if (!"true".equals(value) && !"false".equals(value)) {
             return null;

docs/UserGuide/Write-And-Delete-Data/CSV-Tool.md

@@ -142,12 +142,14 @@ Time,root.test.t1.str,root.test.t2.str,root.test.t2.int
 1970-01-01T08:00:00.002+08:00,"123",,
 ```
 
-The data aligned by time, and headers with data type.
+The data aligned by time, and headers with data type.（Text type data supports double quotation marks and no double quotation marks）
 
 ```sql
 Time,root.test.t1.str(TEXT),root.test.t2.str(TEXT),root.test.t2.int(INT32)
 1970-01-01T08:00:00.001+08:00,"123hello world","123\,abc",100
-1970-01-01T08:00:00.002+08:00,"123",,
+1970-01-01T08:00:00.002+08:00,123,hello world,123
+1970-01-01T08:00:00.003+08:00,"123",,
+1970-01-01T08:00:00.004+08:00,123,,12
 ```
 
 The data aligned by device, and headers without data type.
@@ -159,13 +161,13 @@ Time,Device,str,int
 1970-01-01T08:00:00.001+08:00,root.test.t2,"123\,abc",100
 ```
 
-The data aligned by device,  and headers with data type.
+The data aligned by device,  and headers with data type.(Text type data supports double quotation marks and no double quotation marks)
 
 ```sql
 Time,Device,str(TEXT),int(INT32)
 1970-01-01T08:00:00.001+08:00,root.test.t1,"123hello world",
-1970-01-01T08:00:00.002+08:00,root.test.t1,"123",
-1970-01-01T08:00:00.001+08:00,root.test.t2,"123\,abc",100
+1970-01-01T08:00:00.002+08:00,root.test.t1,hello world,123
+1970-01-01T08:00:00.003+08:00,root.test.t1,,123
 ```
 
 ### Syntax

docs/zh/UserGuide/Write-And-Delete-Data/CSV-Tool.md

@@ -142,12 +142,14 @@ Time,root.test.t1.str,root.test.t2.str,root.test.t2.int
 1970-01-01T08:00:00.002+08:00,"123",,
 ```
 
-通过时间对齐，并且header中包含数据类型的数据。
+通过时间对齐，并且header中包含数据类型的数据。（Text类型数据支持加双引号和不加双引号）
 
 ```sql
 Time,root.test.t1.str(TEXT),root.test.t2.str(TEXT),root.test.t2.int(INT32)
 1970-01-01T08:00:00.001+08:00,"123hello world","123\,abc",100
-1970-01-01T08:00:00.002+08:00,"123",,
+1970-01-01T08:00:00.002+08:00,123,hello world,123
+1970-01-01T08:00:00.003+08:00,"123",,
+1970-01-01T08:00:00.004+08:00,123,,12
 ```
 
 通过设备对齐，并且header中不包含数据类型的数据。
@@ -159,13 +161,14 @@ Time,Device,str,int
 1970-01-01T08:00:00.001+08:00,root.test.t2,"123\,abc",100
 ```
 
-通过设备对齐，并且header中包含数据类型的数据。
+通过设备对齐，并且header中包含数据类型的数据。（Text类型数据支持加双引号和不加双引号）
 
 ```sql
 Time,Device,str(TEXT),int(INT32)
 1970-01-01T08:00:00.001+08:00,root.test.t1,"123hello world",
 1970-01-01T08:00:00.002+08:00,root.test.t1,"123",
 1970-01-01T08:00:00.001+08:00,root.test.t2,"123\,abc",100
+1970-01-01T08:00:00.002+08:00,root.test.t1,hello world,123
 ```
 
 ### 运行方法