Bump gson from 2.2.4 to 2.8.9 in /otswriter

Bumps [gson](https://github.com/google/gson) from 2.2.4 to 2.8.9.
- [Release notes](https://github.com/google/gson/releases)
- [Changelog](https://github.com/google/gson/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/gson/compare/gson-2.2.4...gson-parent-2.8.9)

---
updated-dependencies:
- dependency-name: com.google.code.gson:gson
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

README.md

@@ -3,7 +3,7 @@
 
 # DataX
 
-DataX 是阿里云 [DataWorks数据集成](https://www.aliyun.com/product/bigdata/ide) 的开源版本，在阿里巴巴集团内被广泛使用的离线数据同步工具/平台。DataX 实现了包括 MySQL、Oracle、SqlServer、Postgre、HDFS、Hive、ADS、HBase、TableStore(OTS)、MaxCompute(ODPS)、Hologres、DRDS 等各种异构数据源之间高效的数据同步功能。
+DataX 是阿里云 [DataWorks数据集成](https://www.aliyun.com/product/bigdata/ide) 的开源版本，在阿里巴巴集团内被广泛使用的离线数据同步工具/平台。DataX 实现了包括 MySQL、Oracle、OceanBase、SqlServer、Postgre、HDFS、Hive、ADS、HBase、TableStore(OTS)、MaxCompute(ODPS)、Hologres、DRDS 等各种异构数据源之间高效的数据同步功能。
 
 # DataX 商业版本
 阿里云DataWorks数据集成是DataX团队在阿里云上的商业化产品，致力于提供复杂网络环境下、丰富的异构数据源之间高速稳定的数据移动能力，以及繁杂业务背景下的数据同步解决方案。目前已经支持云上近3000家客户，单日同步数据超过3万亿条。DataWorks数据集成目前支持离线50+种数据源，可以进行整库迁移、批量上云、增量同步、分库分表等各类同步解决方案。2020年更新实时同步能力，2020年更新实时同步能力，支持10+种数据源的读写任意组合。提供MySQL，Oracle等多种数据源到阿里云MaxCompute，Hologres等大数据引擎的一键全增量同步解决方案。
@@ -39,6 +39,7 @@ DataX目前已经有了比较全面的插件体系，主流的RDBMS数据库、N
 | ------------ | ---------- | :-------: | :-------: |:-------: |
 | RDBMS 关系型数据库 | MySQL      |     √     |     √     |[读](https://github.com/alibaba/DataX/blob/master/mysqlreader/doc/mysqlreader.md) 、[写](https://github.com/alibaba/DataX/blob/master/mysqlwriter/doc/mysqlwriter.md)|
 |              | Oracle     |     √     |     √     |[读](https://github.com/alibaba/DataX/blob/master/oraclereader/doc/oraclereader.md) 、[写](https://github.com/alibaba/DataX/blob/master/oraclewriter/doc/oraclewriter.md)|
+|              | OceanBase  |     √     |     √     |[读](https://open.oceanbase.com/docs/community/oceanbase-database/V3.1.0/use-datax-to-full-migration-data-to-oceanbase) 、[写](https://open.oceanbase.com/docs/community/oceanbase-database/V3.1.0/use-datax-to-full-migration-data-to-oceanbase)|
 |              | SQLServer  |     √     |     √     |[读](https://github.com/alibaba/DataX/blob/master/sqlserverreader/doc/sqlserverreader.md) 、[写](https://github.com/alibaba/DataX/blob/master/sqlserverwriter/doc/sqlserverwriter.md)|
 |              | PostgreSQL |     √     |     √     |[读](https://github.com/alibaba/DataX/blob/master/postgresqlreader/doc/postgresqlreader.md) 、[写](https://github.com/alibaba/DataX/blob/master/postgresqlwriter/doc/postgresqlwriter.md)|
 |              | DRDS |     √     |     √     |[读](https://github.com/alibaba/DataX/blob/master/drdsreader/doc/drdsreader.md) 、[写](https://github.com/alibaba/DataX/blob/master/drdswriter/doc/drdswriter.md)|
@@ -46,7 +47,7 @@ DataX目前已经有了比较全面的插件体系，主流的RDBMS数据库、N
 | 阿里云数仓数据存储    | ODPS       |     √     |     √     |[读](https://github.com/alibaba/DataX/blob/master/odpsreader/doc/odpsreader.md) 、[写](https://github.com/alibaba/DataX/blob/master/odpswriter/doc/odpswriter.md)|
 |              | ADS        |           |     √     |[写](https://github.com/alibaba/DataX/blob/master/adswriter/doc/adswriter.md)|
 |              | OSS        |     √     |     √     |[读](https://github.com/alibaba/DataX/blob/master/ossreader/doc/ossreader.md) 、[写](https://github.com/alibaba/DataX/blob/master/osswriter/doc/osswriter.md)|
-|              | OCS        |     √     |     √     |[读](https://github.com/alibaba/DataX/blob/master/ocsreader/doc/ocsreader.md) 、[写](https://github.com/alibaba/DataX/blob/master/ocswriter/doc/ocswriter.md)|
+|              | OCS        |           |     √     |[写](https://github.com/alibaba/DataX/blob/master/ocswriter/doc/ocswriter.md)|
 | NoSQL数据存储    | OTS        |     √     |     √     |[读](https://github.com/alibaba/DataX/blob/master/otsreader/doc/otsreader.md) 、[写](https://github.com/alibaba/DataX/blob/master/otswriter/doc/otswriter.md)|
 |              | Hbase0.94  |     √     |     √     |[读](https://github.com/alibaba/DataX/blob/master/hbase094xreader/doc/hbase094xreader.md) 、[写](https://github.com/alibaba/DataX/blob/master/hbase094xwriter/doc/hbase094xwriter.md)|
 |              | Hbase1.1   |     √     |     √     |[读](https://github.com/alibaba/DataX/blob/master/hbase11xreader/doc/hbase11xreader.md) 、[写](https://github.com/alibaba/DataX/blob/master/hbase11xwriter/doc/hbase11xwriter.md)|
@@ -152,3 +153,6 @@ This software is free to use under the Apache License [Apache license](https://g
 - DataX开源用户交流群5
     - <img src="https://github.com/alibaba/DataX/blob/master/images/DataX%E5%BC%80%E6%BA%90%E7%94%A8%E6%88%B7%E4%BA%A4%E6%B5%81%E7%BE%A45.jpg" width="20%" height="20%">
 
+- DataX开源用户交流群6 
+    - <img src="https://user-images.githubusercontent.com/1905000/124073771-139cbd00-da75-11eb-9a3f-598cba145a76.png" width="20%" height="20%">
+

core/src/main/bin/datax.py

@@ -1,23 +1,26 @@
 #!/usr/bin/env python
 # -*- coding:utf-8 -*-
 
-import sys
-import os
-import signal
-import subprocess
-import time
-import re
-import socket
-import json
-from optparse import OptionParser
-from optparse import OptionGroup
-from string import Template
 import codecs
+import json
+import os
 import platform
+import re
+import signal
+import socket
+import subprocess
+import sys
+import time
+from optparse import OptionGroup
+from optparse import OptionParser
+from string import Template
+
+ispy2 = sys.version_info.major == 2
 
 def isWindows():
     return platform.system() == 'Windows'
 
+
 DATAX_HOME = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
 DATAX_VERSION = 'DATAX-OPENSOURCE-3.0'
@@ -52,13 +55,19 @@ def getLocalIp():
 
 def suicide(signum, e):
     global child_process
-    print >> sys.stderr, "[Error] DataX receive unexpected signal %d, starts to suicide." % (signum)
+    if ispy2:
+        print >> sys.stderr, "[Error] DataX receive unexpected signal %d, starts to suicide." % (signum)
+    else:
+        print("[Error] DataX receive unexpected signal %d, starts to suicide." % (signum), sys.stderr)
 
     if child_process:
         child_process.send_signal(signal.SIGQUIT)
         time.sleep(1)
         child_process.kill()
-    print >> sys.stderr, "DataX Process was killed ! you did ?"
+    if ispy2:
+        print >> sys.stderr, "DataX Process was killed ! you did ?"
+    else:
+        print("DataX Process was killed ! you did ?", sys.stderr)
     sys.exit(RET_STATE["KILL"])
 
 
@@ -92,10 +101,10 @@ def getOptionParser():
                                        'if you have mutiple parameters: -p"-DtableName=your-table-name -DcolumnName=your-column-name".'
                                        'Note: you should config in you job tableName with ${tableName}.')
     prodEnvOptionGroup.add_option("-r", "--reader", metavar="<parameter used in view job config[reader] template>",
-                                  action="store", dest="reader",type="string",
+                                  action="store", dest="reader", type="string",
                                   help='View job config[reader] template, eg: mysqlreader,streamreader')
     prodEnvOptionGroup.add_option("-w", "--writer", metavar="<parameter used in view job config[writer] template>",
-                                  action="store", dest="writer",type="string",
+                                  action="store", dest="writer", type="string",
                                   help='View job config[writer] template, eg: mysqlwriter,streamwriter')
     parser.add_option_group(prodEnvOptionGroup)
 
@@ -108,45 +117,50 @@ def getOptionParser():
     parser.add_option_group(devEnvOptionGroup)
     return parser
 
+
 def generateJobConfigTemplate(reader, writer):
-    readerRef = "Please refer to the %s document:\n     https://github.com/alibaba/DataX/blob/master/%s/doc/%s.md \n" % (reader,reader,reader)
-    writerRef = "Please refer to the %s document:\n     https://github.com/alibaba/DataX/blob/master/%s/doc/%s.md \n " % (writer,writer,writer)
-    print readerRef
-    print writerRef
+    readerRef = "Please refer to the %s document:\n     https://github.com/alibaba/DataX/blob/master/%s/doc/%s.md \n" % (
+        reader, reader, reader)
+    writerRef = "Please refer to the %s document:\n     https://github.com/alibaba/DataX/blob/master/%s/doc/%s.md \n " % (
+        writer, writer, writer)
+    print(readerRef)
+    print(writerRef)
     jobGuid = 'Please save the following configuration as a json file and  use\n     python {DATAX_HOME}/bin/datax.py {JSON_FILE_NAME}.json \nto run the job.\n'
-    print jobGuid
-    jobTemplate={
-      "job": {
-        "setting": {
-          "speed": {
-            "channel": ""
-          }
-        },
-        "content": [
-          {
-            "reader": {},
-            "writer": {}
-          }
-        ]
-      }
+    print(jobGuid)
+    jobTemplate = {
+        "job": {
+            "setting": {
+                "speed": {
+                    "channel": ""
+                }
+            },
+            "content": [
+                {
+                    "reader": {},
+                    "writer": {}
+                }
+            ]
+        }
     }
-    readerTemplatePath = "%s/plugin/reader/%s/plugin_job_template.json" % (DATAX_HOME,reader)
-    writerTemplatePath = "%s/plugin/writer/%s/plugin_job_template.json" % (DATAX_HOME,writer)
+    readerTemplatePath = "%s/plugin/reader/%s/plugin_job_template.json" % (DATAX_HOME, reader)
+    writerTemplatePath = "%s/plugin/writer/%s/plugin_job_template.json" % (DATAX_HOME, writer)
     try:
-      readerPar = readPluginTemplate(readerTemplatePath);
-    except Exception, e:
-       print "Read reader[%s] template error: can\'t find file %s" % (reader,readerTemplatePath)
+        readerPar = readPluginTemplate(readerTemplatePath)
+    except:
+        print("Read reader[%s] template error: can\'t find file %s" % (reader, readerTemplatePath))
     try:
-      writerPar = readPluginTemplate(writerTemplatePath);
-    except Exception, e:
-      print "Read writer[%s] template error: : can\'t find file %s" % (writer,writerTemplatePath)
-    jobTemplate['job']['content'][0]['reader'] = readerPar;
-    jobTemplate['job']['content'][0]['writer'] = writerPar;
-    print json.dumps(jobTemplate, indent=4, sort_keys=True)
+        writerPar = readPluginTemplate(writerTemplatePath)
+    except:
+        print("Read writer[%s] template error: : can\'t find file %s" % (writer, writerTemplatePath))
+    jobTemplate['job']['content'][0]['reader'] = readerPar
+    jobTemplate['job']['content'][0]['writer'] = writerPar
+    print(json.dumps(jobTemplate, indent=4, sort_keys=True))
+
 
 def readPluginTemplate(plugin):
     with open(plugin, 'r') as f:
-            return json.load(f)
+        return json.load(f)
+
 
 def isUrl(path):
     if not path:
@@ -168,7 +182,7 @@ def buildStartCommand(options, args):
 
     if options.remoteDebug:
         tempJVMCommand = tempJVMCommand + " " + REMOTE_DEBUG_CONFIG
-        print 'local ip: ', getLocalIp()
+        print('local ip: ', getLocalIp())
 
     if options.loglevel:
         tempJVMCommand = tempJVMCommand + " " + ("-Dloglevel=%s" % (options.loglevel))
@@ -198,11 +212,11 @@ def buildStartCommand(options, args):
 
 
 def printCopyright():
-    print '''
+    print('''
 DataX (%s), From Alibaba !
 Copyright (C) 2010-2017, Alibaba Group. All Rights Reserved.
 
-''' % DATAX_VERSION
+''' % DATAX_VERSION)
     sys.stdout.flush()
 
 
@@ -211,7 +225,7 @@ if __name__ == "__main__":
     parser = getOptionParser()
     options, args = parser.parse_args(sys.argv[1:])
     if options.reader is not None and options.writer is not None:
-        generateJobConfigTemplate(options.reader,options.writer)
+        generateJobConfigTemplate(options.reader, options.writer)
         sys.exit(RET_STATE['OK'])
     if len(args) != 1:
         parser.print_help()

core/src/main/java/com/alibaba/datax/core/Engine.java

@@ -73,7 +73,7 @@ public class Engine {
         boolean traceEnable = allConf.getBool(CoreConstant.DATAX_CORE_CONTAINER_TRACE_ENABLE, true);
         boolean perfReportEnable = allConf.getBool(CoreConstant.DATAX_CORE_REPORT_DATAX_PERFLOG, true);
 
-        //standlone模式的datax shell任务不进行汇报
+        //standalone模式的 datax shell任务不进行汇报
         if(instanceId == -1){
             perfReportEnable = false;
         }

drdsreader/doc/drdsreader.md

@@ -50,7 +50,7 @@ DRDS的插件目前DataX只适配了Mysql引擎的场景，DRDS对于DataX而言
                         // 数据库连接密码
                         "password": "root",
                         "column": [
-                            "id"，"name"
+                            "id","name"
                         ],
                         "connection": [
                             {

hbase11xsqlwriter/pom.xml

@@ -19,7 +19,7 @@
         <hadoop.version>2.7.1</hadoop.version>
         <commons-codec.version>1.8</commons-codec.version>
         <protobuf.version>3.2.0</protobuf.version>
-        <httpclient.version>4.5.13</httpclient.version>
+        <httpclient.version>4.4.1</httpclient.version>
     </properties>
 
     <dependencies>

hbase11xwriter/doc/hbase11xwriter.md

@@ -203,19 +203,20 @@ HbaseWriter 插件实现了从向Hbase中写取数据。在底层实现上，Hba
 	* 描述：要写入的hbase字段。index：指定该列对应reader端column的索引，从0开始；name：指定hbase表中的列，必须为 列族:列名 的格式；type：指定写入数据类型，用于转换HBase byte[]。配置格式如下：
 	
 	```
-"column": [
-              {
-                "index":1,
-                "name": "cf1:q1",
-                "type": "string"
-              },
-              {
-                "index":2,
-                "name": "cf1:q2",
-                "type": "string"
-              }
-           ］ 	
-		            
+
+	"column": [
+		      {
+			"index":1,
+			"name": "cf1:q1",
+			"type": "string"
+		      },
+		      {
+			"index":2,
+			"name": "cf1:q2",
+			"type": "string"
+		      }
+		   ］ 	
+
 	```
 
 	* 必选：是<br />
@@ -227,17 +228,17 @@ HbaseWriter 插件实现了从向Hbase中写取数据。在底层实现上，Hba
 	* 描述：要写入的hbase的rowkey列。index：指定该列对应reader端column的索引，从0开始，若为常量index为－1；type：指定写入数据类型，用于转换HBase byte[]；value：配置常量，常作为多个字段的拼接符。hbasewriter会将rowkeyColumn中所有列按照配置顺序进行拼接作为写入hbase的rowkey，不能全为常量。配置格式如下：
 	
 	```
-"rowkeyColumn": [
-                {
-                  "index":0,
-                  "type":"string"
-                },
-                {
-                  "index":-1,
-                  "type":"string",
-                  "value":"_"
-                }
-            ] 	
+	"rowkeyColumn": [
+			{
+			  "index":0,
+			  "type":"string"
+			},
+			{
+			  "index":-1,
+			  "type":"string",
+			  "value":"_"
+			}
+		    ] 	
 		            
 	```
 
@@ -250,19 +251,19 @@ HbaseWriter 插件实现了从向Hbase中写取数据。在底层实现上，Hba
 	* 描述：指定写入hbase的时间戳。支持：当前时间、指定时间列，指定时间，三者选一。若不配置表示用当前时间。index：指定对应reader端column的索引，从0开始，需保证能转换为long,若是Date类型，会尝试用yyyy-MM-dd HH:mm:ss和yyyy-MM-dd HH:mm:ss SSS去解析；若为指定时间index为－1；value：指定时间的值,long值。配置格式如下：
 	
 	```
-"versionColumn":{
-	"index":1
-}
+	"versionColumn":{
+		"index":1
+	}
 		            
 	```
 	
 	或者
 	
 	```
-"versionColumn":{
-	"index":－1,
-	"value":123456789
-}
+	"versionColumn":{
+		"index":－1,
+		"value":123456789
+	}
 		            
 	```
 

introduction.md

@@ -36,6 +36,7 @@ DataX本身作为离线数据同步框架，采用Framework + plugin架构构建
 | ------------ | ---------- | :-------: | :-------: |:-------: |
 | RDBMS 关系型数据库 | MySQL      |     √     |     √     |[读](https://github.com/alibaba/DataX/blob/master/mysqlreader/doc/mysqlreader.md) 、[写](https://github.com/alibaba/DataX/blob/master/mysqlwriter/doc/mysqlwriter.md)|
 |              | Oracle     |     √     |     √     |[读](https://github.com/alibaba/DataX/blob/master/oraclereader/doc/oraclereader.md) 、[写](https://github.com/alibaba/DataX/blob/master/oraclewriter/doc/oraclewriter.md)|
+|              | OceanBase  |     √     |     √     |[读](https://open.oceanbase.com/docs/community/oceanbase-database/V3.1.0/use-datax-to-full-migration-data-to-oceanbase) 、[写](https://open.oceanbase.com/docs/community/oceanbase-database/V3.1.0/use-datax-to-full-migration-data-to-oceanbase)|
 |              | SQLServer  |     √     |     √     |[读](https://github.com/alibaba/DataX/blob/master/sqlserverreader/doc/sqlserverreader.md) 、[写](https://github.com/alibaba/DataX/blob/master/sqlserverwriter/doc/sqlserverwriter.md)|
 |              | PostgreSQL |     √     |     √     |[读](https://github.com/alibaba/DataX/blob/master/postgresqlreader/doc/postgresqlreader.md) 、[写](https://github.com/alibaba/DataX/blob/master/postgresqlwriter/doc/postgresqlwriter.md)|
 |              | DRDS |     √     |     √     |[读](https://github.com/alibaba/DataX/blob/master/drdsreader/doc/drdsreader.md) 、[写](https://github.com/alibaba/DataX/blob/master/drdswriter/doc/drdswriter.md)|

mongodbreader/doc/mongodbreader.md

@@ -8,7 +8,7 @@ MongoDBReader 插件利用 MongoDB 的java客户端MongoClient进行MongoDB的
 MongoDBReader通过Datax框架从MongoDB并行的读取数据，通过主控的JOB程序按照指定的规则对MongoDB中的数据进行分片，并行读取，然后将MongoDB支持的类型通过逐一判断转换成Datax支持的类型。
 
 #### 3 功能说明
-* 该示例从ODPS读一份数据到MongoDB。
+* 该示例从MongoDB读一份数据到ODPS。
 
 	    {
 	    "job": {
@@ -127,6 +127,7 @@ MongoDBReader通过Datax框架从MongoDB并行的读取数据，通过主控的J
 * address： MongoDB的数据地址信息，因为MonogDB可能是个集群，则ip端口信息需要以Json数组的形式给出。【必填】
 * userName：MongoDB的用户名。【选填】
 * userPassword： MongoDB的密码。【选填】
+* authDb: MongoDB认证数据库【选填】
 * collectionName： MonogoDB的集合名。【必填】
 * column：MongoDB的文档列名。【必填】
 * name：Column的名字。【必填】
@@ -147,4 +148,4 @@ MongoDBReader通过Datax框架从MongoDB并行的读取数据，通过主控的J
 
 
 #### 6 性能报告
-#### 7 测试报告
+#### 7 测试报告

mongodbwriter/doc/mongodbwriter.md

@@ -139,7 +139,7 @@ MongoDBWriter通过Datax框架获取Reader生成的数据，然后将Datax支持
 * splitter：特殊分隔符，当且仅当要处理的字符串要用分隔符分隔为字符数组时，才使用这个参数，通过这个参数指定的分隔符，将字符串分隔存储到MongoDB的数组中。【选填】
 * upsertInfo：指定了传输数据时更新的信息。【选填】
 * isUpsert：当设置为true时，表示针对相同的upsertKey做更新操作。【选填】
-* upsertKey：upsertKey指定了没行记录的业务主键。用来做更新时使用。【选填】
+* upsertKey：upsertKey指定了每行记录的业务主键。用来做更新时使用。【选填】
 
 #### 5 类型转换
 
@@ -154,4 +154,4 @@ MongoDBWriter通过Datax框架获取Reader生成的数据，然后将Datax支持
 
 
 #### 6 性能报告
-#### 7 测试报告
+#### 7 测试报告

mysqlreader/doc/mysqlreader.md

@@ -165,7 +165,7 @@ MysqlReader插件实现了从Mysql读取数据。在底层实现上，MysqlReade
 
 	  支持常量配置，用户需要按照Mysql SQL语法格式:
 	  ["id", "\`table\`", "1", "'bazhen.csy'", "null", "to_char(a + 1)", "2.3" , "true"]
-	  id为普通列名，\`table\`为包含保留在的列名，1为整形数字常量，'bazhen.csy'为字符串常量，null为空指针，to_char(a + 1)为表达式，2.3为浮点数，true为布尔值。
+	  id为普通列名，\`table\`为包含保留字的列名，1为整形数字常量，'bazhen.csy'为字符串常量，null为空指针，to_char(a + 1)为表达式，2.3为浮点数，true为布尔值。
 
 	* 必选：是 <br />
 

oceanbasev10reader/src/main/assembly/package.xml

@@ -23,6 +23,13 @@
             </includes>
             <outputDirectory>plugin/reader/oceanbasev10reader</outputDirectory>
         </fileSet>
+        <fileSet>
+            <directory>src/main/libs/</directory>
+            <includes>
+                <include>*.jar</include>
+            </includes>
+            <outputDirectory>plugin/reader/oceanbasev10reader/libs</outputDirectory>
+        </fileSet>
     </fileSets>
 
     <dependencySets>

oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/OceanBaseReader.java

@@ -32,19 +32,21 @@ public class OceanBaseReader extends Reader {
             if (userConfigedFetchSize != null) {
                 LOG.warn("The [fetchSize] is not recognized, please use readBatchSize instead.");
             }
-
             this.originalConfig.set(Constant.FETCH_SIZE, Integer.MIN_VALUE);
-
             setDatabaseType(originalConfig);
-
             this.readerJob = new ReaderJob();
             this.readerJob.init(this.originalConfig);
         }
 
+        @Override
+        public void prepare() {
+            //ObReaderUtils.DATABASE_TYPE获取当前数据库的语法模式
+        }
+
         @Override
         public void preCheck() {
             init();
-            this.readerJob.preCheck(this.originalConfig, ObReaderUtils.DATABASE_TYPE);
+            this.readerJob.preCheck(this.originalConfig, ObReaderUtils.databaseType);
 
         }
 
@@ -70,7 +72,7 @@ public class OceanBaseReader extends Reader {
             Configuration connConf = Configuration.from(conns.get(0).toString());
             List<String> jdbcUrls = connConf.getList(Key.JDBC_URL, String.class);
             String jdbcUrl = jdbcUrls.get(0);
-            if(jdbcUrl.startsWith(com.alibaba.datax.plugin.rdbms.writer.Constant.OB10_SPLIT_STRING)) {
+            if (jdbcUrl.startsWith(com.alibaba.datax.plugin.rdbms.writer.Constant.OB10_SPLIT_STRING)) {
                 String[] ss = jdbcUrl.split(com.alibaba.datax.plugin.rdbms.writer.Constant.OB10_SPLIT_STRING_PATTERN);
                 if (ss.length != 3) {
                     LOG.warn("unrecognized jdbc url: " + jdbcUrl);
@@ -85,9 +87,10 @@ public class OceanBaseReader extends Reader {
                 Connection conn = DBUtil.getConnection(DataBaseType.OceanBase, obJdbcUrl, username, password);
                 String compatibleMode = ObReaderUtils.getCompatibleMode(conn);
                 if (ObReaderUtils.isOracleMode(compatibleMode)) {
-                    ObReaderUtils.DATABASE_TYPE = DataBaseType.OceanBase;
+                    ObReaderUtils.compatibleMode = ObReaderUtils.OB_COMPATIBLE_MODE_ORACLE;
                 }
-            } catch (Exception e){
+
+            } catch (Exception e) {
                 LOG.warn("error in get compatible mode, using mysql as default: " + e.getMessage());
             }
         }

oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/ext/ReaderJob.java

@@ -6,13 +6,38 @@ import com.alibaba.datax.common.constant.CommonConstant;
 import com.alibaba.datax.common.util.Configuration;
 import com.alibaba.datax.plugin.rdbms.reader.CommonRdbmsReader;
 import com.alibaba.datax.plugin.rdbms.reader.Key;
+import com.alibaba.datax.plugin.rdbms.util.DataBaseType;
 import com.alibaba.datax.plugin.rdbms.writer.Constant;
+import com.alibaba.datax.plugin.reader.oceanbasev10reader.OceanBaseReader;
 import com.alibaba.datax.plugin.reader.oceanbasev10reader.util.ObReaderUtils;
+import com.alibaba.fastjson.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 
 public class ReaderJob extends CommonRdbmsReader.Job {
+    private Logger LOG = LoggerFactory.getLogger(OceanBaseReader.Task.class);
 
     public ReaderJob() {
-        super(ObReaderUtils.DATABASE_TYPE);
+        super(ObReaderUtils.databaseType);
+    }
+
+    @Override
+    public void init(Configuration originalConfig) {
+        //将config中的column和table中的关键字进行转义
+        List<String> columns = originalConfig.getList(Key.COLUMN, String.class);
+        ObReaderUtils.escapeDatabaseKeywords(columns);
+        originalConfig.set(Key.COLUMN, columns);
+
+        List<JSONObject> conns = originalConfig.getList(com.alibaba.datax.plugin.rdbms.reader.Constant.CONN_MARK, JSONObject.class);
+        for (int i = 0; i < conns.size(); i++) {
+            JSONObject conn = conns.get(i);
+            Configuration connConfig = Configuration.from(conn.toString());
+            List<String> tables = connConfig.getList(Key.TABLE, String.class);
+            ObReaderUtils.escapeDatabaseKeywords(tables);
+            originalConfig.set(String.format("%s[%d].%s", com.alibaba.datax.plugin.rdbms.reader.Constant.CONN_MARK, i, Key.TABLE), tables);
+        }
+        super.init(originalConfig);
     }
 
     @Override

oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/ext/ReaderTask.java

@@ -1,13 +1,5 @@
 package com.alibaba.datax.plugin.reader.oceanbasev10reader.ext;
 
-import java.sql.*;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.alibaba.datax.common.element.Column;
 import com.alibaba.datax.common.element.Record;
 import com.alibaba.datax.common.plugin.RecordSender;
@@ -19,11 +11,17 @@ import com.alibaba.datax.plugin.rdbms.reader.CommonRdbmsReader;
 import com.alibaba.datax.plugin.rdbms.reader.Constant;
 import com.alibaba.datax.plugin.rdbms.reader.Key;
 import com.alibaba.datax.plugin.rdbms.util.DBUtil;
-import com.alibaba.datax.plugin.rdbms.util.DataBaseType;
 import com.alibaba.datax.plugin.rdbms.util.RdbmsException;
 import com.alibaba.datax.plugin.reader.oceanbasev10reader.Config;
 import com.alibaba.datax.plugin.reader.oceanbasev10reader.util.ObReaderUtils;
 import com.alibaba.datax.plugin.reader.oceanbasev10reader.util.TaskContext;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.sql.*;
+import java.util.ArrayList;
+import java.util.List;
 
 public class ReaderTask extends CommonRdbmsReader.Task {
     private static final Logger LOG = LoggerFactory.getLogger(ReaderTask.class);
@@ -41,11 +39,12 @@ public class ReaderTask extends CommonRdbmsReader.Task {
     private boolean reuseConn = false;
 
     public ReaderTask(int taskGroupId, int taskId) {
-        super(ObReaderUtils.DATABASE_TYPE, taskGroupId, taskId);
+        super(ObReaderUtils.databaseType, taskGroupId, taskId);
         this.taskGroupId = taskGroupId;
         this.taskId = taskId;
     }
 
+    @Override
     public void init(Configuration readerSliceConfig) {
         /* for database connection */
         username = readerSliceConfig.getString(Key.USERNAME);
@@ -54,7 +53,7 @@ public class ReaderTask extends CommonRdbmsReader.Task {
         queryTimeoutSeconds = readerSliceConfig.getInt(Config.QUERY_TIMEOUT_SECOND,
                 Config.DEFAULT_QUERY_TIMEOUT_SECOND);
         // ob10的处理
-        if(jdbcUrl.startsWith(com.alibaba.datax.plugin.rdbms.writer.Constant.OB10_SPLIT_STRING)) {
+        if (jdbcUrl.startsWith(com.alibaba.datax.plugin.rdbms.writer.Constant.OB10_SPLIT_STRING)) {
             String[] ss = jdbcUrl.split(com.alibaba.datax.plugin.rdbms.writer.Constant.OB10_SPLIT_STRING_PATTERN);
             if (ss.length == 3) {
                 LOG.info("this is ob1_0 jdbc url.");
@@ -63,16 +62,14 @@ public class ReaderTask extends CommonRdbmsReader.Task {
             }
         }
 
-        if (ObReaderUtils.DATABASE_TYPE == DataBaseType.OceanBase) {
-            jdbcUrl = jdbcUrl.replace("jdbc:mysql:", "jdbc:oceanbase:") + "&socketTimeout=1800000&connectTimeout=60000"; //socketTimeout 半个小时
+        jdbcUrl = jdbcUrl.replace("jdbc:mysql:", "jdbc:oceanbase:") + "&socketTimeout=1800000&connectTimeout=60000"; //socketTimeout 半个小时
+        if (ObReaderUtils.compatibleMode.equals(ObReaderUtils.OB_COMPATIBLE_MODE_ORACLE)) {
             compatibleMode = ObReaderUtils.OB_COMPATIBLE_MODE_ORACLE;
-        } else {
-            jdbcUrl = jdbcUrl + "&socketTimeout=1800000&connectTimeout=60000"; //socketTimeout 半个小时
         }
         LOG.info("this is ob1_0 jdbc url. user=" + username + " :url=" + jdbcUrl);
         mandatoryEncoding = readerSliceConfig.getString(Key.MANDATORY_ENCODING, "");
         retryLimit = readerSliceConfig.getInt(Config.RETRY_LIMIT, Config.DEFAULT_RETRY_LIMIT);
-        LOG.info("retryLimit: "+ retryLimit);
+        LOG.info("retryLimit: " + retryLimit);
     }
 
     private void buildSavePoint(TaskContext context) {
@@ -83,7 +80,6 @@ public class ReaderTask extends CommonRdbmsReader.Task {
     }
 
     /**
-     *
      * 如果isTableMode && table有PK
      * <p>
      * 则支持断点续读 (若pk不在原始的columns中,则追加到尾部,但不传给下游)
@@ -92,7 +88,7 @@ public class ReaderTask extends CommonRdbmsReader.Task {
      */
     @Override
     public void startRead(Configuration readerSliceConfig, RecordSender recordSender,
-            TaskPluginCollector taskPluginCollector, int fetchSize) {
+                          TaskPluginCollector taskPluginCollector, int fetchSize) {
         String querySql = readerSliceConfig.getString(Key.QUERY_SQL);
         String table = readerSliceConfig.getString(Key.TABLE);
         PerfTrace.getInstance().addTaskDetails(taskId, table + "," + jdbcUrl);
@@ -131,14 +127,14 @@ public class ReaderTask extends CommonRdbmsReader.Task {
     }
 
     private void startRead0(boolean isTableMode, TaskContext context, RecordSender recordSender,
-            TaskPluginCollector taskPluginCollector) {
+                            TaskPluginCollector taskPluginCollector) {
         // 不是table模式 直接使用原来的做法
         if (!isTableMode) {
             doRead(recordSender, taskPluginCollector, context);
             return;
         }
         // check primary key index
-        Connection conn = DBUtil.getConnection(ObReaderUtils.DATABASE_TYPE, jdbcUrl, username, password);
+        Connection conn = DBUtil.getConnection(ObReaderUtils.databaseType, jdbcUrl, username, password);
         ObReaderUtils.initConn4Reader(conn, queryTimeoutSeconds);
         context.setConn(conn);
         try {
@@ -184,11 +180,11 @@ public class ReaderTask extends CommonRdbmsReader.Task {
                 }
             } catch (Throwable e) {
                 if (retryLimit == ++retryCount) {
-                    throw RdbmsException.asQueryException(ObReaderUtils.DATABASE_TYPE, new Exception(e),
+                    throw RdbmsException.asQueryException(ObReaderUtils.databaseType, new Exception(e),
                             context.getQuerySql(), context.getTable(), username);
                 }
                 LOG.error("read fail, retry count " + retryCount + ", sleep 60 second, save point:" +
-                        context.getSavePoint() + ", error: "+ e.getMessage());
+                        context.getSavePoint() + ", error: " + e.getMessage());
                 ObReaderUtils.sleep(60000); // sleep 10s
             }
             // 假如原来的查询有查出数据,则改成增量查询
@@ -227,7 +223,7 @@ public class ReaderTask extends CommonRdbmsReader.Task {
             LOG.info("connection is alive, will reuse this connection.");
         } else {
             LOG.info("Create new connection for reader.");
-            conn = DBUtil.getConnection(ObReaderUtils.DATABASE_TYPE, jdbcUrl, username, password);
+            conn = DBUtil.getConnection(ObReaderUtils.databaseType, jdbcUrl, username, password);
             ObReaderUtils.initConn4Reader(conn, queryTimeoutSeconds);
             context.setConn(conn);
         }
@@ -287,7 +283,7 @@ public class ReaderTask extends CommonRdbmsReader.Task {
             ObReaderUtils.close(null, null, context.getConn());
             context.setConn(null);
             LOG.error("reader data fail", e);
-            throw RdbmsException.asQueryException(ObReaderUtils.DATABASE_TYPE, e, context.getQuerySql(),
+            throw RdbmsException.asQueryException(ObReaderUtils.databaseType, e, context.getQuerySql(),
                     context.getTable(), username);
         } finally {
             perfRecord.end();

oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/util/TaskContext.java

@@ -162,6 +162,7 @@ public class TaskContext {
     public String getUserSavePoint() {
         return userSavePoint;
     }
+
     public void setUserSavePoint(String userSavePoint) {
         this.userSavePoint = userSavePoint;
     }

oceanbasev10writer/src/main/assembly/package.xml

@@ -23,6 +23,13 @@
             </includes>
             <outputDirectory>plugin/writer/oceanbasev10writer</outputDirectory>
         </fileSet>
+        <fileSet>
+            <directory>src/main/libs</directory>
+            <includes>
+                <include>*.jar</include>
+            </includes>
+            <outputDirectory>plugin/writer/oceanbasev10writer/libs</outputDirectory>
+        </fileSet>
     </fileSets>
 
     <dependencySets>

oceanbasev10writer/src/main/java/com/alibaba/datax/plugin/writer/oceanbasev10writer/OceanBaseV10Writer.java

@@ -1,15 +1,5 @@
 package com.alibaba.datax.plugin.writer.oceanbasev10writer;
 
-import java.sql.*;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-import com.alibaba.datax.plugin.writer.oceanbasev10writer.util.DbUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.alibaba.datax.common.plugin.RecordReceiver;
 import com.alibaba.datax.common.spi.Writer;
 import com.alibaba.datax.common.util.Configuration;
@@ -20,8 +10,16 @@ import com.alibaba.datax.plugin.rdbms.writer.Constant;
 import com.alibaba.datax.plugin.rdbms.writer.Key;
 import com.alibaba.datax.plugin.rdbms.writer.util.WriterUtil;
 import com.alibaba.datax.plugin.writer.oceanbasev10writer.task.ConcurrentTableWriterTask;
-import com.alibaba.datax.plugin.writer.oceanbasev10writer.task.SingleTableWriterTask;
+import com.alibaba.datax.plugin.writer.oceanbasev10writer.util.DbUtils;
 import com.alibaba.datax.plugin.writer.oceanbasev10writer.util.ObWriterUtils;
+import com.alibaba.fastjson.JSONObject;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.sql.Connection;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 2016-04-07
@@ -61,6 +59,19 @@ public class OceanBaseV10Writer extends Writer {
 		public void init() {
 			this.originalConfig = super.getPluginJobConf();
 			checkCompatibleMode(originalConfig);
+			//将config中的column和table中的关键字进行转义
+			List<String> columns = originalConfig.getList(Key.COLUMN, String.class);
+			ObWriterUtils.escapeDatabaseKeywords(columns);
+			originalConfig.set(Key.COLUMN, columns);
+
+			List<JSONObject> conns = originalConfig.getList(Constant.CONN_MARK, JSONObject.class);
+			for (int i = 0; i < conns.size(); i++) {
+				JSONObject conn = conns.get(i);
+				Configuration connConfig = Configuration.from(conn.toString());
+				List<String> tables = connConfig.getList(Key.TABLE, String.class);
+				ObWriterUtils.escapeDatabaseKeywords(tables);
+				originalConfig.set(String.format("%s[%d].%s", Constant.CONN_MARK, i, Key.TABLE), tables);
+			}
 			this.commonJob = new CommonRdbmsWriter.Job(DATABASE_TYPE);
 			this.commonJob.init(this.originalConfig);
 		}
@@ -223,6 +234,7 @@ public class OceanBaseV10Writer extends Writer {
 		/**
 		 * 注意：此方法每个 Task 都会执行一次。 最佳实践：此处适当封装确保简洁清晰完成数据写入工作。
 		 */
+		@Override
 		public void startWrite(RecordReceiver recordReceiver) {
 			this.writerTask.startWrite(recordReceiver, this.writerSliceConfig, super.getTaskPluginCollector());
 		}

oceanbasev10writer/src/main/java/com/alibaba/datax/plugin/writer/oceanbasev10writer/ext/ServerConnectInfo.java

@@ -24,14 +24,32 @@ public class ServerConnectInfo {
 			this.tenantName  = ss[1].trim().split(":")[1];
 			this.jdbcUrl = ss[2].replace("jdbc:mysql:", "jdbc:oceanbase:");
 		} else {
-			throw new RuntimeException ("jdbc url format is not correct: " + jdbcUrl);
+			this.jdbcUrl = jdbcUrl.replace("jdbc:mysql:", "jdbc:oceanbase:");
+			if (username.contains("@") && username.contains("#")) {
+				this.userName = username.substring(0, username.indexOf("@"));
+				this.tenantName = username.substring(username.indexOf("@") + 1, username.indexOf("#"));
+				this.clusterName = username.substring(username.indexOf("#") + 1);
+			} else if (username.contains(":")) {
+				String[] config = username.split(":");
+				if (config.length != 3) {
+					throw new RuntimeException ("username format is not correct: " + username);
+				}
+				this.clusterName = config[0];
+				this.tenantName = config[1];
+				this.userName = config[2];
+			} else {
+				this.clusterName = null;
+				this.tenantName = null;
+				this.userName = username;
+			}
 		}
+
 		this.password = password;
 		parseJdbcUrl(jdbcUrl);
 	}
 
 	private void parseJdbcUrl(final String jdbcUrl) {
-		Pattern pattern = Pattern.compile("//([\\w\\.\\-]+:\\d+)/([\\w]+)\\?");
+		Pattern pattern = Pattern.compile("//([\\w\\.\\-]+:\\d+)/([\\w-]+)\\?");
 		Matcher matcher = pattern.matcher(jdbcUrl);
 		if (matcher.find()) {
 			String ipPort = matcher.group(1);
@@ -51,8 +69,11 @@ public class ServerConnectInfo {
 	}
 
 	public String getFullUserName() {
-		StringBuilder builder = new StringBuilder();
-		builder.append(userName).append("@").append(tenantName).append("#").append(clusterName);
+		StringBuilder builder = new StringBuilder(userName);
+		if (tenantName != null && clusterName != null) {
+			builder.append("@").append(tenantName).append("#").append(clusterName);
+		}
+
 		return builder.toString();
 	}
 }

oceanbasev10writer/src/main/java/com/alibaba/datax/plugin/writer/oceanbasev10writer/task/ConcurrentTableWriterTask.java

@@ -1,7 +1,27 @@
 package com.alibaba.datax.plugin.writer.oceanbasev10writer.task;
 
+import com.alibaba.datax.common.element.Column;
+import com.alibaba.datax.common.element.Record;
+import com.alibaba.datax.common.exception.DataXException;
+import com.alibaba.datax.common.plugin.RecordReceiver;
+import com.alibaba.datax.common.plugin.TaskPluginCollector;
+import com.alibaba.datax.common.util.Configuration;
+import com.alibaba.datax.plugin.rdbms.util.DBUtil;
+import com.alibaba.datax.plugin.rdbms.util.DBUtilErrorCode;
+import com.alibaba.datax.plugin.rdbms.util.DataBaseType;
+import com.alibaba.datax.plugin.rdbms.writer.CommonRdbmsWriter;
+import com.alibaba.datax.plugin.writer.oceanbasev10writer.Config;
+import com.alibaba.datax.plugin.writer.oceanbasev10writer.ext.ConnHolder;
+import com.alibaba.datax.plugin.writer.oceanbasev10writer.ext.ObClientConnHolder;
+import com.alibaba.datax.plugin.writer.oceanbasev10writer.ext.ServerConnectInfo;
+import com.alibaba.datax.plugin.writer.oceanbasev10writer.util.ObWriterUtils;
+import com.alipay.oceanbase.obproxy.data.TableEntryKey;
+import com.alipay.oceanbase.obproxy.util.ObPartitionIdCalculator;
+import org.apache.commons.lang3.tuple.Pair;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.sql.Connection;
-//import java.sql.PreparedStatement;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.util.ArrayList;
@@ -16,27 +36,7 @@ import java.util.concurrent.locks.Condition;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
-import com.alibaba.datax.common.element.Column;
-import com.alibaba.datax.plugin.writer.oceanbasev10writer.ext.ObClientConnHolder;
-import org.apache.commons.lang3.tuple.Pair;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.alibaba.datax.common.element.Record;
-import com.alibaba.datax.common.exception.DataXException;
-import com.alibaba.datax.common.plugin.RecordReceiver;
-import com.alibaba.datax.common.plugin.TaskPluginCollector;
-import com.alibaba.datax.common.util.Configuration;
-import com.alibaba.datax.plugin.rdbms.util.DBUtil;
-import com.alibaba.datax.plugin.rdbms.util.DBUtilErrorCode;
-import com.alibaba.datax.plugin.rdbms.util.DataBaseType;
-import com.alibaba.datax.plugin.rdbms.writer.CommonRdbmsWriter;
-import com.alibaba.datax.plugin.writer.oceanbasev10writer.Config;
-import com.alibaba.datax.plugin.writer.oceanbasev10writer.ext.ConnHolder;
-import com.alibaba.datax.plugin.writer.oceanbasev10writer.ext.ServerConnectInfo;
-import com.alibaba.datax.plugin.writer.oceanbasev10writer.util.ObWriterUtils;
-import com.alipay.oceanbase.obproxy.data.TableEntryKey;
-import com.alipay.oceanbase.obproxy.util.ObPartitionIdCalculator;
+//import java.sql.PreparedStatement;
 
 public class ConcurrentTableWriterTask extends CommonRdbmsWriter.Task {
     private static final Logger LOG = LoggerFactory.getLogger(ConcurrentTableWriterTask.class);
@@ -62,6 +62,7 @@ public class ConcurrentTableWriterTask extends CommonRdbmsWriter.Task {
 	private ObPartitionIdCalculator partCalculator = null;
 
 	private HashMap<Long, List<Record>> groupInsertValues;
+	List<Record> unknownPartRecords = new ArrayList<Record>();
 //	private List<Record> unknownPartRecords;
 	private List<Integer> partitionKeyIndexes;
 	
@@ -104,10 +105,14 @@ public class ConcurrentTableWriterTask extends CommonRdbmsWriter.Task {
 				connectInfo.getFullUserName(), connectInfo.password);
         checkConnHolder.initConnection();
         if (isOracleCompatibleMode) {
-           connectInfo.databaseName =  connectInfo.databaseName.toUpperCase();
-           table = table.toUpperCase();
-           LOG.info(String.format("this is oracle compatible mode, change database to %s, table to %s",
-                   connectInfo.databaseName, table));
+			connectInfo.databaseName = connectInfo.databaseName.toUpperCase();
+			//在转义的情况下不翻译
+			if (!(table.startsWith("\"") && table.endsWith("\""))) {
+				table = table.toUpperCase();
+			}
+
+			LOG.info(String.format("this is oracle compatible mode, change database to %s, table to %s",
+					connectInfo.databaseName, table));
         }
 
         if (config.getBool(Config.USE_PART_CALCULATOR, Config.DEFAULT_USE_PART_CALCULATOR)) {
@@ -150,7 +155,7 @@ public class ConcurrentTableWriterTask extends CommonRdbmsWriter.Task {
 				partCalculator = new ObPartitionIdCalculator(connectInfo.ipPort, tableEntryKey);
 			} catch (Exception ex) {
 				++retry;
-				LOG.warn("create new part calculator failed, retry ... {}", retry, ex);
+				LOG.warn("create new part calculator failed, retry {}: {}", retry, ex.getMessage());
 			}
 		} while (partCalculator == null && retry < 3); // try 3 times
 	}
@@ -289,20 +294,15 @@ public class ConcurrentTableWriterTask extends CommonRdbmsWriter.Task {
 	}
 
 	private void addLeftRecords() {
+		//不需要刷新Cache，已经是最后一批数据了
 		for (List<Record> groupValues : groupInsertValues.values()) {
 			if (groupValues.size() > 0 ) {
-				int retry = 0;
-				while (true) {
-					try {
-						concurrentWriter.addBatchRecords(groupValues);
-						break;
-					} catch (InterruptedException e) {
-						retry++;
-						LOG.info("Concurrent table writer is interrupted, retry {}", retry);
-					}
-				}
+				addRecordsToWriteQueue(groupValues);
 			}
 		}
+		if (unknownPartRecords.size() > 0) {
+			addRecordsToWriteQueue(unknownPartRecords);
+		}
 	}
 	
 	private void addRecordToCache(final Record record) {
@@ -326,41 +326,40 @@ public class ConcurrentTableWriterTask extends CommonRdbmsWriter.Task {
 			}
 			groupValues.add(record);
 			if (groupValues.size() >= batchSize) {
-				int i = 0;
-				while (true) {
-					if (i > 0) {
-						LOG.info("retry add batch record the {} times", i);
-					}
-					try {
-						concurrentWriter.addBatchRecords(groupValues);
-						printEveryTime();
-						break;
-					} catch (InterruptedException e) {
-						LOG.info("Concurrent table writer is interrupted");
-					}
-				}
-				groupValues = new ArrayList<Record>(batchSize);
+				groupValues = addRecordsToWriteQueue(groupValues);
 				groupInsertValues.put(partId, groupValues);
 			}
 		} else {
-			LOG.warn("add unknown part record {}", record);
-			List<Record> unknownPartRecords = new ArrayList<Record>();
+			LOG.debug("add unknown part record {}", record);
 			unknownPartRecords.add(record);
-			int i = 0;
-			while (true) {
-				if (i > 0) {
-					LOG.info("retry add batch record the {} times", i);
-				}
-				try {
-					concurrentWriter.addBatchRecords(unknownPartRecords);
-					break;
-				} catch (InterruptedException e) {
-					LOG.info("Concurrent table writer is interrupted");
-				}
+			if (unknownPartRecords.size() >= batchSize) {
+				unknownPartRecords = addRecordsToWriteQueue(unknownPartRecords);
 			}
+
 		}
 	}
 
+	/**
+	 *
+	 * @param records
+	 * @return 返回一个新的Cache用于存储接下来的数据
+	 */
+	private List<Record> addRecordsToWriteQueue(List<Record> records) {
+		int i = 0;
+		while (true) {
+			if (i > 0) {
+				LOG.info("retry add batch record the {} times", i);
+			}
+			try {
+				concurrentWriter.addBatchRecords(records);
+				break;
+			} catch (InterruptedException e) {
+				i++;
+				LOG.info("Concurrent table writer is interrupted");
+			}
+		}
+		return new ArrayList<Record>(batchSize);
+	}
 	private void checkMemStore() {
 		Connection checkConn = checkConnHolder.reconnect();
 		long now = System.currentTimeMillis();

oceanbasev10writer/src/main/java/com/alibaba/datax/plugin/writer/oceanbasev10writer/task/InsertTask.java

@@ -65,6 +65,7 @@ public class InsertTask implements Runnable {
 		this.writeRecordSql = writeRecordSql;
 		this.isStop = false;
 		this.deleteMeta = deleteMeta;
+		connHolder.initConnection();
 	}
 	
 	void setWriterTask(ConcurrentTableWriterTask writerTask) {
@@ -151,7 +152,6 @@ public class InsertTask implements Runnable {
 
 	public void doMultiInsert(final List<Record> buffer, final boolean printCost, final long restrict) {
 		checkMemstore();
-		connHolder.initConnection();
 		Connection conn = connHolder.getConn();
 		boolean success = false;
 		long cost = 0;
@@ -165,7 +165,6 @@ public class InsertTask implements Runnable {
 					} catch (InterruptedException e) {
 						LOG.info("thread interrupted ..., ignore");
 					}
-					connHolder.initConnection();
 					conn = connHolder.getConn();
 					LOG.info("retry {}, start do batch insert, size={}", i, buffer.size());
 					checkMemstore();

odpsreader/src/main/java/com/alibaba/datax/plugin/reader/odpsreader/util/DESCipher.java

@@ -40,7 +40,7 @@ public class DESCipher {
 	 * 　　
 	 */
 
-	public static final String KEY = "u4Gqu4Z8";
+	public static final String KEY = "DESDES";
 
 	private final static String DES = "DES";
 

odpswriter/src/main/java/com/alibaba/datax/plugin/writer/odpswriter/util/DESCipher.java

@@ -40,7 +40,7 @@ public class DESCipher {
 	 * 　　
 	 */
 
-	public static final String KEY = "u4Gqu4Z8";
+	public static final String KEY = "DESDES";
 
 	private final static String DES = "DES";
 

oscarwriter/pom.xml

@@ -39,12 +39,18 @@
             <artifactId>plugin-rdbms-util</artifactId>
             <version>${datax-project-version}</version>
         </dependency>
-        <dependency>
+    <!--    <dependency>
             <groupId>com.oscar</groupId>
             <artifactId>oscar</artifactId>
             <version>7.0.8</version>
             <scope>system</scope>
             <systemPath>${basedir}/src/main/lib/oscarJDBC.jar</systemPath>
+        </dependency>-->
+        <!--驱动文件找不到了，暂时替换成下面这个-->
+        <dependency>
+            <groupId>com.csicit.thirdparty</groupId>
+            <artifactId>oscar</artifactId>
+            <version>1.0.1</version>
         </dependency>
 
     </dependencies>

otsreader/pom.xml

@@ -34,6 +34,16 @@
             <groupId>com.aliyun.openservices</groupId>
             <artifactId>ots-public</artifactId>
             <version>2.2.4</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>log4j-api</artifactId>
+                    <groupId>org.apache.logging.log4j</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>log4j-core</artifactId>
+                    <groupId>org.apache.logging.log4j</groupId>
+                </exclusion>
+            </exclusions>
         </dependency> 
         <dependency>
             <groupId>com.google.code.gson</groupId>

otsstreamreader/pom.xml

@@ -33,6 +33,16 @@
             <groupId>com.aliyun.openservices</groupId>
             <artifactId>tablestore-streamclient</artifactId>
             <version>1.0.0</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>log4j-api</artifactId>
+                    <groupId>org.apache.logging.log4j</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>log4j-core</artifactId>
+                    <groupId>org.apache.logging.log4j</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>

otswriter/pom.xml

@@ -34,11 +34,21 @@
             <groupId>com.aliyun.openservices</groupId>
             <artifactId>ots-public</artifactId>
             <version>2.2.4</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>log4j-api</artifactId>
+                    <groupId>org.apache.logging.log4j</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>log4j-core</artifactId>
+                    <groupId>org.apache.logging.log4j</groupId>
+                </exclusion>
+            </exclusions>
         </dependency> 
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.2.4</version>
+            <version>2.8.9</version>
         </dependency>
     </dependencies>
     <build>

package.xml

@@ -189,6 +189,13 @@
             </includes>
             <outputDirectory>datax</outputDirectory>
         </fileSet>
+        <fileSet>
+            <directory>tdenginewriter/target/datax/</directory>
+            <includes>
+                <include>**/*.*</include>
+            </includes>
+            <outputDirectory>datax</outputDirectory>
+        </fileSet>
         <fileSet>
             <directory>drdswriter/target/datax/</directory>
             <includes>
@@ -357,6 +364,13 @@
             </includes>
             <outputDirectory>datax</outputDirectory>
         </fileSet>
+        <fileSet>
+            <directory>tsdbreader/target/datax/</directory>
+            <includes>
+                <include>**/*.*</include>
+            </includes>
+            <outputDirectory>datax</outputDirectory>
+        </fileSet>
         <fileSet>
             <directory>adbpgwriter/target/datax/</directory>
             <includes>

plugin-rdbms-util/pom.xml

@@ -63,12 +63,5 @@
             <artifactId>guava</artifactId>
             <version>r05</version>
         </dependency>
- 		<dependency>
- 			<groupId>com.alipay.oceanbase</groupId>
- 			<artifactId>oceanbase-client</artifactId>
- 			<version>1.1.10</version>
- 			<scope>system</scope>
- 			<systemPath>${basedir}/src/main/libs/oceanbase-client-1.1.10.jar</systemPath>
- 		</dependency>
 	</dependencies>
 </project>

pom.xml

@@ -73,6 +73,7 @@
 
         <!-- writer -->
         <module>mysqlwriter</module>
+        <module>tdenginewriter</module>
         <module>drdswriter</module>
         <module>odpswriter</module>
         <module>txtfilewriter</module>
@@ -182,6 +183,17 @@
                 <version>1.9.5</version>
                 <scope>test</scope>
             </dependency>
+            <dependency>
+                <groupId>org.apache.logging.log4j</groupId>
+                <artifactId>log4j-api</artifactId>
+                <version>2.17.1</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.logging.log4j</groupId>
+                <artifactId>log4j-core</artifactId>
+                <version>2.17.1</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

postgresqlreader/doc/postgresqlreader.md

@@ -48,7 +48,7 @@ PostgresqlReader插件实现了从PostgreSQL读取数据。在底层实现上，
                         // 数据库连接密码
                         "password": "xx",
                         "column": [
-                            "id"，"name"
+                            "id","name"
                         ],
                         //切分主键
                         "splitPk": "id",

postgresqlwriter/src/main/java/com/alibaba/datax/plugin/writer/postgresqlwriter/PostgresqlWriter.java

@@ -67,6 +67,8 @@ public class PostgresqlWriter extends Writer {
 				public String calcValueHolder(String columnType){
 					if("serial".equalsIgnoreCase(columnType)){
 						return "?::int";
+					}else if("bigserial".equalsIgnoreCase(columnType)){
+						return "?::int8";
 					}else if("bit".equalsIgnoreCase(columnType)){
 						return "?::bit varying";
 					}

rdbmsreader/doc/rdbmsreader.md

@@ -138,7 +138,7 @@ RDBMSReader插件实现了从RDBMS读取数据。在底层实现上，RDBMSReade
   
 	**rdbmswriter如何增加新的数据库支持:**  
 	
-	- 进入rdbmsreader对应目录，这里${DATAX_HOME}为DataX主目录，即: ${DATAX_HOME}/plugin/reader/rdbmswriter
+	- 进入rdbmsreader对应目录，这里${DATAX_HOME}为DataX主目录，即: ${DATAX_HOME}/plugin/reader/rdbmsreader
 	- 在rdbmsreader插件目录下有plugin.json配置文件，在此文件中注册您具体的数据库驱动，具体放在drivers数组中。rdbmsreader插件在任务执行时会动态选择合适的数据库驱动连接数据库。
 
 

sqlserverwriter/doc/sqlserverwriter.md

@@ -127,7 +127,7 @@ SqlServerWriter 通过 DataX 框架获取 Reader 生成的协议数据，根据
 
 * **column**
 
-  * 描述：目的表需要写入数据的字段,字段之间用英文逗号分隔。例如: "column": ["id","name","age"]。如果要依次写入全部列，使用*表示, 例如: "column": ["*"]
+  * 描述：目的表需要写入数据的字段,字段之间用英文逗号分隔。例如: "column": ["id","name","age"]。如果要依次写入全部列，使用*表示, 例如: "column": ["\*"]
 
     		**column配置项必须指定，不能留空！**
 

tdenginewriter/doc/tdenginewriter-CN.md

@@ -0,0 +1,405 @@
+# DataX TDengineWriter
+
+简体中文| [English](./tdenginewriter.md)
+
+## 1 快速介绍
+
+TDengineWriter插件实现了写入数据到TDengine数据库功能。可用于离线同步其它数据库的数据到TDengine。
+
+## 2 实现原理
+
+TDengineWriter 通过 DataX 框架获取 Reader生成的协议数据，根据reader的类型解析数据。目前有两种写入方式：
+
+1. 对于OpenTSDBReader, TDengineWriter通过JNI方式调用TDengine客户端库文件（taos.lib或taos.dll）中的方法，使用[schemaless的方式](https://www.taosdata.com/cn/documentation/insert#schemaless)写入。
+
+2. 对于其它数据源,会根据配置生成SQL语句, 通过[taos-jdbcdriver](https://www.taosdata.com/cn/documentation/connector/java)批量写入。
+
+这样区分的原因是OpenTSDBReader将opentsdb的数据统一读取为json字符串，Writer端接收到的数据只有1列。而其它Reader插件一般会把数据放在不同列。
+
+## 3 功能说明
+### 3.1 从OpenTSDB到TDengine
+#### 3.1.1 配置样例
+
+```json
+{
+  "job": {
+    "content": [
+      {
+        "reader": {
+          "name": "opentsdbreader",
+          "parameter": {
+            "endpoint": "http://192.168.1.180:4242",
+            "column": [
+              "weather_temperature"
+            ],
+            "beginDateTime": "2021-01-01 00:00:00",
+            "endDateTime": "2021-01-01 01:00:00"
+          }
+        },
+        "writer": {
+          "name": "tdenginewriter",
+          "parameter": {
+            "host": "192.168.1.180",
+            "port": 6030,
+            "dbName": "test",
+            "username": "root",
+            "password": "taosdata"
+          }
+        }
+      }
+    ],
+    "setting": {
+      "speed": {
+        "channel": 1
+      }
+    }
+  }
+}
+```
+
+#### 3.1.2 参数说明
+
+| 参数      | 描述                 | 是否必选 | 默认值   |
+| --------- | -------------------- | -------- | -------- |
+| host      | TDengine实例的host   | 是       | 无       |
+| port      | TDengine实例的port   | 是       | 无       |
+| username      | TDengine实例的用户名 | 否       | root     |
+| password  | TDengine实例的密码   | 否       | taosdata |
+| dbName    | 目的数据库的名称     | 是       | 无       |
+| batchSize | 每次批量插入多少记录 | 否       | 1        |
+
+
+#### 3.1.3 类型转换
+
+目前，由于OpenTSDBReader将opentsdb的数据统一读取为json字符串，TDengineWriter 在做Opentsdb到TDengine的迁移时，按照以下类型进行处理：
+
+| OpenTSDB数据类型 | DataX 内部类型 | TDengine 数据类型 |
+| ---------------- | -------------- | ----------------- |
+| timestamp        | Date           | timestamp         |
+| Integer（value） | Double         | double            |
+| Float（value）   | Double         | double            |
+| String（value）  | String         | binary            |
+| Integer（tag）   | String         | binary            |
+| Float（tag）     | String         | binary            |
+| String（tag）    | String         | binary            |
+
+### 3.2 从MongoDB到TDengine
+
+#### 3.2.1 配置样例
+```json
+{
+    "job": {
+        "setting": {
+            "speed": {
+                "channel": 2
+            }
+        },
+        "content": [
+            {
+                "reader": {
+                    "name": "mongodbreader",
+                    "parameter": {
+                        "address": [
+                            "127.0.0.1:27017"
+                        ],
+                        "userName": "user",
+                        "mechanism": "SCRAM-SHA-1",
+                        "userPassword": "password",
+                        "authDb": "admin",
+                        "dbName": "test",
+                        "collectionName": "stock",
+                        "column": [
+                            {
+                              "name": "stockID",
+                              "type": "string"  
+                            },
+                            {
+                                "name": "tradeTime",
+                                "type": "date"
+                            },
+                            {
+                                "name": "lastPrice",
+                                "type": "double"
+                            },
+                            {
+                              "name": "askPrice1",
+                              "type": "double"
+                            },
+                            {
+                              "name": "bidPrice1",
+                              "type": "double"
+                            },
+                            {
+                                "name": "volume",
+                                "type": "int"
+                            }
+                        ]
+                    }
+                },
+                "writer": {
+                    "name": "tdenginewriter",
+                    "parameter": {
+                        "host": "localhost",
+                        "port": 6030,
+                        "dbName": "test",
+                        "username": "root",
+                        "password": "taosdata",
+                        "stable": "stock",
+                        "tagColumn": {
+                          "industry": "energy",
+                          "stockID": 0
+                        },
+                        "fieldColumn": {
+                          "lastPrice": 2,
+                          "askPrice1": 3,
+                          "bidPrice1": 4,
+                          "volume": 5
+                        },
+                        "timestampColumn": {
+                          "tradeTime": 1
+                        }
+                    }
+                }
+            }
+        ]
+    }
+}
+```
+
+**注：本配置的writer部分同样适用于关系型数据库**
+
+
+#### 3.2.2 参数说明
+| 参数            | 描述                 | 是否必选         | 默认值   | 备注               |
+| --------------- | -------------------- | ---------------- | -------- | ------------------ |
+| host            | TDengine实例的host   | 是               | 无       |
+| port            | TDengine实例的port   | 是               | 无       |
+| username            | TDengine实例的用户名 | 否               | root     |
+| password        | TDengine实例的密码   | 否               | taosdata |
+| dbName          | 目的数据库的名称     | 是               | 无       |
+| batchSize       | 每次批量插入多少记录 | 否               | 1000     |
+| stable          | 目标超级表的名称     | 是(OpenTSDB除外) | 无       |
+| tagColumn       | 格式:{tagName1: tagInd1, tagName2: tagInd2}, 标签列在写插件收到的Record中的位置和列名   | 否               | 无       | 位置索引均从0开始, tagInd如果为字符串, 表示固定标签值，不需要从源数据中获取  |
+| fieldColumn     | 格式:{fdName1: fdInd1, fdName2: fdInd2}, 字段列在写插件收到的Record中的位置和列名   | 否               | 无       |                    |
+| timestampColumn | 格式:{tsColName: tsColIndex}, 时间戳列在写插件收到的Record中的位置和列名 | 否               | 无       | 时间戳列只能有一个 |
+
+示例配置中tagColumn有一个industry，它的值是一个固定的字符串“energy”, 作用是给导入的所有数据加一个值为"energy"的固定标签industry。这个应用场景可以是：在源库中，有多个设备采集的数据分表存储，设备名就是表名，可以用这个机制把设备名称转化为标签。
+
+#### 3.2.3 自动建表规则
+##### 3.2.3.1 超级表创建规则
+
+如果配置了tagColumn、 fieldColumn和timestampColumn将会在插入第一条数据前，自动创建超级表。<br>
+数据列的类型从第1条记录自动推断, 标签列默认类型为`NCHAR(64)`, 比如示例配置，可能生成以下建表语句：
+
+```sql
+CREATE STABLE IF NOT EXISTS market_snapshot (
+  tadetime TIMESTAMP,
+  lastprice DOUBLE,
+  askprice1 DOUBLE,
+  bidprice1 DOUBLE,
+  volume INT
+)
+TAGS(
+  industry NCHAR(64),
+  stockID NCHAR(64)
+);
+```
+
+##### 3.2.3.2 子表创建规则
+
+子表结构与超级表相同，子表表名生成规则：
+1. 将标签的value 组合成为如下的字符串: `tag_value1!tag_value2!tag_value3`。
+2. 计算该字符串的 MD5 散列值 "md5_val"。
+3. "t_md5val"作为子表名。其中的 "t" 是固定的前缀。
+
+#### 3.2.4 用户提前建表
+
+如果你已经创建好目标超级表，那么tagColumn、 fieldColumn和timestampColumn三个字段均可省略, 插件将通过执行通过`describe stableName`获取表结构的信息。
+此时要求接收到的Record中Column的顺序和执行`describe stableName`返回的列顺序相同， 比如通过`describe stableName`返回以下内容：
+```
+             Field              |         Type         |   Length    |   Note   |
+=================================================================================
+ ts                             | TIMESTAMP            |           8 |          |
+ current                        | DOUBLE               |           8 |          |
+ location                      | BINARY                |           10 | TAG      |
+```
+那么插件收到的数据第1列必须代表时间戳，第2列必须代表电流，第3列必须代表位置。
+
+#### 3.2.5 注意事项
+
+1. tagColumn、 fieldColumn和timestampColumn三个字段用于描述目标表的结构信息，这三个配置字段必须同时存在或同时省略。
+2. 如果存在以上三个配置，且目标表也已经存在，则两者必须一致。**一致性**由用户自己保证，插件不做检查。不一致可能会导致插入失败或插入数据错乱。
+
+#### 3.2.6 类型转换
+
+| DataX 内部类型 | TDengine 数据类型 |
+|-------------- | ----------------- |
+|Long           | BIGINT            |
+|Double         | DOUBLE            |
+|String         | NCHAR(64)         |
+|Date           | TIMESTAMP         |
+|Boolean        | BOOL              |
+|Bytes          | BINARY(64)        |
+
+### 3.3 从关系型数据库到TDengine
+writer部分的配置规则和上述MongoDB的示例是一样的，这里给出一个MySQL的示例。
+
+#### 3.3.1 MySQL中表结构
+```sql
+CREATE TABLE IF NOT EXISTS weather(
+    station varchar(100),
+    latitude DOUBLE,
+    longtitude DOUBLE,
+    `date` DATE,
+    TMAX int,
+    TMIN int
+)
+```
+
+#### 3.3.2 配置文件示例
+
+```json 
+{
+  "job": {
+    "content": [
+      {
+        "reader": {
+          "name": "mysqlreader",
+          "parameter": {
+            "username": "root",
+            "password": "passw0rd",
+            "column": [
+              "*"
+            ],
+            "splitPk": "station",
+            "connection": [
+              {
+                "table": [
+                  "weather"
+                ],
+                "jdbcUrl": [
+                  "jdbc:mysql://127.0.0.1:3306/test?useSSL=false&useUnicode=true&characterEncoding=utf8"
+                ]
+              }
+            ]
+          }
+        },
+        "writer": {
+          "name": "tdenginewriter",
+          "parameter": {
+            "host": "127.0.0.1",
+            "port": 6030,
+            "dbName": "test",
+            "username": "root",
+            "password": "taosdata",
+            "batchSize": 1000,
+            "stable": "weather",
+            "tagColumn": {
+              "station": 0
+            },
+            "fieldColumn": {
+              "latitude": 1,
+              "longtitude": 2,
+              "tmax": 4,
+              "tmin": 5
+            },
+            "timestampColumn":{
+              "date": 3
+            }
+          }
+        }
+      }
+    ],
+    "setting": {
+      "speed": {
+        "channel": 1
+      }
+    }
+  }
+}
+```
+
+
+## 4 性能报告
+
+### 4.1 环境准备
+
+#### 4.1.1 数据特征
+
+建表语句：
+
+单行记录类似于：
+
+#### 4.1.2 机器参数
+
+* 执行DataX的机器参数为:
+    1. cpu:
+    2. mem:
+    3. net: 千兆双网卡
+    4. disc: DataX 数据不落磁盘，不统计此项
+
+* TDengine数据库机器参数为:
+    1. cpu:
+    2. mem:
+    3. net: 千兆双网卡
+    4. disc:
+
+#### 4.1.3 DataX jvm 参数
+
+	-Xms1024m -Xmx1024m -XX:+HeapDumpOnOutOfMemoryError
+
+### 4.2 测试报告
+
+#### 4.2.1 单表测试报告
+
+| 通道数 | DataX速度(Rec/s) | DataX流量(MB/s) | DataX机器网卡流出流量(MB/s) | DataX机器运行负载 | DB网卡进入流量(MB/s) | DB运行负载 | DB TPS |
+| ------ | ---------------- | --------------- | --------------------------- | ----------------- | -------------------- | ---------- | ------ |
+| 1      |                  |                 |                             |                   |                      |            |        |
+| 4      |                  |                 |                             |                   |                      |            |        |
+| 8      |                  |                 |                             |                   |                      |            |        |
+| 16     |                  |                 |                             |                   |                      |            |        |
+| 32     |                  |                 |                             |                   |                      |            |        |
+
+说明：
+
+1. 这里的单表，主键类型为 bigint(20),自增。
+2. batchSize 和 通道个数，对性能影响较大。
+3. 16通道，4096批量提交时，出现 full gc 2次。
+
+#### 4.2.4 性能测试小结
+
+
+## 5 约束限制
+
+1. 本插件自动创建超级表时NCHAR类型的长度固定为64，对于包含长度大于64的字符串的数据源，将不支持。
+2. 标签列不能包含null值，如果包含会被过滤掉。
+
+## FAQ
+
+### 如何选取要同步的数据的范围？
+
+数据范围的选取在Reader插件端配置，对于不同的Reader插件配置方法往往不同。比如对于mysqlreader， 可以用sql语句指定数据范围。对于opentsdbreader, 用beginDateTime和endDateTime两个配置项指定数据范围。
+
+### 如何一次导入多张源表？
+
+如果Reader插件支持一次读多张表，Writer插件就能一次导入多张表。如果Reader不支持多多张表，可以建多个job，分别导入。Writer插件只负责写数据。
+
+### 一张源表导入之后对应TDengine中多少张表？
+
+这是由tagColumn决定的，如果所有tag列的值都相同，那么目标表只有一个。源表有多少不同的tag组合，目标超级表就有多少子表。
+
+### 源表和目标表的字段顺序一致吗？
+
+TDengine要求每个表第一列是时间戳列，后边是普通字段，最后是标签列。如果源表不是这个顺序，插件在自动建表时会自动调整。
+
+### 插件如何确定各列的数据类型？
+
+根据收到的第一批数据自动推断各列的类型。
+
+### 为什么插入10年前的数据会抛异常`TDengine ERROR (2350): failed to execute batch bind` ?
+
+因为创建数据库的时候，默认保留10年的数据。可以手动指定要保留多长时间的数据，比如:`CREATE DATABASE power KEEP 36500;`。
+
+### 如果编译的时候某些插件的依赖找不到怎么办？
+
+如果这个插件不是必须的，可以注释掉根目录下的pom.xml中的对应插件。

tdenginewriter/doc/tdenginewriter.md

@@ -0,0 +1,356 @@
+# DataX TDengineWriter
+
+[简体中文](./tdenginewriter-CN.md) | English
+
+## 1 Quick Introduction
+
+TDengineWriter Plugin writes data to [TDengine](https://www.taosdata.com/en/). It can be used to offline synchronize data from other databases to TDengine.
+
+## 2 Implementation
+
+TDengineWriter get records from DataX Framework that are generated from reader side. It has two whiting strategies:
+
+1. For data from OpenTSDBReader which is in json format, to leverage the new feature of TDengine Server that support writing json data directly called [schemaless writing](https://www.taosdata.com/cn/documentation/insert#schemaless), we use JNI to call functions in `taos.lib` or `taos.dll`.(Since the feature was not included in taos-jdbcdrive until version 2.0.36).
+2. For other data sources, we use [taos-jdbcdriver](https://www.taosdata.com/cn/documentation/connector/java) to write data. If the target table is not exists beforehand, then it will be created automatically according to your configuration.
+
+## 3 Features Introduction
+### 3.1 From OpenTSDB to TDengine
+#### 3.1.1 Sample Setting
+
+```json
+{
+  "job": {
+    "content": [
+      {
+        "reader": {
+          "name": "opentsdbreader",
+          "parameter": {
+            "endpoint": "http://192.168.1.180:4242",
+            "column": [
+              "weather_temperature"
+            ],
+            "beginDateTime": "2021-01-01 00:00:00",
+            "endDateTime": "2021-01-01 01:00:00"
+          }
+        },
+        "writer": {
+          "name": "tdenginewriter",
+          "parameter": {
+            "host": "192.168.1.180",
+            "port": 6030,
+            "dbName": "test",
+            "username": "root",
+            "password": "taosdata"
+          }
+        }
+      }
+    ],
+    "setting": {
+      "speed": {
+        "channel": 1
+      }
+    }
+  }
+}
+```
+
+#### 3.1.2 Configuration
+
+| Parameter | Description                    | Required | Default  |
+| --------- | ------------------------------ | -------- | -------- |
+| host      | host of TDengine               | Yes      |          |
+| port      | port of TDengine               | Yes      |          |
+| username      | use name of TDengine           | No       | root     |
+| password  | password of TDengine           | No       | taosdata |
+| dbName    | name of target database        | No       |          |
+| batchSize | batch size of insert operation | No       | 1        |
+
+
+#### 3.1.3 Type Convert
+
+| OpenTSDB Type    | DataX Type | TDengine Type |
+| ---------------- | ---------- | ------------- |
+| timestamp        | Date       | timestamp     |
+| Integer（value） | Double     | double        |
+| Float（value）   | Double     | double        |
+| String（value）  | String     | binary        |
+| Integer（tag）   | String     | binary        |
+| Float（tag）     | String     | binary        |
+| String（tag）    | String     | binary        |
+
+### 3.2 From MongoDB to TDengine
+
+#### 3.2.1 Sample Setting
+```json
+{
+    "job": {
+        "setting": {
+            "speed": {
+                "channel": 2
+            }
+        },
+        "content": [
+            {
+                "reader": {
+                    "name": "mongodbreader",
+                    "parameter": {
+                        "address": [
+                            "127.0.0.1:27017"
+                        ],
+                        "userName": "user",
+                        "mechanism": "SCRAM-SHA-1",
+                        "userPassword": "password",
+                        "authDb": "admin",
+                        "dbName": "test",
+                        "collectionName": "stock",
+                        "column": [
+                            {
+                              "name": "stockID",
+                              "type": "string"  
+                            },
+                            {
+                                "name": "tradeTime",
+                                "type": "date"
+                            },
+                            {
+                                "name": "lastPrice",
+                                "type": "double"
+                            },
+                            {
+                              "name": "askPrice1",
+                              "type": "double"
+                            },
+                            {
+                              "name": "bidPrice1",
+                              "type": "double"
+                            },
+                            {
+                                "name": "volume",
+                                "type": "int"
+                            }
+                        ]
+                    }
+                },
+                "writer": {
+                    "name": "tdenginewriter",
+                    "parameter": {
+                        "host": "localhost",
+                        "port": 6030,
+                        "dbName": "test",
+                        "username": "root",
+                        "password": "taosdata",
+                        "stable": "stock",
+                        "tagColumn": {
+                          "industry": "energy",
+                          "stockID": 0
+                        },
+                        "fieldColumn": {
+                          "lastPrice": 2,
+                          "askPrice1": 3,
+                          "bidPrice1": 4,
+                          "volume": 5
+                        },
+                        "timestampColumn": {
+                          "tradeTime": 1
+                        }
+                    }
+                }
+            }
+        ]
+    }
+}
+```
+
+**Note：the writer part of this setting can also apply to other data source except for OpenTSDB **
+
+
+#### 3.2.2 Configuration
+
+| Parameter       | Description                                                     | Required                 | Default  | Remark              |
+| --------------- | --------------------------------------------------------------- | ------------------------ | -------- | ------------------- |
+| host            | host ofTDengine                                                 | Yes                      |          |
+| port            | port of TDengine                                                | Yes                      |          |
+| username            | username of TDengine                                           | No                       | root     |
+| password        | password of TDengine                                            | No                       | taosdata |
+| dbName          | name of target database                                         | Yes                      |          |
+| batchSize       | batch size of insert operation                                  | No                       | 1000     |
+| stable          | name of target super table                                      | Yes(except for OpenTSDB) |          |
+| tagColumn       | name and position of tag columns in the record from reader, format:{tagName1: tagInd1, tagName2: tagInd2}      | No                       |          | index starts with 0 |
+| fieldColumn     | name and position of data columns in the record from reader, format: {fdName1: fdInd1, fdName2: fdInd2}     | No                       |          |                     |
+| timestampColumn | name and position of timestamp column in the record from reader | No                       |          |                     |
+
+**Note**: You see that the value of tagColumn "industry" is a fixed string, this ia a good feature of this plugin. Think about this scenario: you have many tables with the structure and one table corresponds to one device. You want to use the device number as a tag in the target super table, then this feature is designed for you.
+
+#### 3.2.3 Auto table creating
+##### 3.2.3.1 Rules
+
+If all of `tagColumn`, `fieldColumn` and `timestampColumn` are offered in writer configuration, then target super table will be created automatically.
+The type of tag columns will always be `NCHAR(64)`. The sample setting above will produce following sql:
+
+```sql
+CREATE STABLE IF NOT EXISTS market_snapshot (
+  tadetime TIMESTAMP,
+  lastprice DOUBLE,
+  askprice1 DOUBLE,
+  bidprice1 DOUBLE,
+  volume INT
+)
+TAGS(
+  industry NCHAR(64),
+  stockID NCHAR(64)
+);
+```
+
+##### 3.2.3.2 Sub-table Creating Rules
+
+The structure of sub-tables are the same with structure of super table. The names of sub-tables are generated by rules below:
+1. combine value of tags like this:`tag_value1!tag_value2!tag_value3`.
+2. compute md5 hash hex of  above string, named `md5val`
+3. use "t_md5val" as sub-table name, in which "t" is fixed prefix.
+
+#### 3.2.4 Use Pre-created Table
+
+If you have created super table firstly, then all of tagColumn, fieldColumn and timestampColumn can be omitted. The writer plugin will get table schema by executing `describe stableName`.
+The order of columns of records received by this plugin must be the same as the order of columns returned by `describe stableName`. For example, if you have super table as below:
+```
+             Field              |         Type         |   Length    |   Note   |
+=================================================================================
+ ts                             | TIMESTAMP            |           8 |          |
+ current                        | DOUBLE               |           8 |          |
+ location                      | BINARY                |           10 | TAG      |
+```
+Then the first columns received by this writer plugin must represent timestamp, the second column must represent current with type double, the third column must represent location with internal type string.
+
+#### 3.2.5 Remarks
+
+1. Config keys --tagColumn, fieldColumn and timestampColumn, must be presented or omitted at the same time.  
+2. If above three config keys exist and the target table also exists, then the order of columns defined by the config file and the existed table must be the same.
+
+#### 3.2.6 Type Convert
+
+|DataX Type | TDengine Type |
+|-------------- | ----------------- |
+|Long           | BIGINT            |
+|Double         | DOUBLE            |
+|String         | NCHAR(64)         |
+|Date           | TIMESTAMP         |
+|Boolean        | BOOL              |
+|Bytes          | BINARY(64)        |
+
+### 3.3 From Relational Database to TDengine
+
+Take MySQl as example.
+
+#### 3.3.1 Table Structure in MySQL
+```sql
+CREATE TABLE IF NOT EXISTS weather(
+    station varchar(100),
+    latitude DOUBLE,
+    longtitude DOUBLE,
+    `date` DATE,
+    TMAX int,
+    TMIN int
+)
+```
+
+#### 3.3.2 Sample Setting
+
+```json 
+{
+  "job": {
+    "content": [
+      {
+        "reader": {
+          "name": "mysqlreader",
+          "parameter": {
+            "username": "root",
+            "password": "passw0rd",
+            "column": [
+              "*"
+            ],
+            "splitPk": "station",
+            "connection": [
+              {
+                "table": [
+                  "weather"
+                ],
+                "jdbcUrl": [
+                  "jdbc:mysql://127.0.0.1:3306/test?useSSL=false&useUnicode=true&characterEncoding=utf8"
+                ]
+              }
+            ]
+          }
+        },
+        "writer": {
+          "name": "tdenginewriter",
+          "parameter": {
+            "host": "127.0.0.1",
+            "port": 6030,
+            "dbName": "test",
+            "username": "root",
+            "password": "taosdata",
+            "batchSize": 1000,
+            "stable": "weather",
+            "tagColumn": {
+              "station": 0
+            },
+            "fieldColumn": {
+              "latitude": 1,
+              "longtitude": 2,
+              "tmax": 4,
+              "tmin": 5
+            },
+            "timestampColumn":{
+              "date": 3
+            }
+          }
+        }
+      }
+    ],
+    "setting": {
+      "speed": {
+        "channel": 1
+      }
+    }
+  }
+}
+```
+
+
+## 4 Performance Test
+
+## 5 Restriction
+
+1. NCHAR type has fixed length 64 when auto creating stable.
+2. Rows have null tag values will be dropped.
+
+## FAQ
+
+### How to filter on source table？
+
+It depends on reader plugin. For different reader plugins, the way may be different.
+
+### How to import multiple source tables at once？
+
+It depends on reader plugin. If the reader plugin supports reading multiple tables at once, then there is no problem. 
+
+### How many sub-tables will be produced?
+
+The number of sub-tables is determined by tagColumns, equals to the number of different combinations of tag values. 
+
+### Do columns in source table and columns in target table must be in the same order?
+
+No. TDengine require the first column has timestamp type，which is followed by data columns, followed by tag columns. The writer plugin will create super table in this column order, regardless of origin column orders.
+
+### How dose the plugin infer the data type of incoming data?
+
+By the first batch of records it received.
+
+###  Why can't I insert data of 10 years ago? Do this will get error: `TDengine ERROR (2350): failed to execute batch bind`.
+
+Because the database you created only keep 10 years data by default, you can create table like this: `CREATE DATABASE power KEEP 36500;`, in order to enlarge the time period to 100 years.
+
+
+### What should I do if some dependencies of a plugin can't be found?
+
+I this plugin is not necessary for you, just remove it from pom.xml under project's root directory.

tdenginewriter/pom.xml

@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>datax-all</artifactId>
+        <groupId>com.alibaba.datax</groupId>
+        <version>0.0.1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.alibaba.datax.tdenginewriter</groupId>
+    <artifactId>tdenginewriter</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.taosdata.jdbc</groupId>
+            <artifactId>taos-jdbcdriver</artifactId>
+            <version>2.0.34</version>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba.datax</groupId>
+            <artifactId>datax-common</artifactId>
+            <version>${datax-project-version}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>slf4j-log4j12</artifactId>
+                    <groupId>org.slf4j</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>com.taosdata.jdbc</groupId>
+            <artifactId>taos-jdbcdriver</artifactId>
+            <version>2.0.34</version>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>${junit-version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>${commons-lang3-version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <!-- compiler plugin -->
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>${jdk-version}</source>
+                    <target>${jdk-version}</target>
+                    <encoding>${project-sourceEncoding}</encoding>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <configuration>
+                    <descriptors>
+                        <descriptor>src/main/assembly/package.xml</descriptor>
+                    </descriptors>
+                    <finalName>datax</finalName>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>dwzip</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.12.4</version>
+                <configuration>
+                    <!-- 包含哪些测试用例 -->
+                    <includes>
+                        <include>**/*Test.java</include>
+                    </includes>
+                    <!-- 不包含哪些测试用例 -->
+                    <excludes>
+                    </excludes>
+                    <testFailureIgnore>true</testFailureIgnore>
+                </configuration>
+            </plugin>
+
+        </plugins>
+    </build>
+
+</project>

tdenginewriter/src/main/assembly/package.xml

@@ -0,0 +1,34 @@
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+    <id></id>
+    <formats>
+        <format>dir</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <fileSets>
+        <fileSet>
+            <directory>src/main/resources</directory>
+            <includes>
+                <include>plugin.json</include>
+                <include>plugin_job_template.json</include>
+            </includes>
+            <outputDirectory>plugin/writer/tdenginewriter</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>target/</directory>
+            <includes>
+                <include>tdenginewriter-0.0.1-SNAPSHOT.jar</include>
+            </includes>
+            <outputDirectory>plugin/writer/tdenginewriter</outputDirectory>
+        </fileSet>
+    </fileSets>
+
+    <dependencySets>
+        <dependencySet>
+            <useProjectArtifact>false</useProjectArtifact>
+            <outputDirectory>plugin/writer/tdenginewriter/libs</outputDirectory>
+            <scope>runtime</scope>
+        </dependencySet>
+    </dependencySets>
+</assembly>

tdenginewriter/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/DataHandler.java

@@ -0,0 +1,12 @@
+package com.alibaba.datax.plugin.writer.tdenginewriter;
+
+import com.alibaba.datax.common.plugin.RecordReceiver;
+
+import com.alibaba.datax.common.plugin.TaskPluginCollector;
+
+import java.util.Properties;
+
+public interface DataHandler {
+
+    long handle(RecordReceiver lineReceiver, Properties properties, TaskPluginCollector collector);
+}

tdenginewriter/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/DataHandlerFactory.java

@@ -0,0 +1,10 @@
+package com.alibaba.datax.plugin.writer.tdenginewriter;
+
+public class DataHandlerFactory {
+
+    public static DataHandler build(String peerPluginName) {
+        if (peerPluginName.equals("opentsdbreader"))
+            return new OpentsdbDataHandler();
+        return new DefaultDataHandler();
+    }
+}

tdenginewriter/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/DefaultDataHandler.java

@@ -0,0 +1,108 @@
+package com.alibaba.datax.plugin.writer.tdenginewriter;
+
+import com.alibaba.datax.common.element.Record;
+import com.alibaba.datax.common.plugin.RecordReceiver;
+import com.alibaba.datax.common.plugin.TaskPluginCollector;
+import com.taosdata.jdbc.TSDBDriver;
+import com.taosdata.jdbc.TSDBPreparedStatement;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.util.Properties;
+
+/**
+ * 默认DataHandler
+ */
+public class DefaultDataHandler implements DataHandler {
+    private static final Logger LOG = LoggerFactory.getLogger(DefaultDataHandler.class);
+
+    static {
+        try {
+            Class.forName("com.taosdata.jdbc.TSDBDriver");
+        } catch (ClassNotFoundException e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public long handle(RecordReceiver lineReceiver, Properties properties, TaskPluginCollector collector) {
+        SchemaManager schemaManager = new SchemaManager(properties);
+        if (!schemaManager.configValid()) {
+            return 0;
+        }
+
+        try {
+            Connection conn = getTaosConnection(properties);
+            if (conn == null) {
+                return 0;
+            }
+            if (schemaManager.shouldGuessSchema()) {
+                // 无法从配置文件获取表结构信息，尝试从数据库获取
+                LOG.info(Msg.get("try_get_schema_from_db"));
+                boolean success = schemaManager.getFromDB(conn);
+                if (!success) {
+                    return 0;
+                }
+            } else {
+
+            }
+            int batchSize = Integer.parseInt(properties.getProperty(Key.BATCH_SIZE, "1000"));
+            if (batchSize < 5) {
+                // batchSize太小，会增加自动类型推断错误的概率，建议改大后重试
+                LOG.error(Msg.get("batch_size_too_small"));
+                return 0;
+            }
+            return write(lineReceiver, conn, batchSize, schemaManager, collector);
+        } catch (Exception e) {
+            LOG.error("write failed " + e.getMessage());
+            e.printStackTrace();
+        }
+        return 0;
+    }
+
+
+    private Connection getTaosConnection(Properties properties) throws SQLException {
+        // 检查必要参数
+        String host = properties.getProperty(Key.HOST);
+        String port = properties.getProperty(Key.PORT);
+        String dbname = properties.getProperty(Key.DBNAME);
+        String user = properties.getProperty(Key.USER);
+        String password = properties.getProperty(Key.PASSWORD);
+        if (host == null || port == null || dbname == null || user == null || password == null) {
+            String keys = String.join(" ", Key.HOST, Key.PORT, Key.DBNAME, Key.USER, Key.PASSWORD);
+            LOG.error("Required options missing, please check: " + keys);
+            return null;
+        }
+        String jdbcUrl = String.format("jdbc:TAOS://%s:%s/%s?user=%s&password=%s", host, port, dbname, user, password);
+        Properties connProps = new Properties();
+        connProps.setProperty(TSDBDriver.PROPERTY_KEY_CHARSET, "UTF-8");
+        LOG.info("TDengine connection established, host:{} port:{} dbname:{} user:{}", host, port, dbname, user);
+        return DriverManager.getConnection(jdbcUrl, connProps);
+    }
+
+    /**
+     * 使用SQL批量写入<br/>
+     *
+     * @return 成功写入记录数
+     * @throws SQLException
+     */
+    private long write(RecordReceiver lineReceiver, Connection conn, int batchSize, SchemaManager scm, TaskPluginCollector collector) throws SQLException {
+        Record record = lineReceiver.getFromReader();
+        if (record == null) {
+            return 0;
+        }
+        String pq = String.format("INSERT INTO ? USING %s TAGS(%s) (%s) values (%s)", scm.getStable(), scm.getTagValuesPlaceHolder(), scm.getJoinedFieldNames(), scm.getFieldValuesPlaceHolder());
+        LOG.info("Prepared SQL: {}", pq);
+        try (TSDBPreparedStatement stmt = (TSDBPreparedStatement) conn.prepareStatement(pq)) {
+            JDBCBatchWriter batchWriter = new JDBCBatchWriter(conn, stmt, scm, batchSize, collector);
+            do {
+                batchWriter.append(record);
+            } while ((record = lineReceiver.getFromReader()) != null);
+            batchWriter.flush();
+            return batchWriter.getCount();
+        }
+    }
+}

tdenginewriter/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/JDBCBatchWriter.java

@@ -0,0 +1,244 @@
+package com.alibaba.datax.plugin.writer.tdenginewriter;
+
+import com.alibaba.datax.common.element.Column;
+import com.alibaba.datax.common.element.Record;
+import com.alibaba.datax.common.exception.DataXException;
+import com.alibaba.datax.common.plugin.TaskPluginCollector;
+import com.taosdata.jdbc.TSDBPreparedStatement;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * 使用JDBC原生写入接口批量写入。<br/>
+ * 有两个限制条件导致批量写入的代码逻辑过于复杂，以至于需要开发新的类来封装。<br/>
+ * 1. 用户必须提前把需要批量写入的数据搜集到ArrayList中
+ * 2. 每批写入的表名必须相同。
+ * 这个类的实现逻辑是：
+ * 1. 先把属于同一子表的Record缓存起来
+ * 2. 缓存的数量达到batchSize阈值，自动执行一次批量写入
+ * 3. 最后一批数据需要用户手动flush才能写入
+ */
+public class JDBCBatchWriter {
+    public static final Logger LOG = LoggerFactory.getLogger(JDBCBatchWriter.class);
+    private TSDBPreparedStatement stmt;
+    private SchemaManager scm;
+    private Connection conn;
+    private int batchSize;
+    private TaskPluginCollector collector;
+
+    // 缓存Record， key为tableName
+    Map<String, List<Record>> buf = new HashMap<>();
+    // 缓存表的标签值， key为tableName
+    Map<String, String[]> tableTagValues = new HashMap<>();
+    private long sucCount = 0;
+    private final int tsColIndex;
+    private List<String> fieldList;
+    // 每个record至少应该包含的列数，用于校验数据
+    private int minColNum = 0;
+    private Map<String, Integer> fieldIndexMap;
+    private List<Column.Type> fieldTypes = null;
+
+    public JDBCBatchWriter(Connection conn, TSDBPreparedStatement stmt, SchemaManager scm, int batchSize, TaskPluginCollector collector) {
+        this.conn = conn;
+        this.stmt = stmt;
+        this.scm = scm;
+        this.batchSize = batchSize;
+        this.collector = collector;
+        this.tsColIndex = scm.getTsColIndex();
+        this.fieldList = scm.getFieldList();
+        this.fieldIndexMap = scm.getFieldIndexMap();
+        this.minColNum = 1 + fieldList.size() + scm.getDynamicTagCount();
+
+    }
+
+    public void initFiledTypesAndTargetTable(List<Record> records) throws SQLException {
+        if (fieldTypes != null) {
+            return;
+        }
+        guessFieldTypes(records);
+        if (scm.shouldCreateTable()) {
+            scm.createSTable(conn, fieldTypes);
+        }
+    }
+
+    public void append(Record record) throws SQLException {
+        int columnNum = record.getColumnNumber();
+        if (columnNum < minColNum) {
+            // 实际列数小于期望列数
+            collector.collectDirtyRecord(record, Msg.get("column_number_error"));
+            return;
+        }
+        String[] tagValues = scm.getTagValuesFromRecord(record);
+        if (tagValues == null) {
+            // 标签列包含null
+            collector.collectDirtyRecord(record, Msg.get("tag_value_error"));
+            return;
+        }
+        if (!scm.hasTimestamp(record)) {
+            // 时间戳列为null或类型错误
+            collector.collectDirtyRecord(record, Msg.get("ts_value_error"));
+            return;
+        }
+        String tableName = scm.computeTableName(tagValues);
+        if (buf.containsKey(tableName)) {
+            List<Record> lis = buf.get(tableName);
+            lis.add(record);
+            if (lis.size() == batchSize) {
+                if (fieldTypes == null) {
+                    initFiledTypesAndTargetTable(lis);
+                }
+                executeBatch(tableName);
+                lis.clear();
+            }
+        } else {
+            List<Record> lis = new ArrayList<>(batchSize);
+            lis.add(record);
+            buf.put(tableName, lis);
+            tableTagValues.put(tableName, tagValues);
+        }
+    }
+
+    /**
+     * 只有String类型比较特别，测试发现值为null的列会转成String类型。所以Column的类型为String并不代表这一列的类型真的是String。
+     *
+     * @param records
+     */
+    private void guessFieldTypes(List<Record> records) {
+        fieldTypes = new ArrayList<>(fieldList.size());
+        for (int i = 0; i < fieldList.size(); ++i) {
+            int colIndex = fieldIndexMap.get(fieldList.get(i));
+            boolean ok = false;
+            for (int j = 0; j < records.size() && !ok; ++j) {
+                Column column = records.get(j).getColumn(colIndex);
+                Column.Type type = column.getType();
+                switch (type) {
+                    case LONG:
+                    case DOUBLE:
+                    case DATE:
+                    case BOOL:
+                    case BYTES:
+                        if (column.getRawData() != null) {
+                            fieldTypes.add(type);
+                            ok = true;
+                        }
+                        break;
+                    case STRING:
+                        // 只有非null且非空的String列，才会被真的当作String类型。
+                        String value = column.asString();
+                        if (value != null && !"".equals(value)) {
+                            fieldTypes.add(type);
+                            ok = true;
+                        }
+                        break;
+                    default:
+                        throw DataXException.asDataXException(TDengineWriterErrorCode.TYPE_ERROR, fieldTypes.get(i).toString());
+                }
+            }
+            if (!ok) {
+                // 根据采样的%d条数据，无法推断第%d列的数据类型
+                throw DataXException.asDataXException(TDengineWriterErrorCode.TYPE_ERROR, String.format(Msg.get("infer_column_type_error"), records.size(), i + 1));
+            }
+        }
+        LOG.info("Field Types: {}", fieldTypes);
+    }
+
+    /**
+     * 执行单表批量写入
+     *
+     * @param tableName
+     * @throws SQLException
+     */
+    private void executeBatch(String tableName) throws SQLException {
+        // 表名
+        stmt.setTableName(tableName);
+        List<Record> records = buf.get(tableName);
+        // 标签
+        String[] tagValues = tableTagValues.get(tableName);
+        LOG.debug("executeBatch {}", String.join(",", tagValues));
+        for (int i = 0; i < tagValues.length; ++i) {
+            stmt.setTagNString(i, tagValues[i]);
+        }
+        // 时间戳
+        ArrayList<Long> tsList = records.stream().map(r -> r.getColumn(tsColIndex).asDate().getTime()).collect(Collectors.toCollection(ArrayList::new));
+        stmt.setTimestamp(0, tsList);
+        // 字段
+        for (int i = 0; i < fieldList.size(); ) {
+            String fieldName = fieldList.get(i);
+            int index = fieldIndexMap.get(fieldName);
+            switch (fieldTypes.get(i)) {
+                case LONG:
+                    ArrayList<Long> lisLong = records.stream().map(r -> r.getColumn(index).asBigInteger().longValue()).collect(Collectors.toCollection(ArrayList::new));
+                    stmt.setLong(++i, lisLong);
+                    break;
+                case DOUBLE:
+                    ArrayList<Double> lisDouble = records.stream().map(r -> r.getColumn(index).asDouble()).collect(Collectors.toCollection(ArrayList::new));
+                    stmt.setDouble(++i, lisDouble);
+                    break;
+                case STRING:
+                    ArrayList<String> lisString = records.stream().map(r -> r.getColumn(index).asString()).collect(Collectors.toCollection(ArrayList::new));
+                    stmt.setNString(++i, lisString, 64);
+                    break;
+                case DATE:
+                    ArrayList<Long> lisTs = records.stream().map(r -> r.getColumn(index).asBigInteger().longValue()).collect(Collectors.toCollection(ArrayList::new));
+                    stmt.setTimestamp(++i, lisTs);
+                    break;
+                case BOOL:
+                    ArrayList<Boolean> lisBool = records.stream().map(r -> r.getColumn(index).asBoolean()).collect(Collectors.toCollection(ArrayList::new));
+                    stmt.setBoolean(++i, lisBool);
+                    break;
+                case BYTES:
+                    ArrayList<String> lisBytes = records.stream().map(r -> r.getColumn(index).asString()).collect(Collectors.toCollection(ArrayList::new));
+                    stmt.setString(++i, lisBytes, 64);
+                    break;
+                default:
+                    throw DataXException.asDataXException(TDengineWriterErrorCode.TYPE_ERROR, fieldTypes.get(i).toString());
+            }
+        }
+        // 执行
+        stmt.columnDataAddBatch();
+        stmt.columnDataExecuteBatch();
+        // 更新计数器
+        sucCount += records.size();
+    }
+
+    /**
+     * 把缓存的Record全部写入
+     */
+    public void flush() throws SQLException {
+        if (fieldTypes == null) {
+            List<Record> records = new ArrayList<>();
+            for (List<Record> lis : buf.values()) {
+                records.addAll(lis);
+                if (records.size() > 100) {
+                    break;
+                }
+            }
+            if (records.size() > 0) {
+                initFiledTypesAndTargetTable(records);
+            } else {
+                return;
+            }
+        }
+        for (String tabName : buf.keySet()) {
+            if (buf.get(tabName).size() > 0) {
+                executeBatch(tabName);
+            }
+        }
+        stmt.columnDataCloseBatch();
+    }
+
+    /**
+     * @return 成功写入的数据量
+     */
+    public long getCount() {
+        return sucCount;
+    }
+}

tdenginewriter/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/JniConnection.java

@@ -0,0 +1,89 @@
+package com.alibaba.datax.plugin.writer.tdenginewriter;
+
+import java.util.Properties;
+
+public class JniConnection {
+
+    private static final long JNI_NULL_POINTER = 0L;
+    private static final int JNI_SUCCESSFUL = 0;
+    public static final String PROPERTY_KEY_CONFIG_DIR = "cfgdir";
+    public static final String PROPERTY_KEY_LOCALE = "locale";
+    public static final String PROPERTY_KEY_CHARSET = "charset";
+    public static final String PROPERTY_KEY_TIME_ZONE = "timezone";
+
+    private long conn;
+
+    static {
+        System.loadLibrary("taos");
+    }
+
+    public JniConnection(Properties props) throws Exception {
+        initImp(props.getProperty(PROPERTY_KEY_CONFIG_DIR, null));
+
+        String locale = props.getProperty(PROPERTY_KEY_LOCALE);
+        if (setOptions(0, locale) < 0) {
+            throw new Exception("Failed to set locale: " + locale + ". System default will be used.");
+        }
+        String charset = props.getProperty(PROPERTY_KEY_CHARSET);
+        if (setOptions(1, charset) < 0) {
+            throw new Exception("Failed to set charset: " + charset + ". System default will be used.");
+        }
+        String timezone = props.getProperty(PROPERTY_KEY_TIME_ZONE);
+        if (setOptions(2, timezone) < 0) {
+            throw new Exception("Failed to set timezone: " + timezone + ". System default will be used.");
+        }
+    }
+
+    public void open(String host, int port, String dbname, String user, String password) throws Exception {
+        if (this.conn != JNI_NULL_POINTER) {
+            close();
+            this.conn = JNI_NULL_POINTER;
+        }
+
+        this.conn = connectImp(host, port, dbname, user, password);
+        if (this.conn == JNI_NULL_POINTER) {
+            String errMsg = getErrMsgImp(0);
+            throw new Exception(errMsg);
+        }
+    }
+
+    public void insertOpentsdbJson(String json) throws Exception {
+        if (this.conn == JNI_NULL_POINTER) {
+            throw new Exception("JNI connection is NULL");
+        }
+
+        long result = insertOpentsdbJson(json, this.conn);
+        int errCode = getErrCodeImp(this.conn, result);
+        if (errCode != JNI_SUCCESSFUL) {
+            String errMsg = getErrMsgImp(result);
+            freeResultSetImp(this.conn, result);
+            throw new Exception(errMsg);
+        }
+        freeResultSetImp(this.conn, result);
+    }
+
+    public void close() throws Exception {
+        int code = this.closeConnectionImp(this.conn);
+        if (code != 0) {
+            throw new Exception("JNI closeConnection failed");
+        }
+        this.conn = JNI_NULL_POINTER;
+    }
+
+    private static native void initImp(String configDir);
+
+    private static native int setOptions(int optionIndex, String optionValue);
+
+    private native long connectImp(String host, int port, String dbName, String user, String password);
+
+    private native int getErrCodeImp(long connection, long pSql);
+
+    private native String getErrMsgImp(long pSql);
+
+    private native void freeResultSetImp(long connection, long pSql);
+
+    private native int closeConnectionImp(long connection);
+
+    private native long insertOpentsdbJson(String json, long pSql);
+
+}

tdenginewriter/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/Key.java

@@ -0,0 +1,14 @@
+package com.alibaba.datax.plugin.writer.tdenginewriter;
+
+public class Key {
+    public static final String HOST = "host";
+    public static final String PORT = "port";
+    public static final String DBNAME = "dbName";
+    public static final String USER = "username";
+    public static final String PASSWORD = "password";
+    public static final String BATCH_SIZE = "batchSize";
+    public static final String STABLE = "stable";
+    public static final String TAG_COLUMN = "tagColumn";
+    public static final String FIELD_COLUMN = "fieldColumn";
+    public static final String TIMESTAMP_COLUMN = "timestampColumn";
+}

tdenginewriter/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/Msg.java

@@ -0,0 +1,20 @@
+package com.alibaba.datax.plugin.writer.tdenginewriter;
+
+import java.util.Locale;
+import java.util.ResourceBundle;
+
+/**
+ * i18n message util
+ */
+public class Msg {
+    private static ResourceBundle bundle;
+
+    static {
+        bundle = ResourceBundle.getBundle("tdenginewritermsg", Locale.getDefault());
+    }
+
+    public static String get(String key) {
+        return bundle.getString(key);
+    }
+
+}

tdenginewriter/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/OpentsdbDataHandler.java

@@ -0,0 +1,99 @@
+package com.alibaba.datax.plugin.writer.tdenginewriter;
+
+import com.alibaba.datax.common.element.Column;
+import com.alibaba.datax.common.element.Record;
+import com.alibaba.datax.common.exception.DataXException;
+import com.alibaba.datax.common.plugin.RecordReceiver;
+import com.alibaba.datax.common.plugin.TaskPluginCollector;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Properties;
+
+public class OpentsdbDataHandler implements DataHandler {
+    private static final Logger LOG = LoggerFactory.getLogger(OpentsdbDataHandler.class);
+    private static final String DEFAULT_BATCH_SIZE = "1";
+
+    @Override
+    public long handle(RecordReceiver lineReceiver, Properties properties, TaskPluginCollector collector) {
+        // opentsdb json protocol use JNI and schemaless API to write
+        String host = properties.getProperty(Key.HOST);
+        int port = Integer.parseInt(properties.getProperty(Key.PORT));
+        String dbname = properties.getProperty(Key.DBNAME);
+        String user = properties.getProperty(Key.USER);
+        String password = properties.getProperty(Key.PASSWORD);
+
+        JniConnection conn = null;
+        long count = 0;
+        try {
+            conn = new JniConnection(properties);
+            conn.open(host, port, dbname, user, password);
+            LOG.info("TDengine connection established, host: " + host + ", port: " + port + ", dbname: " + dbname + ", user: " + user);
+            int batchSize = Integer.parseInt(properties.getProperty(Key.BATCH_SIZE, DEFAULT_BATCH_SIZE));
+            count = writeOpentsdb(lineReceiver, conn, batchSize);
+        } catch (Exception e) {
+            LOG.error(e.getMessage());
+            e.printStackTrace();
+        } finally {
+            try {
+                if (conn != null)
+                    conn.close();
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+            LOG.info("TDengine connection closed");
+        }
+
+        return count;
+    }
+
+    private long writeOpentsdb(RecordReceiver lineReceiver, JniConnection conn, int batchSize) {
+        long recordIndex = 1;
+        try {
+            Record record;
+            StringBuilder sb = new StringBuilder();
+            while ((record = lineReceiver.getFromReader()) != null) {
+                if (batchSize == 1) {
+                    String jsonData = recordToString(record);
+                    LOG.debug(">>> " + jsonData);
+                    conn.insertOpentsdbJson(jsonData);
+                } else if (recordIndex % batchSize == 1) {
+                    sb.append("[").append(recordToString(record)).append(",");
+                } else if (recordIndex % batchSize == 0) {
+                    sb.append(recordToString(record)).append("]");
+                    String jsonData = sb.toString();
+                    LOG.debug(">>> " + jsonData);
+                    conn.insertOpentsdbJson(jsonData);
+                    sb.delete(0, sb.length());
+                } else {
+                    sb.append(recordToString(record)).append(",");
+                }
+                recordIndex++;
+            }
+            if (sb.length() != 0 && sb.charAt(0) == '[') {
+                String jsonData = sb.deleteCharAt(sb.length() - 1).append("]").toString();
+                LOG.debug(">>> " + jsonData);
+                conn.insertOpentsdbJson(jsonData);
+            }
+        } catch (Exception e) {
+            LOG.error("TDengineWriter ERROR: " + e.getMessage());
+            throw DataXException.asDataXException(TDengineWriterErrorCode.RUNTIME_EXCEPTION, e);
+        }
+        return recordIndex - 1;
+    }
+
+    private String recordToString(Record record) {
+        int recordLength = record.getColumnNumber();
+        if (0 == recordLength) {
+            return "";
+        }
+        Column column;
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0; i < recordLength; i++) {
+            column = record.getColumn(i);
+            sb.append(column.asString()).append("\t");
+        }
+        sb.setLength(sb.length() - 1);
+        return sb.toString();
+    }
+}

tdenginewriter/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/SchemaManager.java

@@ -0,0 +1,271 @@
+package com.alibaba.datax.plugin.writer.tdenginewriter;
+
+import com.alibaba.datax.common.element.Column;
+import com.alibaba.datax.common.element.Record;
+import com.alibaba.datax.common.exception.DataXException;
+import org.apache.commons.codec.digest.DigestUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.*;
+import java.util.stream.Collectors;
+
+public class SchemaManager {
+    private static final Logger LOG = LoggerFactory.getLogger(SchemaManager.class);
+
+    private String stable; // 目标超表名
+    private Map<String, String> fixedTagValue = new HashMap<>(); // 固定标签值 标签名 -> 标签值
+    private Map<String, Integer> tagIndexMap = new HashMap<>(); // 动态标签值  标签名 -> 列索引
+    private Map<String, Integer> fieldIndexMap = new HashMap<>(); // 字段名 -> 字段索引
+    private String tsColName; // 时间戳列名
+    private int tsColIndex = -1; // 时间戳列索引
+    private List<String> fieldList = new ArrayList<>();
+    private List<String> tagList = new ArrayList<>();
+    private boolean canInferSchemaFromConfig = false;
+
+
+    public SchemaManager() {
+    }
+
+    public SchemaManager(Properties properties) {
+        getFromConfig(properties);
+    }
+
+    private String mapDataxType(Column.Type type) {
+        switch (type) {
+            case LONG:
+                return "BIGINT";
+            case DOUBLE:
+                return "DOUBLE";
+            case STRING:
+                return "NCHAR(64)";
+            case DATE:
+                return "TIMESTAMP";
+            case BOOL:
+                return "BOOL";
+            case BYTES:
+                return "BINARY(64)";
+            default:
+                throw DataXException.asDataXException(TDengineWriterErrorCode.TYPE_ERROR, type.toString());
+        }
+    }
+
+    public void setStable(String stable) {
+        stable = stable;
+    }
+
+    public String getStable() {
+        return stable;
+    }
+
+    private void getFromConfig(Properties properties) {
+        stable = properties.getProperty(Key.STABLE);
+        if (stable == null) {
+            LOG.error("Config error: no stable");
+            return;
+        }
+        for (Object key : properties.keySet()) {
+            String k = (String) key;
+            String v = properties.getProperty(k);
+
+            String[] ps = k.split("\\.");
+            if (ps.length == 1) {
+                continue;
+            }
+            if (k.startsWith(Key.TAG_COLUMN)) {
+                String tagName = ps[1];
+                try {
+                    Integer tagIndex = Integer.parseInt(v);
+                    this.tagIndexMap.put(tagName, tagIndex);
+                    tagList.add(tagName);
+                } catch (NumberFormatException e) {
+                    fixedTagValue.put(tagName, v);
+                    tagList.add(tagName);
+                }
+            } else if (k.startsWith(Key.FIELD_COLUMN)) {
+                String fieldName = ps[1];
+                Integer fileIndex = Integer.parseInt(v);
+                fieldIndexMap.put(fieldName, fileIndex);
+            } else if (k.startsWith(Key.TIMESTAMP_COLUMN)) {
+                tsColName = ps[1];
+                tsColIndex = Integer.parseInt(v);
+            }
+        }
+        List<String> sortedFieldName = fieldIndexMap.entrySet().stream().sorted((x, y) -> x.getValue().compareTo(y.getValue())).map(e -> e.getKey()).collect(Collectors.toList());
+        fieldList.addAll(sortedFieldName); // 排序的目的是保证自动建表时列的顺序和输入数据的列的顺序保持一致
+        canInferSchemaFromConfig = tsColIndex > -1 && !(fixedTagValue.isEmpty() && tagIndexMap.isEmpty()) && !fieldIndexMap.isEmpty();
+        LOG.info("Config file parsed result：fixedTags=[{}] ,tags=[{}], fields=[{}], tsColName={}, tsIndex={}", String.join(",", fixedTagValue.keySet()), String.join(",", tagIndexMap.keySet()), String.join(",", fieldList), tsColName, tsColIndex);
+    }
+
+    public boolean shouldGuessSchema() {
+        return !canInferSchemaFromConfig;
+    }
+
+    public boolean shouldCreateTable() {
+        return canInferSchemaFromConfig;
+    }
+
+    public boolean configValid() {
+        boolean valid = (tagList.size() > 0 && fieldList.size() > 0 && tsColIndex > -1) || (tagList.size() == 0 && fieldList.size() == 0 && tsColIndex == -1);
+        if (!valid) {
+            LOG.error("Config error: tagColumn, fieldColumn and timestampColumn must be present together or absent together.");
+        }
+        return valid;
+    }
+
+    /**
+     * 通过执行`describe dbname.stable`命令，获取表的schema.<br/>
+     * describe命名返回有4列内容，分布是：Field,Type,Length,Note<br/>
+     *
+     * @return 成功返回true，如果超表不存在或其他错误则返回false
+     */
+    public boolean getFromDB(Connection conn) {
+        try {
+            List<String> stables = getSTables(conn);
+            if (!stables.contains(stable)) {
+                LOG.error("super table {} not exist， fail to get schema from database.", stable);
+                return false;
+            }
+        } catch (SQLException e) {
+            LOG.error(e.getMessage());
+            e.printStackTrace();
+            return false;
+        }
+        try (Statement stmt = conn.createStatement()) {
+            ResultSet rs = stmt.executeQuery("describe " + stable);
+            int colIndex = 0;
+            while (rs.next()) {
+                String name = rs.getString(1);
+                String type = rs.getString(2);
+                String note = rs.getString(4);
+                if ("TIMESTAMP".equals(type)) {
+                    tsColName = name;
+                    tsColIndex = colIndex;
+                } else if ("TAG".equals(note)) {
+                    tagIndexMap.put(name, colIndex);
+                    tagList.add(name);
+                } else {
+                    fieldIndexMap.put(name, colIndex);
+                    fieldList.add(name);
+                }
+                colIndex++;
+            }
+            LOG.info("table info：tags=[{}], fields=[{}], tsColName={}, tsIndex={}", String.join(",", tagIndexMap.keySet()), String.join(",", fieldList), tsColName, tsColIndex);
+            return true;
+        } catch (SQLException e) {
+            LOG.error(e.getMessage());
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    public static List<String> getSTables(Connection conn) throws SQLException {
+        List<String> stables = new ArrayList<>();
+        try (Statement stmt = conn.createStatement()) {
+            ResultSet rs = stmt.executeQuery("show stables");
+            while (rs.next()) {
+                String name = rs.getString(1);
+                stables.add(name);
+            }
+        }
+        return stables;
+    }
+
+    public void createSTable(Connection conn, List<Column.Type> fieldTypes) throws SQLException {
+        StringBuilder sb = new StringBuilder();
+        sb.append("CREATE STABLE IF NOT EXISTS ").append(stable).append("(");
+        sb.append(tsColName).append(" ").append("TIMESTAMP,");
+        for (int i = 0; i < fieldList.size(); ++i) {
+            String fieldName = fieldList.get(i);
+            Column.Type dxType = fieldTypes.get(i);
+            sb.append(fieldName).append(' ');
+            String tdType = mapDataxType(dxType);
+            sb.append(tdType).append(',');
+        }
+        sb.deleteCharAt(sb.length() - 1);
+        sb.append(") TAGS(");
+        for (String tagName : tagList) {
+            sb.append(tagName).append(" NCHAR(64),");
+        }
+        sb.deleteCharAt(sb.length() - 1);
+        sb.append(")");
+        String q = sb.toString();
+        LOG.info("run sql：" + q);
+        try (Statement stmt = conn.createStatement()) {
+            stmt.execute(q);
+        }
+    }
+
+    public String[] getTagValuesFromRecord(Record record) {
+        String[] tagValues = new String[tagList.size()];
+        for (int i = 0; i < tagList.size(); ++i) {
+            if (fixedTagValue.containsKey(tagList.get(i))) {
+                tagValues[i] = fixedTagValue.get(tagList.get(i));
+            } else {
+                int tagIndex = tagIndexMap.get(tagList.get(i));
+                tagValues[i] = record.getColumn(tagIndex).asString();
+            }
+            if (tagValues[i] == null) {
+                return null;
+            }
+        }
+        return tagValues;
+    }
+
+    public boolean hasTimestamp(Record record) {
+        Column column = record.getColumn(tsColIndex);
+        if (column.getType() == Column.Type.DATE && column.asDate() != null) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    public Map<String, Integer> getFieldIndexMap() {
+        return fieldIndexMap;
+    }
+
+    public List<String> getFieldList() {
+        return fieldList;
+    }
+
+    public String getJoinedFieldNames() {
+        return tsColName + ", " + String.join(", ", fieldList);
+    }
+
+    public int getTsColIndex() {
+        return tsColIndex;
+    }
+
+    public String getTagValuesPlaceHolder() {
+        return tagList.stream().map(x -> "?").collect(Collectors.joining(","));
+    }
+
+    public String getFieldValuesPlaceHolder() {
+        return "?, " + fieldList.stream().map(x -> "?").collect(Collectors.joining(", "));
+    }
+
+    /**
+     * 计算子表表名
+     * <ol>
+     * <li>将标签的value 组合成为如下的字符串: tag_value1!tag_value2!tag_value3。</li>
+     * <li>计算该字符串的 MD5 散列值 "md5_val"。</li>
+     * <li>"t_md5val"作为子表名。其中的 "t" 是固定的前缀。</li>
+     * </ol>
+     *
+     * @param tagValues
+     * @return
+     */
+    public String computeTableName(String[] tagValues) {
+        String s = String.join("!", tagValues);
+        return "t_" + DigestUtils.md5Hex(s);
+    }
+
+    public int getDynamicTagCount() {
+        return tagIndexMap.size();
+    }
+}

tdenginewriter/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/TDengineWriter.java

@@ -0,0 +1,91 @@
+package com.alibaba.datax.plugin.writer.tdenginewriter;
+
+
+import com.alibaba.datax.common.plugin.RecordReceiver;
+import com.alibaba.datax.common.spi.Writer;
+import com.alibaba.datax.common.util.Configuration;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
+import java.util.Set;
+
+public class TDengineWriter extends Writer {
+
+    private static final String PEER_PLUGIN_NAME = "peerPluginName";
+
+    static {
+        try {
+            Class.forName("com.taosdata.jdbc.TSDBDriver");
+        } catch (ClassNotFoundException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public static class Job extends Writer.Job {
+
+        private Configuration originalConfig;
+
+        @Override
+        public void init() {
+            this.originalConfig = super.getPluginJobConf();
+            this.originalConfig.set(PEER_PLUGIN_NAME, getPeerPluginName());
+        }
+
+        @Override
+        public void destroy() {
+
+        }
+
+        @Override
+        public List<Configuration> split(int mandatoryNumber) {
+            List<Configuration> writerSplitConfigs = new ArrayList<>();
+            for (int i = 0; i < mandatoryNumber; i++) {
+                writerSplitConfigs.add(this.originalConfig);
+            }
+            return writerSplitConfigs;
+        }
+    }
+
+    public static class Task extends Writer.Task {
+        private static final Logger LOG = LoggerFactory.getLogger(Job.class);
+
+        private Configuration writerSliceConfig;
+
+        @Override
+        public void init() {
+            this.writerSliceConfig = getPluginJobConf();
+
+        }
+
+        @Override
+        public void destroy() {
+
+        }
+
+        @Override
+        public void startWrite(RecordReceiver lineReceiver) {
+            Set<String> keys = this.writerSliceConfig.getKeys();
+            Properties properties = new Properties();
+            for (String key : keys) {
+                String value = this.writerSliceConfig.getString(key);
+                properties.setProperty(key, value);
+            }
+            if (!keys.contains(Key.USER)) {
+                properties.setProperty(Key.USER, "root");
+            }
+            if (!keys.contains(Key.PASSWORD)) {
+                properties.setProperty(Key.PASSWORD, "taosdata");
+            }
+            LOG.debug("========================properties==========================\n" + properties);
+            String peerPluginName = this.writerSliceConfig.getString(PEER_PLUGIN_NAME);
+            LOG.debug("start to handle record from: " + peerPluginName);
+            DataHandler handler = DataHandlerFactory.build(peerPluginName);
+            long records = handler.handle(lineReceiver, properties, getTaskPluginCollector());
+            LOG.debug("handle data finished, records: " + records);
+        }
+
+    }
+}

tdenginewriter/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/TDengineWriterErrorCode.java

@@ -0,0 +1,32 @@
+package com.alibaba.datax.plugin.writer.tdenginewriter;
+
+import com.alibaba.datax.common.spi.ErrorCode;
+
+public enum TDengineWriterErrorCode implements ErrorCode {
+    RUNTIME_EXCEPTION("TDengineWriter-00", "运行时异常"),
+    TYPE_ERROR("TDengineWriter-00", "Datax类型无法正确映射到TDengine类型");
+
+    private final String code;
+    private final String description;
+
+    private TDengineWriterErrorCode(String code, String description) {
+        this.code = code;
+        this.description = description;
+    }
+
+    @Override
+    public String getCode() {
+        return this.code;
+    }
+
+    @Override
+    public String getDescription() {
+        return this.description;
+    }
+
+    @Override
+    public String toString() {
+        return String.format("Code:[%s], Description:[%s]. ", this.code,
+                this.description);
+    }
+}

tdenginewriter/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/com_alibaba_datax_plugin_writer_tdenginewriter_JniConnection.h

@@ -0,0 +1,105 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class com_alibaba_datax_plugin_writer_JniConnection */
+
+#ifndef _Included_com_alibaba_datax_plugin_writer_JniConnection
+#define _Included_com_alibaba_datax_plugin_writer_JniConnection
+#ifdef __cplusplus
+extern "C" {
+#endif
+#undef com_alibaba_datax_plugin_writer_JniConnection_JNI_NULL_POINTER
+#define com_alibaba_datax_plugin_writer_JniConnection_JNI_NULL_POINTER 0LL
+#undef com_alibaba_datax_plugin_writer_JniConnection_JNI_SUCCESSFUL
+#define com_alibaba_datax_plugin_writer_JniConnection_JNI_SUCCESSFUL 0L
+/*
+ * Class:     com_alibaba_datax_plugin_writer_JniConnection
+ * Method:    initImp
+ * Signature: (Ljava/lang/String;)V
+ */
+JNIEXPORT void JNICALL Java_com_alibaba_datax_plugin_writer_JniConnection_initImp
+  (JNIEnv *, jclass, jstring);
+
+/*
+ * Class:     com_alibaba_datax_plugin_writer_JniConnection
+ * Method:    setOptions
+ * Signature: (ILjava/lang/String;)I
+ */
+JNIEXPORT jint JNICALL Java_com_alibaba_datax_plugin_writer_JniConnection_setOptions
+  (JNIEnv *, jclass, jint, jstring);
+
+/*
+ * Class:     com_alibaba_datax_plugin_writer_JniConnection
+ * Method:    getTsCharset
+ * Signature: ()Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_com_alibaba_datax_plugin_writer_JniConnection_getTsCharset
+  (JNIEnv *, jclass);
+
+/*
+ * Class:     com_alibaba_datax_plugin_writer_JniConnection
+ * Method:    connectImp
+ * Signature: (Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)J
+ */
+JNIEXPORT jlong JNICALL Java_com_alibaba_datax_plugin_writer_JniConnection_connectImp
+  (JNIEnv *, jobject, jstring, jint, jstring, jstring, jstring);
+
+/*
+ * Class:     com_alibaba_datax_plugin_writer_JniConnection
+ * Method:    executeQueryImp
+ * Signature: ([BJ)J
+ */
+JNIEXPORT jlong JNICALL Java_com_alibaba_datax_plugin_writer_JniConnection_executeQueryImp
+  (JNIEnv *, jobject, jbyteArray, jlong);
+
+/*
+ * Class:     com_alibaba_datax_plugin_writer_JniConnection
+ * Method:    getErrCodeImp
+ * Signature: (JJ)I
+ */
+JNIEXPORT jint JNICALL Java_com_alibaba_datax_plugin_writer_JniConnection_getErrCodeImp
+  (JNIEnv *, jobject, jlong, jlong);
+
+/*
+ * Class:     com_alibaba_datax_plugin_writer_JniConnection
+ * Method:    getErrMsgImp
+ * Signature: (J)Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_com_alibaba_datax_plugin_writer_JniConnection_getErrMsgImp
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     com_alibaba_datax_plugin_writer_JniConnection
+ * Method:    getErrMsgByCode
+ * Signature: (J)Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_com_alibaba_datax_plugin_writer_JniConnection_getErrMsgByCode
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     com_alibaba_datax_plugin_writer_JniConnection
+ * Method:    getAffectedRowsImp
+ * Signature: (JJ)I
+ */
+JNIEXPORT jint JNICALL Java_com_alibaba_datax_plugin_writer_JniConnection_getAffectedRowsImp
+  (JNIEnv *, jobject, jlong, jlong);
+
+/*
+ * Class:     com_alibaba_datax_plugin_writer_JniConnection
+ * Method:    closeConnectionImp
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_com_alibaba_datax_plugin_writer_JniConnection_closeConnectionImp
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     com_alibaba_datax_plugin_writer_JniConnection
+ * Method:    insertOpentsdbJson
+ * Signature: (Ljava/lang/String;J)J
+ */
+JNIEXPORT jlong JNICALL Java_com_alibaba_datax_plugin_writer_JniConnection_insertOpentsdbJson
+  (JNIEnv *, jobject, jstring, jlong);
+
+#ifdef __cplusplus
+}
+#endif
+#endif

tdenginewriter/src/main/resources/plugin.json

@@ -0,0 +1,9 @@
+{
+    "name": "tdenginewriter",
+    "class": "com.alibaba.datax.plugin.writer.tdenginewriter.TDengineWriter",
+    "description": {
+        "useScene": "data migration to tdengine",
+        "mechanism": "use JNI or taos-jdbc to write data to tdengine."
+    },
+    "developer": "zyyang-taosdata"
+}

tdenginewriter/src/main/resources/plugin_job_template.json

@@ -0,0 +1,24 @@
+{
+    "name": "tdenginewriter",
+    "parameter": {
+        "host": "127.0.0.1",
+        "port": 6030,
+        "dbname": "test",
+        "user": "root",
+        "password": "taosdata",
+        "batchSize": 1000,
+        "stable": "weather",
+        "tagColumn": {
+            "station": 0
+        },
+        "fieldColumn": {
+            "latitude": 1,
+            "longtitude": 2,
+            "tmax": 4,
+            "tmin": 5
+        },
+        "timestampColumn":{
+            "date": 3
+        }
+    }
+}

tdenginewriter/src/main/resources/tdenginewritermsg.properties

@@ -0,0 +1,6 @@
+try_get_schema_fromdb=fail to get  structure info of target table from configure file and will try to get it from database
+batch_size_too_small='batchSize' is too small, please increase it and try again
+column_number_error=number of columns is less than expected
+tag_value_error=tag columns include 'null' value
+ts_value_error=timestamp column type error or null
+infer_column_type_error=fail to infer column type: sample count %d, column index %d

tdenginewriter/src/main/resources/tdenginewritermsg_en_US.properties

@@ -0,0 +1,6 @@
+try_get_schema_fromdb=fail to get  structure info of target table from configure file and will try to get it from database
+batch_size_too_small='batchSize' is too small, please increase it and try again
+column_number_error=number of columns is less than expected
+tag_value_error=tag columns include 'null' value
+ts_value_error=timestamp column type error or null
+infer_column_type_error=fail to infer column type: sample count %d, column index %d

tdenginewriter/src/main/resources/tdenginewritermsg_zh_CN.properties

@@ -0,0 +1,6 @@
+try_get_schema_fromdb=\u65e0\u6cd5\u4ece\u914d\u7f6e\u6587\u4ef6\u83b7\u53d6\u8868\u7ed3\u6784\u4fe1\u606f\uff0c\u5c1d\u8bd5\u4ece\u6570\u636e\u5e93\u83b7\u53d6
+batch_size_too_small=batchSize\u592a\u5c0f\uff0c\u4f1a\u589e\u52a0\u81ea\u52a8\u7c7b\u578b\u63a8\u65ad\u9519\u8bef\u7684\u6982\u7387\uff0c\u5efa\u8bae\u6539\u5927\u540e\u91cd\u8bd5
+column_number_error=\u5b9e\u9645\u5217\u6570\u5c0f\u4e8e\u671f\u671b\u5217\u6570
+tag_value_error=\u6807\u7b7e\u5217\u5305\u542bnull
+ts_value_error=\u65f6\u95f4\u6233\u5217\u4e3anull\u6216\u7c7b\u578b\u9519\u8bef
+infer_column_type_error=\u6839\u636e\u91c7\u6837\u7684%d\u6761\u6570\u636e\uff0c\u65e0\u6cd5\u63a8\u65ad\u7b2c%d\u5217\u7684\u6570\u636e\u7c7b\u578b

tdenginewriter/src/test/java/com/alibaba/datax/plugin/writer/tdenginewriter/JniConnectionTest.java

@@ -0,0 +1,21 @@
+package com.alibaba.datax.plugin.writer.tdenginewriter;
+
+import org.junit.Test;
+
+import java.util.Properties;
+
+public class JniConnectionTest {
+
+    @Test
+    public void test() throws Exception {
+        JniConnection connection = new JniConnection(new Properties());
+
+        connection.open("192.168.56.105", 6030, "test", "root", "taosdata");
+
+        String json = "{\"metric\":\"weather_temperature\",\"timestamp\":1609430400000,\"value\":123,\"tags\":{\"location\":\"beijing\",\"id\":\"t123\"}}";
+        connection.insertOpentsdbJson(json);
+
+        connection.close();
+    }
+
+}

tdenginewriter/src/test/java/com/alibaba/datax/plugin/writer/tdenginewriter/MessageTest.java

@@ -0,0 +1,25 @@
+package com.alibaba.datax.plugin.writer.tdenginewriter;
+
+import org.junit.Test;
+
+import java.util.Locale;
+import java.util.ResourceBundle;
+
+import org.junit.Assert;
+
+public class MessageTest {
+    @Test
+    public void testChineseMessage() {
+        Locale local = new Locale("zh", "CN");
+        ResourceBundle bundle = ResourceBundle.getBundle("tdenginewritermsg", local);
+        String msg = bundle.getString("try_get_schema_fromdb");
+        Assert.assertEquals("无法从配置文件获取表结构信息，尝试从数据库获取", msg);
+    }
+
+    @Test
+    public void  testDefaultMessage() {
+        ResourceBundle bundle = ResourceBundle.getBundle("tdenginewritermsg", Locale.getDefault());
+        String msg = bundle.getString("try_get_schema_fromdb");
+        System.out.println(msg);
+    }
+}

tdenginewriter/src/test/java/com/alibaba/datax/plugin/writer/tdenginewriter/TDengineWriterTest.java

@@ -0,0 +1,31 @@
+package com.alibaba.datax.plugin.writer.tdenginewriter;
+
+import org.junit.Test;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.sql.Statement;
+
+public class TDengineWriterTest {
+
+
+    @Test
+    public void testGetSchema() throws ClassNotFoundException, SQLException {
+        Class.forName("com.taosdata.jdbc.TSDBDriver");
+        String jdbcUrl = String.format("jdbc:TAOS://%s:%s/%s?user=%s&password=%s", "wozai.fun", "6030", "test", "root", "taosdata");
+        Connection conn = DriverManager.getConnection(jdbcUrl);
+        SchemaManager schemaManager = new SchemaManager();
+        schemaManager.setStable("test1");
+        schemaManager.getFromDB(conn);
+    }
+
+    @Test
+    public void dropTestTable() throws ClassNotFoundException, SQLException {
+        Class.forName("com.taosdata.jdbc.TSDBDriver");
+        String jdbcUrl = String.format("jdbc:TAOS://%s:%s/%s?user=%s&password=%s", "wozai.fun", "6030", "test", "root", "taosdata");
+        Connection conn = DriverManager.getConnection(jdbcUrl);
+        Statement stmt = conn.createStatement();
+        stmt.execute("drop table market_snapshot");
+    }
+}

tsdbreader/src/main/java/com/alibaba/datax/plugin/reader/tsdbreader/Constant.java

@@ -16,6 +16,8 @@ public final class Constant {
     static final String DEFAULT_DATA_FORMAT = "yyyy-MM-dd HH:mm:ss";
 
     public static final String METRIC_SPECIFY_KEY = "__metric__";
+    public static final String METRIC_SPECIFY_KEY_PREFIX = METRIC_SPECIFY_KEY + ".";
+    public static final int METRIC_SPECIFY_KEY_PREFIX_LENGTH = METRIC_SPECIFY_KEY_PREFIX.length();
     public static final String TS_SPECIFY_KEY = "__ts__";
     public static final String VALUE_SPECIFY_KEY = "__value__";
 

tsdbreader/src/main/java/com/alibaba/datax/plugin/reader/tsdbreader/Key.java

@@ -17,14 +17,19 @@ public class Key {
     // RDB for MySQL / ADB etc.
     static final String SINK_DB_TYPE = "sinkDbType";
     static final String ENDPOINT = "endpoint";
+    static final String USERNAME = "username";
+    static final String PASSWORD = "password";
     static final String COLUMN = "column";
     static final String METRIC = "metric";
     static final String FIELD = "field";
     static final String TAG = "tag";
+    static final String COMBINE = "combine";
     static final String INTERVAL_DATE_TIME = "splitIntervalMs";
     static final String BEGIN_DATE_TIME = "beginDateTime";
     static final String END_DATE_TIME = "endDateTime";
+    static final String HINT = "hint";
 
+    static final Boolean COMBINE_DEFAULT_VALUE = false;
     static final Integer INTERVAL_DATE_TIME_DEFAULT_VALUE = 60;
     static final String TYPE_DEFAULT_VALUE = "TSDB";
     static final Set<String> TYPE_SET = new HashSet<>();

tsdbreader/src/main/java/com/alibaba/datax/plugin/reader/tsdbreader/TSDBReader.java

@@ -60,6 +60,15 @@ public class TSDBReader extends Reader {
                         "The parameter [" + Key.ENDPOINT + "] is not set.");
             }
 
+            String username = originalConfig.getString(Key.USERNAME, null);
+            if (StringUtils.isBlank(username)) {
+                LOG.warn("The parameter [" + Key.USERNAME + "] is blank.");
+            }
+            String password = originalConfig.getString(Key.PASSWORD, null);
+            if (StringUtils.isBlank(password)) {
+                LOG.warn("The parameter [" + Key.PASSWORD + "] is blank.");
+            }
+
             // tagK / field could be empty
             if ("TSDB".equals(type)) {
                 List<String> columns = originalConfig.getList(Key.COLUMN, String.class);
@@ -76,7 +85,14 @@ public class TSDBReader extends Reader {
                             "The parameter [" + Key.COLUMN + "] is not set.");
                 }
                 for (String specifyKey : Constant.MUST_CONTAINED_SPECIFY_KEYS) {
-                    if (!columns.contains(specifyKey)) {
+                    boolean containSpecifyKey = false;
+                    for (String column : columns) {
+                        if (column.startsWith(specifyKey)) {
+                            containSpecifyKey = true;
+                            break;
+                        }
+                    }
+                    if (!containSpecifyKey) {
                         throw DataXException.asDataXException(
                                 TSDBReaderErrorCode.ILLEGAL_VALUE,
                                 "The parameter [" + Key.COLUMN + "] should contain "
@@ -99,6 +115,8 @@ public class TSDBReader extends Reader {
                         "The parameter [" + Key.INTERVAL_DATE_TIME + "] should be great than zero.");
             }
 
+            Boolean isCombine = originalConfig.getBool(Key.COMBINE, Key.COMBINE_DEFAULT_VALUE);
+
             SimpleDateFormat format = new SimpleDateFormat(Constant.DEFAULT_DATA_FORMAT);
             String startTime = originalConfig.getString(Key.BEGIN_DATE_TIME);
             Long startDate;
@@ -168,14 +186,14 @@ public class TSDBReader extends Reader {
                 startTime = format.parse(originalConfig.getString(Key.BEGIN_DATE_TIME)).getTime();
             } catch (ParseException e) {
                 throw DataXException.asDataXException(
-                        TSDBReaderErrorCode.ILLEGAL_VALUE, "解析[" + Key.BEGIN_DATE_TIME + "]失败.", e);
+                        TSDBReaderErrorCode.ILLEGAL_VALUE, "Analysis [" + Key.BEGIN_DATE_TIME + "] failed.", e);
             }
             long endTime;
             try {
                 endTime = format.parse(originalConfig.getString(Key.END_DATE_TIME)).getTime();
             } catch (ParseException e) {
                 throw DataXException.asDataXException(
-                        TSDBReaderErrorCode.ILLEGAL_VALUE, "解析[" + Key.END_DATE_TIME + "]失败.", e);
+                        TSDBReaderErrorCode.ILLEGAL_VALUE, "Analysis [" + Key.END_DATE_TIME + "] failed.", e);
             }
             if (TimeUtils.isSecond(startTime)) {
                 startTime *= 1000;
@@ -186,13 +204,14 @@ public class TSDBReader extends Reader {
             DateTime startDateTime = new DateTime(TimeUtils.getTimeInHour(startTime));
             DateTime endDateTime = new DateTime(TimeUtils.getTimeInHour(endTime));
 
+            final Boolean isCombine = originalConfig.getBool(Key.COMBINE, Key.COMBINE_DEFAULT_VALUE);
+
             if ("TSDB".equals(type)) {
-                // split by metric
-                for (String column : columns4TSDB) {
+                if (isCombine) {
                     // split by time in hour
                     while (startDateTime.isBefore(endDateTime)) {
                         Configuration clone = this.originalConfig.clone();
-                        clone.set(Key.COLUMN, Collections.singletonList(column));
+                        clone.set(Key.COLUMN, columns4TSDB);
 
                         clone.set(Key.BEGIN_DATE_TIME, startDateTime.getMillis());
                         startDateTime = startDateTime.plusMillis(splitIntervalMs);
@@ -202,15 +221,30 @@ public class TSDBReader extends Reader {
 
                         LOG.info("Configuration: {}", JSON.toJSONString(clone));
                     }
+                } else {
+                    // split by time in hour
+                    while (startDateTime.isBefore(endDateTime)) {
+                        // split by metric
+                        for (String column : columns4TSDB) {
+                            Configuration clone = this.originalConfig.clone();
+                            clone.set(Key.COLUMN, Collections.singletonList(column));
+
+                            clone.set(Key.BEGIN_DATE_TIME, startDateTime.getMillis());
+                            startDateTime = startDateTime.plusMillis(splitIntervalMs);
+                            // Make sure the time interval is [start, end).
+                            clone.set(Key.END_DATE_TIME, startDateTime.getMillis() - 1);
+                            configurations.add(clone);
+
+                            LOG.info("Configuration: {}", JSON.toJSONString(clone));
+                        }
+                    }
                 }
             } else {
-                // split by metric
-                for (String metric : metrics) {
-                    // split by time in hour
+                if (isCombine) {
                     while (startDateTime.isBefore(endDateTime)) {
                         Configuration clone = this.originalConfig.clone();
                         clone.set(Key.COLUMN, columns4RDB);
-                        clone.set(Key.METRIC, Collections.singletonList(metric));
+                        clone.set(Key.METRIC, metrics);
 
                         clone.set(Key.BEGIN_DATE_TIME, startDateTime.getMillis());
                         startDateTime = startDateTime.plusMillis(splitIntervalMs);
@@ -220,6 +254,24 @@ public class TSDBReader extends Reader {
 
                         LOG.info("Configuration: {}", JSON.toJSONString(clone));
                     }
+                } else {
+                    // split by time in hour
+                    while (startDateTime.isBefore(endDateTime)) {
+                        // split by metric
+                        for (String metric : metrics) {
+                            Configuration clone = this.originalConfig.clone();
+                            clone.set(Key.COLUMN, columns4RDB);
+                            clone.set(Key.METRIC, Collections.singletonList(metric));
+
+                            clone.set(Key.BEGIN_DATE_TIME, startDateTime.getMillis());
+                            startDateTime = startDateTime.plusMillis(splitIntervalMs);
+                            // Make sure the time interval is [start, end).
+                            clone.set(Key.END_DATE_TIME, startDateTime.getMillis() - 1);
+                            configurations.add(clone);
+
+                            LOG.info("Configuration: {}", JSON.toJSONString(clone));
+                        }
+                    }
                 }
             }
             return configurations;
@@ -247,6 +299,8 @@ public class TSDBReader extends Reader {
         private TSDBConnection conn;
         private Long startTime;
         private Long endTime;
+        private Boolean isCombine;
+        private Map<String, Object> hint;
 
         @Override
         public void init() {
@@ -265,11 +319,16 @@ public class TSDBReader extends Reader {
             this.tags = readerSliceConfig.getMap(Key.TAG);
 
             String address = readerSliceConfig.getString(Key.ENDPOINT);
+            String username = readerSliceConfig.getString(Key.USERNAME);
+            String password = readerSliceConfig.getString(Key.PASSWORD);
 
-            conn = new TSDBConnection(address);
+            conn = new TSDBConnection(address, username, password);
 
             this.startTime = readerSliceConfig.getLong(Key.BEGIN_DATE_TIME);
             this.endTime = readerSliceConfig.getLong(Key.END_DATE_TIME);
+
+            this.isCombine = readerSliceConfig.getBool(Key.COMBINE, Key.COMBINE_DEFAULT_VALUE);
+            this.hint = readerSliceConfig.getMap(Key.HINT);
         }
 
         @Override
@@ -283,29 +342,35 @@ public class TSDBReader extends Reader {
                 if ("TSDB".equals(type)) {
                     for (String metric : columns4TSDB) {
                         final Map<String, String> tags = this.tags == null ?
-                                    null : (Map<String, String>) this.tags.get(metric);
+                                null : (Map<String, String>) this.tags.get(metric);
                         if (fields == null || !fields.containsKey(metric)) {
-                            conn.sendDPs(metric, tags, this.startTime, this.endTime, recordSender);
+                            conn.sendDPs(metric, tags, this.startTime, this.endTime, recordSender, hint);
                         } else {
                             conn.sendDPs(metric, (List<String>) fields.get(metric),
-                                    tags, this.startTime, this.endTime, recordSender);
+                                    tags, this.startTime, this.endTime, recordSender, hint);
                         }
                     }
                 } else {
-                    for (String metric : metrics) {
+                    if (isCombine) {
                         final Map<String, String> tags = this.tags == null ?
-                                null : (Map<String, String>) this.tags.get(metric);
-                        if (fields == null || !fields.containsKey(metric)) {
-                            conn.sendRecords(metric, tags, startTime, endTime, columns4RDB, recordSender);
-                        } else {
-                            conn.sendRecords(metric, (List<String>) fields.get(metric),
-                                    tags, startTime, endTime, columns4RDB, recordSender);
+                                null : (Map<String, String>) this.tags.get(metrics.get(0));
+                        conn.sendRecords(metrics, tags, startTime, endTime, columns4RDB, recordSender, hint);
+                    } else {
+                        for (String metric : metrics) {
+                            final Map<String, String> tags = this.tags == null ?
+                                    null : (Map<String, String>) this.tags.get(metric);
+                            if (fields == null || !fields.containsKey(metric)) {
+                                conn.sendRecords(metric, tags, startTime, endTime, columns4RDB, isCombine, recordSender, hint);
+                            } else {
+                                conn.sendRecords(metric, (List<String>) fields.get(metric),
+                                        tags, startTime, endTime, columns4RDB, recordSender, hint);
+                            }
                         }
                     }
                 }
             } catch (Exception e) {
                 throw DataXException.asDataXException(
-                        TSDBReaderErrorCode.ILLEGAL_VALUE, "获取或发送数据点的过程中出错！", e);
+                        TSDBReaderErrorCode.ILLEGAL_VALUE, "Error in getting or sending data point！", e);
             }
         }
 

tsdbreader/src/main/java/com/alibaba/datax/plugin/reader/tsdbreader/conn/Connection4TSDB.java

@@ -22,6 +22,20 @@ public interface Connection4TSDB {
      */
     String address();
 
+    /**
+     * Get the address of Database.
+     *
+     * @return host+ip
+     */
+    String username();
+
+    /**
+     * Get the address of Database.
+     *
+     * @return host+ip
+     */
+    String password();
+
     /**
      * Get the version of Database.
      *
@@ -46,22 +60,27 @@ public interface Connection4TSDB {
     /**
      * Send data points for TSDB with single field.
      */
-    void sendDPs(String metric, Map<String, String> tags, Long start, Long end, RecordSender recordSender) throws Exception;
+    void sendDPs(String metric, Map<String, String> tags, Long start, Long end, RecordSender recordSender, Map<String, Object> hint) throws Exception;
 
     /**
      * Send data points for TSDB with multi fields.
      */
-    void sendDPs(String metric, List<String> fields, Map<String, String> tags, Long start, Long end, RecordSender recordSender) throws Exception;
+    void sendDPs(String metric, List<String> fields, Map<String, String> tags, Long start, Long end, RecordSender recordSender, Map<String, Object> hint) throws Exception;
 
     /**
      * Send data points for RDB with single field.
      */
-    void sendRecords(String metric, Map<String, String> tags, Long start, Long end, List<String> columns4RDB, RecordSender recordSender) throws Exception;
+    void sendRecords(String metric, Map<String, String> tags, Long start, Long end, List<String> columns4RDB, Boolean isCombine, RecordSender recordSender, Map<String, Object> hint) throws Exception;
 
     /**
      * Send data points for RDB with multi fields.
      */
-    void sendRecords(String metric, List<String> fields, Map<String, String> tags, Long start, Long end, List<String> columns4RDB, RecordSender recordSender) throws Exception;
+    void sendRecords(String metric, List<String> fields, Map<String, String> tags, Long start, Long end, List<String> columns4RDB, RecordSender recordSender, Map<String, Object> hint) throws Exception;
+
+    /**
+     * Send data points for RDB with single fields on combine mode.
+     */
+    void sendRecords(List<String> metrics, Map<String, String> tags, Long start, Long end, List<String> columns4RDB, RecordSender recordSender, Map<String, Object> hint) throws Exception;
 
     /**
      * Put data point.

tsdbreader/src/main/java/com/alibaba/datax/plugin/reader/tsdbreader/conn/TSDBConnection.java

@@ -19,9 +19,13 @@ import java.util.Map;
 public class TSDBConnection implements Connection4TSDB {
 
     private String address;
+    private String username;
+    private String password;
 
-    public TSDBConnection(String address) {
+    public TSDBConnection(String address, String username, String password) {
         this.address = address;
+        this.username = username;
+        this.password = password;
     }
 
     @Override
@@ -29,14 +33,24 @@ public class TSDBConnection implements Connection4TSDB {
         return address;
     }
 
+    @Override
+    public String username() {
+        return username;
+    }
+
+    @Override
+    public String password() {
+        return password;
+    }
+
     @Override
     public String version() {
-        return TSDBUtils.version(address);
+        return TSDBUtils.version(address, username, password);
     }
 
     @Override
     public String config() {
-        return TSDBUtils.config(address);
+        return TSDBUtils.config(address, username, password);
     }
 
     @Override
@@ -45,23 +59,28 @@ public class TSDBConnection implements Connection4TSDB {
     }
 
     @Override
-    public void sendDPs(String metric, Map<String, String> tags, Long start, Long end, RecordSender recordSender) throws Exception {
-        TSDBDump.dump4TSDB(this, metric, tags, start, end, recordSender);
+    public void sendDPs(String metric, Map<String, String> tags, Long start, Long end, RecordSender recordSender, Map<String, Object> hint) throws Exception {
+        TSDBDump.dump4TSDB(this, metric, tags, start, end, recordSender, hint);
     }
 
     @Override
-    public void sendDPs(String metric, List<String> fields, Map<String, String> tags, Long start, Long end, RecordSender recordSender) throws Exception {
-        TSDBDump.dump4TSDB(this, metric, fields, tags, start, end, recordSender);
+    public void sendDPs(String metric, List<String> fields, Map<String, String> tags, Long start, Long end, RecordSender recordSender, Map<String, Object> hint) throws Exception {
+        TSDBDump.dump4TSDB(this, metric, fields, tags, start, end, recordSender, hint);
     }
 
     @Override
-    public void sendRecords(String metric, Map<String, String> tags, Long start, Long end, List<String> columns4RDB, RecordSender recordSender) throws Exception {
-        TSDBDump.dump4RDB(this, metric, tags, start, end, columns4RDB, recordSender);
+    public void sendRecords(String metric, Map<String, String> tags, Long start, Long end, List<String> columns4RDB, Boolean isCombine, RecordSender recordSender, Map<String, Object> hint) throws Exception {
+        TSDBDump.dump4RDB(this, metric, tags, start, end, columns4RDB, recordSender, hint);
     }
 
     @Override
-    public void sendRecords(String metric, List<String> fields, Map<String, String> tags, Long start, Long end, List<String> columns4RDB, RecordSender recordSender) throws Exception {
-        TSDBDump.dump4RDB(this, metric, fields, tags, start, end, columns4RDB, recordSender);
+    public void sendRecords(List<String> metrics, Map<String, String> tags, Long start, Long end, List<String> columns4RDB, RecordSender recordSender, Map<String, Object> hint) throws Exception {
+        TSDBDump.dump4RDB(this, metrics, tags, start, end, columns4RDB, recordSender, hint);
+    }
+
+    @Override
+    public void sendRecords(String metric, List<String> fields, Map<String, String> tags, Long start, Long end, List<String> columns4RDB, RecordSender recordSender, Map<String, Object> hint) throws Exception {
+        TSDBDump.dump4RDB(this, metric, fields, tags, start, end, columns4RDB, recordSender, hint);
     }
 
     @Override

tsdbreader/src/main/java/com/alibaba/datax/plugin/reader/tsdbreader/conn/TSDBDump.java

@@ -9,10 +9,9 @@ import com.alibaba.fastjson.parser.Feature;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+
+import static com.alibaba.datax.plugin.reader.tsdbreader.Constant.METRIC_SPECIFY_KEY_PREFIX_LENGTH;
 
 /**
  * Copyright @ 2019 alibaba.com
@@ -37,10 +36,10 @@ final class TSDBDump {
     }
 
     static void dump4TSDB(TSDBConnection conn, String metric, Map<String, String> tags,
-                          Long start, Long end, RecordSender sender) throws Exception {
+                          Long start, Long end, RecordSender sender, Map<String, Object> hint) throws Exception {
         LOG.info("conn address: {}, metric: {}, start: {}, end: {}", conn.address(), metric, start, end);
 
-        String res = queryRange4SingleField(conn, metric, tags, start, end);
+        String res = queryRange4SingleField(conn, metric, tags, start, end, hint);
         List<String> dps = getDps4TSDB(metric, res);
         if (dps == null || dps.isEmpty()) {
             return;
@@ -49,10 +48,10 @@ final class TSDBDump {
     }
 
     static void dump4TSDB(TSDBConnection conn, String metric, List<String> fields, Map<String, String> tags,
-                          Long start, Long end, RecordSender sender) throws Exception {
+                          Long start, Long end, RecordSender sender, Map<String, Object> hint) throws Exception {
         LOG.info("conn address: {}, metric: {}, start: {}, end: {}", conn.address(), metric, start, end);
 
-        String res = queryRange4MultiFields(conn, metric, fields, tags, start, end);
+        String res = queryRange4MultiFields(conn, metric, fields, tags, start, end, hint);
         List<String> dps = getDps4TSDB(metric, fields, res);
         if (dps == null || dps.isEmpty()) {
             return;
@@ -61,10 +60,10 @@ final class TSDBDump {
     }
 
     static void dump4RDB(TSDBConnection conn, String metric, Map<String, String> tags,
-                         Long start, Long end, List<String> columns4RDB, RecordSender sender) throws Exception {
+                         Long start, Long end, List<String> columns4RDB, RecordSender sender, Map<String, Object> hint) throws Exception {
         LOG.info("conn address: {}, metric: {}, start: {}, end: {}", conn.address(), metric, start, end);
 
-        String res = queryRange4SingleField(conn, metric, tags, start, end);
+        String res = queryRange4SingleField(conn, metric, tags, start, end, hint);
         List<DataPoint4TSDB> dps = getDps4RDB(metric, res);
         if (dps == null || dps.isEmpty()) {
             return;
@@ -92,12 +91,71 @@ final class TSDBDump {
         }
     }
 
+    public static void dump4RDB(TSDBConnection conn, List<String> metrics, Map<String, String> tags, Long start, Long end, List<String> columns4RDB, RecordSender sender, Map<String, Object> hint) throws Exception {
+        LOG.info("conn address: {}, metric: {}, start: {}, end: {}", conn.address(), metrics, start, end);
+
+        List<DataPoint4TSDB> dps = new LinkedList<>();
+        for (String metric : metrics) {
+            String res = queryRange4SingleField(conn, metric, tags, start, end, hint);
+            final List<DataPoint4TSDB> dpList = getDps4RDB(metric, res);
+            if (dpList == null || dpList.isEmpty()) {
+                continue;
+            }
+            dps.addAll(dpList);
+        }
+        if (dps.isEmpty()) {
+            return;
+        }
+        Map<Long, Map<String, DataPoint4TSDB>> dpsCombinedByTs = new LinkedHashMap<>();
+        for (DataPoint4TSDB dp : dps) {
+            final long ts = dp.getTimestamp();
+            final Map<String, DataPoint4TSDB> dpsWithSameTs = dpsCombinedByTs.computeIfAbsent(ts, k -> new LinkedHashMap<>());
+            dpsWithSameTs.put(dp.getMetric(), dp);
+        }
+
+        for (Map.Entry<Long, Map<String, DataPoint4TSDB>> entry : dpsCombinedByTs.entrySet()) {
+            final Long ts = entry.getKey();
+            final Map<String, DataPoint4TSDB> metricAndDps = entry.getValue();
+            final Record record = sender.createRecord();
+            DataPoint4TSDB tmpDp = null;
+
+            for (final String column : columns4RDB) {
+                if (column.startsWith(Constant.METRIC_SPECIFY_KEY)) {
+                    final String m = column.substring(METRIC_SPECIFY_KEY_PREFIX_LENGTH);
+                    tmpDp = metricAndDps.get(m);
+                    if (tmpDp == null) {
+                        continue;
+                    }
+                    record.addColumn(getColumn(tmpDp.getValue()));
+                } else if (Constant.TS_SPECIFY_KEY.equals(column)) {
+                    record.addColumn(new LongColumn(ts));
+                } else if (Constant.VALUE_SPECIFY_KEY.equals(column)) {
+                    // combine 模式下，不应该定义 __value__ 字段，因为 __metric__.xxx 字段会输出对应的 value 值
+                    throw new RuntimeException("The " + Constant.VALUE_SPECIFY_KEY +
+                            " column should not be specified in combine mode!");
+                } else {
+                    // combine 模式下，应该确保 __metric__.xxx 字段的定义，放在 column 数组的最前面，以保证获取到 metric
+                    if (tmpDp == null) {
+                        throw new RuntimeException("These " + Constant.METRIC_SPECIFY_KEY_PREFIX +
+                                " column should be placed first in the column array in combine mode!");
+                    }
+                    final Object tagv = tmpDp.getTags().get(column);
+                    if (tagv == null) {
+                        continue;
+                    }
+                    record.addColumn(getColumn(tagv));
+                }
+            }
+            sender.sendToWriter(record);
+        }
+    }
+
     static void dump4RDB(TSDBConnection conn, String metric, List<String> fields,
                          Map<String, String> tags, Long start, Long end,
-                         List<String> columns4RDB, RecordSender sender) throws Exception {
+                         List<String> columns4RDB, RecordSender sender, Map<String, Object> hint) throws Exception {
         LOG.info("conn address: {}, metric: {}, start: {}, end: {}", conn.address(), metric, start, end);
 
-        String res = queryRange4MultiFields(conn, metric, fields, tags, start, end);
+        String res = queryRange4MultiFields(conn, metric, fields, tags, start, end, hint);
         List<DataPoint4TSDB> dps = getDps4RDB(metric, fields, res);
         if (dps == null || dps.isEmpty()) {
             return;
@@ -131,14 +189,16 @@ final class TSDBDump {
             valueColumn = new LongColumn((Long) value);
         } else if (value instanceof String) {
             valueColumn = new StringColumn((String) value);
+        } else if (value instanceof Integer) {
+            valueColumn = new LongColumn(((Integer)value).longValue());
         } else {
-            throw new Exception(String.format("value 不支持类型: [%s]", value.getClass().getSimpleName()));
+            throw new Exception(String.format("value not supported type: [%s]", value.getClass().getSimpleName()));
         }
         return valueColumn;
     }
 
     private static String queryRange4SingleField(TSDBConnection conn, String metric, Map<String, String> tags,
-                                                 Long start, Long end) throws Exception {
+                                                 Long start, Long end, Map<String, Object> hint) throws Exception {
         String tagKV = getFilterByTags(tags);
         String body = "{\n" +
                 "  \"start\": " + start + ",\n" +
@@ -148,14 +208,15 @@ final class TSDBDump {
                 "      \"aggregator\": \"none\",\n" +
                 "      \"metric\": \"" + metric + "\"\n" +
                 (tagKV == null ? "" : tagKV) +
+                (hint == null ? "" : (", \"hint\": " + JSON.toJSONString(hint))) +
                 "    }\n" +
                 "  ]\n" +
                 "}";
-        return HttpUtils.post(conn.address() + QUERY, body);
+        return HttpUtils.post(conn.address() + QUERY, conn.username(), conn.password(), body);
     }
 
     private static String queryRange4MultiFields(TSDBConnection conn, String metric, List<String> fields,
-                                                 Map<String, String> tags, Long start, Long end) throws Exception {
+                                                 Map<String, String> tags, Long start, Long end, Map<String, Object> hint) throws Exception {
         // fields
         StringBuilder fieldBuilder = new StringBuilder();
         fieldBuilder.append("\"fields\":[");
@@ -177,10 +238,11 @@ final class TSDBDump {
                 "      \"metric\": \"" + metric + "\",\n" +
                 fieldBuilder.toString() +
                 (tagKV == null ? "" : tagKV) +
+                (hint == null ? "" : (", \"hint\": " + JSON.toJSONString(hint))) +
                 "    }\n" +
                 "  ]\n" +
                 "}";
-        return HttpUtils.post(conn.address() + QUERY_MULTI_FIELD, body);
+        return HttpUtils.post(conn.address() + QUERY_MULTI_FIELD, conn.username(), conn.password(), body);
     }
 
     private static String getFilterByTags(Map<String, String> tags) {

tsdbreader/src/main/java/com/alibaba/datax/plugin/reader/tsdbreader/util/HttpUtils.java

@@ -1,11 +1,13 @@
 package com.alibaba.datax.plugin.reader.tsdbreader.util;
 
 import com.alibaba.fastjson.JSON;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.http.client.fluent.Content;
 import org.apache.http.client.fluent.Request;
 import org.apache.http.entity.ContentType;
 
 import java.nio.charset.StandardCharsets;
+import java.util.Base64;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
@@ -22,13 +24,18 @@ public final class HttpUtils {
     public final static int CONNECT_TIMEOUT_DEFAULT_IN_MILL = (int) TimeUnit.SECONDS.toMillis(60);
     public final static int SOCKET_TIMEOUT_DEFAULT_IN_MILL = (int) TimeUnit.SECONDS.toMillis(60);
 
+    private static final String CREDENTIALS_FORMAT = "%s:%s";
+    private static final String BASIC_AUTHENTICATION_FORMAT = "Basic %s";
+
     private HttpUtils() {
     }
 
-    public static String get(String url) throws Exception {
-        Content content = Request.Get(url)
+    public static String get(String url, String username, String password) throws Exception {
+        final Request request = Request.Get(url)
                 .connectTimeout(CONNECT_TIMEOUT_DEFAULT_IN_MILL)
-                .socketTimeout(SOCKET_TIMEOUT_DEFAULT_IN_MILL)
+                .socketTimeout(SOCKET_TIMEOUT_DEFAULT_IN_MILL);
+        addAuth(request, username, password);
+        Content content = request
                 .execute()
                 .returnContent();
         if (content == null) {
@@ -37,24 +44,21 @@ public final class HttpUtils {
         return content.asString(StandardCharsets.UTF_8);
     }
 
-    public static String post(String url, Map<String, Object> params) throws Exception {
-        return post(url, JSON.toJSONString(params), CONNECT_TIMEOUT_DEFAULT_IN_MILL, SOCKET_TIMEOUT_DEFAULT_IN_MILL);
+    public static String post(String url, String username, String password, Map<String, Object> params) throws Exception {
+        return post(url, username, password, JSON.toJSONString(params), CONNECT_TIMEOUT_DEFAULT_IN_MILL, SOCKET_TIMEOUT_DEFAULT_IN_MILL);
     }
 
-    public static String post(String url, String params) throws Exception {
-        return post(url, params, CONNECT_TIMEOUT_DEFAULT_IN_MILL, SOCKET_TIMEOUT_DEFAULT_IN_MILL);
+    public static String post(String url, String username, String password, String params) throws Exception {
+        return post(url, username, password, params, CONNECT_TIMEOUT_DEFAULT_IN_MILL, SOCKET_TIMEOUT_DEFAULT_IN_MILL);
     }
 
-    public static String post(String url, Map<String, Object> params,
+    public static String post(String url, String username, String password, String params,
                               int connectTimeoutInMill, int socketTimeoutInMill) throws Exception {
-        return post(url, JSON.toJSONString(params), connectTimeoutInMill, socketTimeoutInMill);
-    }
-
-    public static String post(String url, String params,
-                              int connectTimeoutInMill, int socketTimeoutInMill) throws Exception {
-        Content content = Request.Post(url)
+        Request request = Request.Post(url)
                 .connectTimeout(connectTimeoutInMill)
-                .socketTimeout(socketTimeoutInMill)
+                .socketTimeout(socketTimeoutInMill);
+        addAuth(request, username, password);
+        Content content = request
                 .addHeader("Content-Type", "application/json")
                 .bodyString(params, ContentType.APPLICATION_JSON)
                 .execute()
@@ -64,4 +68,20 @@ public final class HttpUtils {
         }
         return content.asString(StandardCharsets.UTF_8);
     }
+
+    private static void addAuth(Request request, String username, String password) {
+        String authorization = generateHttpAuthorization(username, password);
+        if (authorization != null) {
+            request.setHeader("Authorization", authorization);
+        }
+    }
+
+    private static String generateHttpAuthorization(String username, String password) {
+        if (StringUtils.isBlank(username) || StringUtils.isBlank(password)) {
+            return null;
+        }
+        String credentials = String.format(CREDENTIALS_FORMAT, username, password);
+        credentials = Base64.getEncoder().encodeToString(credentials.getBytes());
+        return String.format(BASIC_AUTHENTICATION_FORMAT, credentials);
+    }
 }

tsdbreader/src/main/java/com/alibaba/datax/plugin/reader/tsdbreader/util/TSDBUtils.java

@@ -1,11 +1,5 @@
 package com.alibaba.datax.plugin.reader.tsdbreader.util;
 
-import com.alibaba.datax.plugin.reader.tsdbreader.conn.DataPoint4TSDB;
-import com.alibaba.fastjson.JSON;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.List;
 
 /**
  * Copyright @ 2019 alibaba.com
@@ -17,52 +11,28 @@ import java.util.List;
  */
 public final class TSDBUtils {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(TSDBUtils.class);
-
     private TSDBUtils() {
     }
 
-    public static String version(String address) {
+    public static String version(String address, String username, String password) {
         String url = String.format("%s/api/version", address);
         String rsp;
         try {
-            rsp = HttpUtils.get(url);
+            rsp = HttpUtils.get(url, username, password);
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
         return rsp;
     }
 
-    public static String config(String address) {
+    public static String config(String address, String username, String password) {
         String url = String.format("%s/api/config", address);
         String rsp;
         try {
-            rsp = HttpUtils.get(url);
+            rsp = HttpUtils.get(url, username, password);
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
         return rsp;
     }
-
-    public static boolean put(String address, List<DataPoint4TSDB> dps) {
-        return put(address, JSON.toJSON(dps));
-    }
-
-    public static boolean put(String address, DataPoint4TSDB dp) {
-        return put(address, JSON.toJSON(dp));
-    }
-
-    private static boolean put(String address, Object o) {
-        String url = String.format("%s/api/put", address);
-        String rsp;
-        try {
-            rsp = HttpUtils.post(url, o.toString());
-            // If successful, the returned content should be null.
-            assert rsp == null;
-        } catch (Exception e) {
-            LOGGER.error("Address: {}, DataPoints: {}", url, o);
-            throw new RuntimeException(e);
-        }
-        return true;
-    }
 }

tsdbreader/src/test/java/com/alibaba/datax/plugin/reader/tsdbreader/conn/TSDBConnectionTest.java

@@ -19,12 +19,12 @@ public class TSDBConnectionTest {
 
     @Test
     public void testVersion() {
-        String version = new TSDBConnection(TSDB_ADDRESS).version();
+        String version = new TSDBConnection(TSDB_ADDRESS,null,null).version();
         Assert.assertNotNull(version);
     }
 
     @Test
     public void testIsSupported() {
-        Assert.assertTrue(new TSDBConnection(TSDB_ADDRESS).isSupported());
+        Assert.assertTrue(new TSDBConnection(TSDB_ADDRESS,null,null).isSupported());
     }
 }

tsdbreader/src/test/java/com/alibaba/datax/plugin/reader/tsdbreader/util/HttpUtilsTest.java

@@ -1,39 +0,0 @@
-package com.alibaba.datax.plugin.reader.tsdbreader.util;
-
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Copyright @ 2019 alibaba.com
- * All right reserved.
- * Function：HttpUtils Test
- *
- * @author Benedict Jin
- * @since 2019-10-21
- */
-@Ignore
-public class HttpUtilsTest {
-
-    @Test
-    public void testSimpleCase() throws Exception {
-        String url = "https://httpbin.org/post";
-        Map<String, Object> params = new HashMap<>();
-        params.put("foo", "bar");
-
-        String rsp = HttpUtils.post(url, params);
-        System.out.println(rsp);
-        Assert.assertNotNull(rsp);
-    }
-
-    @Test
-    public void testGet() throws Exception {
-        String url = String.format("%s/api/version", Const.TSDB_ADDRESS);
-        String rsp = HttpUtils.get(url);
-        System.out.println(rsp);
-        Assert.assertNotNull(rsp);
-    }
-}

tsdbwriter/doc/tsdbhttpwriter.md

@@ -6,24 +6,57 @@ ___
 
 ## 1 快速介绍
 
-TSDBWriter 插件实现了将数据点写入到阿里巴巴自研 TSDB 数据库中（后续简称 TSDB）。
+TSDBWriter 插件实现了将数据点写入到阿里巴巴云原生多模数据库Lindorm TSDB数据库中（后续简称 TSDB）。
 
 
-时间序列数据库（Time Series Database , 简称 TSDB）是一种高性能，低成本，稳定可靠的在线时序数据库服务；提供高效读写，高压缩比存储、时序数据插值及聚合计算，广泛应用于物联网（IoT）设备监控系统 ，企业能源管理系统（EMS），生产安全监控系统，电力检测系统等行业场景。 TSDB 提供百万级时序数据秒级写入，高压缩比低成本存储、预降采样、插值、多维聚合计算，查询结果可视化功能；解决由于设备采集点数量巨大，数据采集频率高，造成的存储成本高，写入和查询分析效率低的问题。更多关于 TSDB 的介绍，详见[阿里云 TSDB 官网](https://help.aliyun.com/product/54825.html)。
+时间序列数据库（Time Series Database , 简称 TSDB）是一种高性能，低成本，稳定可靠的在线时序数据库服务；提供高效读写，高压缩比存储、时序数据插值及聚合计算，广泛应用于物联网（IoT）设备监控系统 ，企业能源管理系统（EMS），生产安全监控系统，电力检测系统等行业场景。 TSDB 提供千万级时序数据秒级写入，高压缩比低成本存储、预降采样、插值、多维聚合计算，查询结果可视化功能；解决由于设备采集点数量巨大，数据采集频率高，造成的存储成本高，写入和查询分析效率低的问题。更多关于 TSDB 的介绍，详见[阿里云 Lindorm TSDB 官网](https://help.aliyun.com/document_detail/174600.html)。
 
+注意：阿里巴巴自研HiTSDB已全新升级为云原生多模数据库Lindorm TSDB。Lindorm TSDB兼容大部分HiTSDB的HTTP API并提供原生SQL能力，TSDBWriter插件使用HTTP API方式写入，要使用原生SQL能力需要提前在Lindorm TSDB进行建表。详细参见[与旧版TSDB的比较](https://help.aliyun.com/document_detail/387477.html)
 
 
 ## 2 实现原理
 
-通过 HTTP 连接 TSDB 实例，并通过 `/api/put` 接口将数据点写入。关于写入接口详见 TSDB 的[接口说明文档](https://help.aliyun.com/document_detail/59939.html)。
-
-
+通过TSDB客户端 hitsdb-client 连接 TSDB 实例，并将数据点通过HTTP API方式写入。关于写入接口详见TSDB 的[SDK 参考](https://help.aliyun.com/document_detail/61587.html)。
 
 ## 3 功能说明
 
 ### 3.1 配置样例
 
-* 配置一个从 OpenTSDB 数据库同步抽取数据到 TSDB：
+* 配置TSDB Writer：
+```json
+{
+  "name": "tsdbwriter",
+  "parameter": {
+    "endpoint": "http://localhost:8242",
+    "sourceDbType": "RDB",
+    "batchSize": 256,
+    "columnType": [
+      "tag",
+      "tag",
+      "field_string",
+      "field_double",
+      "timestamp",
+      "field_bool"
+    ],
+    "column": [
+      "tag1",
+      "tag2",
+      "field1",
+      "field2",
+      "timestamp",
+      "field3"
+    ],
+    "multiField":"true",
+    "table":"testmetric", 
+    "username":"xxx",
+    "password":"xxx",
+    "ignoreWriteError":"false",
+    "database":"default"
+  }
+}
+```
+
+* 配置一个从 支持 OpenTSDB 协议的数据库同步抽取数据到 TSDB：
 
 ```json
 {
@@ -42,7 +75,7 @@ TSDBWriter 插件实现了将数据点写入到阿里巴巴自研 TSDB 数据库
           }
         },
         "writer": {
-          "name": "tsdbhttpwriter",
+          "name": "tsdbwriter",
           "parameter": {
             "endpoint": "http://localhost:8242"
           }
@@ -58,7 +91,37 @@ TSDBWriter 插件实现了将数据点写入到阿里巴巴自研 TSDB 数据库
 }
 ```
 
-
+* 使用 OpenTSDB （单值）协议写入TSDB（不推荐）：
+```json
+{
+  "name": "tsdbwriter",
+  "endpoint": "http://localhost:8242",
+  "sourceDbType": "RDB",
+  "parameter": {
+    "batchSize": 256,
+    "columnType": [
+      "tag",
+      "tag",
+      "field_string",
+      "field_double",
+      "timestamp",
+      "field_boolean"
+    ],
+    "column": [
+      "tag1",
+      "tag2",
+      "field_metric_1",
+      "field_metric_2",
+      "timestamp",
+      "field_metric_3"
+    ],
+    "username":"tsdb",
+    "password":"enxU^",
+    "ignoreWriteError":"false"
+  }
+}
+```
+转换到的TSDB 表名（metric）由column中field对应的列名决定：对于上诉配置一行关系型数据将会写入三个metric（field_metric_1，field_metric_2，field_metric_3）
 
 ### 3.2 参数说明
 
@@ -74,23 +137,85 @@ TSDBWriter 插件实现了将数据点写入到阿里巴巴自研 TSDB 数据库
     * 格式：http://IP:Port
     * 默认值：无
 
+* **sourceDbType**
+   * 描述：源端数据类型
+   * 必选：否
+   * 格式：string [RDB或者TSDB]
+   * 默认值：TSDB
+
+* **multiField**
+   * 描述：使用HTTP API多值（多个field）方式写入，目前TSDB版本使用多值写入，需要指定为true
+   * 必选：是
+   * 格式：bool
+   * 默认值：false （单值）
+   * 说明: 如果使用Lindorm TSDB原生SQL能力访问HTTP API方式写入的数据，需要在TSDB进行预建表，否则只能使用HiTSDB HTTP API方式[查询数据](https://help.aliyun.com/document_detail/107576.html)。
+
+* **column**
+   * 描述：关系型数据库中表的字段名
+   * 必选：当sourceDbType为RDB时必选
+   * 格式：string 
+   * 默认值：无
+   * 说明: 此处的字段顺序，需要和Reader插件中配置的column字段的顺序保持一致。
+
+* **columnType**
+   * 描述：关系型数据库中表字段，映射到TSDB中的类型。支持的类型如下所示：
+      * timestamp：该字段为时间戳
+      * tag：该字段为tag
+      * field_string: 该Field的value是字符串类型
+      * field_double: 该Field的value是数值类型
+      * field_boolean: 该Field的value是布尔类型
+   * 必选：当sourceDbType为RDB时必选
+   * 格式：string [RDB或者TSDB]
+   * 默认值: 无
+   * 说明: 此处的字段顺序，需要和column配置中的字段顺序保持一致
+
+* **table**
+   * 描述：TSDB对应表名（metric）
+   * 必选：当sourceDbType为RDB时且multiField为true时必选
+   * 格式：string 
+   * 默认值：无
+   * 说明: 要导入的TSDB表名，如果multiField为falase,不需要填写，对应的metric需要写到column字段
+
 * **batchSize**
    * 描述：每次批量数据的条数
    * 必选：否
    * 格式：int，需要保证大于 0
    * 默认值：100
 
+* **ignoreWriteError**
+   * 描述：如果设置为 true，则忽略写入错误，继续写入；否则，多次重试后仍写入失败的话，则会终止写入任务
+   * 必选：否
+   * 格式：bool
+   * 默认值：false
+
+* **username**
+   * 描述：数据库用户名
+   * 必选：否
+   * 格式：string 
+   * 默认值：无
+   * 说明: TSDB配置了鉴权需要填写
+
+
+* **password**
+   * 描述：数据库密码
+   * 必选：否
+   * 格式：string 
+   * 默认值：无
+   * 说明: TSDB配置了鉴权需要填写
+
+* **database**
+   * 描述：导入的数据库
+   * 必选：否
+   * 格式：string 
+   * 默认值：default
+   * 说明: TSDB需要提前创建数据库
+
 * **maxRetryTime**
    * 描述：失败后重试的次数
    * 必选：否
    * 格式：int，需要保证大于 1
    * 默认值：3
 
-* **ignoreWriteError**
-   * 描述：如果设置为 true，则忽略写入错误，继续写入；否则，多次重试后仍写入失败的话，则会终止写入任务
-   * 必选：否
-   * 格式：bool
-   * 默认值：false
 
 
 
@@ -171,7 +296,7 @@ HBase 机型： 8C16G * 5
 
 ## 5 约束限制
 
-### 5.1 目前只支持兼容 TSDB 2.4.x 及以上版本
+### 5.1 目前支持Lindorm TSDB全部版本 以及 HiTSDB 2.4.x 及以上版本
 
 其他版本暂不保证兼容
 

tsdbwriter/pom.xml

@@ -91,6 +91,13 @@
             <version>${fastjson.version}</version>
         </dependency>
 
+        <!-- tsdb -->
+        <dependency>
+            <groupId>com.aliyun</groupId>
+            <artifactId>hitsdb-client</artifactId>
+            <version>0.4.0-SNAPSHOT</version>
+        </dependency>
+
         <!-- test -->
         <dependency>
             <groupId>junit</groupId>

tsdbwriter/src/main/java/com/alibaba/datax/plugin/writer/conn/Connection4TSDB.java

@@ -21,6 +21,28 @@ public interface Connection4TSDB {
      */
     String address();
 
+    /**
+     * Get the setted database name.
+     *
+     * @return database
+     */
+    String database();
+
+
+    /**
+     * Get the username of Database.
+     *
+     * @return username
+     */
+    String username();
+
+    /**
+     * Get the password of Database.
+     *
+     * @return password
+     */
+    String password();
+
     /**
      * Get the version of Database.
      *
@@ -69,17 +91,25 @@ public interface Connection4TSDB {
     boolean put(List<DataPoint4TSDB> dps);
 
     /**
-     * Put data points.
+     * Put data points with single field.
      *
      * @param dps data points
      * @return whether the data point is written successfully
      */
     boolean put(String dps);
 
+    /**
+     * Put data points with multi fields.
+     *
+     * @param dps data points
+     * @return whether the data point is written successfully
+     */
+    boolean mput(String dps);
+
     /**
      * Whether current version is supported.
      *
      * @return true: supported; false: not yet!
      */
     boolean isSupported();
-}
+}

tsdbwriter/src/main/java/com/alibaba/datax/plugin/writer/conn/TSDBConnection.java

@@ -18,12 +18,18 @@ import java.util.List;
 public class TSDBConnection implements Connection4TSDB {
 
     private String address;
+    private String username;
+    private String password;
+    private String database;
 
-    public TSDBConnection(String address) {
+    public TSDBConnection(String address, String database, String username, String password) {
         if (StringUtils.isBlank(address)) {
             throw new RuntimeException("TSDBConnection init failed because address is blank!");
         }
         this.address = address;
+        this.database = database;
+        this.username = username;
+        this.password = password;
     }
 
     @Override
@@ -31,14 +37,29 @@ public class TSDBConnection implements Connection4TSDB {
         return address;
     }
 
+    @Override
+    public String username() {
+        return username;
+    }
+
+    @Override
+    public String database() {
+        return database;
+    }
+
+    @Override
+    public String password() {
+        return password;
+    }
+
     @Override
     public String version() {
-        return TSDBUtils.version(address);
+        return TSDBUtils.version(address, username, password);
     }
 
     @Override
     public String config() {
-        return TSDBUtils.config(address);
+        return TSDBUtils.config(address, username, password);
     }
 
     @Override
@@ -53,17 +74,22 @@ public class TSDBConnection implements Connection4TSDB {
 
     @Override
     public boolean put(DataPoint4TSDB dp) {
-        return TSDBUtils.put(address, dp);
+        return TSDBUtils.put(address, database, username, password, dp);
     }
 
     @Override
     public boolean put(List<DataPoint4TSDB> dps) {
-        return TSDBUtils.put(address, dps);
+        return TSDBUtils.put(address, database, username, password, dps);
     }
 
     @Override
     public boolean put(String dps) {
-        return TSDBUtils.put(address, dps);
+        return TSDBUtils.put(address, database, username, password, dps);
+    }
+
+    @Override
+    public boolean mput(String dps) {
+        return TSDBUtils.mput(address, database, username, password, dps);
     }
 
     @Override

tsdbwriter/src/main/java/com/alibaba/datax/plugin/writer/tsdbwriter/Key.java

@@ -10,8 +10,22 @@ package com.alibaba.datax.plugin.writer.tsdbwriter;
  */
 public class Key {
 
+    static final String SOURCE_DB_TYPE = "sourceDbType";
+    static final String MULTI_FIELD = "multiField";
+
+    // common
     static final String ENDPOINT = "endpoint";
+    static final String USERNAME = "username";
+    static final String PASSWORD = "password";
+    static final String IGNORE_WRITE_ERROR = "ignoreWriteError";
+    static final String DATABASE = "database";
+
+    // for tsdb
     static final String BATCH_SIZE = "batchSize";
     static final String MAX_RETRY_TIME = "maxRetryTime";
-    static final String IGNORE_WRITE_ERROR = "ignoreWriteError";
+
+    // for rdb
+    static final String COLUMN = "column";
+    static final String COLUMN_TYPE = "columnType";
+    static final String TABLE = "table";
 }

tsdbwriter/src/main/java/com/alibaba/datax/plugin/writer/tsdbwriter/SourceDBType.java

@@ -0,0 +1,5 @@
+package com.alibaba.datax.plugin.writer.tsdbwriter;
+
+public enum SourceDBType {
+    TSDB, RDB
+}

tsdbwriter/src/main/java/com/alibaba/datax/plugin/writer/tsdbwriter/TSDBConverter.java

@@ -0,0 +1,96 @@
+package com.alibaba.datax.plugin.writer.tsdbwriter;
+
+import com.alibaba.datax.common.element.Column;
+import com.alibaba.datax.common.element.Record;
+import com.alibaba.fastjson.JSON;
+import com.aliyun.hitsdb.client.value.request.MultiFieldPoint;
+import com.aliyun.hitsdb.client.value.request.Point;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+class TSDBConverter {
+
+    private static final Logger LOG = LoggerFactory.getLogger(TSDBConverter.class);
+
+    private List<String> columnName;
+    private List<String> columnType;
+
+    TSDBConverter(List<String> columnName, List<String> columnType) {
+        this.columnName = columnName;
+        this.columnType = columnType;
+        LOG.info("columnName: {}, columnType: {}", JSON.toJSONString(columnName), JSON.toJSONString(columnType));
+    }
+
+    List<Point> transRecord2Point(List<Record> records) {
+        List<Point> dps = new ArrayList<Point>();
+        for (Record record : records) {
+            List<Point.MetricBuilder> metricBuilders = new ArrayList<Point.MetricBuilder>();
+            Map<String, String> tags = new HashMap<String, String>();
+            Long time = 0L;
+
+            for (int i = 0; i < columnType.size(); i++) {
+                String type = columnType.get(i);
+                String name = columnName.get(i);
+                Column column = record.getColumn(i);
+                if (TSDBModel.TSDB_TAG.equals(type)) {
+                    tags.put(name, column.asString());
+                } else if (TSDBModel.TSDB_FIELD_DOUBLE.equals(type)) {
+                    metricBuilders.add(new Point.MetricBuilder(name).value(column.asDouble()));
+                } else if (TSDBModel.TSDB_FIELD_STRING.equals(type)) {
+                    metricBuilders.add(new Point.MetricBuilder(name).value(column.asString()));
+                } else if (TSDBModel.TSDB_FIELD_BOOL.equals(type)) {
+                    metricBuilders.add(new Point.MetricBuilder(name).value(column.asBoolean()));
+                } else if (TSDBModel.TSDB_TIMESTAMP.equals(type)) {
+                    time = column.asLong();
+                } else if (TSDBModel.TSDB_METRIC_NUM.equals(type)) {
+                    // compatible with previous usage of TSDB_METRIC_NUM
+                    metricBuilders.add(new Point.MetricBuilder(name).value(column.asDouble()));
+                } else if (TSDBModel.TSDB_METRIC_STRING.equals(type)) {
+                    // compatible with previous usage of TSDB_METRIC_STRING
+                    metricBuilders.add(new Point.MetricBuilder(name).value(column.asString()));
+                }
+            }
+            for (Point.MetricBuilder metricBuilder : metricBuilders) {
+                dps.add(metricBuilder.tag(tags).timestamp(time).build(false));
+            }
+        }
+        return dps;
+    }
+
+    List<MultiFieldPoint> transRecord2MultiFieldPoint(List<Record> records, String tableName) {
+        List<MultiFieldPoint> dps = new ArrayList<MultiFieldPoint>();
+        for (Record record : records) {
+            MultiFieldPoint.MetricBuilder builder = MultiFieldPoint.metric(tableName);
+            for (int i = 0; i < columnType.size(); i++) {
+                String type = columnType.get(i);
+                String name = columnName.get(i);
+                Column column = record.getColumn(i);
+                if (TSDBModel.TSDB_TAG.equals(type)) {
+                    builder.tag(name, column.asString());
+                } else if (TSDBModel.TSDB_FIELD_DOUBLE.equals(type)) {
+                    builder.field(name, column.asDouble());
+                } else if (TSDBModel.TSDB_FIELD_STRING.equals(type)) {
+                    builder.field(name, column.asString());
+                } else if (TSDBModel.TSDB_FIELD_BOOL.equals(type)) {
+                    builder.field(name, column.asBoolean());
+                } else if (TSDBModel.TSDB_TIMESTAMP.equals(type)) {
+                    builder.timestamp(column.asLong());
+                } else if (TSDBModel.TSDB_METRIC_NUM.equals(type)) {
+                    // compatible with previous usage of TSDB_METRIC_NUM
+                    builder.field(name, column.asDouble());
+                } else if (TSDBModel.TSDB_METRIC_STRING.equals(type)) {
+                    // compatible with previous usage of TSDB_METRIC_STRING
+                    builder.field(name, column.asString());
+                }
+            }
+            MultiFieldPoint point = builder.build(false);
+            dps.add(point);
+        }
+        return dps;
+    }
+}

tsdbwriter/src/main/java/com/alibaba/datax/plugin/writer/tsdbwriter/TSDBModel.java

@@ -0,0 +1,11 @@
+package com.alibaba.datax.plugin.writer.tsdbwriter;
+
+class TSDBModel {
+    static final String TSDB_METRIC_NUM = "metric_num";
+    static final String TSDB_METRIC_STRING = "metric_string";
+    static final String TSDB_TAG = "tag";
+    static final String TSDB_TIMESTAMP = "timestamp";
+    static final String TSDB_FIELD_DOUBLE = "field_double";
+    static final String TSDB_FIELD_STRING = "field_string";
+    static final String TSDB_FIELD_BOOL = "field_bool";
+}

tsdbwriter/src/main/java/com/alibaba/datax/plugin/writer/tsdbwriter/TSDBWriter.java

@@ -7,12 +7,20 @@ import com.alibaba.datax.common.spi.Writer;
 import com.alibaba.datax.common.util.Configuration;
 import com.alibaba.datax.common.util.RetryUtil;
 import com.alibaba.datax.plugin.writer.conn.TSDBConnection;
+import com.aliyun.hitsdb.client.TSDB;
+import com.aliyun.hitsdb.client.TSDBClientFactory;
+import com.aliyun.hitsdb.client.TSDBConfig;
+import com.aliyun.hitsdb.client.value.request.MultiFieldPoint;
+import com.aliyun.hitsdb.client.value.request.Point;
+import com.aliyun.hitsdb.client.value.response.batch.IgnoreErrorsResult;
+import com.aliyun.hitsdb.client.value.response.batch.MultiFieldIgnoreErrorsResult;
+import com.aliyun.hitsdb.client.value.response.batch.SummaryResult;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.io.IOException;
+import java.util.*;
 import java.util.concurrent.Callable;
 
 /**
@@ -26,6 +34,9 @@ import java.util.concurrent.Callable;
 @SuppressWarnings("unused")
 public class TSDBWriter extends Writer {
 
+    private static SourceDBType DB_TYPE;
+    private static TSDB tsdb = null;
+
     public static class Job extends Writer.Job {
 
         private static final Logger LOG = LoggerFactory.getLogger(Job.class);
@@ -34,33 +45,99 @@ public class TSDBWriter extends Writer {
 
         @Override
         public void init() {
-            this.originalConfig = super.getPluginJobConf();
+            originalConfig = super.getPluginJobConf();
 
-            String address = this.originalConfig.getString(Key.ENDPOINT);
-            if (StringUtils.isBlank(address)) {
+            // check source db type
+            String sourceDbType = originalConfig.getString(Key.SOURCE_DB_TYPE);
+            if (StringUtils.isBlank(sourceDbType)) {
+                sourceDbType = SourceDBType.TSDB.name();
+                originalConfig.set(Key.SOURCE_DB_TYPE, sourceDbType);
+                LOG.info("The parameter [" + Key.SOURCE_DB_TYPE + "] will be default value: " + SourceDBType.TSDB);
+            }
+            try {
+                DB_TYPE = SourceDBType.valueOf(sourceDbType);
+            } catch (Exception e) {
                 throw DataXException.asDataXException(TSDBWriterErrorCode.REQUIRED_VALUE,
-                        "The parameter [" + Key.ENDPOINT + "] is not set.");
+                        "The parameter [" + Key.SOURCE_DB_TYPE +
+                                "] is invalid, which should be one of [" + Arrays.toString(SourceDBType.values()) + "].");
             }
 
-            Integer batchSize = this.originalConfig.getInt(Key.BATCH_SIZE);
-            if (batchSize == null || batchSize < 1) {
-                originalConfig.set(Key.BATCH_SIZE, Constant.DEFAULT_BATCH_SIZE);
-                LOG.info("The parameter [" + Key.BATCH_SIZE +
-                        "] will be default value: " + Constant.DEFAULT_BATCH_SIZE);
-            }
+            // for tsdb
+            if (DB_TYPE == SourceDBType.TSDB) {
+                String address = originalConfig.getString(Key.ENDPOINT);
+                if (StringUtils.isBlank(address)) {
+                    throw DataXException.asDataXException(TSDBWriterErrorCode.REQUIRED_VALUE,
+                            "The parameter [" + Key.ENDPOINT + "] is not set.");
+                }
 
-            Integer retrySize = this.originalConfig.getInt(Key.MAX_RETRY_TIME);
-            if (retrySize == null || retrySize < 0) {
-                originalConfig.set(Key.MAX_RETRY_TIME, Constant.DEFAULT_TRY_SIZE);
-                LOG.info("The parameter [" + Key.MAX_RETRY_TIME +
-                        "] will be default value: " + Constant.DEFAULT_TRY_SIZE);
-            }
+                String username = originalConfig.getString(Key.USERNAME, null);
+                if (StringUtils.isBlank(username)) {
+                    LOG.warn("The parameter [" + Key.USERNAME + "] is blank.");
+                }
+                String password = originalConfig.getString(Key.PASSWORD, null);
+                if (StringUtils.isBlank(password)) {
+                    LOG.warn("The parameter [" + Key.PASSWORD + "] is blank.");
+                }
+
+                Integer batchSize = originalConfig.getInt(Key.BATCH_SIZE);
+                if (batchSize == null || batchSize < 1) {
+                    originalConfig.set(Key.BATCH_SIZE, Constant.DEFAULT_BATCH_SIZE);
+                    LOG.info("The parameter [" + Key.BATCH_SIZE +
+                            "] will be default value: " + Constant.DEFAULT_BATCH_SIZE);
+                }
+
+                Integer retrySize = originalConfig.getInt(Key.MAX_RETRY_TIME);
+                if (retrySize == null || retrySize < 0) {
+                    originalConfig.set(Key.MAX_RETRY_TIME, Constant.DEFAULT_TRY_SIZE);
+                    LOG.info("The parameter [" + Key.MAX_RETRY_TIME +
+                            "] will be default value: " + Constant.DEFAULT_TRY_SIZE);
+                }
+
+                Boolean ignoreWriteError = originalConfig.getBool(Key.IGNORE_WRITE_ERROR);
+                if (ignoreWriteError == null) {
+                    originalConfig.set(Key.IGNORE_WRITE_ERROR, Constant.DEFAULT_IGNORE_WRITE_ERROR);
+                    LOG.info("The parameter [" + Key.IGNORE_WRITE_ERROR +
+                            "] will be default value: " + Constant.DEFAULT_IGNORE_WRITE_ERROR);
+                }
+            } else if (DB_TYPE == SourceDBType.RDB) {
+                // for rdb
+                originalConfig.getNecessaryValue(Key.ENDPOINT, TSDBWriterErrorCode.REQUIRED_VALUE);
+                originalConfig.getNecessaryValue(Key.COLUMN_TYPE, TSDBWriterErrorCode.REQUIRED_VALUE);
+                originalConfig.getNecessaryValue(Key.COLUMN, TSDBWriterErrorCode.REQUIRED_VALUE);
+                String endpoint = originalConfig.getString(Key.ENDPOINT);
+                String[] split = endpoint.split(":");
+                if (split.length != 3) {
+                    throw DataXException.asDataXException(TSDBWriterErrorCode.REQUIRED_VALUE,
+                            "The parameter [" + Key.ENDPOINT + "] is invalid, which should be [http://IP:Port].");
+                }
+                String ip = split[1].substring(2);
+                int port = Integer.parseInt(split[2]);
+
+                String username = originalConfig.getString(Key.USERNAME, null);
+                if (StringUtils.isBlank(username)) {
+                    LOG.warn("The parameter [" + Key.USERNAME + "] is blank.");
+                }
+
+                String password = originalConfig.getString(Key.PASSWORD, null);
+                if (StringUtils.isBlank(password)) {
+                    LOG.warn("The parameter [" + Key.PASSWORD + "] is blank.");
+                }
+
+                if (!StringUtils.isBlank(password) && !StringUtils.isBlank(username)) {
+                    tsdb = TSDBClientFactory.connect(TSDBConfig.address(ip, port).basicAuth(username, password).config());
+                } else {
+                    tsdb = TSDBClientFactory.connect(TSDBConfig.address(ip, port).config());
+                }
+
+                String database = originalConfig.getString(Key.DATABASE, null);
+                if (StringUtils.isBlank(database)) {
+                    LOG.info("The parameter [" + Key.DATABASE + "] is blank.");
+                } else {
+                    tsdb.useDatabase(database);
+                }
+
+                LOG.info("Tsdb config:" + originalConfig.toJSON());
 
-            Boolean ignoreWriteError = this.originalConfig.getBool(Key.IGNORE_WRITE_ERROR);
-            if (ignoreWriteError == null) {
-                originalConfig.set(Key.IGNORE_WRITE_ERROR, Constant.DEFAULT_IGNORE_WRITE_ERROR);
-                LOG.info("The parameter [" + Key.IGNORE_WRITE_ERROR +
-                        "] will be default value: " + Constant.DEFAULT_IGNORE_WRITE_ERROR);
             }
         }
 
@@ -72,7 +149,7 @@ public class TSDBWriter extends Writer {
         public List<Configuration> split(int mandatoryNumber) {
             ArrayList<Configuration> configurations = new ArrayList<Configuration>(mandatoryNumber);
             for (int i = 0; i < mandatoryNumber; i++) {
-                configurations.add(this.originalConfig.clone());
+                configurations.add(originalConfig.clone());
             }
             return configurations;
         }
@@ -83,6 +160,14 @@ public class TSDBWriter extends Writer {
 
         @Override
         public void destroy() {
+            if (DB_TYPE == SourceDBType.RDB) {
+                if (tsdb != null) {
+                    try {
+                        tsdb.close();
+                    } catch (IOException ignored) {
+                    }
+                }
+            }
         }
     }
 
@@ -91,18 +176,87 @@ public class TSDBWriter extends Writer {
         private static final Logger LOG = LoggerFactory.getLogger(Task.class);
 
         private TSDBConnection conn;
+        private boolean multiField;
         private int batchSize;
         private int retrySize;
         private boolean ignoreWriteError;
+        private String tableName;
+        private TSDBConverter tsdbConverter;
 
         @Override
         public void init() {
             Configuration writerSliceConfig = getPluginJobConf();
-            String address = writerSliceConfig.getString(Key.ENDPOINT);
-            this.conn = new TSDBConnection(address);
-            this.batchSize = writerSliceConfig.getInt(Key.BATCH_SIZE);
-            this.retrySize = writerSliceConfig.getInt(Key.MAX_RETRY_TIME);
+
+            // single field | multi fields
+            this.multiField = writerSliceConfig.getBool(Key.MULTI_FIELD, false);
             this.ignoreWriteError = writerSliceConfig.getBool(Key.IGNORE_WRITE_ERROR);
+
+            // for tsdb
+            if (DB_TYPE == SourceDBType.TSDB) {
+                String address = writerSliceConfig.getString(Key.ENDPOINT);
+                String database = writerSliceConfig.getString(Key.DATABASE);
+                String username = writerSliceConfig.getString(Key.USERNAME);
+                String password = writerSliceConfig.getString(Key.PASSWORD);
+                this.conn = new TSDBConnection(address, database, username, password);
+                this.batchSize = writerSliceConfig.getInt(Key.BATCH_SIZE);
+                this.retrySize = writerSliceConfig.getInt(Key.MAX_RETRY_TIME);
+
+            } else if (DB_TYPE == SourceDBType.RDB) {
+                // for rdb
+                int timeSize = 0;
+                int fieldSize = 0;
+                int tagSize = 0;
+                batchSize = writerSliceConfig.getInt(Key.BATCH_SIZE, 100);
+                List<String> columnName = writerSliceConfig.getList(Key.COLUMN, String.class);
+                List<String> columnType = writerSliceConfig.getList(Key.COLUMN_TYPE, String.class);
+                Set<String> typeSet = new HashSet<String>(columnType);
+                if (columnName.size() != columnType.size()) {
+                    throw DataXException.asDataXException(TSDBWriterErrorCode.ILLEGAL_VALUE,
+                            "The parameter [" + Key.COLUMN_TYPE + "] should has same length with [" + Key.COLUMN + "].");
+                }
+
+                for (String type : columnType) {
+                    if (TSDBModel.TSDB_TAG.equals(type)) {
+                        tagSize ++;
+                    } else if (TSDBModel.TSDB_FIELD_DOUBLE.equals(type) || TSDBModel.TSDB_FIELD_STRING.equals(type)
+                            || TSDBModel.TSDB_FIELD_BOOL.equals(type)) {
+                        fieldSize++;
+                    } else if (TSDBModel.TSDB_TIMESTAMP.equals(type)) {
+                        timeSize++;
+                    }
+                }
+
+                if (fieldSize == 0) {
+                    // compatible with previous usage of TSDB_METRIC_NUM and TSDB_METRIC_STRING
+                    if (!typeSet.contains(TSDBModel.TSDB_METRIC_NUM) && !typeSet.contains(TSDBModel.TSDB_METRIC_STRING)) {
+                        throw DataXException.asDataXException(TSDBWriterErrorCode.ILLEGAL_VALUE,
+                                "The parameter [" + Key.COLUMN_TYPE + "] is invalid, must set at least one of "
+                                        + TSDBModel.TSDB_FIELD_DOUBLE + ", " + TSDBModel.TSDB_FIELD_STRING + " or " + TSDBModel.TSDB_FIELD_BOOL + ".");
+                    }
+                }
+
+                if (tagSize == 0) {
+                    throw DataXException.asDataXException(TSDBWriterErrorCode.ILLEGAL_VALUE,
+                            "The parameter [" + Key.COLUMN_TYPE + "] is invalid, must set " + TSDBModel.TSDB_TAG + ". ");
+                }
+
+                if (timeSize != 1) {
+                    throw DataXException.asDataXException(TSDBWriterErrorCode.ILLEGAL_VALUE,
+                            "The parameter [" + Key.COLUMN_TYPE + "] is invalid, must set one and only one "
+                                    + TSDBModel.TSDB_TIMESTAMP + ".");
+                }
+
+                if (multiField) {
+                    // check source db type
+                    tableName = writerSliceConfig.getString(Key.TABLE);
+                    if (StringUtils.isBlank(tableName)) {
+                        throw DataXException.asDataXException(TSDBWriterErrorCode.ILLEGAL_VALUE,
+                                "The parameter [" + Key.TABLE + "] h must set when use multi field input.");
+                    }
+                }
+                tsdbConverter = new TSDBConverter(columnName, columnType);
+
+            }
         }
 
         @Override
@@ -111,30 +265,52 @@ public class TSDBWriter extends Writer {
 
         @Override
         public void startWrite(RecordReceiver recordReceiver) {
-            try {
-                Record lastRecord = null;
-                Record record;
-                int count = 0;
-                StringBuilder dps = new StringBuilder();
-                while ((record = recordReceiver.getFromReader()) != null) {
-                    final int recordLength = record.getColumnNumber();
-                    for (int i = 0; i < recordLength; i++) {
-                        dps.append(record.getColumn(i).asString());
-                        dps.append(",");
-                        count++;
-                        if (count == batchSize) {
-                            count = 0;
-                            batchPut(record, "[" + dps.substring(0, dps.length() - 1) + "]");
-                            dps = new StringBuilder();
+            // for tsdb
+            if (DB_TYPE == SourceDBType.TSDB) {
+                try {
+                    Record lastRecord = null;
+                    Record record;
+                    int count = 0;
+                    StringBuilder dps = new StringBuilder();
+                    while ((record = recordReceiver.getFromReader()) != null) {
+                        final int recordLength = record.getColumnNumber();
+                        for (int i = 0; i < recordLength; i++) {
+                            dps.append(record.getColumn(i).asString());
+                            dps.append(",");
+                            count++;
+                            if (count == batchSize) {
+                                count = 0;
+                                batchPut(record, "[" + dps.substring(0, dps.length() - 1) + "]");
+                                dps = new StringBuilder();
+                            }
                         }
+                        lastRecord = record;
                     }
-                    lastRecord = record;
+                    if (StringUtils.isNotBlank(dps.toString())) {
+                        batchPut(lastRecord, "[" + dps.substring(0, dps.length() - 1) + "]");
+                    }
+                } catch (Exception e) {
+                    throw DataXException.asDataXException(TSDBWriterErrorCode.RUNTIME_EXCEPTION, e);
                 }
-                if (StringUtils.isNotBlank(dps.toString())) {
-                    batchPut(lastRecord, "[" + dps.substring(0, dps.length() - 1) + "]");
+            } else if (DB_TYPE == SourceDBType.RDB) {
+                // for rdb
+                List<Record> writerBuffer = new ArrayList<Record>(this.batchSize);
+                Record record;
+                long total = 0;
+                while ((record = recordReceiver.getFromReader()) != null) {
+                    writerBuffer.add(record);
+                    if (writerBuffer.size() >= this.batchSize) {
+                        total += doBatchInsert(writerBuffer);
+                        writerBuffer.clear();
+                    }
                 }
-            } catch (Exception e) {
-                throw DataXException.asDataXException(TSDBWriterErrorCode.RUNTIME_EXCEPTION, e);
+                if (!writerBuffer.isEmpty()) {
+                    total += doBatchInsert(writerBuffer);
+                    writerBuffer.clear();
+                }
+                getTaskPluginCollector().collectMessage("write size", total + "");
+                LOG.info("Task finished, write size: {}", total);
+
             }
         }
 
@@ -143,12 +319,13 @@ public class TSDBWriter extends Writer {
                 RetryUtil.executeWithRetry(new Callable<Integer>() {
                     @Override
                     public Integer call() {
-                        if (!conn.put(dps)) {
-                            getTaskPluginCollector().collectDirtyRecord(record, "Put data points failed!");
-                            throw DataXException.asDataXException(TSDBWriterErrorCode.RUNTIME_EXCEPTION,
-                                    "Put data points failed!");
+                        final boolean success = multiField ? conn.mput(dps) : conn.put(dps);
+                        if (success) {
+                            return 0;
                         }
-                        return 0;
+                        getTaskPluginCollector().collectDirtyRecord(record, "Put data points failed!");
+                        throw DataXException.asDataXException(TSDBWriterErrorCode.RUNTIME_EXCEPTION,
+                                "Put data points failed!");
                     }
                 }, retrySize, 60000L, true);
             } catch (Exception e) {
@@ -160,6 +337,47 @@ public class TSDBWriter extends Writer {
             }
         }
 
+        private long doBatchInsert(final List<Record> writerBuffer) {
+            int size;
+            if (ignoreWriteError) {
+                if (multiField) {
+                    List<MultiFieldPoint> points = tsdbConverter.transRecord2MultiFieldPoint(writerBuffer, tableName);
+                    size = points.size();
+                    MultiFieldIgnoreErrorsResult ignoreErrorsResult = tsdb.multiFieldPutSync(points, MultiFieldIgnoreErrorsResult.class);
+                    if (ignoreErrorsResult == null) {
+                        LOG.error("Unexpected inner error for insert");
+                    } else if (ignoreErrorsResult.getFailed() > 0) {
+                        LOG.error("write TSDB failed num:" + ignoreErrorsResult.getFailed());
+                    }
+                } else {
+                    List<Point> points = tsdbConverter.transRecord2Point(writerBuffer);
+                    size = points.size();
+                    IgnoreErrorsResult ignoreErrorsResult = tsdb.putSync(points, IgnoreErrorsResult.class);
+                    if (ignoreErrorsResult == null) {
+                        LOG.error("Unexpected inner error for insert");
+                    } else if (ignoreErrorsResult.getFailed() > 0) {
+                        LOG.error("write TSDB failed num:" + ignoreErrorsResult.getFailed());
+                    }
+                }
+            } else {
+                SummaryResult summaryResult;
+                if (multiField) {
+                    List<MultiFieldPoint> points = tsdbConverter.transRecord2MultiFieldPoint(writerBuffer, tableName);
+                    size = points.size();
+                    summaryResult = tsdb.multiFieldPutSync(points, SummaryResult.class);
+                } else {
+                    List<Point> points = tsdbConverter.transRecord2Point(writerBuffer);
+                    size = points.size();
+                    summaryResult = tsdb.putSync(points, SummaryResult.class);
+                }
+                if (summaryResult.getFailed() > 0) {
+                    LOG.error("write TSDB failed num:" + summaryResult.getFailed());
+                    throw DataXException.asDataXException(TSDBWriterErrorCode.RUNTIME_EXCEPTION, "Write TSDB failed", new Exception());
+                }
+            }
+            return size;
+        }
+
         @Override
         public void post() {
         }

tsdbwriter/src/main/java/com/alibaba/datax/plugin/writer/tsdbwriter/TSDBWriterErrorCode.java

@@ -13,6 +13,7 @@ import com.alibaba.datax.common.spi.ErrorCode;
 public enum TSDBWriterErrorCode implements ErrorCode {
 
     REQUIRED_VALUE("TSDBWriter-00", "Missing the necessary value"),
+    ILLEGAL_VALUE("TSDBWriter-01", "Illegal value"),
     RUNTIME_EXCEPTION("TSDBWriter-01", "Runtime exception"),
     RETRY_WRITER_EXCEPTION("TSDBWriter-02", "After repeated attempts, the write still fails");
 

tsdbwriter/src/main/java/com/alibaba/datax/plugin/writer/util/HttpUtils.java

@@ -1,11 +1,14 @@
 package com.alibaba.datax.plugin.writer.util;
 
 import com.alibaba.fastjson.JSON;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.http.client.fluent.Content;
 import org.apache.http.client.fluent.Request;
 import org.apache.http.entity.ContentType;
 
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
@@ -19,43 +22,44 @@ import java.util.concurrent.TimeUnit;
  */
 public final class HttpUtils {
 
-    public final static Charset UTF_8 = Charset.forName("UTF-8");
     public final static int CONNECT_TIMEOUT_DEFAULT_IN_MILL = (int) TimeUnit.SECONDS.toMillis(60);
     public final static int SOCKET_TIMEOUT_DEFAULT_IN_MILL = (int) TimeUnit.SECONDS.toMillis(60);
 
+    private static final String CREDENTIALS_FORMAT = "%s:%s";
+    private static final String BASIC_AUTHENTICATION_FORMAT = "Basic %s";
+
     private HttpUtils() {
     }
 
-    public static String get(String url) throws Exception {
-        Content content = Request.Get(url)
+    public static String get(String url, String username, String password) throws Exception {
+        final Request request = Request.Get(url)
                 .connectTimeout(CONNECT_TIMEOUT_DEFAULT_IN_MILL)
-                .socketTimeout(SOCKET_TIMEOUT_DEFAULT_IN_MILL)
+                .socketTimeout(SOCKET_TIMEOUT_DEFAULT_IN_MILL);
+        addAuth(request, username, password);
+        Content content = request
                 .execute()
                 .returnContent();
         if (content == null) {
             return null;
         }
-        return content.asString(UTF_8);
+        return content.asString(StandardCharsets.UTF_8);
     }
 
-    public static String post(String url, Map<String, Object> params) throws Exception {
-        return post(url, JSON.toJSONString(params), CONNECT_TIMEOUT_DEFAULT_IN_MILL, SOCKET_TIMEOUT_DEFAULT_IN_MILL);
+    public static String post(String url, String username, String password, Map<String, Object> params) throws Exception {
+        return post(url, username, password, JSON.toJSONString(params), CONNECT_TIMEOUT_DEFAULT_IN_MILL, SOCKET_TIMEOUT_DEFAULT_IN_MILL);
     }
 
-    public static String post(String url, String params) throws Exception {
-        return post(url, params, CONNECT_TIMEOUT_DEFAULT_IN_MILL, SOCKET_TIMEOUT_DEFAULT_IN_MILL);
+    public static String post(String url, String username, String password, String params) throws Exception {
+        return post(url, username, password, params, CONNECT_TIMEOUT_DEFAULT_IN_MILL, SOCKET_TIMEOUT_DEFAULT_IN_MILL);
     }
 
-    public static String post(String url, Map<String, Object> params,
+    public static String post(String url, String username, String password, String params,
                               int connectTimeoutInMill, int socketTimeoutInMill) throws Exception {
-        return post(url, JSON.toJSONString(params), connectTimeoutInMill, socketTimeoutInMill);
-    }
-
-    public static String post(String url, String params,
-                              int connectTimeoutInMill, int socketTimeoutInMill) throws Exception {
-        Content content = Request.Post(url)
+        Request request = Request.Post(url)
                 .connectTimeout(connectTimeoutInMill)
-                .socketTimeout(socketTimeoutInMill)
+                .socketTimeout(socketTimeoutInMill);
+        addAuth(request, username, password);
+        Content content = request
                 .addHeader("Content-Type", "application/json")
                 .bodyString(params, ContentType.APPLICATION_JSON)
                 .execute()
@@ -63,6 +67,22 @@ public final class HttpUtils {
         if (content == null) {
             return null;
         }
-        return content.asString(UTF_8);
+        return content.asString(StandardCharsets.UTF_8);
+    }
+
+    private static void addAuth(Request request, String username, String password) {
+        String authorization = generateHttpAuthorization(username, password);
+        if (authorization != null) {
+            request.setHeader("Authorization", authorization);
+        }
+    }
+
+    private static String generateHttpAuthorization(String username, String password) {
+        if (StringUtils.isBlank(username) || StringUtils.isBlank(password)) {
+            return null;
+        }
+        String credentials = String.format(CREDENTIALS_FORMAT, username, password);
+        credentials = Base64.getEncoder().encodeToString(credentials.getBytes());
+        return String.format(BASIC_AUTHENTICATION_FORMAT, credentials);
     }
 }

tsdbwriter/src/main/java/com/alibaba/datax/plugin/writer/util/TSDBUtils.java

@@ -2,6 +2,7 @@ package com.alibaba.datax.plugin.writer.util;
 
 import com.alibaba.datax.plugin.writer.conn.DataPoint4TSDB;
 import com.alibaba.fastjson.JSON;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -22,45 +23,56 @@ public final class TSDBUtils {
     private TSDBUtils() {
     }
 
-    public static String version(String address) {
+    public static String version(String address, String username, String password) {
         String url = String.format("%s/api/version", address);
         String rsp;
         try {
-            rsp = HttpUtils.get(url);
+            rsp = HttpUtils.get(url, username, password);
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
         return rsp;
     }
 
-    public static String config(String address) {
+    public static String config(String address, String username, String password) {
         String url = String.format("%s/api/config", address);
         String rsp;
         try {
-            rsp = HttpUtils.get(url);
+            rsp = HttpUtils.get(url, username, password);
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
         return rsp;
     }
 
-    public static boolean put(String address, List<DataPoint4TSDB> dps) {
-        return put(address, JSON.toJSON(dps));
+    public static boolean put(String address, String database, String username, String password, List<DataPoint4TSDB> dps) {
+        return put(address, database, username, password, JSON.toJSON(dps));
     }
 
-    public static boolean put(String address, DataPoint4TSDB dp) {
-        return put(address, JSON.toJSON(dp));
+    public static boolean put(String address, String database, String username, String password, DataPoint4TSDB dp) {
+        return put(address, database, username, password, JSON.toJSON(dp));
     }
 
-    private static boolean put(String address, Object o) {
-        return put(address, o.toString());
+    private static boolean put(String address, String database, String username, String password, Object o) {
+        return put(address, database, username, password, o.toString());
     }
 
-    public static boolean put(String address, String s) {
-        String url = String.format("%s/api/put", address);
+    public static boolean put(String address, String database, String username, String password, String s) {
+        return put(address, database, username, password, s, false);
+    }
+
+    public static boolean mput(String address, String database, String username, String password, String s) {
+        return put(address, database, username, password, s, true);
+    }
+
+    public static boolean put(String address, String database, String username, String password, String s, boolean multiField) {
+        String url = address + (multiField ? "/api/mput" : "/api/put");
+        if (!StringUtils.isBlank(database)) {
+            url = url.concat("?db=" + database);
+        }
         String rsp;
         try {
-            rsp = HttpUtils.post(url, s);
+            rsp = HttpUtils.post(url, username, password, s);
             // If successful, the returned content should be null.
             assert rsp == null;
         } catch (Exception e) {

tsdbwriter/src/test/java/com/alibaba/datax/plugin/writer/conn/TSDBConnectionTest.java

@@ -19,12 +19,12 @@ public class TSDBConnectionTest {
 
     @Test
     public void testVersion() {
-        String version = new TSDBConnection(TSDB_ADDRESS).version();
+        String version = new TSDBConnection(TSDB_ADDRESS,null,null,null).version();
         Assert.assertNotNull(version);
     }
 
     @Test
     public void testIsSupported() {
-        Assert.assertTrue(new TSDBConnection(TSDB_ADDRESS).isSupported());
+        Assert.assertTrue(new TSDBConnection(TSDB_ADDRESS,null,null,null).isSupported());
     }
 }

tsdbwriter/src/test/java/com/alibaba/datax/plugin/writer/util/HttpUtilsTest.java

@@ -24,7 +24,7 @@ public class HttpUtilsTest {
         Map<String, Object> params = new HashMap<String, Object>();
         params.put("foo", "bar");
 
-        String rsp = HttpUtils.post(url, params);
+        String rsp = HttpUtils.post(url, null,null,params);
         System.out.println(rsp);
         Assert.assertNotNull(rsp);
     }
@@ -32,7 +32,7 @@ public class HttpUtilsTest {
     @Test
     public void testGet() throws Exception {
         String url = String.format("%s/api/version", Const.OPENTSDB_ADDRESS);
-        String rsp = HttpUtils.get(url);
+        String rsp = HttpUtils.get(url,null,null);
         System.out.println(rsp);
         Assert.assertNotNull(rsp);
     }

tsdbwriter/src/test/java/com/alibaba/datax/plugin/writer/util/TSDBTest.java

@@ -17,11 +17,11 @@ public class TSDBTest {
 
     @Test
     public void testVersion() {
-        String version = TSDBUtils.version(Const.TSDB_ADDRESS);
+        String version = TSDBUtils.version(Const.TSDB_ADDRESS,null,null);
         Assert.assertNotNull(version);
         System.out.println(version);
 
-        version = TSDBUtils.version(Const.OPENTSDB_ADDRESS);
+        version = TSDBUtils.version(Const.OPENTSDB_ADDRESS,null,null);
         Assert.assertNotNull(version);
         System.out.println(version);
     }

userGuid.md

@@ -10,7 +10,7 @@ DataX本身作为数据同步框架，将不同数据源的同步抽象为从源
 
 - Linux
 - [JDK(1.8以上，推荐1.8) ](http://www.oracle.com/technetwork/cn/java/javase/downloads/index.html) 
-- [Python(推荐Python2.6.X) ](https://www.python.org/downloads/)
+- [Python(2或3都可以) ](https://www.python.org/downloads/)
 - [Apache Maven 3.x](https://maven.apache.org/download.cgi) (Compile DataX)
 
 # Quick Start