[debezium] Upgrade to Debezium 1.9.8.Final(#3033) (#3034)

apache · Jan 26, 2024 · 7ea1972 · 7ea1972
1 parent 10e542c
commit 7ea1972
Show file tree

Hide file tree

Showing 19 changed files with 108 additions and 710 deletions.
diff --git a/...java/com/ververica/cdc/connectors/mysql/source/parser/CustomAlterTableParserListener.java b/...java/com/ververica/cdc/connectors/mysql/source/parser/CustomAlterTableParserListener.java
@@ -42,7 +42,7 @@
 
 import static com.ververica.cdc.connectors.mysql.utils.MySqlTypeUtils.fromDbzColumn;
 
-/** Copied from {@link AlterTableParserListener} in Debezium 1.9.7.Final. */
+/** Copied from {@link AlterTableParserListener} in Debezium 1.9.8.Final. */
 public class CustomAlterTableParserListener extends MySqlParserBaseListener {
 
     private static final int STARTING_INDEX = 1;

diff --git a/...a/com/ververica/cdc/connectors/mysql/source/parser/CustomMySqlAntlrDdlParserListener.java b/...a/com/ververica/cdc/connectors/mysql/source/parser/CustomMySqlAntlrDdlParserListener.java
@@ -48,7 +48,7 @@
 import java.util.concurrent.CopyOnWriteArrayList;
 
 /**
- * Copied from {@link MySqlAntlrDdlParserListener} in Debezium 1.9.7.final.
+ * Copied from {@link MySqlAntlrDdlParserListener} in Debezium 1.9.8.final.
  *
  * <p>This listener's constructor will use some modified listener.
  */

diff --git a/...onnector-debezium/src/main/java/io/debezium/relational/RelationalChangeRecordEmitter.java b/...onnector-debezium/src/main/java/io/debezium/relational/RelationalChangeRecordEmitter.java
@@ -22,7 +22,7 @@
 import java.util.Optional;
 
 /**
- * Copied from Debezium 1.9.7.Final.
+ * Copied from Debezium 1.9.8.Final.
  *
  * <p>Base class for {@link ChangeRecordEmitter} implementations based on a relational database.
  *

diff --git a/.../flink-connector-mysql-cdc/src/main/java/io/debezium/connector/mysql/MySqlConnection.java b/.../flink-connector-mysql-cdc/src/main/java/io/debezium/connector/mysql/MySqlConnection.java
@@ -38,7 +38,7 @@
 import java.util.Properties;
 
 /**
- * Copied from Debezium project(1.9.7.final) to add custom jdbc properties in the jdbc url. The new
+ * Copied from Debezium project(1.9.8.final) to add custom jdbc properties in the jdbc url. The new
  * parameter {@code jdbcProperties} in the constructor of {@link MySqlConnectionConfiguration} will
  * be used to generate the jdbc url pattern, and may overwrite the default value.
  *

diff --git a/...ector-mysql-cdc/src/main/java/io/debezium/connector/mysql/MySqlDefaultValueConverter.java b/...ector-mysql-cdc/src/main/java/io/debezium/connector/mysql/MySqlDefaultValueConverter.java
@@ -35,8 +35,8 @@
 import java.util.regex.Pattern;
 
 /**
- * Copied from Debezium project(1.9.7.final) to add BIGINT and SMALLINT to TRIM_DATA_TYPES. Remove
- * this when https://issues.redhat.com/browse/DBZ-6824 is fixed.
+ * Copied from Debezium project(1.9.8.final) to add BIGINT and SMALLINT to TRIM_DATA_TYPES. Remove
+ * this until https://issues.redhat.com/browse/DBZ-6824 is fixed in 2.3.3.Final.
  *
  * <p>Line 81 & 82: add BIGINT and SMALLINT to TRIM_DATA_TYPES.
  */

diff --git a/...-mysql-cdc/src/main/java/io/debezium/connector/mysql/MySqlStreamingChangeEventSource.java b/...-mysql-cdc/src/main/java/io/debezium/connector/mysql/MySqlStreamingChangeEventSource.java
@@ -84,7 +84,7 @@
 import static io.debezium.util.Strings.isNullOrEmpty;
 
 /**
- * Copied from Debezium project to fix
+ * Copied from Debezium project(1.9.8.Final) to fix
  * https://github.com/ververica/flink-cdc-connectors/issues/1944.
  *
  * <p>Line 1427-1433 : Adjust GTID merging logic to support recovering from job which previously

diff --git a/...k-connector-mysql-cdc/src/main/java/io/debezium/connector/mysql/MySqlValueConverters.java b/...k-connector-mysql-cdc/src/main/java/io/debezium/connector/mysql/MySqlValueConverters.java
@@ -48,8 +48,8 @@
 import java.util.regex.Pattern;
 
 /**
- * Copied from Debezium project to fix FLOAT converted to FLOAT64 type issue. See DBZ-3865,
- * DBZ-5843. Remove it when debezium version is upgraded above 2.0.0.Final.
+ * Copied from Debezium project(1.9.8.Final) to fix FLOAT converted to FLOAT64 type issue. See
+ * DBZ-3865, DBZ-5843. Remove it when debezium version is upgraded above 2.0.0.Final.
  *
  * <p>Line 240 & 246: add FLOAT type adjustment.
  *

diff --git a/.../src/main/java/io/debezium/connector/mysql/antlr/listener/DefaultValueParserListener.java b/.../src/main/java/io/debezium/connector/mysql/antlr/listener/DefaultValueParserListener.java
@@ -13,11 +13,11 @@
 import java.util.concurrent.atomic.AtomicReference;
 
 /**
- * Copied from Debezium project(v1.9.7.Final) to fix
+ * Copied from Debezium project(v1.9.8.Final) to fix
  * https://github.com/ververica/flink-cdc-connectors/issues/1506.
  *
  * <p>Line 48~59: use the actual default string value when the sql contains COLLATE. We should
- * remove this class after we bumped a higher debezium version where the
+ * remove this class after we bumped debezium 2.0 where the
  * https://issues.redhat.com/browse/DBZ-5587 has been fixed.
  */
 public class DefaultValueParserListener extends MySqlParserBaseListener {
@@ -95,7 +95,10 @@ public void exitDefaultValue(boolean skipIfUnknownOptional) {
     }
 
     private String unquote(String stringLiteral) {
-        return stringLiteral.substring(1, stringLiteral.length() - 1);
+        if (stringLiteral != null && stringLiteral.startsWith("'") && stringLiteral.endsWith("'")) {
+            return stringLiteral.substring(1, stringLiteral.length() - 1);
+        }
+        return stringLiteral;
     }
 
     private String unquoteBinary(String stringLiteral) {