upgrade version v4.1.0 and remove useless implement method

qlangtech · Oct 24, 2024 · 711398d · 711398d
1 parent 7979b59
commit 711398d
Show file tree

Hide file tree

Showing 13 changed files with 27 additions and 142 deletions.
diff --git a/pom.xml b/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>com.qlangtech.tis</groupId>
         <artifactId>tis</artifactId>
-        <version>4.0.1</version>
+        <version>4.1.0</version>
     </parent>
     <groupId>com.qlangtech.tis.plugins</groupId>
     <artifactId>tis-plugin-parent</artifactId>
@@ -216,7 +216,7 @@
         <scmTag>HEAD</scmTag>
         <!-- Where to put temporary files during test runs. -->
         <surefireTempDir>${project.build.directory}/tmp</surefireTempDir>
-        <testcontainers.version>1.17.3</testcontainers.version>
+        <testcontainers.version>1.18.3</testcontainers.version>
         <powerjob.version>4.3.6</powerjob.version>
         <mariadb-java-client.version>3.4.1</mariadb-java-client.version>
     </properties>

diff --git a/tis-datax/executor/dolphinscheduler-task-tis-datasync/dependency-reduced-pom.xml b/tis-datax/executor/dolphinscheduler-task-tis-datasync/dependency-reduced-pom.xml
@@ -3,13 +3,13 @@
   <parent>
     <artifactId>tis-datax</artifactId>
     <groupId>com.qlangtech.tis.plugins</groupId>
-    <version>4.0.1</version>
+    <version>4.1.0</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.qlangtech.tis.plugins</groupId>
   <artifactId>dolphinscheduler-task-tis-datasync</artifactId>
-  <version>4.0.1</version>
+  <version>4.1.0</version>
   <licenses>
     <license>
       <name>GNU Affero General Public License</name>
@@ -68,7 +68,7 @@
     <dependency>
       <groupId>com.qlangtech.tis</groupId>
       <artifactId>tis-base-test</artifactId>
-      <version>4.0.1</version>
+      <version>4.1.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -86,7 +86,7 @@
     <dependency>
       <groupId>com.alibaba.datax</groupId>
       <artifactId>datax-common</artifactId>
-      <version>4.0.1</version>
+      <version>4.1.0</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

diff --git a/tis-datax/executor/powerjob-worker-samples/pom.xml b/tis-datax/executor/powerjob-worker-samples/pom.xml
@@ -89,7 +89,6 @@
         <dependency>
             <groupId>javax.xml.bind</groupId>
             <artifactId>jaxb-api</artifactId>
-            <version>2.3.1</version>
         </dependency>
         <dependency>
             <groupId>com.qlangtech.tis</groupId>

diff --git a/...tis-aliyun-jindo-sdk-extends/tis-aliyun-jindo-sdk-extends-impl/dependency-reduced-pom.xml b/...tis-aliyun-jindo-sdk-extends/tis-aliyun-jindo-sdk-extends-impl/dependency-reduced-pom.xml
@@ -3,12 +3,12 @@
   <parent>
     <artifactId>tis-aliyun-jindo-sdk-extends</artifactId>
     <groupId>com.qlangtech.tis.plugins</groupId>
-    <version>4.0.1</version>
+    <version>4.1.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.qlangtech.tis.plugins</groupId>
   <artifactId>tis-aliyun-jindo-sdk-extends-impl</artifactId>
-  <version>4.0.1</version>
+  <version>4.1.0</version>
   <licenses>
     <license>
       <name>GNU Affero General Public License</name>
@@ -46,7 +46,7 @@
     <dependency>
       <groupId>com.alibaba.datax</groupId>
       <artifactId>datax-common</artifactId>
-      <version>4.0.1</version>
+      <version>4.1.0</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -64,7 +64,7 @@
     <dependency>
       <groupId>com.qlangtech.tis</groupId>
       <artifactId>tis-plugin</artifactId>
-      <version>4.0.1</version>
+      <version>4.1.0</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

