Combine CSV SQL TSfile data import/export script (apache#13930) (apache#14191)

* [To rc/1.3.3] Combine CSV SQL TSfile data import/export script (apache#13930)

Co-authored-by: 2b3c511 <[email protected]>

* delete type_info parma in import_data.sh -ft sql (apache#14103)

Co-authored-by: 2b3c511 <[email protected]>

---------

Co-authored-by: 2b3c511 <[email protected]>

Author: 2b3c511

integration-test/src/test/java/org/apache/iotdb/tools/it/ExportDataTestIT.java

@@ -89,6 +89,8 @@ protected void testOnWindows() throws IOException {
             "root",
             "-pw",
             "root",
+            "-ft",
+            "csv",
             "-t",
             "target",
             "-q",
@@ -115,6 +117,8 @@ protected void testOnWindows() throws IOException {
             "root",
             "-pw",
             "root",
+            "-ft",
+            "csv",
             "-t",
             "target",
             "-q",
@@ -143,7 +147,7 @@ protected void testOnWindows() throws IOException {
             "root",
             "-t",
             "target",
-            "-type",
+            "-ft",
             "sql",
             "-q",
             "select * from root.test.t2 where time > 1 and time < 1000000000000",
@@ -170,6 +174,8 @@ protected void testOnUnix() throws IOException {
             "root",
             "-pw",
             "root",
+            "-ft",
+            "csv",
             "-t",
             "target",
             "-q",
@@ -195,6 +201,8 @@ protected void testOnUnix() throws IOException {
             "root",
             "-t",
             "target",
+            "-ft",
+            "csv",
             "-q",
             "select * from root.**");
     builder1.environment().put("CLASSPATH", libPath);
@@ -218,7 +226,7 @@ protected void testOnUnix() throws IOException {
             "root",
             "-t",
             "target",
-            "-type",
+            "-ft",
             "sql",
             "-q",
             "select * from root.test.t2 where time > 1 and time < 1000000000000");

integration-test/src/test/java/org/apache/iotdb/tools/it/ImportDataTestIT.java

@@ -74,7 +74,7 @@ public void test() throws IOException {
   @Override
   protected void testOnWindows() throws IOException {
     final String[] output = {
-      "The file name must end with \"csv\" or \"txt\"!",
+      "Source file or directory ./csv/ does not exist",
     };
     ProcessBuilder builder =
         new ProcessBuilder(
@@ -89,19 +89,21 @@ protected void testOnWindows() throws IOException {
             "root",
             "-pw",
             "root",
+            "-ft",
+            "csv",
             "-s",
-            "./",
+            "./csv/",
             "&",
             "exit",
             "%^errorlevel%");
     builder.environment().put("CLASSPATH", libPath);
-    testOutput(builder, output, 0);
+    testOutput(builder, output, 1);
   }
 
   @Override
   protected void testOnUnix() throws IOException {
     final String[] output = {
-      "The file name must end with \"csv\" or \"txt\"!",
+      "Source file or directory ./csv/ does not exist",
     };
     ProcessBuilder builder =
         new ProcessBuilder(
@@ -115,9 +117,11 @@ protected void testOnUnix() throws IOException {
             "root",
             "-pw",
             "root",
+            "-ft",
+            "csv",
             "-s",
-            "./");
+            "./csv/");
     builder.environment().put("CLASSPATH", libPath);
-    testOutput(builder, output, 0);
+    testOutput(builder, output, 1);
   }
 }

iotdb-client/cli/src/assembly/resources/tools/export-data.bat

@@ -21,9 +21,9 @@
 
 title IoTDB Export
 
-echo ````````````````````````````````````````````````
-echo Starting IoTDB Client Export Script
-echo ````````````````````````````````````````````````
+@REM echo ````````````````````````````````````````````````
+@REM echo Starting IoTDB Client Export Script
+@REM echo ````````````````````````````````````````````````
 
 if "%OS%" == "Windows_NT" setlocal
 

iotdb-client/cli/src/assembly/resources/tools/export-data.sh

@@ -18,9 +18,9 @@
 # under the License.
 #
 
-echo ------------------------------------------
-echo Starting IoTDB Client Export Script
-echo ------------------------------------------
+#echo ------------------------------------------
+#echo Starting IoTDB Client Export Script
+#echo ------------------------------------------
 
 if [ -z "${IOTDB_INCLUDE}" ]; then
   #do nothing

iotdb-client/cli/src/assembly/resources/tools/import-data.bat

@@ -21,9 +21,9 @@
 
 title IoTDB Import
 
-echo ````````````````````````````````````````````````
-echo Starting IoTDB Client Import Script
-echo ````````````````````````````````````````````````
+@REM echo ````````````````````````````````````````````````
+@REM echo Starting IoTDB Client Import Script
+@REM echo ````````````````````````````````````````````````
 
 if "%OS%" == "Windows_NT" setlocal
 

iotdb-client/cli/src/assembly/resources/tools/import-data.sh

@@ -18,9 +18,9 @@
 # under the License.
 #
 
-echo ------------------------------------------
-echo Starting IoTDB Client Import Script
-echo ------------------------------------------
+#echo ------------------------------------------
+#echo Starting IoTDB Client Import Script
+#echo ------------------------------------------
 
 if [ -z "${IOTDB_INCLUDE}" ]; then
   #do nothing