Skip to content

Commit 57ef855

Browse files
baisui1981baisui1981
committed
support datetime converter ,issue:datavane/tis#474 
1 parent 087488c commit 57ef855

File tree

8 files changed

+33
-24
lines changed

8 files changed

+33
-24
lines changed

‎tis-datax/executor/dolphinscheduler-task-tis-datasync/dependency-reduced-pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
<parent>
44
<artifactId>tis-datax</artifactId>
55
<groupId>com.qlangtech.tis.plugins</groupId>
6-
<version>4.3.0</version>
6+
<version>5.0.0-SNAPSHOT</version>
77
<relativePath>../../pom.xml</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>
1010
<groupId>com.qlangtech.tis.plugins</groupId>
1111
<artifactId>dolphinscheduler-task-tis-datasync</artifactId>
12-
<version>4.3.0</version>
12+
<version>5.0.0-SNAPSHOT</version>
1313
<licenses>
1414
<license>
1515
<name>GNU Affero General Public License</name>
@@ -68,7 +68,7 @@
6868
<dependency>
6969
<groupId>com.qlangtech.tis</groupId>
7070
<artifactId>tis-base-test</artifactId>
71-
<version>4.3.0</version>
71+
<version>5.0.0-SNAPSHOT</version>
7272
<scope>test</scope>
7373
<exclusions>
7474
<exclusion>
@@ -96,7 +96,7 @@
9696
<dependency>
9797
<groupId>com.alibaba.datax</groupId>
9898
<artifactId>datax-common</artifactId>
99-
<version>4.3.0</version>
99+
<version>5.0.0-SNAPSHOT</version>
100100
<scope>provided</scope>
101101
</dependency>
102102
<dependency>

‎tis-datax/tis-aliyun-jindo-sdk-extends/tis-aliyun-jindo-sdk-extends-impl/dependency-reduced-pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
<parent>
44
<artifactId>tis-aliyun-jindo-sdk-extends</artifactId>
55
<groupId>com.qlangtech.tis.plugins</groupId>
6-
<version>4.3.0</version>
6+
<version>5.0.0-SNAPSHOT</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99
<groupId>com.qlangtech.tis.plugins</groupId>
1010
<artifactId>tis-aliyun-jindo-sdk-extends-impl</artifactId>
11-
<version>4.3.0</version>
11+
<version>5.0.0-SNAPSHOT</version>
1212
<licenses>
1313
<license>
1414
<name>GNU Affero General Public License</name>
@@ -46,7 +46,7 @@
4646
<dependency>
4747
<groupId>com.alibaba.datax</groupId>
4848
<artifactId>datax-common</artifactId>
49-
<version>4.3.0</version>
49+
<version>5.0.0-SNAPSHOT</version>
5050
<scope>provided</scope>
5151
</dependency>
5252
<dependency>
@@ -64,7 +64,7 @@
6464
<dependency>
6565
<groupId>com.qlangtech.tis</groupId>
6666
<artifactId>tis-plugin</artifactId>
67-
<version>4.3.0</version>
67+
<version>5.0.0-SNAPSHOT</version>
6868
<scope>provided</scope>
6969
</dependency>
7070
<dependency>