diff --git a/tis-datax/tis-datax-sqlserver-v2008-plugin/pom.xml b/tis-datax/tis-datax-sqlserver-v2008-plugin/pom.xml
@@ -45,6 +45,11 @@
 <!--            <version>4.0</version>-->
 <!--        </dependency>-->
 
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+        </dependency>
+
 
         <dependency>
             <groupId>com.qlangtech.tis.sqlserver</groupId>

diff --git a/.../main/java/com/qlangtech/tis/plugins/incr/flink/chunjun/source/ChunjunSourceFunction.java b/.../main/java/com/qlangtech/tis/plugins/incr/flink/chunjun/source/ChunjunSourceFunction.java
@@ -191,14 +191,4 @@ protected final String parseType(CMeta cm) {
         return cm.getType().getS();
     }
 
-
-    @Override
-    public String getTopic() {
-        return null;
-    }
-
-    @Override
-    public void setDeserialize(IAsyncMsgDeserialize deserialize) {
-
-    }
 }
diff --git a/.../main/java/com/qlangtech/plugins/incr/flink/cdc/mongdb/FlinkCDCMongoDBSourceFunction.java b/.../main/java/com/qlangtech/plugins/incr/flink/cdc/mongdb/FlinkCDCMongoDBSourceFunction.java
@@ -118,15 +118,6 @@ private List<ReaderSource> createSourceFunctions(MangoDBDataSourceFactory dsFact
         return sourceFuncs;
     }
 
-    @Override
-    public String getTopic() {
-        return null;
-    }
-
-    @Override
-    public void setDeserialize(IAsyncMsgDeserialize deserialize) {
-
-    }
 
     @Override
     public IConsumerHandle getConsumerHandle() {

diff --git a/...main/java/com/qlangtech/tis/plugins/incr/flink/cdc/mysql/FlinkCDCMysqlSourceFunction.java b/...main/java/com/qlangtech/tis/plugins/incr/flink/cdc/mysql/FlinkCDCMysqlSourceFunction.java
@@ -23,12 +23,11 @@
 import com.qlangtech.plugins.incr.flink.cdc.FlinkCol;
 import com.qlangtech.plugins.incr.flink.cdc.ISourceValConvert;
 import com.qlangtech.plugins.incr.flink.cdc.SourceChannel;
-
 import com.qlangtech.plugins.incr.flink.cdc.SourceChannel.ReaderSourceCreator;
 import com.qlangtech.plugins.incr.flink.cdc.TISDeserializationSchema;
 import com.qlangtech.plugins.incr.flink.cdc.valconvert.DateTimeConverter;
-import com.qlangtech.tis.async.message.client.consumer.IAsyncMsgDeserialize;
 import com.qlangtech.tis.async.message.client.consumer.IConsumerHandle;
+import com.qlangtech.tis.async.message.client.consumer.IFlinkColCreator;
 import com.qlangtech.tis.async.message.client.consumer.IMQListener;
 import com.qlangtech.tis.async.message.client.consumer.MQConsumeException;
 import com.qlangtech.tis.coredefine.module.action.TargetResName;
@@ -45,16 +44,15 @@
 import com.qlangtech.tis.plugin.ds.TableInDB;
 import com.qlangtech.tis.plugins.incr.flink.FlinkColMapper;
 import com.qlangtech.tis.plugins.incr.flink.cdc.AbstractRowDataMapper;
-import com.qlangtech.tis.async.message.client.consumer.IFlinkColCreator;
 import com.qlangtech.tis.realtime.ReaderSource;
 import com.qlangtech.tis.realtime.dto.DTOStream;
 import com.qlangtech.tis.realtime.transfer.DTO;
 import com.qlangtech.tis.util.IPluginContext;
-import org.apache.commons.lang.StringUtils;
-import org.apache.flink.cdc.connectors.mysql.source.MySqlSource;
 import io.debezium.config.CommonConnectorConfig;
 import io.debezium.connector.mysql.MySqlConnectorConfig;
+import org.apache.commons.lang.StringUtils;
 import org.apache.flink.api.common.JobExecutionResult;
+import org.apache.flink.cdc.connectors.mysql.source.MySqlSource;
 import org.apache.kafka.connect.data.Field;
 import org.apache.kafka.connect.data.Schema;
 import org.apache.kafka.connect.data.Struct;
@@ -276,16 +274,4 @@ protected List<ReaderSource> createReaderSources(String dbHost, HostDBs dbs, MyS
             );
         }
     }
