This is an automated email from the ASF dual-hosted git repository.
leonard pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink-cdc.git
The following commit(s) were added to refs/heads/master by this push:
new 7b01d9ca4 [hotfix][ci] Fix CI failure due to implicit conflicts
7b01d9ca4 is described below
commit 7b01d9ca40d5347c484bf4ca8f4afdbffab21e1e
Author: Kunni <lvyanquan....@alibaba-inc.com>
AuthorDate: Fri Jan 10 10:14:53 2025 +0800
[hotfix][ci] Fix CI failure due to implicit conflicts
This closes #3846
---
.../flink/cdc/composer/flink/FlinkPipelineComposerITCase.java | 6 +++---
.../flink/cdc/connectors/paimon/sink/v2/PaimonSinkITCase.java | 3 ++-
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git
a/flink-cdc-composer/src/test/java/org/apache/flink/cdc/composer/flink/FlinkPipelineComposerITCase.java
b/flink-cdc-composer/src/test/java/org/apache/flink/cdc/composer/flink/FlinkPipelineComposerITCase.java
index 6d77bcfcd..55a205d49 100644
---
a/flink-cdc-composer/src/test/java/org/apache/flink/cdc/composer/flink/FlinkPipelineComposerITCase.java
+++
b/flink-cdc-composer/src/test/java/org/apache/flink/cdc/composer/flink/FlinkPipelineComposerITCase.java
@@ -1241,7 +1241,7 @@ class FlinkPipelineComposerITCase {
assertThat(mergedTableSchema)
.isEqualTo(
Schema.newBuilder()
- .physicalColumn("id", DataTypes.BIGINT())
+ .physicalColumn("id",
DataTypes.BIGINT().notNull())
.physicalColumn("name", DataTypes.STRING())
.physicalColumn("age", DataTypes.INT())
.physicalColumn("last_name",
DataTypes.STRING())
@@ -1252,9 +1252,9 @@ class FlinkPipelineComposerITCase {
String[] outputEvents = outCaptor.toString().trim().split("\n");
assertThat(outputEvents)
.containsExactly(
-
"CreateTableEvent{tableId=default_namespace.default_schema.merged,
schema=columns={`id` INT,`name` STRING,`age` INT,`last_name` STRING},
primaryKeys=id, options=()}",
+
"CreateTableEvent{tableId=default_namespace.default_schema.merged,
schema=columns={`id` INT NOT NULL,`name` STRING,`age` INT,`last_name` STRING},
primaryKeys=id, options=()}",
"AddColumnEvent{tableId=default_namespace.default_schema.merged,
addedColumns=[ColumnWithPosition{column=`description` STRING, position=AFTER,
existedColumnName=last_name}]}",
-
"AlterColumnTypeEvent{tableId=default_namespace.default_schema.merged,
typeMapping={id=BIGINT}, oldTypeMapping={id=INT}}",
+
"AlterColumnTypeEvent{tableId=default_namespace.default_schema.merged,
typeMapping={id=BIGINT NOT NULL}, oldTypeMapping={id=INT NOT NULL}}",
"DataChangeEvent{tableId=default_namespace.default_schema.merged, before=[],
after=[1, Alice, 18, last_name, null], op=INSERT, meta=()}",
"DataChangeEvent{tableId=default_namespace.default_schema.merged, before=[],
after=[2, Bob, 20, last_name, null], op=INSERT, meta=()}",
"DataChangeEvent{tableId=default_namespace.default_schema.merged, before=[2,
Bob, 20, last_name, null], after=[2, Bob, 30, last_name, null], op=UPDATE,
meta=()}",
diff --git
a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-paimon/src/test/java/org/apache/flink/cdc/connectors/paimon/sink/v2/PaimonSinkITCase.java
b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-paimon/src/test/java/org/apache/flink/cdc/connectors/paimon/sink/v2/PaimonSinkITCase.java
index 8c54837e8..34dddb93f 100644
---
a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-paimon/src/test/java/org/apache/flink/cdc/connectors/paimon/sink/v2/PaimonSinkITCase.java
+++
b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-paimon/src/test/java/org/apache/flink/cdc/connectors/paimon/sink/v2/PaimonSinkITCase.java
@@ -276,7 +276,8 @@ public class PaimonSinkITCase {
// Each commit will generate one sequence number(equal to
checkpointId).
List<Row> expected =
enableDeleteVector
- ? Collections.singletonList(Row.ofKind(RowKind.INSERT,
3L))
+ ? Arrays.asList(
+ Row.ofKind(RowKind.INSERT, 1L),
Row.ofKind(RowKind.INSERT, 3L))
: Arrays.asList(
Row.ofKind(RowKind.INSERT, 1L),
Row.ofKind(RowKind.INSERT, 2L),
