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 5e8aaa7 [fix]Fix failed test cases and optimize pom.xml (#13)
5e8aaa7 is described below
commit 5e8aaa758df0fe02b78dd5b9985835d2006b4a83
Author: wudongliang <46414265+donglian...@users.noreply.github.com>
AuthorDate: Mon Apr 15 18:13:27 2024 +0800
[fix]Fix failed test cases and optimize pom.xml (#13)
---
pom.xml | 31 ++++++++++++++--------
.../connector/converter/RecordDescriptor.java | 6 +----
.../connector/converter/TestRecordService.java | 4 +--
3 files changed, 23 insertions(+), 18 deletions(-)
diff --git a/pom.xml b/pom.xml
index 2ceea3c..d062676 100644
--- a/pom.xml
+++ b/pom.xml
@@ -78,9 +78,18 @@
<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<confluent.version>7.2.1</confluent.version>
+ <kafka.version>2.5.1</kafka.version>
<avro.version>1.11.3</avro.version>
<metrics.version>4.2.25</metrics.version>
<spotless.version>2.4.2</spotless.version>
+ <debezium.version>1.9.8.Final</debezium.version>
+ <mockito.version>2.27.0</mockito.version>
+ <junit.version>4.13.1</junit.version>
+ <slf4j.version>1.7.25</slf4j.version>
+ <mysql-connector.version>8.0.30</mysql-connector.version>
+ <jackson.version>2.13.2.1</jackson.version>
+ <httpcomponents.version>4.5.13</httpcomponents.version>
+ <commons-io.version>2.3</commons-io.version>
</properties>
<repositories>
@@ -95,13 +104,13 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.3</version>
+ <version>${commons-io.version}</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.kafka/connect-api
-->
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>connect-api</artifactId>
- <version>2.5.1</version>
+ <version>${kafka.version}</version>
<scope>provided</scope>
<exclusions>
<exclusion>
@@ -129,47 +138,47 @@
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>connect-runtime</artifactId>
- <version>2.5.1</version>
+ <version>${kafka.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>2.13.2.1</version>
+ <version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>4.5.13</version>
+ <version>${httpcomponents.version}</version>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
- <version>8.0.30</version>
+ <version>${mysql-connector.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.7.25</version>
+ <version>${slf4j.version}</version>
</dependency>
<!--junit for unit test-->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.13.1</version>
+ <version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.7.25</version>
+ <version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>2.27.0</version>
+ <version>${mockito.version}</version>
<scope>test</scope>
</dependency>
@@ -254,7 +263,7 @@
<dependency>
<groupId>io.debezium</groupId>
<artifactId>debezium-core</artifactId>
- <version>1.9.8.Final</version>
+ <version>${debezium.version}</version>
</dependency>
</dependencies>
diff --git
a/src/main/java/org/apache/doris/kafka/connector/converter/RecordDescriptor.java
b/src/main/java/org/apache/doris/kafka/connector/converter/RecordDescriptor.java
index 66a7c21..188f103 100644
---
a/src/main/java/org/apache/doris/kafka/connector/converter/RecordDescriptor.java
+++
b/src/main/java/org/apache/doris/kafka/connector/converter/RecordDescriptor.java
@@ -81,11 +81,7 @@ public class RecordDescriptor {
}
public boolean isTombstone() {
- // NOTE
- // Debezium TOMBSTONE has both value and valueSchema to null, instead
the
- // ExtractNewRecordState SMT with delete.handling.mode=none will
generate
- // a record only with value null that by JDBC connector is treated as
a flattened delete.
- // See isDelete method.
+ // Debezium TOMBSTONE has both value and valueSchema to null.
return record.value() == null && record.valueSchema() == null;
}
diff --git
a/src/test/java/org/apache/doris/kafka/connector/converter/TestRecordService.java
b/src/test/java/org/apache/doris/kafka/connector/converter/TestRecordService.java
index 498feb0..dc0d2fe 100644
---
a/src/test/java/org/apache/doris/kafka/connector/converter/TestRecordService.java
+++
b/src/test/java/org/apache/doris/kafka/connector/converter/TestRecordService.java
@@ -75,14 +75,14 @@ public class TestRecordService {
String noDeleteValue =
"{\"schema\":{\"type\":\"struct\",\"fields\":[{\"type\":\"struct\",\"fields\":[{\"type\":\"int32\",\"optional\":false,\"field\":\"id\"},{\"type\":\"string\",\"optional\":true,\"field\":\"name\"},{\"type\":\"int32\",\"optional\":true,\"field\":\"age\"},{\"type\":\"string\",\"optional\":true,\"field\":\"email\"},{\"type\":\"int32\",\"optional\":true,\"name\":\"io.debezium.time.Date\",\"version\":1,\"field\":\"birth_date\"},{\"type\":\"int32\",\"optional\":true,\"field\":\"i
[...]
String expectedNoDeleteValue =
- "{\"id\":8,\"name\":\"Jfohn
Doe\",\"age\":430,\"email\":\"j...@example.com\",\"birth_date\":\"1994-05-20\",\"integer_column\":12323,\"float_column\":45.67,\"decimal_column\":123.45,\"datetime_column\":\"2024-04-12T10:30\",\"date_column\":\"2024-04-12\",\"time_column\":\"2024-04-12T10:30\",\"text_column\":\"Lorem
ipsum dolor sit amet, consectetur adipiscing
elit.\",\"varchar_column\":null,\"binary_column\":\"1234567890ABCDEF0000\",\"blob_column\":null,\"is_active\":2,\"__D
[...]
+ "{\"id\":8,\"name\":\"Jfohn
Doe\",\"age\":430,\"email\":\"j...@example.com\",\"birth_date\":\"1994-05-20\",\"integer_column\":12323,\"float_column\":45.67,\"decimal_column\":123.45,\"datetime_column\":\"2024-04-12T10:30\",\"date_column\":\"2024-04-12\",\"time_column\":\"2024-04-15T10:30\",\"text_column\":\"Lorem
ipsum dolor sit amet, consectetur adipiscing
elit.\",\"varchar_column\":null,\"binary_column\":\"1234567890ABCDEF0000\",\"blob_column\":null,\"is_active\":2,\"__D
[...]
buildProcessStructRecord(topic, noDeleteValue, expectedNoDeleteValue);
// delete value
String deleteValue =
"{\"schema\":{\"type\":\"struct\",\"fields\":[{\"type\":\"struct\",\"fields\":[{\"type\":\"int32\",\"optional\":false,\"field\":\"id\"},{\"type\":\"string\",\"optional\":true,\"field\":\"name\"},{\"type\":\"int32\",\"optional\":true,\"field\":\"age\"},{\"type\":\"string\",\"optional\":true,\"field\":\"email\"},{\"type\":\"int32\",\"optional\":true,\"name\":\"io.debezium.time.Date\",\"version\":1,\"field\":\"birth_date\"},{\"type\":\"int32\",\"optional\":true,\"field\":\"i
[...]
String expectedDeleteValue =
- "{\"id\":8,\"name\":\"Jfohn
Doe\",\"age\":430,\"email\":\"j...@example.com\",\"birth_date\":\"1994-05-20\",\"integer_column\":12323,\"float_column\":45.67,\"decimal_column\":123.45,\"datetime_column\":\"2024-04-12T10:30\",\"date_column\":\"2024-04-12\",\"time_column\":\"2024-04-12T10:30\",\"text_column\":\"Lorem
ipsum dolor sit amet, consectetur adipiscing
elit.\",\"varchar_column\":null,\"binary_column\":\"1234567890ABCDEF0000\",\"blob_column\":null,\"is_active\":2,\"__D
[...]
+ "{\"id\":8,\"name\":\"Jfohn
Doe\",\"age\":430,\"email\":\"j...@example.com\",\"birth_date\":\"1994-05-20\",\"integer_column\":12323,\"float_column\":45.67,\"decimal_column\":123.45,\"datetime_column\":\"2024-04-12T10:30\",\"date_column\":\"2024-04-12\",\"time_column\":\"2024-04-15T10:30\",\"text_column\":\"Lorem
ipsum dolor sit amet, consectetur adipiscing
elit.\",\"varchar_column\":null,\"binary_column\":\"1234567890ABCDEF0000\",\"blob_column\":null,\"is_active\":2,\"__D
[...]
buildProcessStructRecord(topic, deleteValue, expectedDeleteValue);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
