From 3b7bf92edf1957b28625e6f92ccae58f2e38859c Mon Sep 17 00:00:00 2001
From: zyyang <zyyang@taosdata.com>
Date: Wed, 2 Mar 2022 16:08:07 +0800
Subject: [PATCH] invoke load driver in static block

---
 .../datax/plugin/reader/TDengineReader.java   | 33 +++---------
 .../resources/incremental_sync/t2dm-jni.json  | 50 +++++++++++++++++++
 .../incremental_sync/t2dm-restful.json        | 50 +++++++++++++++++++
 .../test/resources/incremental_sync/upload.sh |  3 +-
 4 files changed, 108 insertions(+), 28 deletions(-)
 create mode 100644 tdenginewriter/src/test/resources/incremental_sync/t2dm-jni.json
 create mode 100644 tdenginewriter/src/test/resources/incremental_sync/t2dm-restful.json

diff --git a/tdenginereader/src/main/java/com/alibaba/datax/plugin/reader/TDengineReader.java b/tdenginereader/src/main/java/com/alibaba/datax/plugin/reader/TDengineReader.java
index 6c2f1223..aea75f83 100644
--- a/tdenginereader/src/main/java/com/alibaba/datax/plugin/reader/TDengineReader.java
+++ b/tdenginereader/src/main/java/com/alibaba/datax/plugin/reader/TDengineReader.java
@@ -16,8 +16,6 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 public class TDengineReader extends Reader {
 
@@ -239,32 +237,13 @@ public class TDengineReader extends Reader {
         }
     }
 
-    private static Long parseSplitInterval(String splitInterval) throws Exception {
-        final long second = 1000;
-        final long minute = 60 * second;
-        final long hour = 60 * minute;
-        final long day = 24 * hour;
-
-        Pattern compile = Pattern.compile("^(\\d+)([dhms])$");
-        Matcher matcher = compile.matcher(splitInterval);
-        while (matcher.find()) {
-            long value = Long.parseLong(matcher.group(1));
-            if (value == 0)
-                throw new Exception("invalid splitInterval: 0");
-            char unit = matcher.group(2).charAt(0);
-            switch (unit) {
-                case 'd':
-                    return value * day;
-                default:
-                case 'h':
-                    return value * hour;
-                case 'm':
-                    return value * minute;
-                case 's':
-                    return value * second;
-            }
+    static {
+        try {
+            Class.forName("com.taosdata.jdbc.TSDBDriver");
+            Class.forName("com.taosdata.jdbc.rs.RestfulDriver");
+        } catch (ClassNotFoundException e) {
+            e.printStackTrace();
         }
-        throw new Exception("invalid splitInterval: " + splitInterval);
     }
 
 }
diff --git a/tdenginewriter/src/test/resources/incremental_sync/t2dm-jni.json b/tdenginewriter/src/test/resources/incremental_sync/t2dm-jni.json
new file mode 100644
index 00000000..341f6293
--- /dev/null
+++ b/tdenginewriter/src/test/resources/incremental_sync/t2dm-jni.json
@@ -0,0 +1,50 @@
+{
+  "job": {
+    "content": [
+      {
+        "reader": {
+          "name": "tdenginereader",
+          "parameter": {
+            "username": "root",
+            "password": "taosdata",
+            "column": [
+              "*"
+            ],
+            "connection": [
+              {
+                "table": [
+                  "stb1"
+                ],
+                "jdbcUrl": "jdbc:TAOS://192.168.56.105:6030/db1"
+              }
+            ]
+          }
+        },
+        "writer": {
+          "name": "rdbmswriter",
+          "parameter": {
+            "connection": [
+              {
+                "table": [
+                  "stb2"
+                ],
+                "jdbcUrl": "jdbc:dm://192.168.0.72:5236"
+              }
+            ],
+            "username": "TESTUSER",
+            "password": "test123456",
+            "table": "stb2",
+            "column": [
+              "*"
+            ]
+          }
+        }
+      }
+    ],
+    "setting": {
+      "speed": {
+        "channel": 1
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/tdenginewriter/src/test/resources/incremental_sync/t2dm-restful.json b/tdenginewriter/src/test/resources/incremental_sync/t2dm-restful.json
new file mode 100644
index 00000000..b2cf91e2
--- /dev/null
+++ b/tdenginewriter/src/test/resources/incremental_sync/t2dm-restful.json
@@ -0,0 +1,50 @@
+{
+  "job": {
+    "content": [
+      {
+        "reader": {
+          "name": "tdenginereader",
+          "parameter": {
+            "username": "root",
+            "password": "taosdata",
+            "column": [
+              "*"
+            ],
+            "connection": [
+              {
+                "table": [
+                  "stb1"
+                ],
+                "jdbcUrl": "jdbc:TAOS-RS://192.168.56.105:6041/db1"
+              }
+            ]
+          }
+        },
+        "writer": {
+          "name": "rdbmswriter",
+          "parameter": {
+            "connection": [
+              {
+                "table": [
+                  "stb2"
+                ],
+                "jdbcUrl": "jdbc:dm://192.168.0.72:5236"
+              }
+            ],
+            "username": "TESTUSER",
+            "password": "test123456",
+            "table": "stb2",
+            "column": [
+              "*"
+            ]
+          }
+        }
+      }
+    ],
+    "setting": {
+      "speed": {
+        "channel": 1
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/tdenginewriter/src/test/resources/incremental_sync/upload.sh b/tdenginewriter/src/test/resources/incremental_sync/upload.sh
index c7d11ca1..9b2a35e3 100755
--- a/tdenginewriter/src/test/resources/incremental_sync/upload.sh
+++ b/tdenginewriter/src/test/resources/incremental_sync/upload.sh
@@ -2,4 +2,5 @@
 
 scp dm2t-update.json root@192.168.56.105:/root/workspace/tmp/datax/job
 scp dm2t_sync.sh root@192.168.56.105:/root/workspace/tmp/datax
-scp clean_env.sh root@192.168.56.105:/root/workspace/tmp/datax
\ No newline at end of file
+scp clean_env.sh root@192.168.56.105:/root/workspace/tmp/datax
+scp
\ No newline at end of file