This is an automated email from the ASF dual-hosted git repository.
diwu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris-kafka-connector.git
The following commit(s) were added to refs/heads/master by this push:
new 5139d51 [fix]Fix DateTimeUtils, SchemaUtils referenced packages from
debezium-connector-jdbc (#22)
5139d51 is described below
commit 5139d51f904d5c4ae1b23977da2e9a20cfb9ee33
Author: wudongliang <[email protected]>
AuthorDate: Wed May 29 17:54:19 2024 +0800
[fix]Fix DateTimeUtils, SchemaUtils referenced packages from
debezium-connector-jdbc (#22)
---
.../org/apache/doris/kafka/connector/converter/RecordService.java | 4 ++--
.../org/apache/doris/kafka/connector/converter/type/AbstractType.java | 2 +-
.../doris/kafka/connector/converter/type/connect/ConnectDateType.java | 2 +-
.../doris/kafka/connector/converter/type/connect/ConnectTimeType.java | 2 +-
.../kafka/connector/converter/type/connect/ConnectTimestampType.java | 2 +-
.../doris/kafka/connector/converter/type/debezium/DateType.java | 2 +-
.../doris/kafka/connector/converter/type/debezium/MicroTimeType.java | 2 +-
.../kafka/connector/converter/type/debezium/MicroTimestampType.java | 2 +-
.../doris/kafka/connector/converter/type/debezium/NanoTimeType.java | 2 +-
.../kafka/connector/converter/type/debezium/NanoTimestampType.java | 2 +-
.../doris/kafka/connector/converter/type/debezium/TimeType.java | 2 +-
.../doris/kafka/connector/converter/type}/util/DateTimeUtils.java | 3 ++-
.../doris/kafka/connector/converter/type}/util/SchemaUtils.java | 3 ++-
13 files changed, 16 insertions(+), 14 deletions(-)
diff --git
a/src/main/java/org/apache/doris/kafka/connector/converter/RecordService.java
b/src/main/java/org/apache/doris/kafka/connector/converter/RecordService.java
index 9487307..cd76c42 100644
---
a/src/main/java/org/apache/doris/kafka/connector/converter/RecordService.java
+++
b/src/main/java/org/apache/doris/kafka/connector/converter/RecordService.java
@@ -126,9 +126,9 @@ public class RecordService {
private void validate(SinkRecord record) {
if (isSchemaChange(record)) {
LOG.warn(
- "Schema change records are not supported by JDBC
connector. Adjust `topics` or `topics.regex` to exclude schema change topic.");
+ "Schema change records are not supported by
doris-kafka-connector. Adjust `topics` or `topics.regex` to exclude schema
change topic.");
throw new DorisException(
- "Schema change records are not supported by JDBC
connector. Adjust `topics` or `topics.regex` to exclude schema change topic.");
+ "Schema change records are not supported by
doris-kafka-connector. Adjust `topics` or `topics.regex` to exclude schema
change topic.");
}
}
diff --git
a/src/main/java/org/apache/doris/kafka/connector/converter/type/AbstractType.java
b/src/main/java/org/apache/doris/kafka/connector/converter/type/AbstractType.java
index 650e792..8bc6b54 100644
---
a/src/main/java/org/apache/doris/kafka/connector/converter/type/AbstractType.java
+++
b/src/main/java/org/apache/doris/kafka/connector/converter/type/AbstractType.java
@@ -18,10 +18,10 @@
*/
package org.apache.doris.kafka.connector.converter.type;
-import io.debezium.connector.jdbc.util.SchemaUtils;
import java.util.Objects;
import java.util.Optional;
import org.apache.doris.kafka.connector.cfg.DorisOptions;
+import org.apache.doris.kafka.connector.converter.type.util.SchemaUtils;
import org.apache.kafka.connect.data.Schema;
/** An abstract implementation of {@link Type}, which all types should extend.
*/
diff --git
a/src/main/java/org/apache/doris/kafka/connector/converter/type/connect/ConnectDateType.java
b/src/main/java/org/apache/doris/kafka/connector/converter/type/connect/ConnectDateType.java
index acac4af..b4dbdbe 100644
---
a/src/main/java/org/apache/doris/kafka/connector/converter/type/connect/ConnectDateType.java
+++
b/src/main/java/org/apache/doris/kafka/connector/converter/type/connect/ConnectDateType.java
@@ -18,8 +18,8 @@
*/
package org.apache.doris.kafka.connector.converter.type.connect;
-import io.debezium.connector.jdbc.util.DateTimeUtils;
import org.apache.doris.kafka.connector.converter.type.AbstractDateType;
+import org.apache.doris.kafka.connector.converter.type.util.DateTimeUtils;
import org.apache.kafka.connect.data.Date;
import org.apache.kafka.connect.errors.ConnectException;
diff --git
a/src/main/java/org/apache/doris/kafka/connector/converter/type/connect/ConnectTimeType.java
b/src/main/java/org/apache/doris/kafka/connector/converter/type/connect/ConnectTimeType.java
index c2e1698..b7a7834 100644
---
a/src/main/java/org/apache/doris/kafka/connector/converter/type/connect/ConnectTimeType.java
+++
b/src/main/java/org/apache/doris/kafka/connector/converter/type/connect/ConnectTimeType.java
@@ -18,12 +18,12 @@
*/
package org.apache.doris.kafka.connector.converter.type.connect;
-import io.debezium.connector.jdbc.util.DateTimeUtils;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.util.Date;
import org.apache.doris.kafka.connector.converter.type.AbstractTimeType;
+import org.apache.doris.kafka.connector.converter.type.util.DateTimeUtils;
import org.apache.kafka.connect.data.Time;
import org.apache.kafka.connect.errors.ConnectException;
diff --git
a/src/main/java/org/apache/doris/kafka/connector/converter/type/connect/ConnectTimestampType.java
b/src/main/java/org/apache/doris/kafka/connector/converter/type/connect/ConnectTimestampType.java
index 2de8c42..9009352 100644
---
a/src/main/java/org/apache/doris/kafka/connector/converter/type/connect/ConnectTimestampType.java
+++
b/src/main/java/org/apache/doris/kafka/connector/converter/type/connect/ConnectTimestampType.java
@@ -18,8 +18,8 @@
*/
package org.apache.doris.kafka.connector.converter.type.connect;
-import io.debezium.connector.jdbc.util.DateTimeUtils;
import org.apache.doris.kafka.connector.converter.type.AbstractTimestampType;
+import org.apache.doris.kafka.connector.converter.type.util.DateTimeUtils;
import org.apache.kafka.connect.data.Timestamp;
import org.apache.kafka.connect.errors.ConnectException;
diff --git
a/src/main/java/org/apache/doris/kafka/connector/converter/type/debezium/DateType.java
b/src/main/java/org/apache/doris/kafka/connector/converter/type/debezium/DateType.java
index a5589f3..6dc8b5c 100644
---
a/src/main/java/org/apache/doris/kafka/connector/converter/type/debezium/DateType.java
+++
b/src/main/java/org/apache/doris/kafka/connector/converter/type/debezium/DateType.java
@@ -18,9 +18,9 @@
*/
package org.apache.doris.kafka.connector.converter.type.debezium;
-import io.debezium.connector.jdbc.util.DateTimeUtils;
import io.debezium.time.Date;
import org.apache.doris.kafka.connector.converter.type.AbstractDateType;
+import org.apache.doris.kafka.connector.converter.type.util.DateTimeUtils;
import org.apache.kafka.connect.errors.ConnectException;
public class DateType extends AbstractDateType {
diff --git
a/src/main/java/org/apache/doris/kafka/connector/converter/type/debezium/MicroTimeType.java
b/src/main/java/org/apache/doris/kafka/connector/converter/type/debezium/MicroTimeType.java
index b2a1381..b2565da 100644
---
a/src/main/java/org/apache/doris/kafka/connector/converter/type/debezium/MicroTimeType.java
+++
b/src/main/java/org/apache/doris/kafka/connector/converter/type/debezium/MicroTimeType.java
@@ -18,9 +18,9 @@
*/
package org.apache.doris.kafka.connector.converter.type.debezium;
-import io.debezium.connector.jdbc.util.DateTimeUtils;
import io.debezium.time.MicroTime;
import java.time.LocalTime;
+import org.apache.doris.kafka.connector.converter.type.util.DateTimeUtils;
public class MicroTimeType extends AbstractDebeziumTimeType {
diff --git
a/src/main/java/org/apache/doris/kafka/connector/converter/type/debezium/MicroTimestampType.java
b/src/main/java/org/apache/doris/kafka/connector/converter/type/debezium/MicroTimestampType.java
index cb8e3c9..e08eabd 100644
---
a/src/main/java/org/apache/doris/kafka/connector/converter/type/debezium/MicroTimestampType.java
+++
b/src/main/java/org/apache/doris/kafka/connector/converter/type/debezium/MicroTimestampType.java
@@ -18,9 +18,9 @@
*/
package org.apache.doris.kafka.connector.converter.type.debezium;
-import io.debezium.connector.jdbc.util.DateTimeUtils;
import io.debezium.time.MicroTimestamp;
import java.time.LocalDateTime;
+import org.apache.doris.kafka.connector.converter.type.util.DateTimeUtils;
public class MicroTimestampType extends AbstractDebeziumTimestampType {
diff --git
a/src/main/java/org/apache/doris/kafka/connector/converter/type/debezium/NanoTimeType.java
b/src/main/java/org/apache/doris/kafka/connector/converter/type/debezium/NanoTimeType.java
index abcc05e..3c82d44 100644
---
a/src/main/java/org/apache/doris/kafka/connector/converter/type/debezium/NanoTimeType.java
+++
b/src/main/java/org/apache/doris/kafka/connector/converter/type/debezium/NanoTimeType.java
@@ -18,9 +18,9 @@
*/
package org.apache.doris.kafka.connector.converter.type.debezium;
-import io.debezium.connector.jdbc.util.DateTimeUtils;
import io.debezium.time.NanoTime;
import java.time.LocalTime;
+import org.apache.doris.kafka.connector.converter.type.util.DateTimeUtils;
public class NanoTimeType extends AbstractDebeziumTimeType {
diff --git
a/src/main/java/org/apache/doris/kafka/connector/converter/type/debezium/NanoTimestampType.java
b/src/main/java/org/apache/doris/kafka/connector/converter/type/debezium/NanoTimestampType.java
index a7c08d0..75e020f 100644
---
a/src/main/java/org/apache/doris/kafka/connector/converter/type/debezium/NanoTimestampType.java
+++
b/src/main/java/org/apache/doris/kafka/connector/converter/type/debezium/NanoTimestampType.java
@@ -18,10 +18,10 @@
*/
package org.apache.doris.kafka.connector.converter.type.debezium;
-import io.debezium.connector.jdbc.util.DateTimeUtils;
import io.debezium.time.MicroTimestamp;
import io.debezium.time.NanoTimestamp;
import java.time.LocalDateTime;
+import org.apache.doris.kafka.connector.converter.type.util.DateTimeUtils;
/**
* An implementation of {@link
org.apache.doris.kafka.connector.converter.type.Type} for {@link
diff --git
a/src/main/java/org/apache/doris/kafka/connector/converter/type/debezium/TimeType.java
b/src/main/java/org/apache/doris/kafka/connector/converter/type/debezium/TimeType.java
index be1d329..174aa96 100644
---
a/src/main/java/org/apache/doris/kafka/connector/converter/type/debezium/TimeType.java
+++
b/src/main/java/org/apache/doris/kafka/connector/converter/type/debezium/TimeType.java
@@ -18,9 +18,9 @@
*/
package org.apache.doris.kafka.connector.converter.type.debezium;
-import io.debezium.connector.jdbc.util.DateTimeUtils;
import io.debezium.time.Time;
import java.time.LocalTime;
+import org.apache.doris.kafka.connector.converter.type.util.DateTimeUtils;
public class TimeType extends AbstractDebeziumTimeType {
diff --git a/src/main/java/io/debezium/connector/jdbc/util/DateTimeUtils.java
b/src/main/java/org/apache/doris/kafka/connector/converter/type/util/DateTimeUtils.java
similarity index 98%
rename from src/main/java/io/debezium/connector/jdbc/util/DateTimeUtils.java
rename to
src/main/java/org/apache/doris/kafka/connector/converter/type/util/DateTimeUtils.java
index 941254d..73dbc45 100644
--- a/src/main/java/io/debezium/connector/jdbc/util/DateTimeUtils.java
+++
b/src/main/java/org/apache/doris/kafka/connector/converter/type/util/DateTimeUtils.java
@@ -18,9 +18,10 @@
*
* Copied from
*
https://github.com/debezium/debezium-connector-jdbc/blob/main/src/main/java/io/debezium/connector/jdbc/util/DateTimeUtils.java
+ * modified by doris.
*/
-package io.debezium.connector.jdbc.util;
+package org.apache.doris.kafka.connector.converter.type.util;
import io.debezium.time.Conversions;
import java.sql.Timestamp;
diff --git a/src/main/java/io/debezium/connector/jdbc/util/SchemaUtils.java
b/src/main/java/org/apache/doris/kafka/connector/converter/type/util/SchemaUtils.java
similarity index 96%
rename from src/main/java/io/debezium/connector/jdbc/util/SchemaUtils.java
rename to
src/main/java/org/apache/doris/kafka/connector/converter/type/util/SchemaUtils.java
index 178507c..fe0e94a 100644
--- a/src/main/java/io/debezium/connector/jdbc/util/SchemaUtils.java
+++
b/src/main/java/org/apache/doris/kafka/connector/converter/type/util/SchemaUtils.java
@@ -18,9 +18,10 @@
*
* Copied from
*
https://github.com/debezium/debezium-connector-jdbc/blob/main/src/main/java/io/debezium/connector/jdbc/util/SchemaUtils.java
+ * modified by doris.
*/
-package io.debezium.connector.jdbc.util;
+package org.apache.doris.kafka.connector.converter.type.util;
import java.util.Objects;
import java.util.Optional;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
