Merge pull request #1571 from dingxiaobo/mergeUpstream

tdengine updates from @zyyang-taosdata
alibaba · Oct 26, 2022 · f4fe220 · f4fe220
2 parents 0783394 + 8fadb0c
commit f4fe220
Show file tree

Hide file tree

Showing 27 changed files with 840 additions and 191 deletions.
diff --git a/tdenginereader/pom.xml b/tdenginereader/pom.xml
@@ -29,11 +29,6 @@
             </exclusions>
         </dependency>
 
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>fastjson</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>com.alibaba.datax.tdenginewriter</groupId>
             <artifactId>tdenginewriter</artifactId>
@@ -44,13 +39,7 @@
         <dependency>
             <groupId>com.taosdata.jdbc</groupId>
             <artifactId>taos-jdbcdriver</artifactId>
-            <version>2.0.37</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.alibaba</groupId>
-                    <artifactId>fastjson</artifactId>
-                </exclusion>
-            </exclusions>
+            <version>2.0.39</version>
         </dependency>
 
         <dependency>

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
@@ -93,7 +93,7 @@ public void init() {
             }
             if (start >= end)
                 throw DataXException.asDataXException(TDengineReaderErrorCode.ILLEGAL_VALUE,
-                        "The parameter " + Key.BEGIN_DATETIME + ": " + beginDatetime + " should be less than the parameter " + Key.END_DATETIME + ": " + endDatetime + ".");
+                        "The parameter [" + Key.BEGIN_DATETIME + "] should be less than the parameter [" + Key.END_DATETIME + "].");
 
         }
 
@@ -119,6 +119,7 @@ public List<Configuration> split(int adviceNumber) {
                 }
             }
 
+            LOG.info("Configuration: {}", configurations);
             return configurations;
         }
     }

diff --git a/tdenginewriter/doc/tdenginewriter-CN.md b/tdenginewriter/doc/tdenginewriter-CN.md
@@ -175,8 +175,8 @@ datax中的数据类型，可以映射到TDengine的数据类型
 | TDengine到TDengine | [超级表到子表](../src/test/resources/t2t-3.json)             |
 | TDengine到TDengine | [普通表到普通表](../src/test/resources/t2t-4.json)           |
 | RDBMS到TDengine    | [普通表到超级表，指定tbname](../src/test/resources/dm2t-1.json) |
-| RDBMS到TDengine    | [普通表到超级表，不指定tbname](../src/test/resources/dm2t-2.json) |
-| RDBMS到TDengine    | [普通表到子表](../src/test/resources/dm2t-3.json)            |
+| RDBMS到TDengine    | [普通表到超级表，不指定tbname](../src/test/resources/dm2t-3.json) |
+| RDBMS到TDengine    | [普通表到子表](../src/test/resources/dm2t-2.json)            |
 | RDBMS到TDengine    | [普通表到普通表](../src/test/resources/dm2t-4.json)          |
 | OpenTSDB到TDengine | [metric到普通表](../src/test/resources/o2t-1.json)           |
 

diff --git a/tdenginewriter/pom.xml b/tdenginewriter/pom.xml
@@ -20,21 +20,10 @@
 
     <dependencies>
 
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>fastjson</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>com.taosdata.jdbc</groupId>
             <artifactId>taos-jdbcdriver</artifactId>
-            <version>2.0.37</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.alibaba</groupId>
-                    <artifactId>fastjson</artifactId>
-                </exclusion>
-            </exclusions>
+            <version>2.0.39</version>
         </dependency>
 
         <dependency>
@@ -73,6 +62,7 @@
             <version>5.1.49</version>
             <scope>test</scope>
         </dependency>
+
         <!-- 添加 dm8 jdbc jar 包依赖-->
         <!--        <dependency>-->
         <!--            <groupId>com.dameng</groupId>-->

diff --git a/tdenginewriter/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/Constants.java b/tdenginewriter/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/Constants.java
@@ -1,6 +1,8 @@
 package com.alibaba.datax.plugin.writer.tdenginewriter;
 
 public class Constants {
-    public static final int DEFAULT_BATCH_SIZE = 1000;
+    public static final String DEFAULT_USERNAME = "root";
+    public static final String DEFAULT_PASSWORD = "taosdata";
+    public static final int DEFAULT_BATCH_SIZE = 1;
     public static final boolean DEFAULT_IGNORE_TAGS_UNMATCHED = false;
 }