-
-    @Override
-    public String getTopic() {
-        return null;
-    }
-
-    @Override
-    public void setDeserialize(IAsyncMsgDeserialize deserialize) {
-
-    }
-
-
 }
diff --git a/tis-incr/tis-flink-cdc-mysql-shade-4-debezium-connector-mysql/dependency-reduced-pom.xml b/tis-incr/tis-flink-cdc-mysql-shade-4-debezium-connector-mysql/dependency-reduced-pom.xml
@@ -3,12 +3,12 @@
   <parent>
     <artifactId>tis-incr</artifactId>
     <groupId>com.qlangtech.tis.plugins</groupId>
-    <version>4.0.1</version>
+    <version>4.1.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.qlangtech.tis.plugins</groupId>
   <artifactId>tis-flink-cdc-shade-4-debezium-connector-mysql</artifactId>
-  <version>4.0.1</version>
+  <version>4.1.0</version>
   <licenses>
     <license>
       <name>GNU Affero General Public License</name>
@@ -66,7 +66,7 @@
     <dependency>
       <groupId>com.qlangtech.tis</groupId>
       <artifactId>tis-plugin</artifactId>
-      <version>4.0.1</version>
+      <version>4.1.0</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

diff --git a/...c/main/java/com/qlangtech/plugins/incr/flink/cdc/oracle/FlinkCDCOracleSourceFunction.java b/...c/main/java/com/qlangtech/plugins/incr/flink/cdc/oracle/FlinkCDCOracleSourceFunction.java
@@ -97,78 +97,4 @@ public JobExecutionResult start(TargetResName channalName, IDataxReader dataSour
     }
 
 
-//    //https://ververica.github.io/flink-cdc-connectors/master/
-//    private List<SourceFunction<DTO>> getMySqlSourceFunction(DBConfigGetter dataSource, List<ISelectedTab> tabs) {
-//
-//        try {
-//            BasicDataSourceFactory dsFactory = dataSource.getBasicDataSource();
-//            List<SourceFunction<DTO>> sourceFuncs = Lists.newArrayList();
-//            DBConfig dbConfig = dataSource.getDbConfig();
-//            Map<String, List<String>> ip2dbs = Maps.newHashMap();
-//            Map<String, List<ISelectedTab>> db2tabs = Maps.newHashMap();
-//            dbConfig.vistDbName((config, ip, dbName) -> {
-//                List<String> dbs = ip2dbs.get(ip);
-//                if (dbs == null) {
-//                    dbs = Lists.newArrayList();
-//                    ip2dbs.put(ip, dbs);
-//                }
-//                dbs.add(dbName);
-//
-//                if (db2tabs.get(dbName) == null) {
-//                    db2tabs.put(dbName, tabs);
-//                }
-//                return false;
-//            });
-//
-//            for (Map.Entry<String /**ip*/, List<String>/**dbs*/> entry : ip2dbs.entrySet()) {
-//
-//
-//                Set<String> tbs = entry.getValue().stream().flatMap(
-//                        (dbName) -> db2tabs.get(dbName).stream().map((tab) -> dbName + "." + tab.getName())).collect(Collectors.toSet());
-//
-//
-//                Properties debeziumProperties = new Properties();
-//                debeziumProperties.put("snapshot.locking.mode", "none");// do not use lock
-//                sourceFuncs.add(MySqlSource.<DTO>builder()
-//                        .hostname(entry.getKey())
-//                        .port(dsFactory.port)
-//                        .databaseList(entry.getValue().toArray(new String[entry.getValue().size()])) // monitor all tables under inventory database
-//                        .tableList(tbs.toArray(new String[tbs.size()]))
-//                        .username(dsFactory.getUserName())
-//                        .password(dsFactory.getPassword())
-//                        .startupOptions(sourceFactory.getStartupOptions())
-//                        .debeziumProperties(debeziumProperties)
-//                        //.deserializer(new JsonStringDebeziumDeserializationSchema()) // converts SourceRecord to JSON String
-//                        .deserializer(new TISDeserializationSchema()) // converts SourceRecord to JSON String
-//                        .build());
-//            }
-//
-//            return sourceFuncs;
-//
-//        } catch (Exception e) {
-//            throw new RuntimeException(e);
-//        }
-//
-//
-//    }
-
-//    public IDataxProcessor getDataXProcessor() {
-//        return dataXProcessor;
-//    }
-//
-//    public void setDataXProcessor(IDataxProcessor dataXProcessor) {
-//        this.dataXProcessor = dataXProcessor;
-//    }
-
-    @Override
-    public String getTopic() {
-        return null;
-    }
-
-    @Override
-    public void setDeserialize(IAsyncMsgDeserialize deserialize) {
-
-    }
-
-
 }
