Fix CI

apache · Aug 17, 2024 · 7e97e83 · 7e97e83
1 parent 215a4bf
commit 7e97e83
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 15 deletions.
diff --git a/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/utils/SchemaUtils.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/utils/SchemaUtils.java
@@ -273,7 +273,7 @@ public Schema visit(DropColumnEvent event) {
 
                     @Override
                     public Schema visit(DropTableEvent event) {
-                        return null;
+                        return schema;
                     }
 
                     @Override

diff --git a/...n/java/org/apache/flink/cdc/connectors/starrocks/sink/EventRecordSerializationSchema.java b/...n/java/org/apache/flink/cdc/connectors/starrocks/sink/EventRecordSerializationSchema.java
@@ -92,19 +92,15 @@ private void applySchemaChangeEvent(SchemaChangeEvent event) {
             }
             newSchema = SchemaUtils.applySchemaChangeEvent(tableInfo.schema, event);
         }
-        if (newSchema != null) {
-            TableInfo tableInfo = new TableInfo();
-            tableInfo.schema = newSchema;
-            tableInfo.fieldGetters = new RecordData.FieldGetter[newSchema.getColumnCount()];
-            for (int i = 0; i < newSchema.getColumnCount(); i++) {
-                tableInfo.fieldGetters[i] =
-                        StarRocksUtils.createFieldGetter(
-                                newSchema.getColumns().get(i).getType(), i, zoneId);
-            }
-            tableInfoMap.put(tableId, tableInfo);
-        } else {
-            tableInfoMap.remove(tableId);
+        TableInfo tableInfo = new TableInfo();
+        tableInfo.schema = newSchema;
+        tableInfo.fieldGetters = new RecordData.FieldGetter[newSchema.getColumnCount()];
+        for (int i = 0; i < newSchema.getColumnCount(); i++) {
+            tableInfo.fieldGetters[i] =
+                    StarRocksUtils.createFieldGetter(
+                            newSchema.getColumns().get(i).getType(), i, zoneId);
         }
+        tableInfoMap.put(tableId, tableInfo);
     }
 
     private StarRocksRowData applyDataChangeEvent(DataChangeEvent event) {

diff --git a/.../java/org/apache/flink/cdc/runtime/operators/schema/coordinator/SchemaDerivationTest.java b/.../java/org/apache/flink/cdc/runtime/operators/schema/coordinator/SchemaDerivationTest.java
@@ -380,8 +380,8 @@ void testIncompatibleTypes() {
                         () ->
                                 schemaDerivation.applySchemaChange(
                                         new CreateTableEvent(TABLE_2, INCOMPATIBLE_SCHEMA)))
-                .hasRootCauseInstanceOf(IllegalStateException.class)
-                .hasRootCauseMessage("Incompatible types: \"INT\" and \"STRING\"");
+                .isInstanceOf(IllegalStateException.class)
+                .hasMessage("Incompatible types: \"INT\" and \"STRING\"");
     }
 
     @Test