‎tis-incr/tis-flink-cdc-kingbase-plugin/src/main/java/com/qlangtech/plugins/incr/flink/cdc/pglike/KingBaseDateTimeConverter.java‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,13 @@ protected String convertTime(Object input) {
6060
@Override
6161
protected String convertDateTime(Object input) {
6262
if (input != null) {
63-
// System.out.println("convertDateTime:" + input.getClass());
64-
// throw new UnsupportedOperationException();
65-
return datetimeFormatter.format(LocalDateTime.ofInstant((Instant) input, this.timestampZoneId));
63+
if (input instanceof java.sql.Timestamp) {
64+
return datetimeFormatter.format(((java.sql.Timestamp) input).toLocalDateTime());
65+
} else if (input instanceof Instant) {
66+
return datetimeFormatter.format(LocalDateTime.ofInstant((Instant) input, this.timestampZoneId));
67+
} else {
68+
throw new UnsupportedOperationException("convertDateTime:" + input.getClass() + ",val:" + String.valueOf(input));
69+
}
6670
}
6771
return null;
6872
}

‎tis-incr/tis-flink-cdc-kingbase-shade-4-debezium-connector-postgresql/dependency-reduced-pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
<parent>
44
<artifactId>tis-incr</artifactId>
55
<groupId>com.qlangtech.tis.plugins</groupId>
6-
<version>4.3.0</version>
6+
<version>5.0.0-SNAPSHOT</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99
<groupId>com.qlangtech.tis.plugins</groupId>
1010
<artifactId>tis-flink-cdc-kingbase-shade-4-debezium-connector-postgresql</artifactId>
11-
<version>4.3.0</version>
11+
<version>5.0.0-SNAPSHOT</version>
1212
<licenses>
1313
<license>
1414
<name>GNU Affero General Public License</name>
@@ -69,7 +69,7 @@
6969
<dependency>
7070
<groupId>com.qlangtech.tis</groupId>
7171
<artifactId>tis-plugin</artifactId>
72-
<version>4.3.0</version>
72+
<version>5.0.0-SNAPSHOT</version>
7373
<scope>provided</scope>
7474
</dependency>
7575
<dependency>

‎tis-incr/tis-flink-cdc-mysql-shade-4-debezium-connector-mysql/dependency-reduced-pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
<parent>
44
<artifactId>tis-incr</artifactId>
55
<groupId>com.qlangtech.tis.plugins</groupId>
6-
<version>4.3.0</version>
6+
<version>5.0.0-SNAPSHOT</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99
<groupId>com.qlangtech.tis.plugins</groupId>
1010
<artifactId>tis-flink-cdc-shade-4-debezium-connector-mysql</artifactId>
11-
<version>4.3.0</version>
11+
<version>5.0.0-SNAPSHOT</version>
1212
<licenses>
1313
<license>
1414
<name>GNU Affero General Public License</name>
@@ -66,7 +66,7 @@
6666
<dependency>
6767
<groupId>com.qlangtech.tis</groupId>
6868
<artifactId>tis-plugin</artifactId>
69-
<version>4.3.0</version>
69+
<version>5.0.0-SNAPSHOT</version>
7070
<scope>provided</scope>
7171
</dependency>
7272
<dependency>

‎tis-incr/tis-flink-cdc-postgresql-shade-4-debezium-connector-postgresql/dependency-reduced-pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
<parent>
44
<artifactId>tis-incr</artifactId>
55
<groupId>com.qlangtech.tis.plugins</groupId>
6-
<version>4.3.0</version>
6+
<version>5.0.0-SNAPSHOT</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99
<groupId>com.qlangtech.tis.plugins</groupId>
1010
<artifactId>tis-flink-cdc-postgresql-shade-4-debezium-connector-postgresql</artifactId>
11-
<version>4.3.0</version>
11+
<version>5.0.0-SNAPSHOT</version>
1212
<licenses>
1313
<license>
1414
<name>GNU Affero General Public License</name>
@@ -68,7 +68,7 @@
6868
<dependency>
6969
<groupId>com.qlangtech.tis</groupId>
7070
<artifactId>tis-plugin</artifactId>
71-
<version>4.3.0</version>
71+
<version>5.0.0-SNAPSHOT</version>
7272
<scope>provided</scope>
7373
</dependency>
7474
<dependency>

‎tis-incr/tis-sink-elasticsearch7/dependency-reduced-pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
<parent>
44
<artifactId>tis-incr</artifactId>
55
<groupId>com.qlangtech.tis.plugins</groupId>
6-
<version>4.3.0</version>
6+
<version>5.0.0-SNAPSHOT</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99
<groupId>com.qlangtech.tis.plugins</groupId>
1010
<artifactId>tis-sink-elasticsearch7</artifactId>
11-
<version>4.3.0</version>
11+
<version>5.0.0-SNAPSHOT</version>
1212
<licenses>
1313
<license>
1414
<name>GNU Affero General Public License</name>
@@ -63,7 +63,7 @@
6363
<dependency>
6464
<groupId>com.qlangtech.tis</groupId>
6565
<artifactId>tis-plugin</artifactId>
66-
<version>4.3.0</version>
66+
<version>5.0.0-SNAPSHOT</version>
6767
<scope>provided</scope>
6868
</dependency>
6969
<dependency>

‎tis-k8s-plugin/src/main/java/com/qlangtech/tis/plugin/k8s/K8SController.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,13 @@ public K8SController(K8sImage k8sConfig, CoreV1Api client) {
8383
this.api = client;
8484
}
8585

86+
// @Override
87+
// public void checkUseable(TargetResName name) {
88+
//
89+
// }
90+
8691
@Override
87-
public void checkUseable(TargetResName name) {
92+
public void checkUseable(TargetResName collection, boolean deploying) {
8893

8994
}
9095

0 commit comments

Comments
 (0)