diff --git a/...ava/com/qlangtech/plugins/incr/flink/cdc/postgresql/FlinkCDCPostgreSQLSourceFunction.java b/...ava/com/qlangtech/plugins/incr/flink/cdc/postgresql/FlinkCDCPostgreSQLSourceFunction.java
@@ -131,16 +131,4 @@ public JobExecutionResult start(TargetResName dataxName, IDataxReader dataSource
         }
     }
 
-
-    @Override
-    public String getTopic() {
-        return null;
-    }
-
-    @Override
-    public void setDeserialize(IAsyncMsgDeserialize deserialize) {
-
-    }
-
-
 }
diff --git a/...tis-flink-cdc-postgresql-shade-4-debezium-connector-postgresql/dependency-reduced-pom.xml b/...tis-flink-cdc-postgresql-shade-4-debezium-connector-postgresql/dependency-reduced-pom.xml
@@ -3,12 +3,12 @@
   <parent>
     <artifactId>tis-incr</artifactId>
     <groupId>com.qlangtech.tis.plugins</groupId>
-    <version>4.0.1</version>
+    <version>4.1.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.qlangtech.tis.plugins</groupId>
   <artifactId>tis-flink-cdc-postgresql-shade-4-debezium-connector-postgresql</artifactId>
-  <version>4.0.1</version>
+  <version>4.1.0</version>
   <licenses>
     <license>
       <name>GNU Affero General Public License</name>
@@ -68,7 +68,7 @@
     <dependency>
       <groupId>com.qlangtech.tis</groupId>
       <artifactId>tis-plugin</artifactId>
-      <version>4.0.1</version>
+      <version>4.1.0</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

diff --git a/tis-incr/tis-sink-elasticsearch7/dependency-reduced-pom.xml b/tis-incr/tis-sink-elasticsearch7/dependency-reduced-pom.xml
@@ -3,12 +3,12 @@
   <parent>
     <artifactId>tis-incr</artifactId>
     <groupId>com.qlangtech.tis.plugins</groupId>
-    <version>4.0.1</version>
+    <version>4.1.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.qlangtech.tis.plugins</groupId>
   <artifactId>tis-sink-elasticsearch7</artifactId>
-  <version>4.0.1</version>
+  <version>4.1.0</version>
   <licenses>
     <license>
       <name>GNU Affero General Public License</name>
@@ -63,7 +63,7 @@
     <dependency>
       <groupId>com.qlangtech.tis</groupId>
       <artifactId>tis-plugin</artifactId>
-      <version>4.0.1</version>
+      <version>4.1.0</version>
       <scope>provided</scope>
     </dependency>
     <dependency>