diff --git a/tdengine20reader/src/main/java/com/alibaba/datax/plugin/reader/TDengineReader.java b/tdengine20reader/src/main/java/com/alibaba/datax/plugin/tdengine20reader/TDengineReader.java similarity index 98% rename from tdengine20reader/src/main/java/com/alibaba/datax/plugin/reader/TDengineReader.java rename to tdengine20reader/src/main/java/com/alibaba/datax/plugin/tdengine20reader/TDengineReader.java index 4ec42d9e..33a6e800 100644 --- a/tdengine20reader/src/main/java/com/alibaba/datax/plugin/reader/TDengineReader.java +++ b/tdengine20reader/src/main/java/com/alibaba/datax/plugin/tdengine20reader/TDengineReader.java @@ -1,11 +1,11 @@ -package com.alibaba.datax.plugin.reader; +package com.alibaba.datax.plugin.tdengine20reader; import com.alibaba.datax.common.element.*; import com.alibaba.datax.common.exception.DataXException; import com.alibaba.datax.common.plugin.RecordSender; import com.alibaba.datax.common.spi.Reader; import com.alibaba.datax.common.util.Configuration; -import com.alibaba.datax.plugin.writer.tdenginewriter.Key; +import com.alibaba.datax.plugin.writer.tdengine20writer.Key; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -15,8 +15,6 @@ import java.sql.*; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; import java.util.List; public class TDengineReader extends Reader { diff --git a/tdengine30reader/src/main/java/com/alibaba/datax/plugin/reader/TDengineReaderErrorCode.java b/tdengine20reader/src/main/java/com/alibaba/datax/plugin/tdengine20reader/TDengineReaderErrorCode.java similarity index 94% rename from tdengine30reader/src/main/java/com/alibaba/datax/plugin/reader/TDengineReaderErrorCode.java rename to tdengine20reader/src/main/java/com/alibaba/datax/plugin/tdengine20reader/TDengineReaderErrorCode.java index b784ab06..1deea80f 100644 --- a/tdengine30reader/src/main/java/com/alibaba/datax/plugin/reader/TDengineReaderErrorCode.java +++ b/tdengine20reader/src/main/java/com/alibaba/datax/plugin/tdengine20reader/TDengineReaderErrorCode.java @@ -1,4 +1,4 @@ -package com.alibaba.datax.plugin.reader; +package com.alibaba.datax.plugin.tdengine20reader; import com.alibaba.datax.common.spi.ErrorCode; diff --git a/tdengine20reader/src/main/resources/plugin.json b/tdengine20reader/src/main/resources/plugin.json index 2d826be2..21496255 100755 --- a/tdengine20reader/src/main/resources/plugin.json +++ b/tdengine20reader/src/main/resources/plugin.json @@ -1,6 +1,6 @@ { - "name": "tdengin20ereader", - "class": "com.alibaba.datax.plugin.reader.TDengineReader", + "name": "tdengine20reader", + "class": "com.alibaba.datax.plugin.tdengine20reader.TDengineReader", "description": { "useScene": "data migration from tdengine", "mechanism": "use JDBC to read data from tdengine." diff --git a/tdengine20reader/src/test/java/com/alibaba/datax/plugin/reader/TDengine2DMTest.java b/tdengine20reader/src/test/java/com/alibaba/datax/plugin/tdengine20reader/TDengine2DMTest.java similarity index 97% rename from tdengine20reader/src/test/java/com/alibaba/datax/plugin/reader/TDengine2DMTest.java rename to tdengine20reader/src/test/java/com/alibaba/datax/plugin/tdengine20reader/TDengine2DMTest.java index e1064717..1e09129b 100644 --- a/tdengine20reader/src/test/java/com/alibaba/datax/plugin/reader/TDengine2DMTest.java +++ b/tdengine20reader/src/test/java/com/alibaba/datax/plugin/tdengine20reader/TDengine2DMTest.java @@ -1,4 +1,4 @@ -package com.alibaba.datax.plugin.reader; +package com.alibaba.datax.plugin.tdengine20reader; import com.alibaba.datax.core.Engine; import org.junit.Ignore; @@ -31,7 +31,7 @@ public class TDengine2DMTest { @Test public void t2dm_case02() throws Throwable { // given - createSupTable("us"); +// createSupTable("us"); // when String[] params = {"-mode", "standalone", "-jobid", "-1", "-job", "src/test/resources/t2dm.json"}; diff --git a/tdengine30reader/src/test/java/com/alibaba/datax/plugin/reader/TDengine2StreamTest.java b/tdengine20reader/src/test/java/com/alibaba/datax/plugin/tdengine20reader/TDengine2StreamTest.java similarity index 98% rename from tdengine30reader/src/test/java/com/alibaba/datax/plugin/reader/TDengine2StreamTest.java rename to tdengine20reader/src/test/java/com/alibaba/datax/plugin/tdengine20reader/TDengine2StreamTest.java index f628a648..7d4dbb72 100644 --- a/tdengine30reader/src/test/java/com/alibaba/datax/plugin/reader/TDengine2StreamTest.java +++ b/tdengine20reader/src/test/java/com/alibaba/datax/plugin/tdengine20reader/TDengine2StreamTest.java @@ -1,4 +1,4 @@ -package com.alibaba.datax.plugin.reader; +package com.alibaba.datax.plugin.tdengine20reader; import com.alibaba.datax.core.Engine; import org.junit.Ignore; diff --git a/tdengine20reader/src/test/java/com/alibaba/datax/plugin/reader/TDengineReaderTest.java b/tdengine20reader/src/test/java/com/alibaba/datax/plugin/tdengine20reader/TDengineReaderTest.java similarity index 98% rename from tdengine20reader/src/test/java/com/alibaba/datax/plugin/reader/TDengineReaderTest.java rename to tdengine20reader/src/test/java/com/alibaba/datax/plugin/tdengine20reader/TDengineReaderTest.java index 491ddbaf..6d839eb4 100644 --- a/tdengine20reader/src/test/java/com/alibaba/datax/plugin/reader/TDengineReaderTest.java +++ b/tdengine20reader/src/test/java/com/alibaba/datax/plugin/tdengine20reader/TDengineReaderTest.java @@ -1,7 +1,7 @@ -package com.alibaba.datax.plugin.reader; +package com.alibaba.datax.plugin.tdengine20reader; import com.alibaba.datax.common.util.Configuration; -import com.alibaba.datax.plugin.writer.tdenginewriter.Key; +import com.alibaba.datax.plugin.writer.tdengine20writer.Key; import org.junit.Assert; import org.junit.Test; diff --git a/tdengine20reader/src/test/resources/t2dm.json b/tdengine20reader/src/test/resources/t2dm.json index d87ade0c..088a5f86 100644 --- a/tdengine20reader/src/test/resources/t2dm.json +++ b/tdengine20reader/src/test/resources/t2dm.json @@ -3,7 +3,7 @@ "content": [ { "reader": { - "name": "tdenginereader", + "name": "tdengine20reader", "parameter": { "username": "root", "password": "taosdata", diff --git a/tdengine20reader/src/test/resources/t2stream-1.json b/tdengine20reader/src/test/resources/t2stream-1.json index 183ab7e2..0a7dbcf9 100644 --- a/tdengine20reader/src/test/resources/t2stream-1.json +++ b/tdengine20reader/src/test/resources/t2stream-1.json @@ -3,7 +3,7 @@ "content": [ { "reader": { - "name": "tdenginereader", + "name": "tdengine20reader", "parameter": { "username": "root", "password": "taosdata", diff --git a/tdengine20reader/src/test/resources/t2stream-2.json b/tdengine20reader/src/test/resources/t2stream-2.json index 15bfe9be..56f27e71 100644 --- a/tdengine20reader/src/test/resources/t2stream-2.json +++ b/tdengine20reader/src/test/resources/t2stream-2.json @@ -3,7 +3,7 @@ "content": [ { "reader": { - "name": "tdenginereader", + "name": "tdengine20reader", "parameter": { "username": "root", "password": "taosdata", diff --git a/tdengine20writer/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/ColumnMeta.java b/tdengine20writer/src/main/java/com/alibaba/datax/plugin/writer/tdengine20writer/ColumnMeta.java similarity index 90% rename from tdengine20writer/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/ColumnMeta.java rename to tdengine20writer/src/main/java/com/alibaba/datax/plugin/writer/tdengine20writer/ColumnMeta.java index 5c77eccd..cf707ef2 100644 --- a/tdengine20writer/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/ColumnMeta.java +++ b/tdengine20writer/src/main/java/com/alibaba/datax/plugin/writer/tdengine20writer/ColumnMeta.java @@ -1,4 +1,4 @@ -package com.alibaba.datax.plugin.writer.tdenginewriter; +package com.alibaba.datax.plugin.writer.tdengine20writer; public class ColumnMeta { String field; diff --git a/tdengine20writer/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/Constants.java b/tdengine20writer/src/main/java/com/alibaba/datax/plugin/writer/tdengine20writer/Constants.java similarity index 82% rename from tdengine20writer/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/Constants.java rename to tdengine20writer/src/main/java/com/alibaba/datax/plugin/writer/tdengine20writer/Constants.java index d62c8f32..3dc5c41b 100644 --- a/tdengine20writer/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/Constants.java +++ b/tdengine20writer/src/main/java/com/alibaba/datax/plugin/writer/tdengine20writer/Constants.java @@ -1,4 +1,4 @@ -package com.alibaba.datax.plugin.writer.tdenginewriter; +package com.alibaba.datax.plugin.writer.tdengine20writer; public class Constants { public static final String DEFAULT_USERNAME = "root"; diff --git a/tdengine30writer/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/DataHandler.java b/tdengine20writer/src/main/java/com/alibaba/datax/plugin/writer/tdengine20writer/DataHandler.java similarity index 79% rename from tdengine30writer/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/DataHandler.java rename to tdengine20writer/src/main/java/com/alibaba/datax/plugin/writer/tdengine20writer/DataHandler.java index f22d4d6c..01f388e5 100644 --- a/tdengine30writer/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/DataHandler.java +++ b/tdengine20writer/src/main/java/com/alibaba/datax/plugin/writer/tdengine20writer/DataHandler.java @@ -1,4 +1,4 @@ -package com.alibaba.datax.plugin.writer.tdenginewriter; +package com.alibaba.datax.plugin.writer.tdengine20writer; import com.alibaba.datax.common.plugin.RecordReceiver; import com.alibaba.datax.common.plugin.TaskPluginCollector; diff --git a/tdengine20writer/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/DefaultDataHandler.java b/tdengine20writer/src/main/java/com/alibaba/datax/plugin/writer/tdengine20writer/DefaultDataHandler.java similarity index 99% rename from tdengine20writer/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/DefaultDataHandler.java rename to tdengine20writer/src/main/java/com/alibaba/datax/plugin/writer/tdengine20writer/DefaultDataHandler.java index 849486fd..4d2b3902 100644 --- a/tdengine20writer/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/DefaultDataHandler.java +++ b/tdengine20writer/src/main/java/com/alibaba/datax/plugin/writer/tdengine20writer/DefaultDataHandler.java @@ -1,4 +1,4 @@ -package com.alibaba.datax.plugin.writer.tdenginewriter; +package com.alibaba.datax.plugin.writer.tdengine20writer; import com.alibaba.datax.common.element.Column; import com.alibaba.datax.common.element.Record; diff --git a/tdengine30writer/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/Key.java b/tdengine20writer/src/main/java/com/alibaba/datax/plugin/writer/tdengine20writer/Key.java similarity index 93% rename from tdengine30writer/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/Key.java rename to tdengine20writer/src/main/java/com/alibaba/datax/plugin/writer/tdengine20writer/Key.java index 1a9358db..f1a8af23 100644 --- a/tdengine30writer/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/Key.java +++ b/tdengine20writer/src/main/java/com/alibaba/datax/plugin/writer/tdengine20writer/Key.java @@ -1,4 +1,4 @@ -package com.alibaba.datax.plugin.writer.tdenginewriter; +package com.alibaba.datax.plugin.writer.tdengine20writer; public class Key { public static final String USERNAME = "username"; diff --git a/tdengine20writer/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/OpentsdbDataHandler.java b/tdengine20writer/src/main/java/com/alibaba/datax/plugin/writer/tdengine20writer/OpentsdbDataHandler.java similarity index 97% rename from tdengine20writer/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/OpentsdbDataHandler.java rename to tdengine20writer/src/main/java/com/alibaba/datax/plugin/writer/tdengine20writer/OpentsdbDataHandler.java index 2fb5a98f..a80fd615 100644 --- a/tdengine20writer/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/OpentsdbDataHandler.java +++ b/tdengine20writer/src/main/java/com/alibaba/datax/plugin/writer/tdengine20writer/OpentsdbDataHandler.java @@ -1,4 +1,4 @@ -package com.alibaba.datax.plugin.writer.tdenginewriter; +package com.alibaba.datax.plugin.writer.tdengine20writer; import com.alibaba.datax.common.element.Column; import com.alibaba.datax.common.element.Record; @@ -14,7 +14,6 @@ import org.slf4j.LoggerFactory; import java.sql.Connection; import java.sql.DriverManager; -import java.sql.SQLException; public class OpentsdbDataHandler implements DataHandler { private static final Logger LOG = LoggerFactory.getLogger(OpentsdbDataHandler.class); diff --git a/tdengine20writer/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/SchemaManager.java b/tdengine20writer/src/main/java/com/alibaba/datax/plugin/writer/tdengine20writer/SchemaManager.java similarity index 99% rename from tdengine20writer/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/SchemaManager.java rename to tdengine20writer/src/main/java/com/alibaba/datax/plugin/writer/tdengine20writer/SchemaManager.java index fc0c002d..f1ec43b7 100644 --- a/tdengine20writer/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/SchemaManager.java +++ b/tdengine20writer/src/main/java/com/alibaba/datax/plugin/writer/tdengine20writer/SchemaManager.java @@ -1,4 +1,4 @@ -package com.alibaba.datax.plugin.writer.tdenginewriter; +package com.alibaba.datax.plugin.writer.tdengine20writer; import com.alibaba.datax.common.exception.DataXException; import org.apache.commons.lang3.StringUtils; diff --git a/tdengine20writer/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/TDengineWriter.java b/tdengine20writer/src/main/java/com/alibaba/datax/plugin/writer/tdengine20writer/TDengineWriter.java similarity index 98% rename from tdengine20writer/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/TDengineWriter.java rename to tdengine20writer/src/main/java/com/alibaba/datax/plugin/writer/tdengine20writer/TDengineWriter.java index 73982744..d221cb9d 100644 --- a/tdengine20writer/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/TDengineWriter.java +++ b/tdengine20writer/src/main/java/com/alibaba/datax/plugin/writer/tdengine20writer/TDengineWriter.java @@ -1,4 +1,4 @@ -package com.alibaba.datax.plugin.writer.tdenginewriter; +package com.alibaba.datax.plugin.writer.tdengine20writer; import com.alibaba.datax.common.exception.DataXException; import com.alibaba.datax.common.plugin.RecordReceiver; diff --git a/tdengine30writer/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/TDengineWriterErrorCode.java b/tdengine20writer/src/main/java/com/alibaba/datax/plugin/writer/tdengine20writer/TDengineWriterErrorCode.java similarity index 93% rename from tdengine30writer/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/TDengineWriterErrorCode.java rename to tdengine20writer/src/main/java/com/alibaba/datax/plugin/writer/tdengine20writer/TDengineWriterErrorCode.java index 469449e6..d31cd892 100644 --- a/tdengine30writer/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/TDengineWriterErrorCode.java +++ b/tdengine20writer/src/main/java/com/alibaba/datax/plugin/writer/tdengine20writer/TDengineWriterErrorCode.java @@ -1,4 +1,4 @@ -package com.alibaba.datax.plugin.writer.tdenginewriter; +package com.alibaba.datax.plugin.writer.tdengine20writer; import com.alibaba.datax.common.spi.ErrorCode; diff --git a/tdengine30writer/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/TableMeta.java b/tdengine20writer/src/main/java/com/alibaba/datax/plugin/writer/tdengine20writer/TableMeta.java similarity index 89% rename from tdengine30writer/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/TableMeta.java rename to tdengine20writer/src/main/java/com/alibaba/datax/plugin/writer/tdengine20writer/TableMeta.java index 2a6b0536..870d8188 100644 --- a/tdengine30writer/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/TableMeta.java +++ b/tdengine20writer/src/main/java/com/alibaba/datax/plugin/writer/tdengine20writer/TableMeta.java @@ -1,4 +1,4 @@ -package com.alibaba.datax.plugin.writer.tdenginewriter; +package com.alibaba.datax.plugin.writer.tdengine20writer; public class TableMeta { TableType tableType; diff --git a/tdengine20writer/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/TableType.java b/tdengine20writer/src/main/java/com/alibaba/datax/plugin/writer/tdengine20writer/TableType.java similarity index 52% rename from tdengine20writer/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/TableType.java rename to tdengine20writer/src/main/java/com/alibaba/datax/plugin/writer/tdengine20writer/TableType.java index 6c97ac3f..a41ef4fa 100644 --- a/tdengine20writer/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/TableType.java +++ b/tdengine20writer/src/main/java/com/alibaba/datax/plugin/writer/tdengine20writer/TableType.java @@ -1,4 +1,4 @@ -package com.alibaba.datax.plugin.writer.tdenginewriter; +package com.alibaba.datax.plugin.writer.tdengine20writer; public enum TableType { SUP_TABLE, SUB_TABLE, NML_TABLE diff --git a/tdengine20writer/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/TimestampPrecision.java b/tdengine20writer/src/main/java/com/alibaba/datax/plugin/writer/tdengine20writer/TimestampPrecision.java similarity index 53% rename from tdengine20writer/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/TimestampPrecision.java rename to tdengine20writer/src/main/java/com/alibaba/datax/plugin/writer/tdengine20writer/TimestampPrecision.java index 46564d6a..31fbe6cb 100644 --- a/tdengine20writer/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/TimestampPrecision.java +++ b/tdengine20writer/src/main/java/com/alibaba/datax/plugin/writer/tdengine20writer/TimestampPrecision.java @@ -1,4 +1,4 @@ -package com.alibaba.datax.plugin.writer.tdenginewriter; +package com.alibaba.datax.plugin.writer.tdengine20writer; public enum TimestampPrecision { MILLISEC, MICROSEC, NANOSEC diff --git a/tdengine20writer/src/main/resources/plugin.json b/tdengine20writer/src/main/resources/plugin.json index 7ac475ea..83fbdd0f 100644 --- a/tdengine20writer/src/main/resources/plugin.json +++ b/tdengine20writer/src/main/resources/plugin.json @@ -1,6 +1,6 @@ { "name": "tdengine20writer", - "class": "com.alibaba.datax.plugin.writer.tdenginewriter.TDengineWriter", + "class": "com.alibaba.datax.plugin.writer.tdengine20writer.TDengineWriter", "description": { "useScene": "data migration to tdengine", "mechanism": "use taos-jdbcdriver to write data." diff --git a/tdengine30writer/src/test/java/com/alibaba/datax/plugin/writer/tdenginewriter/Csv2TDengineTest.java b/tdengine20writer/src/test/java/com/alibaba/datax/plugin/writer/tdengine20writer/Csv2TDengineTest.java similarity index 95% rename from tdengine30writer/src/test/java/com/alibaba/datax/plugin/writer/tdenginewriter/Csv2TDengineTest.java rename to tdengine20writer/src/test/java/com/alibaba/datax/plugin/writer/tdengine20writer/Csv2TDengineTest.java index 7352c3ca..a7faf446 100644 --- a/tdengine30writer/src/test/java/com/alibaba/datax/plugin/writer/tdenginewriter/Csv2TDengineTest.java +++ b/tdengine20writer/src/test/java/com/alibaba/datax/plugin/writer/tdengine20writer/Csv2TDengineTest.java @@ -1,4 +1,4 @@ -package com.alibaba.datax.plugin.writer.tdenginewriter; +package com.alibaba.datax.plugin.writer.tdengine20writer; import com.alibaba.datax.core.Engine; import org.junit.Ignore; diff --git a/tdengine30writer/src/test/java/com/alibaba/datax/plugin/writer/tdenginewriter/DM2TDengineTest.java b/tdengine20writer/src/test/java/com/alibaba/datax/plugin/writer/tdengine20writer/DM2TDengineTest.java similarity index 98% rename from tdengine30writer/src/test/java/com/alibaba/datax/plugin/writer/tdenginewriter/DM2TDengineTest.java rename to tdengine20writer/src/test/java/com/alibaba/datax/plugin/writer/tdengine20writer/DM2TDengineTest.java index 15f6b1bc..0f9507d7 100644 --- a/tdengine30writer/src/test/java/com/alibaba/datax/plugin/writer/tdenginewriter/DM2TDengineTest.java +++ b/tdengine20writer/src/test/java/com/alibaba/datax/plugin/writer/tdengine20writer/DM2TDengineTest.java @@ -1,4 +1,4 @@ -package com.alibaba.datax.plugin.writer.tdenginewriter; +package com.alibaba.datax.plugin.writer.tdengine20writer; import com.alibaba.datax.core.Engine; import org.junit.Before; diff --git a/tdengine20writer/src/test/java/com/alibaba/datax/plugin/writer/tdenginewriter/DefaultDataHandlerTest.java b/tdengine20writer/src/test/java/com/alibaba/datax/plugin/writer/tdengine20writer/DefaultDataHandlerTest.java similarity index 99% rename from tdengine20writer/src/test/java/com/alibaba/datax/plugin/writer/tdenginewriter/DefaultDataHandlerTest.java rename to tdengine20writer/src/test/java/com/alibaba/datax/plugin/writer/tdengine20writer/DefaultDataHandlerTest.java index 46e601ad..0a77289d 100644 --- a/tdengine20writer/src/test/java/com/alibaba/datax/plugin/writer/tdenginewriter/DefaultDataHandlerTest.java +++ b/tdengine20writer/src/test/java/com/alibaba/datax/plugin/writer/tdengine20writer/DefaultDataHandlerTest.java @@ -1,4 +1,4 @@ -package com.alibaba.datax.plugin.writer.tdenginewriter; +package com.alibaba.datax.plugin.writer.tdengine20writer; import com.alibaba.datax.common.element.DateColumn; import com.alibaba.datax.common.element.LongColumn; diff --git a/tdengine20writer/src/test/java/com/alibaba/datax/plugin/writer/tdenginewriter/Mongo2TDengineTest.java b/tdengine20writer/src/test/java/com/alibaba/datax/plugin/writer/tdengine20writer/Mongo2TDengineTest.java similarity index 86% rename from tdengine20writer/src/test/java/com/alibaba/datax/plugin/writer/tdenginewriter/Mongo2TDengineTest.java rename to tdengine20writer/src/test/java/com/alibaba/datax/plugin/writer/tdengine20writer/Mongo2TDengineTest.java index 2356b6f8..5c08551a 100644 --- a/tdengine20writer/src/test/java/com/alibaba/datax/plugin/writer/tdenginewriter/Mongo2TDengineTest.java +++ b/tdengine20writer/src/test/java/com/alibaba/datax/plugin/writer/tdengine20writer/Mongo2TDengineTest.java @@ -1,4 +1,4 @@ -package com.alibaba.datax.plugin.writer.tdenginewriter; +package com.alibaba.datax.plugin.writer.tdengine20writer; import com.alibaba.datax.core.Engine; import org.junit.Test; diff --git a/tdengine20writer/src/test/java/com/alibaba/datax/plugin/writer/tdenginewriter/Mysql2TDengineTest.java b/tdengine20writer/src/test/java/com/alibaba/datax/plugin/writer/tdengine20writer/Mysql2TDengineTest.java similarity index 98% rename from tdengine20writer/src/test/java/com/alibaba/datax/plugin/writer/tdenginewriter/Mysql2TDengineTest.java rename to tdengine20writer/src/test/java/com/alibaba/datax/plugin/writer/tdengine20writer/Mysql2TDengineTest.java index 8bef9c3c..a49118f5 100644 --- a/tdengine20writer/src/test/java/com/alibaba/datax/plugin/writer/tdenginewriter/Mysql2TDengineTest.java +++ b/tdengine20writer/src/test/java/com/alibaba/datax/plugin/writer/tdengine20writer/Mysql2TDengineTest.java @@ -1,4 +1,4 @@ -package com.alibaba.datax.plugin.writer.tdenginewriter; +package com.alibaba.datax.plugin.writer.tdengine20writer; import com.alibaba.datax.core.Engine; import org.junit.Before; diff --git a/tdengine30writer/src/test/java/com/alibaba/datax/plugin/writer/tdenginewriter/Mysql2TDengineTest2.java b/tdengine20writer/src/test/java/com/alibaba/datax/plugin/writer/tdengine20writer/Mysql2TDengineTest2.java similarity index 96% rename from tdengine30writer/src/test/java/com/alibaba/datax/plugin/writer/tdenginewriter/Mysql2TDengineTest2.java rename to tdengine20writer/src/test/java/com/alibaba/datax/plugin/writer/tdengine20writer/Mysql2TDengineTest2.java index 98eae4f5..3829ce5d 100644 --- a/tdengine30writer/src/test/java/com/alibaba/datax/plugin/writer/tdenginewriter/Mysql2TDengineTest2.java +++ b/tdengine20writer/src/test/java/com/alibaba/datax/plugin/writer/tdengine20writer/Mysql2TDengineTest2.java @@ -1,8 +1,7 @@ -package com.alibaba.datax.plugin.writer.tdenginewriter; +package com.alibaba.datax.plugin.writer.tdengine20writer; import com.alibaba.datax.core.Engine; import org.apache.commons.lang3.RandomStringUtils; -import org.apache.commons.lang3.StringUtils; import org.junit.Before; import org.junit.Test; diff --git a/tdengine30writer/src/test/java/com/alibaba/datax/plugin/writer/tdenginewriter/Mysql2TDengineTest3.java b/tdengine20writer/src/test/java/com/alibaba/datax/plugin/writer/tdengine20writer/Mysql2TDengineTest3.java similarity index 98% rename from tdengine30writer/src/test/java/com/alibaba/datax/plugin/writer/tdenginewriter/Mysql2TDengineTest3.java rename to tdengine20writer/src/test/java/com/alibaba/datax/plugin/writer/tdengine20writer/Mysql2TDengineTest3.java index 7061445b..fb14c334 100644 --- a/tdengine30writer/src/test/java/com/alibaba/datax/plugin/writer/tdenginewriter/Mysql2TDengineTest3.java +++ b/tdengine20writer/src/test/java/com/alibaba/datax/plugin/writer/tdengine20writer/Mysql2TDengineTest3.java @@ -1,4 +1,4 @@ -package com.alibaba.datax.plugin.writer.tdenginewriter; +package com.alibaba.datax.plugin.writer.tdengine20writer; import com.alibaba.datax.core.Engine; import org.apache.commons.lang3.RandomStringUtils; diff --git a/tdengine20writer/src/test/java/com/alibaba/datax/plugin/writer/tdenginewriter/Opentsdb2TDengineTest.java b/tdengine20writer/src/test/java/com/alibaba/datax/plugin/writer/tdengine20writer/Opentsdb2TDengineTest.java similarity index 94% rename from tdengine20writer/src/test/java/com/alibaba/datax/plugin/writer/tdenginewriter/Opentsdb2TDengineTest.java rename to tdengine20writer/src/test/java/com/alibaba/datax/plugin/writer/tdengine20writer/Opentsdb2TDengineTest.java index ad326f7e..566c8b3c 100644 --- a/tdengine20writer/src/test/java/com/alibaba/datax/plugin/writer/tdenginewriter/Opentsdb2TDengineTest.java +++ b/tdengine20writer/src/test/java/com/alibaba/datax/plugin/writer/tdengine20writer/Opentsdb2TDengineTest.java @@ -1,4 +1,4 @@ -package com.alibaba.datax.plugin.writer.tdenginewriter; +package com.alibaba.datax.plugin.writer.tdengine20writer; import com.alibaba.datax.core.Engine; import org.junit.Assert; diff --git a/tdengine30writer/src/test/java/com/alibaba/datax/plugin/writer/tdenginewriter/SchemaManagerTest.java b/tdengine20writer/src/test/java/com/alibaba/datax/plugin/writer/tdengine20writer/SchemaManagerTest.java similarity index 98% rename from tdengine30writer/src/test/java/com/alibaba/datax/plugin/writer/tdenginewriter/SchemaManagerTest.java rename to tdengine20writer/src/test/java/com/alibaba/datax/plugin/writer/tdengine20writer/SchemaManagerTest.java index 3708e6f9..4230d284 100644 --- a/tdengine30writer/src/test/java/com/alibaba/datax/plugin/writer/tdenginewriter/SchemaManagerTest.java +++ b/tdengine20writer/src/test/java/com/alibaba/datax/plugin/writer/tdengine20writer/SchemaManagerTest.java @@ -1,4 +1,4 @@ -package com.alibaba.datax.plugin.writer.tdenginewriter; +package com.alibaba.datax.plugin.writer.tdengine20writer; import org.junit.AfterClass; import org.junit.Assert; diff --git a/tdengine20writer/src/test/java/com/alibaba/datax/plugin/writer/tdenginewriter/Stream2TDengineTest.java b/tdengine20writer/src/test/java/com/alibaba/datax/plugin/writer/tdengine20writer/Stream2TDengineTest.java similarity index 96% rename from tdengine20writer/src/test/java/com/alibaba/datax/plugin/writer/tdenginewriter/Stream2TDengineTest.java rename to tdengine20writer/src/test/java/com/alibaba/datax/plugin/writer/tdengine20writer/Stream2TDengineTest.java index e54bcbde..9cc1cee2 100644 --- a/tdengine20writer/src/test/java/com/alibaba/datax/plugin/writer/tdenginewriter/Stream2TDengineTest.java +++ b/tdengine20writer/src/test/java/com/alibaba/datax/plugin/writer/tdengine20writer/Stream2TDengineTest.java @@ -1,7 +1,6 @@ -package com.alibaba.datax.plugin.writer.tdenginewriter; +package com.alibaba.datax.plugin.writer.tdengine20writer; import com.alibaba.datax.core.Engine; -import org.junit.Before; import org.junit.Test; import java.sql.Connection; diff --git a/tdengine30writer/src/test/java/com/alibaba/datax/plugin/writer/tdenginewriter/TDengine2TDengineTest.java b/tdengine20writer/src/test/java/com/alibaba/datax/plugin/writer/tdengine20writer/TDengine2TDengineTest.java similarity index 99% rename from tdengine30writer/src/test/java/com/alibaba/datax/plugin/writer/tdenginewriter/TDengine2TDengineTest.java rename to tdengine20writer/src/test/java/com/alibaba/datax/plugin/writer/tdengine20writer/TDengine2TDengineTest.java index 9e954633..833976d5 100644 --- a/tdengine30writer/src/test/java/com/alibaba/datax/plugin/writer/tdenginewriter/TDengine2TDengineTest.java +++ b/tdengine20writer/src/test/java/com/alibaba/datax/plugin/writer/tdengine20writer/TDengine2TDengineTest.java @@ -1,4 +1,4 @@ -package com.alibaba.datax.plugin.writer.tdenginewriter; +package com.alibaba.datax.plugin.writer.tdengine20writer; import com.alibaba.datax.core.Engine; import org.junit.Before; diff --git a/tdengine20writer/src/test/java/com/alibaba/datax/plugin/writer/tdenginewriter/TDengineWriterTest.java b/tdengine20writer/src/test/java/com/alibaba/datax/plugin/writer/tdengine20writer/TDengineWriterTest.java similarity index 97% rename from tdengine20writer/src/test/java/com/alibaba/datax/plugin/writer/tdenginewriter/TDengineWriterTest.java rename to tdengine20writer/src/test/java/com/alibaba/datax/plugin/writer/tdengine20writer/TDengineWriterTest.java index 813f6131..381fb034 100644 --- a/tdengine20writer/src/test/java/com/alibaba/datax/plugin/writer/tdenginewriter/TDengineWriterTest.java +++ b/tdengine20writer/src/test/java/com/alibaba/datax/plugin/writer/tdengine20writer/TDengineWriterTest.java @@ -1,4 +1,4 @@ -package com.alibaba.datax.plugin.writer.tdenginewriter; +package com.alibaba.datax.plugin.writer.tdengine20writer; import com.alibaba.datax.common.util.Configuration; import org.junit.Assert; diff --git a/tdengine30reader/src/main/java/com/alibaba/datax/plugin/reader/TDengineReader.java b/tdengine30reader/src/main/java/com/alibaba/datax/plugin/tdengine20reader/TDengineReader.java similarity index 99% rename from tdengine30reader/src/main/java/com/alibaba/datax/plugin/reader/TDengineReader.java rename to tdengine30reader/src/main/java/com/alibaba/datax/plugin/tdengine20reader/TDengineReader.java index e81b8c8f..6fc017b9 100644 --- a/tdengine30reader/src/main/java/com/alibaba/datax/plugin/reader/TDengineReader.java +++ b/tdengine30reader/src/main/java/com/alibaba/datax/plugin/tdengine20reader/TDengineReader.java @@ -1,4 +1,4 @@ -package com.alibaba.datax.plugin.reader; +package com.alibaba.datax.plugin.tdengine20reader; import com.alibaba.datax.common.element.*; import com.alibaba.datax.common.element.Record; @@ -6,7 +6,7 @@ import com.alibaba.datax.common.exception.DataXException; import com.alibaba.datax.common.plugin.RecordSender; import com.alibaba.datax.common.spi.Reader; import com.alibaba.datax.common.util.Configuration; -import com.alibaba.datax.plugin.writer.tdenginewriter.Key; +import com.alibaba.datax.plugin.writer.tdengine20writer.Key; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/tdengine20reader/src/main/java/com/alibaba/datax/plugin/reader/TDengineReaderErrorCode.java b/tdengine30reader/src/main/java/com/alibaba/datax/plugin/tdengine20reader/TDengineReaderErrorCode.java similarity index 94% rename from tdengine20reader/src/main/java/com/alibaba/datax/plugin/reader/TDengineReaderErrorCode.java rename to tdengine30reader/src/main/java/com/alibaba/datax/plugin/tdengine20reader/TDengineReaderErrorCode.java index b784ab06..1deea80f 100644 --- a/tdengine20reader/src/main/java/com/alibaba/datax/plugin/reader/TDengineReaderErrorCode.java +++ b/tdengine30reader/src/main/java/com/alibaba/datax/plugin/tdengine20reader/TDengineReaderErrorCode.java @@ -1,4 +1,4 @@ -package com.alibaba.datax.plugin.reader; +package com.alibaba.datax.plugin.tdengine20reader; import com.alibaba.datax.common.spi.ErrorCode; diff --git a/tdengine30reader/src/main/resources/plugin.json b/tdengine30reader/src/main/resources/plugin.json index b495beea..7bd94a0f 100755 --- a/tdengine30reader/src/main/resources/plugin.json +++ b/tdengine30reader/src/main/resources/plugin.json @@ -1,6 +1,6 @@ { "name": "tdengine30reader", - "class": "com.alibaba.datax.plugin.reader.TDengineReader", + "class": "com.alibaba.datax.plugin.tdengine30reader.TDengineReader", "description": { "useScene": "data migration from tdengine", "mechanism": "use JDBC to read data from tdengine." diff --git a/tdengine30reader/src/test/java/com/alibaba/datax/plugin/reader/TDengine2DMTest.java b/tdengine30reader/src/test/java/com/alibaba/datax/plugin/tdengine20reader/TDengine2DMTest.java similarity index 98% rename from tdengine30reader/src/test/java/com/alibaba/datax/plugin/reader/TDengine2DMTest.java rename to tdengine30reader/src/test/java/com/alibaba/datax/plugin/tdengine20reader/TDengine2DMTest.java index e1064717..347c63c6 100644 --- a/tdengine30reader/src/test/java/com/alibaba/datax/plugin/reader/TDengine2DMTest.java +++ b/tdengine30reader/src/test/java/com/alibaba/datax/plugin/tdengine20reader/TDengine2DMTest.java @@ -1,4 +1,4 @@ -package com.alibaba.datax.plugin.reader; +package com.alibaba.datax.plugin.tdengine20reader; import com.alibaba.datax.core.Engine; import org.junit.Ignore; diff --git a/tdengine20reader/src/test/java/com/alibaba/datax/plugin/reader/TDengine2StreamTest.java b/tdengine30reader/src/test/java/com/alibaba/datax/plugin/tdengine20reader/TDengine2StreamTest.java similarity index 98% rename from tdengine20reader/src/test/java/com/alibaba/datax/plugin/reader/TDengine2StreamTest.java rename to tdengine30reader/src/test/java/com/alibaba/datax/plugin/tdengine20reader/TDengine2StreamTest.java index f628a648..7d4dbb72 100644 --- a/tdengine20reader/src/test/java/com/alibaba/datax/plugin/reader/TDengine2StreamTest.java +++ b/tdengine30reader/src/test/java/com/alibaba/datax/plugin/tdengine20reader/TDengine2StreamTest.java @@ -1,4 +1,4 @@ -package com.alibaba.datax.plugin.reader; +package com.alibaba.datax.plugin.tdengine20reader; import com.alibaba.datax.core.Engine; import org.junit.Ignore; diff --git a/tdengine30reader/src/test/java/com/alibaba/datax/plugin/reader/TDengineReaderTest.java b/tdengine30reader/src/test/java/com/alibaba/datax/plugin/tdengine20reader/TDengineReaderTest.java similarity index 98% rename from tdengine30reader/src/test/java/com/alibaba/datax/plugin/reader/TDengineReaderTest.java rename to tdengine30reader/src/test/java/com/alibaba/datax/plugin/tdengine20reader/TDengineReaderTest.java index 491ddbaf..6d839eb4 100644 --- a/tdengine30reader/src/test/java/com/alibaba/datax/plugin/reader/TDengineReaderTest.java +++ b/tdengine30reader/src/test/java/com/alibaba/datax/plugin/tdengine20reader/TDengineReaderTest.java @@ -1,7 +1,7 @@ -package com.alibaba.datax.plugin.reader; +package com.alibaba.datax.plugin.tdengine20reader; import com.alibaba.datax.common.util.Configuration; -import com.alibaba.datax.plugin.writer.tdenginewriter.Key; +import com.alibaba.datax.plugin.writer.tdengine20writer.Key; import org.junit.Assert; import org.junit.Test; diff --git a/tdengine30writer/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/ColumnMeta.java b/tdengine30writer/src/main/java/com/alibaba/datax/plugin/writer/tdengine20writer/ColumnMeta.java similarity index 90% rename from tdengine30writer/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/ColumnMeta.java rename to tdengine30writer/src/main/java/com/alibaba/datax/plugin/writer/tdengine20writer/ColumnMeta.java index 5c77eccd..cf707ef2 100644 --- a/tdengine30writer/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/ColumnMeta.java +++ b/tdengine30writer/src/main/java/com/alibaba/datax/plugin/writer/tdengine20writer/ColumnMeta.java @@ -1,4 +1,4 @@ -package com.alibaba.datax.plugin.writer.tdenginewriter; +package com.alibaba.datax.plugin.writer.tdengine20writer; public class ColumnMeta { String field; diff --git a/tdengine30writer/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/Constants.java b/tdengine30writer/src/main/java/com/alibaba/datax/plugin/writer/tdengine20writer/Constants.java similarity index 96% rename from tdengine30writer/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/Constants.java rename to tdengine30writer/src/main/java/com/alibaba/datax/plugin/writer/tdengine20writer/Constants.java index b9141383..6dfad374 100644 --- a/tdengine30writer/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/Constants.java +++ b/tdengine30writer/src/main/java/com/alibaba/datax/plugin/writer/tdengine20writer/Constants.java @@ -1,4 +1,4 @@ -package com.alibaba.datax.plugin.writer.tdenginewriter; +package com.alibaba.datax.plugin.writer.tdengine20writer; public class Constants { public static final String DEFAULT_USERNAME = "root"; diff --git a/tdengine20writer/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/DataHandler.java b/tdengine30writer/src/main/java/com/alibaba/datax/plugin/writer/tdengine20writer/DataHandler.java similarity index 79% rename from tdengine20writer/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/DataHandler.java rename to tdengine30writer/src/main/java/com/alibaba/datax/plugin/writer/tdengine20writer/DataHandler.java index f22d4d6c..01f388e5 100644 --- a/tdengine20writer/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/DataHandler.java +++ b/tdengine30writer/src/main/java/com/alibaba/datax/plugin/writer/tdengine20writer/DataHandler.java @@ -1,4 +1,4 @@ -package com.alibaba.datax.plugin.writer.tdenginewriter; +package com.alibaba.datax.plugin.writer.tdengine20writer; import com.alibaba.datax.common.plugin.RecordReceiver; import com.alibaba.datax.common.plugin.TaskPluginCollector; diff --git a/tdengine30writer/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/DefaultDataHandler.java b/tdengine30writer/src/main/java/com/alibaba/datax/plugin/writer/tdengine20writer/DefaultDataHandler.java similarity index 99% rename from tdengine30writer/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/DefaultDataHandler.java rename to tdengine30writer/src/main/java/com/alibaba/datax/plugin/writer/tdengine20writer/DefaultDataHandler.java index 97f965c9..82bf207f 100644 --- a/tdengine30writer/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/DefaultDataHandler.java +++ b/tdengine30writer/src/main/java/com/alibaba/datax/plugin/writer/tdengine20writer/DefaultDataHandler.java @@ -1,4 +1,4 @@ -package com.alibaba.datax.plugin.writer.tdenginewriter; +package com.alibaba.datax.plugin.writer.tdengine20writer; import com.alibaba.datax.common.element.Column; import com.alibaba.datax.common.element.Record; diff --git a/tdengine20writer/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/Key.java b/tdengine30writer/src/main/java/com/alibaba/datax/plugin/writer/tdengine20writer/Key.java similarity index 93% rename from tdengine20writer/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/Key.java rename to tdengine30writer/src/main/java/com/alibaba/datax/plugin/writer/tdengine20writer/Key.java index 1a9358db..f1a8af23 100644 --- a/tdengine20writer/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/Key.java +++ b/tdengine30writer/src/main/java/com/alibaba/datax/plugin/writer/tdengine20writer/Key.java @@ -1,4 +1,4 @@ -package com.alibaba.datax.plugin.writer.tdenginewriter; +package com.alibaba.datax.plugin.writer.tdengine20writer; public class Key { public static final String USERNAME = "username"; diff --git a/tdengine30writer/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/OpentsdbDataHandler.java b/tdengine30writer/src/main/java/com/alibaba/datax/plugin/writer/tdengine20writer/OpentsdbDataHandler.java similarity index 97% rename from tdengine30writer/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/OpentsdbDataHandler.java rename to tdengine30writer/src/main/java/com/alibaba/datax/plugin/writer/tdengine20writer/OpentsdbDataHandler.java index 2fb5a98f..a80fd615 100644 --- a/tdengine30writer/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/OpentsdbDataHandler.java +++ b/tdengine30writer/src/main/java/com/alibaba/datax/plugin/writer/tdengine20writer/OpentsdbDataHandler.java @@ -1,4 +1,4 @@ -package com.alibaba.datax.plugin.writer.tdenginewriter; +package com.alibaba.datax.plugin.writer.tdengine20writer; import com.alibaba.datax.common.element.Column; import com.alibaba.datax.common.element.Record; @@ -14,7 +14,6 @@ import org.slf4j.LoggerFactory; import java.sql.Connection; import java.sql.DriverManager; -import java.sql.SQLException; public class OpentsdbDataHandler implements DataHandler { private static final Logger LOG = LoggerFactory.getLogger(OpentsdbDataHandler.class); diff --git a/tdengine30writer/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/Schema3_0Manager.java b/tdengine30writer/src/main/java/com/alibaba/datax/plugin/writer/tdengine20writer/Schema3_0Manager.java similarity index 99% rename from tdengine30writer/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/Schema3_0Manager.java rename to tdengine30writer/src/main/java/com/alibaba/datax/plugin/writer/tdengine20writer/Schema3_0Manager.java index 79175409..33273724 100644 --- a/tdengine30writer/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/Schema3_0Manager.java +++ b/tdengine30writer/src/main/java/com/alibaba/datax/plugin/writer/tdengine20writer/Schema3_0Manager.java @@ -1,4 +1,4 @@ -package com.alibaba.datax.plugin.writer.tdenginewriter; +package com.alibaba.datax.plugin.writer.tdengine20writer; import com.alibaba.datax.common.exception.DataXException; import org.apache.commons.lang3.StringUtils; diff --git a/tdengine30writer/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/SchemaManager.java b/tdengine30writer/src/main/java/com/alibaba/datax/plugin/writer/tdengine20writer/SchemaManager.java similarity index 99% rename from tdengine30writer/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/SchemaManager.java rename to tdengine30writer/src/main/java/com/alibaba/datax/plugin/writer/tdengine20writer/SchemaManager.java index 8cff3c88..f74c0f82 100644 --- a/tdengine30writer/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/SchemaManager.java +++ b/tdengine30writer/src/main/java/com/alibaba/datax/plugin/writer/tdengine20writer/SchemaManager.java @@ -1,4 +1,4 @@ -package com.alibaba.datax.plugin.writer.tdenginewriter; +package com.alibaba.datax.plugin.writer.tdengine20writer; import com.alibaba.datax.common.exception.DataXException; import org.apache.commons.lang3.StringUtils; diff --git a/tdengine30writer/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/TDengineWriter.java b/tdengine30writer/src/main/java/com/alibaba/datax/plugin/writer/tdengine20writer/TDengineWriter.java similarity index 98% rename from tdengine30writer/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/TDengineWriter.java rename to tdengine30writer/src/main/java/com/alibaba/datax/plugin/writer/tdengine20writer/TDengineWriter.java index 73982744..d221cb9d 100644 --- a/tdengine30writer/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/TDengineWriter.java +++ b/tdengine30writer/src/main/java/com/alibaba/datax/plugin/writer/tdengine20writer/TDengineWriter.java @@ -1,4 +1,4 @@ -package com.alibaba.datax.plugin.writer.tdenginewriter; +package com.alibaba.datax.plugin.writer.tdengine20writer; import com.alibaba.datax.common.exception.DataXException; import com.alibaba.datax.common.plugin.RecordReceiver; diff --git a/tdengine20writer/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/TDengineWriterErrorCode.java b/tdengine30writer/src/main/java/com/alibaba/datax/plugin/writer/tdengine20writer/TDengineWriterErrorCode.java similarity index 93% rename from tdengine20writer/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/TDengineWriterErrorCode.java rename to tdengine30writer/src/main/java/com/alibaba/datax/plugin/writer/tdengine20writer/TDengineWriterErrorCode.java index 469449e6..d31cd892 100644 --- a/tdengine20writer/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/TDengineWriterErrorCode.java +++ b/tdengine30writer/src/main/java/com/alibaba/datax/plugin/writer/tdengine20writer/TDengineWriterErrorCode.java @@ -1,4 +1,4 @@ -package com.alibaba.datax.plugin.writer.tdenginewriter; +package com.alibaba.datax.plugin.writer.tdengine20writer; import com.alibaba.datax.common.spi.ErrorCode; diff --git a/tdengine20writer/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/TableMeta.java b/tdengine30writer/src/main/java/com/alibaba/datax/plugin/writer/tdengine20writer/TableMeta.java similarity index 89% rename from tdengine20writer/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/TableMeta.java rename to tdengine30writer/src/main/java/com/alibaba/datax/plugin/writer/tdengine20writer/TableMeta.java index 2a6b0536..870d8188 100644 --- a/tdengine20writer/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/TableMeta.java +++ b/tdengine30writer/src/main/java/com/alibaba/datax/plugin/writer/tdengine20writer/TableMeta.java @@ -1,4 +1,4 @@ -package com.alibaba.datax.plugin.writer.tdenginewriter; +package com.alibaba.datax.plugin.writer.tdengine20writer; public class TableMeta { TableType tableType; diff --git a/tdengine30writer/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/TableType.java b/tdengine30writer/src/main/java/com/alibaba/datax/plugin/writer/tdengine20writer/TableType.java similarity index 52% rename from tdengine30writer/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/TableType.java rename to tdengine30writer/src/main/java/com/alibaba/datax/plugin/writer/tdengine20writer/TableType.java index 6c97ac3f..a41ef4fa 100644 --- a/tdengine30writer/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/TableType.java +++ b/tdengine30writer/src/main/java/com/alibaba/datax/plugin/writer/tdengine20writer/TableType.java @@ -1,4 +1,4 @@ -package com.alibaba.datax.plugin.writer.tdenginewriter; +package com.alibaba.datax.plugin.writer.tdengine20writer; public enum TableType { SUP_TABLE, SUB_TABLE, NML_TABLE diff --git a/tdengine30writer/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/TimestampPrecision.java b/tdengine30writer/src/main/java/com/alibaba/datax/plugin/writer/tdengine20writer/TimestampPrecision.java similarity index 53% rename from tdengine30writer/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/TimestampPrecision.java rename to tdengine30writer/src/main/java/com/alibaba/datax/plugin/writer/tdengine20writer/TimestampPrecision.java index 46564d6a..31fbe6cb 100644 --- a/tdengine30writer/src/main/java/com/alibaba/datax/plugin/writer/tdenginewriter/TimestampPrecision.java +++ b/tdengine30writer/src/main/java/com/alibaba/datax/plugin/writer/tdengine20writer/TimestampPrecision.java @@ -1,4 +1,4 @@ -package com.alibaba.datax.plugin.writer.tdenginewriter; +package com.alibaba.datax.plugin.writer.tdengine20writer; public enum TimestampPrecision { MILLISEC, MICROSEC, NANOSEC diff --git a/tdengine30writer/src/main/resources/plugin.json b/tdengine30writer/src/main/resources/plugin.json index cf63245e..30b587a1 100644 --- a/tdengine30writer/src/main/resources/plugin.json +++ b/tdengine30writer/src/main/resources/plugin.json @@ -1,6 +1,6 @@ { "name": "tdengine30writer", - "class": "com.alibaba.datax.plugin.writer.tdenginewriter.TDengineWriter", + "class": "com.alibaba.datax.plugin.writer.tdengine30writer.TDengineWriter", "description": { "useScene": "data migration to tdengine", "mechanism": "use taos-jdbcdriver to write data." diff --git a/tdengine20writer/src/test/java/com/alibaba/datax/plugin/writer/tdenginewriter/Csv2TDengineTest.java b/tdengine30writer/src/test/java/com/alibaba/datax/plugin/writer/tdengine20writer/Csv2TDengineTest.java similarity index 95% rename from tdengine20writer/src/test/java/com/alibaba/datax/plugin/writer/tdenginewriter/Csv2TDengineTest.java rename to tdengine30writer/src/test/java/com/alibaba/datax/plugin/writer/tdengine20writer/Csv2TDengineTest.java index 7352c3ca..a7faf446 100644 --- a/tdengine20writer/src/test/java/com/alibaba/datax/plugin/writer/tdenginewriter/Csv2TDengineTest.java +++ b/tdengine30writer/src/test/java/com/alibaba/datax/plugin/writer/tdengine20writer/Csv2TDengineTest.java @@ -1,4 +1,4 @@ -package com.alibaba.datax.plugin.writer.tdenginewriter; +package com.alibaba.datax.plugin.writer.tdengine20writer; import com.alibaba.datax.core.Engine; import org.junit.Ignore; diff --git a/tdengine20writer/src/test/java/com/alibaba/datax/plugin/writer/tdenginewriter/DM2TDengineTest.java b/tdengine30writer/src/test/java/com/alibaba/datax/plugin/writer/tdengine20writer/DM2TDengineTest.java similarity index 98% rename from tdengine20writer/src/test/java/com/alibaba/datax/plugin/writer/tdenginewriter/DM2TDengineTest.java rename to tdengine30writer/src/test/java/com/alibaba/datax/plugin/writer/tdengine20writer/DM2TDengineTest.java index 15f6b1bc..0f9507d7 100644 --- a/tdengine20writer/src/test/java/com/alibaba/datax/plugin/writer/tdenginewriter/DM2TDengineTest.java +++ b/tdengine30writer/src/test/java/com/alibaba/datax/plugin/writer/tdengine20writer/DM2TDengineTest.java @@ -1,4 +1,4 @@ -package com.alibaba.datax.plugin.writer.tdenginewriter; +package com.alibaba.datax.plugin.writer.tdengine20writer; import com.alibaba.datax.core.Engine; import org.junit.Before; diff --git a/tdengine30writer/src/test/java/com/alibaba/datax/plugin/writer/tdenginewriter/DefaultDataHandlerTest.java b/tdengine30writer/src/test/java/com/alibaba/datax/plugin/writer/tdengine20writer/DefaultDataHandlerTest.java similarity index 99% rename from tdengine30writer/src/test/java/com/alibaba/datax/plugin/writer/tdenginewriter/DefaultDataHandlerTest.java rename to tdengine30writer/src/test/java/com/alibaba/datax/plugin/writer/tdengine20writer/DefaultDataHandlerTest.java index 46e601ad..0a77289d 100644 --- a/tdengine30writer/src/test/java/com/alibaba/datax/plugin/writer/tdenginewriter/DefaultDataHandlerTest.java +++ b/tdengine30writer/src/test/java/com/alibaba/datax/plugin/writer/tdengine20writer/DefaultDataHandlerTest.java @@ -1,4 +1,4 @@ -package com.alibaba.datax.plugin.writer.tdenginewriter; +package com.alibaba.datax.plugin.writer.tdengine20writer; import com.alibaba.datax.common.element.DateColumn; import com.alibaba.datax.common.element.LongColumn; diff --git a/tdengine30writer/src/test/java/com/alibaba/datax/plugin/writer/tdenginewriter/Mongo2TDengineTest.java b/tdengine30writer/src/test/java/com/alibaba/datax/plugin/writer/tdengine20writer/Mongo2TDengineTest.java similarity index 86% rename from tdengine30writer/src/test/java/com/alibaba/datax/plugin/writer/tdenginewriter/Mongo2TDengineTest.java rename to tdengine30writer/src/test/java/com/alibaba/datax/plugin/writer/tdengine20writer/Mongo2TDengineTest.java index 2356b6f8..5c08551a 100644 --- a/tdengine30writer/src/test/java/com/alibaba/datax/plugin/writer/tdenginewriter/Mongo2TDengineTest.java +++ b/tdengine30writer/src/test/java/com/alibaba/datax/plugin/writer/tdengine20writer/Mongo2TDengineTest.java @@ -1,4 +1,4 @@ -package com.alibaba.datax.plugin.writer.tdenginewriter; +package com.alibaba.datax.plugin.writer.tdengine20writer; import com.alibaba.datax.core.Engine; import org.junit.Test; diff --git a/tdengine30writer/src/test/java/com/alibaba/datax/plugin/writer/tdenginewriter/Mysql2TDengineTest.java b/tdengine30writer/src/test/java/com/alibaba/datax/plugin/writer/tdengine20writer/Mysql2TDengineTest.java similarity index 98% rename from tdengine30writer/src/test/java/com/alibaba/datax/plugin/writer/tdenginewriter/Mysql2TDengineTest.java rename to tdengine30writer/src/test/java/com/alibaba/datax/plugin/writer/tdengine20writer/Mysql2TDengineTest.java index 8bef9c3c..a49118f5 100644 --- a/tdengine30writer/src/test/java/com/alibaba/datax/plugin/writer/tdenginewriter/Mysql2TDengineTest.java +++ b/tdengine30writer/src/test/java/com/alibaba/datax/plugin/writer/tdengine20writer/Mysql2TDengineTest.java @@ -1,4 +1,4 @@ -package com.alibaba.datax.plugin.writer.tdenginewriter; +package com.alibaba.datax.plugin.writer.tdengine20writer; import com.alibaba.datax.core.Engine; import org.junit.Before; diff --git a/tdengine20writer/src/test/java/com/alibaba/datax/plugin/writer/tdenginewriter/Mysql2TDengineTest2.java b/tdengine30writer/src/test/java/com/alibaba/datax/plugin/writer/tdengine20writer/Mysql2TDengineTest2.java similarity index 96% rename from tdengine20writer/src/test/java/com/alibaba/datax/plugin/writer/tdenginewriter/Mysql2TDengineTest2.java rename to tdengine30writer/src/test/java/com/alibaba/datax/plugin/writer/tdengine20writer/Mysql2TDengineTest2.java index 98eae4f5..3829ce5d 100644 --- a/tdengine20writer/src/test/java/com/alibaba/datax/plugin/writer/tdenginewriter/Mysql2TDengineTest2.java +++ b/tdengine30writer/src/test/java/com/alibaba/datax/plugin/writer/tdengine20writer/Mysql2TDengineTest2.java @@ -1,8 +1,7 @@ -package com.alibaba.datax.plugin.writer.tdenginewriter; +package com.alibaba.datax.plugin.writer.tdengine20writer; import com.alibaba.datax.core.Engine; import org.apache.commons.lang3.RandomStringUtils; -import org.apache.commons.lang3.StringUtils; import org.junit.Before; import org.junit.Test; diff --git a/tdengine20writer/src/test/java/com/alibaba/datax/plugin/writer/tdenginewriter/Mysql2TDengineTest3.java b/tdengine30writer/src/test/java/com/alibaba/datax/plugin/writer/tdengine20writer/Mysql2TDengineTest3.java similarity index 98% rename from tdengine20writer/src/test/java/com/alibaba/datax/plugin/writer/tdenginewriter/Mysql2TDengineTest3.java rename to tdengine30writer/src/test/java/com/alibaba/datax/plugin/writer/tdengine20writer/Mysql2TDengineTest3.java index 7061445b..fb14c334 100644 --- a/tdengine20writer/src/test/java/com/alibaba/datax/plugin/writer/tdenginewriter/Mysql2TDengineTest3.java +++ b/tdengine30writer/src/test/java/com/alibaba/datax/plugin/writer/tdengine20writer/Mysql2TDengineTest3.java @@ -1,4 +1,4 @@ -package com.alibaba.datax.plugin.writer.tdenginewriter; +package com.alibaba.datax.plugin.writer.tdengine20writer; import com.alibaba.datax.core.Engine; import org.apache.commons.lang3.RandomStringUtils; diff --git a/tdengine30writer/src/test/java/com/alibaba/datax/plugin/writer/tdenginewriter/Opentsdb2TDengineTest.java b/tdengine30writer/src/test/java/com/alibaba/datax/plugin/writer/tdengine20writer/Opentsdb2TDengineTest.java similarity index 94% rename from tdengine30writer/src/test/java/com/alibaba/datax/plugin/writer/tdenginewriter/Opentsdb2TDengineTest.java rename to tdengine30writer/src/test/java/com/alibaba/datax/plugin/writer/tdengine20writer/Opentsdb2TDengineTest.java index ad326f7e..566c8b3c 100644 --- a/tdengine30writer/src/test/java/com/alibaba/datax/plugin/writer/tdenginewriter/Opentsdb2TDengineTest.java +++ b/tdengine30writer/src/test/java/com/alibaba/datax/plugin/writer/tdengine20writer/Opentsdb2TDengineTest.java @@ -1,4 +1,4 @@ -package com.alibaba.datax.plugin.writer.tdenginewriter; +package com.alibaba.datax.plugin.writer.tdengine20writer; import com.alibaba.datax.core.Engine; import org.junit.Assert; diff --git a/tdengine20writer/src/test/java/com/alibaba/datax/plugin/writer/tdenginewriter/SchemaManagerTest.java b/tdengine30writer/src/test/java/com/alibaba/datax/plugin/writer/tdengine20writer/SchemaManagerTest.java similarity index 98% rename from tdengine20writer/src/test/java/com/alibaba/datax/plugin/writer/tdenginewriter/SchemaManagerTest.java rename to tdengine30writer/src/test/java/com/alibaba/datax/plugin/writer/tdengine20writer/SchemaManagerTest.java index 3708e6f9..4230d284 100644 --- a/tdengine20writer/src/test/java/com/alibaba/datax/plugin/writer/tdenginewriter/SchemaManagerTest.java +++ b/tdengine30writer/src/test/java/com/alibaba/datax/plugin/writer/tdengine20writer/SchemaManagerTest.java @@ -1,4 +1,4 @@ -package com.alibaba.datax.plugin.writer.tdenginewriter; +package com.alibaba.datax.plugin.writer.tdengine20writer; import org.junit.AfterClass; import org.junit.Assert; diff --git a/tdengine30writer/src/test/java/com/alibaba/datax/plugin/writer/tdenginewriter/Stream2TDengineTest.java b/tdengine30writer/src/test/java/com/alibaba/datax/plugin/writer/tdengine20writer/Stream2TDengineTest.java similarity index 96% rename from tdengine30writer/src/test/java/com/alibaba/datax/plugin/writer/tdenginewriter/Stream2TDengineTest.java rename to tdengine30writer/src/test/java/com/alibaba/datax/plugin/writer/tdengine20writer/Stream2TDengineTest.java index e54bcbde..9cc1cee2 100644 --- a/tdengine30writer/src/test/java/com/alibaba/datax/plugin/writer/tdenginewriter/Stream2TDengineTest.java +++ b/tdengine30writer/src/test/java/com/alibaba/datax/plugin/writer/tdengine20writer/Stream2TDengineTest.java @@ -1,7 +1,6 @@ -package com.alibaba.datax.plugin.writer.tdenginewriter; +package com.alibaba.datax.plugin.writer.tdengine20writer; import com.alibaba.datax.core.Engine; -import org.junit.Before; import org.junit.Test; import java.sql.Connection; diff --git a/tdengine20writer/src/test/java/com/alibaba/datax/plugin/writer/tdenginewriter/TDengine2TDengineTest.java b/tdengine30writer/src/test/java/com/alibaba/datax/plugin/writer/tdengine20writer/TDengine2TDengineTest.java similarity index 99% rename from tdengine20writer/src/test/java/com/alibaba/datax/plugin/writer/tdenginewriter/TDengine2TDengineTest.java rename to tdengine30writer/src/test/java/com/alibaba/datax/plugin/writer/tdengine20writer/TDengine2TDengineTest.java index 9e954633..833976d5 100644 --- a/tdengine20writer/src/test/java/com/alibaba/datax/plugin/writer/tdenginewriter/TDengine2TDengineTest.java +++ b/tdengine30writer/src/test/java/com/alibaba/datax/plugin/writer/tdengine20writer/TDengine2TDengineTest.java @@ -1,4 +1,4 @@ -package com.alibaba.datax.plugin.writer.tdenginewriter; +package com.alibaba.datax.plugin.writer.tdengine20writer; import com.alibaba.datax.core.Engine; import org.junit.Before; diff --git a/tdengine30writer/src/test/java/com/alibaba/datax/plugin/writer/tdenginewriter/TDengineWriterTest.java b/tdengine30writer/src/test/java/com/alibaba/datax/plugin/writer/tdengine20writer/TDengineWriterTest.java similarity index 97% rename from tdengine30writer/src/test/java/com/alibaba/datax/plugin/writer/tdenginewriter/TDengineWriterTest.java rename to tdengine30writer/src/test/java/com/alibaba/datax/plugin/writer/tdengine20writer/TDengineWriterTest.java index 813f6131..381fb034 100644 --- a/tdengine30writer/src/test/java/com/alibaba/datax/plugin/writer/tdenginewriter/TDengineWriterTest.java +++ b/tdengine30writer/src/test/java/com/alibaba/datax/plugin/writer/tdengine20writer/TDengineWriterTest.java @@ -1,4 +1,4 @@ -package com.alibaba.datax.plugin.writer.tdenginewriter; +package com.alibaba.datax.plugin.writer.tdengine20writer; import com.alibaba.datax.common.util.Configuration; import org.junit.Assert;