yunqingmoswu commented on code in PR #8141: URL: https://github.com/apache/inlong/pull/8141#discussion_r1213891104
########## inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/schema/ColumnSchema.java: ########## @@ -0,0 +1,31 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.inlong.sort.schema; + +import lombok.Data; +import org.apache.flink.table.types.logical.LogicalType; + +@Data +public class ColumnSchema { + + private String name; + private LogicalType type; + private boolean isNullable; + private String doc; Review Comment: What's the meaning of this? ########## inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/schema/ColumnSchema.java: ########## @@ -0,0 +1,31 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.inlong.sort.schema; + +import lombok.Data; +import org.apache.flink.table.types.logical.LogicalType; + +@Data +public class ColumnSchema { Review Comment: Please add some comments for it ########## inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/util/SchemaChangeUtils.java: ########## @@ -23,25 +23,31 @@ import org.apache.inlong.sort.protocol.ddl.operations.Operation; import org.apache.inlong.sort.protocol.enums.SchemaChangePolicy; import org.apache.inlong.sort.protocol.enums.SchemaChangeType; +import org.apache.inlong.sort.schema.ColumnSchema; +import org.apache.inlong.sort.schema.TableChange; import com.google.common.base.Preconditions; +import com.google.common.collect.Sets; +import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; +import java.util.List; import java.util.Map; import java.util.Map.Entry; import java.util.Set; import java.util.StringJoiner; +import java.util.stream.Collectors; /** * Schema-change Utils */ -public final class SchemaChangeUtils { +public class SchemaChangeUtils { Review Comment: I don't think it is a good idea to remove final ########## inlong-sort/sort-flink/base/src/main/java/org/apache/inlong/sort/base/schema/SchemaChangeInterface.java: ########## @@ -0,0 +1,41 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.inlong.sort.base.schema; + +import org.apache.inlong.sort.protocol.ddl.operations.AlterOperation; +import org.apache.inlong.sort.protocol.ddl.operations.CreateTableOperation; +import org.apache.inlong.sort.protocol.enums.SchemaChangeType; + +import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode; + +public interface SchemaChangeInterface { Review Comment: Please add some comments for it and maybe it is better to rename it to 'SchemaChangeAPI' or 'SchemaChangeHandle'? ########## inlong-sort/sort-flink/sort-flink-v1.13/sort-connectors/iceberg/src/main/java/org/apache/inlong/sort/iceberg/schema/IcebergSchemaChangeHelper.java: ########## @@ -0,0 +1,257 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.inlong.sort.iceberg.schema; + +import org.apache.inlong.sort.base.dirty.DirtySinkHelper; +import org.apache.inlong.sort.base.dirty.DirtyType; +import org.apache.inlong.sort.base.format.JsonDynamicSchemaFormat; +import org.apache.inlong.sort.base.metric.sub.SinkTableMetricData; +import org.apache.inlong.sort.base.schema.SchemaChangeHandleException; +import org.apache.inlong.sort.base.schema.SchemaChangeHelper; +import org.apache.inlong.sort.base.sink.SchemaUpdateExceptionPolicy; +import org.apache.inlong.sort.iceberg.sink.multiple.IcebergSchemaChangeUtils; +import org.apache.inlong.sort.protocol.ddl.enums.PositionType; +import org.apache.inlong.sort.protocol.ddl.expressions.AlterColumn; +import org.apache.inlong.sort.protocol.ddl.expressions.Column; +import org.apache.inlong.sort.protocol.ddl.operations.AlterOperation; +import org.apache.inlong.sort.protocol.ddl.operations.CreateTableOperation; +import org.apache.inlong.sort.protocol.enums.SchemaChangePolicy; +import org.apache.inlong.sort.protocol.enums.SchemaChangeType; +import org.apache.inlong.sort.schema.TableChange; +import org.apache.inlong.sort.util.SchemaChangeUtils; + +import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode; +import org.apache.flink.table.types.logical.LogicalType; +import org.apache.flink.table.types.logical.RowType; +import org.apache.flink.util.Preconditions; +import org.apache.iceberg.Schema; +import org.apache.iceberg.Table; +import org.apache.iceberg.Transaction; +import org.apache.iceberg.catalog.Catalog; +import org.apache.iceberg.catalog.SupportsNamespaces; +import org.apache.iceberg.catalog.TableIdentifier; +import org.apache.iceberg.flink.FlinkSchemaUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + +public class IcebergSchemaChangeHelper extends SchemaChangeHelper { Review Comment: Please add some comments ########## inlong-sort/sort-flink/base/src/main/java/org/apache/inlong/sort/base/schema/SchemaChangeHelper.java: ########## @@ -0,0 +1,157 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.inlong.sort.base.schema; + +import org.apache.inlong.sort.base.dirty.DirtySinkHelper; +import org.apache.inlong.sort.base.dirty.DirtyType; +import org.apache.inlong.sort.base.format.JsonDynamicSchemaFormat; +import org.apache.inlong.sort.base.metric.sub.SinkTableMetricData; +import org.apache.inlong.sort.base.sink.SchemaUpdateExceptionPolicy; +import org.apache.inlong.sort.protocol.ddl.operations.AlterOperation; +import org.apache.inlong.sort.protocol.ddl.operations.CreateTableOperation; +import org.apache.inlong.sort.protocol.ddl.operations.Operation; +import org.apache.inlong.sort.protocol.enums.SchemaChangePolicy; +import org.apache.inlong.sort.protocol.enums.SchemaChangeType; +import org.apache.inlong.sort.util.SchemaChangeUtils; + +import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.type.TypeReference; +import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode; +import org.apache.flink.util.Preconditions; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.Map; + +public abstract class SchemaChangeHelper implements SchemaChangeInterface { Review Comment: Please add some comments for it. ########## inlong-sort/sort-flink/sort-flink-v1.13/sort-connectors/iceberg/src/main/java/org/apache/inlong/sort/iceberg/schema/IcebergSchemaChangeHelper.java: ########## @@ -0,0 +1,257 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.inlong.sort.iceberg.schema; + +import org.apache.inlong.sort.base.dirty.DirtySinkHelper; +import org.apache.inlong.sort.base.dirty.DirtyType; +import org.apache.inlong.sort.base.format.JsonDynamicSchemaFormat; +import org.apache.inlong.sort.base.metric.sub.SinkTableMetricData; +import org.apache.inlong.sort.base.schema.SchemaChangeHandleException; +import org.apache.inlong.sort.base.schema.SchemaChangeHelper; +import org.apache.inlong.sort.base.sink.SchemaUpdateExceptionPolicy; +import org.apache.inlong.sort.iceberg.sink.multiple.IcebergSchemaChangeUtils; +import org.apache.inlong.sort.protocol.ddl.enums.PositionType; +import org.apache.inlong.sort.protocol.ddl.expressions.AlterColumn; +import org.apache.inlong.sort.protocol.ddl.expressions.Column; +import org.apache.inlong.sort.protocol.ddl.operations.AlterOperation; +import org.apache.inlong.sort.protocol.ddl.operations.CreateTableOperation; +import org.apache.inlong.sort.protocol.enums.SchemaChangePolicy; +import org.apache.inlong.sort.protocol.enums.SchemaChangeType; +import org.apache.inlong.sort.schema.TableChange; +import org.apache.inlong.sort.util.SchemaChangeUtils; + +import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode; +import org.apache.flink.table.types.logical.LogicalType; +import org.apache.flink.table.types.logical.RowType; +import org.apache.flink.util.Preconditions; +import org.apache.iceberg.Schema; +import org.apache.iceberg.Table; +import org.apache.iceberg.Transaction; +import org.apache.iceberg.catalog.Catalog; +import org.apache.iceberg.catalog.SupportsNamespaces; +import org.apache.iceberg.catalog.TableIdentifier; +import org.apache.iceberg.flink.FlinkSchemaUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + +public class IcebergSchemaChangeHelper extends SchemaChangeHelper { + + private static final Logger LOGGER = LoggerFactory.getLogger(IcebergSchemaChangeHelper.class); + private transient Catalog catalog; + + private transient SupportsNamespaces asNamespaceCatalog; + + public IcebergSchemaChangeHelper(JsonDynamicSchemaFormat dynamicSchemaFormat, boolean schemaChange, + Map<SchemaChangeType, SchemaChangePolicy> policyMap, String databasePattern, String tablePattern, + SchemaUpdateExceptionPolicy exceptionPolicy, + SinkTableMetricData metricData, DirtySinkHelper<Object> dirtySinkHelper, + Catalog catalog, + SupportsNamespaces asNamespaceCatalog) { + super(dynamicSchemaFormat, schemaChange, policyMap, databasePattern, + tablePattern, exceptionPolicy, metricData, dirtySinkHelper); + this.catalog = catalog; + this.asNamespaceCatalog = asNamespaceCatalog; + } + @Override + public void handleAlterOperation(String database, String table, byte[] originData, + String originSchema, JsonNode data, AlterOperation operation) { + if (operation.getAlterColumns() == null || operation.getAlterColumns().isEmpty()) { + if (exceptionPolicy == SchemaUpdateExceptionPolicy.THROW_WITH_STOP) { + throw new SchemaChangeHandleException( + String.format("Alter columns is empty, origin schema: %s", originSchema)); + } + LOGGER.warn("Alter columns is empty, origin schema: {}", originSchema); + return; + } + + Map<SchemaChangeType, List<AlterColumn>> typeMap = new LinkedHashMap<>(); + for (AlterColumn alterColumn : operation.getAlterColumns()) { + Set<SchemaChangeType> types = null; + try { + types = SchemaChangeUtils.extractSchemaChangeType(alterColumn); + Preconditions.checkState(!types.isEmpty(), "Schema change types is empty"); + } catch (Exception e) { + if (exceptionPolicy == SchemaUpdateExceptionPolicy.THROW_WITH_STOP) { + throw new SchemaChangeHandleException( + String.format("Extract schema change type failed, origin schema: %s", originSchema), e); + } + LOGGER.warn("Extract schema change type failed, origin schema: {}", originSchema, e); + } + if (types == null) { + continue; + } + if (types.size() == 1) { + SchemaChangeType type = types.stream().findFirst().get(); + typeMap.computeIfAbsent(type, k -> new ArrayList<>()).add(alterColumn); + } else { + // Handle change column, it only exists change column type and rename column in this scenario for now. + for (SchemaChangeType type : types) { + SchemaChangePolicy policy = policyMap.get(type); + if (policy == SchemaChangePolicy.ENABLE) { + LOGGER.warn("Unsupported for {}: {}", type, originSchema); + } else { + doSchemaChangeBase(type, policy, originSchema); + } + } + } + } + + if (!typeMap.isEmpty()) { + for (Map.Entry<SchemaChangeType, List<AlterColumn>> kv : typeMap.entrySet()) { + SchemaChangePolicy policy = policyMap.get(kv.getKey()); + doSchemaChangeBase(kv.getKey(), policy, originSchema); + if (policy == SchemaChangePolicy.ENABLE) { + try { + switch (kv.getKey()) { + case ADD_COLUMN: + doAddColumn(kv.getValue(), TableIdentifier.of(database, table)); + break; + case DROP_COLUMN: + doDropColumn(kv.getKey(), originSchema); + break; + case RENAME_COLUMN: + doRenameColumn(kv.getKey(), originSchema); + + break; + case CHANGE_COLUMN_TYPE: + doChangeColumnType(kv.getKey(), originSchema); + break; + default: + } + } catch (Exception e) { + if (exceptionPolicy == SchemaUpdateExceptionPolicy.THROW_WITH_STOP) { + throw new SchemaChangeHandleException( + String.format("Apply alter column failed, origin schema: %s", originSchema), e); + } + LOGGER.warn("Apply alter column failed, origin schema: {}", originSchema, e); + handleDirtyData(data, originData, database, table, DirtyType.HANDLE_ALTER_TABLE_ERROR, e); + } + } + } + } + } + + private void doAddColumn(List<AlterColumn> alterColumns, TableIdentifier tableId) { + List<TableChange> tableChanges = new ArrayList<>(); + Table table = catalog.loadTable(tableId); + Transaction transaction = table.newTransaction(); + + alterColumns.forEach(alterColumn -> { + Column column = alterColumn.getNewColumn(); + LogicalType dataType = dynamicSchemaFormat.sqlType2FlinkType(column.getJdbcType()); + TableChange.ColumnPosition position = + column.getPosition().getPositionType() == PositionType.FIRST ? TableChange.ColumnPosition.first() + : TableChange.ColumnPosition.after(column.getName()); + TableChange.AddColumn addColumn = new TableChange.AddColumn(new String[]{column.getName()}, + dataType, column.isNullable(), column.getComment(), position); + tableChanges.add(addColumn); + }); + IcebergSchemaChangeUtils.applySchemaChanges(transaction.updateSchema(), tableChanges); + transaction.commitTransaction(); + } + + private String doChangeColumnType(SchemaChangeType type, String originSchema) { Review Comment: It is recommend to change it as a default implemention in the supper class. ########## inlong-sort/sort-flink/sort-flink-v1.13/sort-connectors/iceberg/src/main/java/org/apache/inlong/sort/iceberg/schema/IcebergSchemaChangeHelper.java: ########## @@ -0,0 +1,257 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.inlong.sort.iceberg.schema; + +import org.apache.inlong.sort.base.dirty.DirtySinkHelper; +import org.apache.inlong.sort.base.dirty.DirtyType; +import org.apache.inlong.sort.base.format.JsonDynamicSchemaFormat; +import org.apache.inlong.sort.base.metric.sub.SinkTableMetricData; +import org.apache.inlong.sort.base.schema.SchemaChangeHandleException; +import org.apache.inlong.sort.base.schema.SchemaChangeHelper; +import org.apache.inlong.sort.base.sink.SchemaUpdateExceptionPolicy; +import org.apache.inlong.sort.iceberg.sink.multiple.IcebergSchemaChangeUtils; +import org.apache.inlong.sort.protocol.ddl.enums.PositionType; +import org.apache.inlong.sort.protocol.ddl.expressions.AlterColumn; +import org.apache.inlong.sort.protocol.ddl.expressions.Column; +import org.apache.inlong.sort.protocol.ddl.operations.AlterOperation; +import org.apache.inlong.sort.protocol.ddl.operations.CreateTableOperation; +import org.apache.inlong.sort.protocol.enums.SchemaChangePolicy; +import org.apache.inlong.sort.protocol.enums.SchemaChangeType; +import org.apache.inlong.sort.schema.TableChange; +import org.apache.inlong.sort.util.SchemaChangeUtils; + +import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode; +import org.apache.flink.table.types.logical.LogicalType; +import org.apache.flink.table.types.logical.RowType; +import org.apache.flink.util.Preconditions; +import org.apache.iceberg.Schema; +import org.apache.iceberg.Table; +import org.apache.iceberg.Transaction; +import org.apache.iceberg.catalog.Catalog; +import org.apache.iceberg.catalog.SupportsNamespaces; +import org.apache.iceberg.catalog.TableIdentifier; +import org.apache.iceberg.flink.FlinkSchemaUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + +public class IcebergSchemaChangeHelper extends SchemaChangeHelper { + + private static final Logger LOGGER = LoggerFactory.getLogger(IcebergSchemaChangeHelper.class); + private transient Catalog catalog; + + private transient SupportsNamespaces asNamespaceCatalog; + + public IcebergSchemaChangeHelper(JsonDynamicSchemaFormat dynamicSchemaFormat, boolean schemaChange, + Map<SchemaChangeType, SchemaChangePolicy> policyMap, String databasePattern, String tablePattern, + SchemaUpdateExceptionPolicy exceptionPolicy, + SinkTableMetricData metricData, DirtySinkHelper<Object> dirtySinkHelper, + Catalog catalog, + SupportsNamespaces asNamespaceCatalog) { + super(dynamicSchemaFormat, schemaChange, policyMap, databasePattern, + tablePattern, exceptionPolicy, metricData, dirtySinkHelper); + this.catalog = catalog; + this.asNamespaceCatalog = asNamespaceCatalog; + } + @Override + public void handleAlterOperation(String database, String table, byte[] originData, + String originSchema, JsonNode data, AlterOperation operation) { + if (operation.getAlterColumns() == null || operation.getAlterColumns().isEmpty()) { + if (exceptionPolicy == SchemaUpdateExceptionPolicy.THROW_WITH_STOP) { + throw new SchemaChangeHandleException( + String.format("Alter columns is empty, origin schema: %s", originSchema)); + } + LOGGER.warn("Alter columns is empty, origin schema: {}", originSchema); + return; + } + + Map<SchemaChangeType, List<AlterColumn>> typeMap = new LinkedHashMap<>(); + for (AlterColumn alterColumn : operation.getAlterColumns()) { + Set<SchemaChangeType> types = null; + try { + types = SchemaChangeUtils.extractSchemaChangeType(alterColumn); + Preconditions.checkState(!types.isEmpty(), "Schema change types is empty"); + } catch (Exception e) { + if (exceptionPolicy == SchemaUpdateExceptionPolicy.THROW_WITH_STOP) { + throw new SchemaChangeHandleException( + String.format("Extract schema change type failed, origin schema: %s", originSchema), e); + } + LOGGER.warn("Extract schema change type failed, origin schema: {}", originSchema, e); + } + if (types == null) { + continue; + } + if (types.size() == 1) { + SchemaChangeType type = types.stream().findFirst().get(); + typeMap.computeIfAbsent(type, k -> new ArrayList<>()).add(alterColumn); + } else { + // Handle change column, it only exists change column type and rename column in this scenario for now. + for (SchemaChangeType type : types) { + SchemaChangePolicy policy = policyMap.get(type); + if (policy == SchemaChangePolicy.ENABLE) { + LOGGER.warn("Unsupported for {}: {}", type, originSchema); + } else { + doSchemaChangeBase(type, policy, originSchema); + } + } + } + } + + if (!typeMap.isEmpty()) { + for (Map.Entry<SchemaChangeType, List<AlterColumn>> kv : typeMap.entrySet()) { + SchemaChangePolicy policy = policyMap.get(kv.getKey()); + doSchemaChangeBase(kv.getKey(), policy, originSchema); + if (policy == SchemaChangePolicy.ENABLE) { + try { + switch (kv.getKey()) { + case ADD_COLUMN: + doAddColumn(kv.getValue(), TableIdentifier.of(database, table)); + break; + case DROP_COLUMN: + doDropColumn(kv.getKey(), originSchema); + break; + case RENAME_COLUMN: + doRenameColumn(kv.getKey(), originSchema); + + break; + case CHANGE_COLUMN_TYPE: + doChangeColumnType(kv.getKey(), originSchema); + break; + default: + } + } catch (Exception e) { + if (exceptionPolicy == SchemaUpdateExceptionPolicy.THROW_WITH_STOP) { + throw new SchemaChangeHandleException( + String.format("Apply alter column failed, origin schema: %s", originSchema), e); + } + LOGGER.warn("Apply alter column failed, origin schema: {}", originSchema, e); + handleDirtyData(data, originData, database, table, DirtyType.HANDLE_ALTER_TABLE_ERROR, e); + } + } + } + } + } + + private void doAddColumn(List<AlterColumn> alterColumns, TableIdentifier tableId) { + List<TableChange> tableChanges = new ArrayList<>(); + Table table = catalog.loadTable(tableId); + Transaction transaction = table.newTransaction(); + + alterColumns.forEach(alterColumn -> { + Column column = alterColumn.getNewColumn(); + LogicalType dataType = dynamicSchemaFormat.sqlType2FlinkType(column.getJdbcType()); + TableChange.ColumnPosition position = + column.getPosition().getPositionType() == PositionType.FIRST ? TableChange.ColumnPosition.first() + : TableChange.ColumnPosition.after(column.getName()); + TableChange.AddColumn addColumn = new TableChange.AddColumn(new String[]{column.getName()}, + dataType, column.isNullable(), column.getComment(), position); + tableChanges.add(addColumn); + }); + IcebergSchemaChangeUtils.applySchemaChanges(transaction.updateSchema(), tableChanges); + transaction.commitTransaction(); + } + + private String doChangeColumnType(SchemaChangeType type, String originSchema) { + LOGGER.warn("Unsupported for {}: {}", type, originSchema); + return null; + } + + private String doRenameColumn(SchemaChangeType type, String originSchema) { Review Comment: It is recommend to change it as a default implemention in the supper class. ########## inlong-sort/sort-flink/sort-flink-v1.13/sort-connectors/iceberg/src/main/java/org/apache/inlong/sort/iceberg/schema/IcebergSchemaChangeHelper.java: ########## @@ -0,0 +1,257 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.inlong.sort.iceberg.schema; + +import org.apache.inlong.sort.base.dirty.DirtySinkHelper; +import org.apache.inlong.sort.base.dirty.DirtyType; +import org.apache.inlong.sort.base.format.JsonDynamicSchemaFormat; +import org.apache.inlong.sort.base.metric.sub.SinkTableMetricData; +import org.apache.inlong.sort.base.schema.SchemaChangeHandleException; +import org.apache.inlong.sort.base.schema.SchemaChangeHelper; +import org.apache.inlong.sort.base.sink.SchemaUpdateExceptionPolicy; +import org.apache.inlong.sort.iceberg.sink.multiple.IcebergSchemaChangeUtils; +import org.apache.inlong.sort.protocol.ddl.enums.PositionType; +import org.apache.inlong.sort.protocol.ddl.expressions.AlterColumn; +import org.apache.inlong.sort.protocol.ddl.expressions.Column; +import org.apache.inlong.sort.protocol.ddl.operations.AlterOperation; +import org.apache.inlong.sort.protocol.ddl.operations.CreateTableOperation; +import org.apache.inlong.sort.protocol.enums.SchemaChangePolicy; +import org.apache.inlong.sort.protocol.enums.SchemaChangeType; +import org.apache.inlong.sort.schema.TableChange; +import org.apache.inlong.sort.util.SchemaChangeUtils; + +import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode; +import org.apache.flink.table.types.logical.LogicalType; +import org.apache.flink.table.types.logical.RowType; +import org.apache.flink.util.Preconditions; +import org.apache.iceberg.Schema; +import org.apache.iceberg.Table; +import org.apache.iceberg.Transaction; +import org.apache.iceberg.catalog.Catalog; +import org.apache.iceberg.catalog.SupportsNamespaces; +import org.apache.iceberg.catalog.TableIdentifier; +import org.apache.iceberg.flink.FlinkSchemaUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + +public class IcebergSchemaChangeHelper extends SchemaChangeHelper { + + private static final Logger LOGGER = LoggerFactory.getLogger(IcebergSchemaChangeHelper.class); + private transient Catalog catalog; + + private transient SupportsNamespaces asNamespaceCatalog; + + public IcebergSchemaChangeHelper(JsonDynamicSchemaFormat dynamicSchemaFormat, boolean schemaChange, + Map<SchemaChangeType, SchemaChangePolicy> policyMap, String databasePattern, String tablePattern, + SchemaUpdateExceptionPolicy exceptionPolicy, + SinkTableMetricData metricData, DirtySinkHelper<Object> dirtySinkHelper, + Catalog catalog, + SupportsNamespaces asNamespaceCatalog) { + super(dynamicSchemaFormat, schemaChange, policyMap, databasePattern, + tablePattern, exceptionPolicy, metricData, dirtySinkHelper); + this.catalog = catalog; + this.asNamespaceCatalog = asNamespaceCatalog; + } + @Override + public void handleAlterOperation(String database, String table, byte[] originData, + String originSchema, JsonNode data, AlterOperation operation) { + if (operation.getAlterColumns() == null || operation.getAlterColumns().isEmpty()) { + if (exceptionPolicy == SchemaUpdateExceptionPolicy.THROW_WITH_STOP) { + throw new SchemaChangeHandleException( + String.format("Alter columns is empty, origin schema: %s", originSchema)); + } + LOGGER.warn("Alter columns is empty, origin schema: {}", originSchema); + return; + } + + Map<SchemaChangeType, List<AlterColumn>> typeMap = new LinkedHashMap<>(); + for (AlterColumn alterColumn : operation.getAlterColumns()) { + Set<SchemaChangeType> types = null; + try { + types = SchemaChangeUtils.extractSchemaChangeType(alterColumn); + Preconditions.checkState(!types.isEmpty(), "Schema change types is empty"); + } catch (Exception e) { + if (exceptionPolicy == SchemaUpdateExceptionPolicy.THROW_WITH_STOP) { + throw new SchemaChangeHandleException( + String.format("Extract schema change type failed, origin schema: %s", originSchema), e); + } + LOGGER.warn("Extract schema change type failed, origin schema: {}", originSchema, e); + } + if (types == null) { + continue; + } + if (types.size() == 1) { + SchemaChangeType type = types.stream().findFirst().get(); + typeMap.computeIfAbsent(type, k -> new ArrayList<>()).add(alterColumn); + } else { + // Handle change column, it only exists change column type and rename column in this scenario for now. + for (SchemaChangeType type : types) { + SchemaChangePolicy policy = policyMap.get(type); + if (policy == SchemaChangePolicy.ENABLE) { + LOGGER.warn("Unsupported for {}: {}", type, originSchema); + } else { + doSchemaChangeBase(type, policy, originSchema); + } + } + } + } + + if (!typeMap.isEmpty()) { + for (Map.Entry<SchemaChangeType, List<AlterColumn>> kv : typeMap.entrySet()) { + SchemaChangePolicy policy = policyMap.get(kv.getKey()); + doSchemaChangeBase(kv.getKey(), policy, originSchema); + if (policy == SchemaChangePolicy.ENABLE) { + try { + switch (kv.getKey()) { + case ADD_COLUMN: + doAddColumn(kv.getValue(), TableIdentifier.of(database, table)); + break; + case DROP_COLUMN: + doDropColumn(kv.getKey(), originSchema); + break; + case RENAME_COLUMN: + doRenameColumn(kv.getKey(), originSchema); + + break; + case CHANGE_COLUMN_TYPE: + doChangeColumnType(kv.getKey(), originSchema); + break; + default: + } + } catch (Exception e) { + if (exceptionPolicy == SchemaUpdateExceptionPolicy.THROW_WITH_STOP) { + throw new SchemaChangeHandleException( + String.format("Apply alter column failed, origin schema: %s", originSchema), e); + } + LOGGER.warn("Apply alter column failed, origin schema: {}", originSchema, e); + handleDirtyData(data, originData, database, table, DirtyType.HANDLE_ALTER_TABLE_ERROR, e); + } + } + } + } + } + + private void doAddColumn(List<AlterColumn> alterColumns, TableIdentifier tableId) { + List<TableChange> tableChanges = new ArrayList<>(); + Table table = catalog.loadTable(tableId); + Transaction transaction = table.newTransaction(); + + alterColumns.forEach(alterColumn -> { + Column column = alterColumn.getNewColumn(); + LogicalType dataType = dynamicSchemaFormat.sqlType2FlinkType(column.getJdbcType()); + TableChange.ColumnPosition position = + column.getPosition().getPositionType() == PositionType.FIRST ? TableChange.ColumnPosition.first() + : TableChange.ColumnPosition.after(column.getName()); + TableChange.AddColumn addColumn = new TableChange.AddColumn(new String[]{column.getName()}, + dataType, column.isNullable(), column.getComment(), position); + tableChanges.add(addColumn); + }); + IcebergSchemaChangeUtils.applySchemaChanges(transaction.updateSchema(), tableChanges); + transaction.commitTransaction(); + } + + private String doChangeColumnType(SchemaChangeType type, String originSchema) { + LOGGER.warn("Unsupported for {}: {}", type, originSchema); + return null; + } + + private String doRenameColumn(SchemaChangeType type, String originSchema) { + LOGGER.warn("Unsupported for {}: {}", type, originSchema); + return null; + } + + private String doDropColumn(SchemaChangeType type, String originSchema) { Review Comment: It is recommend to change it as a default implemention in the supper class. ########## inlong-sort/sort-flink/sort-flink-v1.13/sort-connectors/iceberg/src/main/java/org/apache/inlong/sort/iceberg/schema/IcebergSchemaChangeHelper.java: ########## @@ -0,0 +1,257 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.inlong.sort.iceberg.schema; + +import org.apache.inlong.sort.base.dirty.DirtySinkHelper; +import org.apache.inlong.sort.base.dirty.DirtyType; +import org.apache.inlong.sort.base.format.JsonDynamicSchemaFormat; +import org.apache.inlong.sort.base.metric.sub.SinkTableMetricData; +import org.apache.inlong.sort.base.schema.SchemaChangeHandleException; +import org.apache.inlong.sort.base.schema.SchemaChangeHelper; +import org.apache.inlong.sort.base.sink.SchemaUpdateExceptionPolicy; +import org.apache.inlong.sort.iceberg.sink.multiple.IcebergSchemaChangeUtils; +import org.apache.inlong.sort.protocol.ddl.enums.PositionType; +import org.apache.inlong.sort.protocol.ddl.expressions.AlterColumn; +import org.apache.inlong.sort.protocol.ddl.expressions.Column; +import org.apache.inlong.sort.protocol.ddl.operations.AlterOperation; +import org.apache.inlong.sort.protocol.ddl.operations.CreateTableOperation; +import org.apache.inlong.sort.protocol.enums.SchemaChangePolicy; +import org.apache.inlong.sort.protocol.enums.SchemaChangeType; +import org.apache.inlong.sort.schema.TableChange; +import org.apache.inlong.sort.util.SchemaChangeUtils; + +import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode; +import org.apache.flink.table.types.logical.LogicalType; +import org.apache.flink.table.types.logical.RowType; +import org.apache.flink.util.Preconditions; +import org.apache.iceberg.Schema; +import org.apache.iceberg.Table; +import org.apache.iceberg.Transaction; +import org.apache.iceberg.catalog.Catalog; +import org.apache.iceberg.catalog.SupportsNamespaces; +import org.apache.iceberg.catalog.TableIdentifier; +import org.apache.iceberg.flink.FlinkSchemaUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + +public class IcebergSchemaChangeHelper extends SchemaChangeHelper { + + private static final Logger LOGGER = LoggerFactory.getLogger(IcebergSchemaChangeHelper.class); + private transient Catalog catalog; + + private transient SupportsNamespaces asNamespaceCatalog; + + public IcebergSchemaChangeHelper(JsonDynamicSchemaFormat dynamicSchemaFormat, boolean schemaChange, + Map<SchemaChangeType, SchemaChangePolicy> policyMap, String databasePattern, String tablePattern, + SchemaUpdateExceptionPolicy exceptionPolicy, + SinkTableMetricData metricData, DirtySinkHelper<Object> dirtySinkHelper, + Catalog catalog, + SupportsNamespaces asNamespaceCatalog) { + super(dynamicSchemaFormat, schemaChange, policyMap, databasePattern, + tablePattern, exceptionPolicy, metricData, dirtySinkHelper); + this.catalog = catalog; + this.asNamespaceCatalog = asNamespaceCatalog; + } + @Override + public void handleAlterOperation(String database, String table, byte[] originData, + String originSchema, JsonNode data, AlterOperation operation) { + if (operation.getAlterColumns() == null || operation.getAlterColumns().isEmpty()) { + if (exceptionPolicy == SchemaUpdateExceptionPolicy.THROW_WITH_STOP) { + throw new SchemaChangeHandleException( + String.format("Alter columns is empty, origin schema: %s", originSchema)); + } + LOGGER.warn("Alter columns is empty, origin schema: {}", originSchema); + return; + } + + Map<SchemaChangeType, List<AlterColumn>> typeMap = new LinkedHashMap<>(); + for (AlterColumn alterColumn : operation.getAlterColumns()) { + Set<SchemaChangeType> types = null; + try { + types = SchemaChangeUtils.extractSchemaChangeType(alterColumn); + Preconditions.checkState(!types.isEmpty(), "Schema change types is empty"); + } catch (Exception e) { + if (exceptionPolicy == SchemaUpdateExceptionPolicy.THROW_WITH_STOP) { + throw new SchemaChangeHandleException( + String.format("Extract schema change type failed, origin schema: %s", originSchema), e); + } + LOGGER.warn("Extract schema change type failed, origin schema: {}", originSchema, e); + } + if (types == null) { + continue; + } + if (types.size() == 1) { + SchemaChangeType type = types.stream().findFirst().get(); + typeMap.computeIfAbsent(type, k -> new ArrayList<>()).add(alterColumn); + } else { + // Handle change column, it only exists change column type and rename column in this scenario for now. + for (SchemaChangeType type : types) { + SchemaChangePolicy policy = policyMap.get(type); + if (policy == SchemaChangePolicy.ENABLE) { + LOGGER.warn("Unsupported for {}: {}", type, originSchema); + } else { + doSchemaChangeBase(type, policy, originSchema); + } + } + } + } + + if (!typeMap.isEmpty()) { + for (Map.Entry<SchemaChangeType, List<AlterColumn>> kv : typeMap.entrySet()) { + SchemaChangePolicy policy = policyMap.get(kv.getKey()); + doSchemaChangeBase(kv.getKey(), policy, originSchema); + if (policy == SchemaChangePolicy.ENABLE) { + try { + switch (kv.getKey()) { + case ADD_COLUMN: + doAddColumn(kv.getValue(), TableIdentifier.of(database, table)); + break; + case DROP_COLUMN: + doDropColumn(kv.getKey(), originSchema); + break; + case RENAME_COLUMN: + doRenameColumn(kv.getKey(), originSchema); + + break; + case CHANGE_COLUMN_TYPE: + doChangeColumnType(kv.getKey(), originSchema); + break; + default: + } + } catch (Exception e) { + if (exceptionPolicy == SchemaUpdateExceptionPolicy.THROW_WITH_STOP) { + throw new SchemaChangeHandleException( + String.format("Apply alter column failed, origin schema: %s", originSchema), e); + } + LOGGER.warn("Apply alter column failed, origin schema: {}", originSchema, e); + handleDirtyData(data, originData, database, table, DirtyType.HANDLE_ALTER_TABLE_ERROR, e); + } + } + } + } + } + + private void doAddColumn(List<AlterColumn> alterColumns, TableIdentifier tableId) { + List<TableChange> tableChanges = new ArrayList<>(); + Table table = catalog.loadTable(tableId); + Transaction transaction = table.newTransaction(); + + alterColumns.forEach(alterColumn -> { + Column column = alterColumn.getNewColumn(); + LogicalType dataType = dynamicSchemaFormat.sqlType2FlinkType(column.getJdbcType()); + TableChange.ColumnPosition position = + column.getPosition().getPositionType() == PositionType.FIRST ? TableChange.ColumnPosition.first() + : TableChange.ColumnPosition.after(column.getName()); + TableChange.AddColumn addColumn = new TableChange.AddColumn(new String[]{column.getName()}, + dataType, column.isNullable(), column.getComment(), position); + tableChanges.add(addColumn); + }); + IcebergSchemaChangeUtils.applySchemaChanges(transaction.updateSchema(), tableChanges); + transaction.commitTransaction(); + } + + private String doChangeColumnType(SchemaChangeType type, String originSchema) { + LOGGER.warn("Unsupported for {}: {}", type, originSchema); + return null; + } + + private String doRenameColumn(SchemaChangeType type, String originSchema) { + LOGGER.warn("Unsupported for {}: {}", type, originSchema); + return null; + } + + private String doDropColumn(SchemaChangeType type, String originSchema) { + LOGGER.warn("Unsupported for {}: {}", type, originSchema); + return null; + } + + private void doSchemaChangeBase(SchemaChangeType type, SchemaChangePolicy policy, String schema) { + if (policy == null) { + LOGGER.warn("Unsupported for {}: {}", type, schema); + return; + } + switch (policy) { + case LOG: + LOGGER.warn("Unsupported for {}: {}", type, schema); + break; + case ERROR: + throw new SchemaChangeHandleException(String.format("Unsupported for %s: %s", type, schema)); + default: + } + } + + @Override + public void doCreateTable(byte[] originData, String database, String table, SchemaChangeType type, + String originSchema, JsonNode data, CreateTableOperation operation) { + SchemaChangePolicy policy = policyMap.get(type); + if (policy == SchemaChangePolicy.ENABLE) { + try { + TableIdentifier tableId = TableIdentifier.of(database, table); + List<String> pkListStr = dynamicSchemaFormat.extractPrimaryKeyNames(data); + RowType rowType = dynamicSchemaFormat.extractSchema(data, pkListStr); + Schema schema = FlinkSchemaUtil.convert(FlinkSchemaUtil.toSchema(rowType)); + IcebergSchemaChangeUtils.createTable(catalog, tableId, asNamespaceCatalog, schema); + return; + } catch (Exception e) { + if (exceptionPolicy == SchemaUpdateExceptionPolicy.THROW_WITH_STOP) { + throw new SchemaChangeHandleException( + String.format("Drop column failed, origin schema: %s", originSchema), e); + } + handleDirtyData(data, originData, database, table, DirtyType.CREATE_TABLE_ERROR, e); + return; + } + } + doSchemaChangeBase(type, policy, originSchema); + } + + @Override + public void doDropTable(SchemaChangeType type, String originSchema) { Review Comment: It is recommend to change it as a default implemention in the supper class. ########## inlong-sort/sort-flink/sort-flink-v1.13/sort-connectors/iceberg/src/main/java/org/apache/inlong/sort/iceberg/schema/IcebergSchemaChangeHelper.java: ########## @@ -0,0 +1,257 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.inlong.sort.iceberg.schema; + +import org.apache.inlong.sort.base.dirty.DirtySinkHelper; +import org.apache.inlong.sort.base.dirty.DirtyType; +import org.apache.inlong.sort.base.format.JsonDynamicSchemaFormat; +import org.apache.inlong.sort.base.metric.sub.SinkTableMetricData; +import org.apache.inlong.sort.base.schema.SchemaChangeHandleException; +import org.apache.inlong.sort.base.schema.SchemaChangeHelper; +import org.apache.inlong.sort.base.sink.SchemaUpdateExceptionPolicy; +import org.apache.inlong.sort.iceberg.sink.multiple.IcebergSchemaChangeUtils; +import org.apache.inlong.sort.protocol.ddl.enums.PositionType; +import org.apache.inlong.sort.protocol.ddl.expressions.AlterColumn; +import org.apache.inlong.sort.protocol.ddl.expressions.Column; +import org.apache.inlong.sort.protocol.ddl.operations.AlterOperation; +import org.apache.inlong.sort.protocol.ddl.operations.CreateTableOperation; +import org.apache.inlong.sort.protocol.enums.SchemaChangePolicy; +import org.apache.inlong.sort.protocol.enums.SchemaChangeType; +import org.apache.inlong.sort.schema.TableChange; +import org.apache.inlong.sort.util.SchemaChangeUtils; + +import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode; +import org.apache.flink.table.types.logical.LogicalType; +import org.apache.flink.table.types.logical.RowType; +import org.apache.flink.util.Preconditions; +import org.apache.iceberg.Schema; +import org.apache.iceberg.Table; +import org.apache.iceberg.Transaction; +import org.apache.iceberg.catalog.Catalog; +import org.apache.iceberg.catalog.SupportsNamespaces; +import org.apache.iceberg.catalog.TableIdentifier; +import org.apache.iceberg.flink.FlinkSchemaUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + +public class IcebergSchemaChangeHelper extends SchemaChangeHelper { + + private static final Logger LOGGER = LoggerFactory.getLogger(IcebergSchemaChangeHelper.class); + private transient Catalog catalog; + + private transient SupportsNamespaces asNamespaceCatalog; + + public IcebergSchemaChangeHelper(JsonDynamicSchemaFormat dynamicSchemaFormat, boolean schemaChange, + Map<SchemaChangeType, SchemaChangePolicy> policyMap, String databasePattern, String tablePattern, + SchemaUpdateExceptionPolicy exceptionPolicy, + SinkTableMetricData metricData, DirtySinkHelper<Object> dirtySinkHelper, + Catalog catalog, + SupportsNamespaces asNamespaceCatalog) { + super(dynamicSchemaFormat, schemaChange, policyMap, databasePattern, + tablePattern, exceptionPolicy, metricData, dirtySinkHelper); + this.catalog = catalog; + this.asNamespaceCatalog = asNamespaceCatalog; + } + @Override + public void handleAlterOperation(String database, String table, byte[] originData, + String originSchema, JsonNode data, AlterOperation operation) { + if (operation.getAlterColumns() == null || operation.getAlterColumns().isEmpty()) { + if (exceptionPolicy == SchemaUpdateExceptionPolicy.THROW_WITH_STOP) { + throw new SchemaChangeHandleException( + String.format("Alter columns is empty, origin schema: %s", originSchema)); + } + LOGGER.warn("Alter columns is empty, origin schema: {}", originSchema); + return; + } + + Map<SchemaChangeType, List<AlterColumn>> typeMap = new LinkedHashMap<>(); + for (AlterColumn alterColumn : operation.getAlterColumns()) { + Set<SchemaChangeType> types = null; + try { + types = SchemaChangeUtils.extractSchemaChangeType(alterColumn); + Preconditions.checkState(!types.isEmpty(), "Schema change types is empty"); + } catch (Exception e) { + if (exceptionPolicy == SchemaUpdateExceptionPolicy.THROW_WITH_STOP) { + throw new SchemaChangeHandleException( + String.format("Extract schema change type failed, origin schema: %s", originSchema), e); + } + LOGGER.warn("Extract schema change type failed, origin schema: {}", originSchema, e); + } + if (types == null) { + continue; + } + if (types.size() == 1) { + SchemaChangeType type = types.stream().findFirst().get(); + typeMap.computeIfAbsent(type, k -> new ArrayList<>()).add(alterColumn); + } else { + // Handle change column, it only exists change column type and rename column in this scenario for now. + for (SchemaChangeType type : types) { + SchemaChangePolicy policy = policyMap.get(type); + if (policy == SchemaChangePolicy.ENABLE) { + LOGGER.warn("Unsupported for {}: {}", type, originSchema); + } else { + doSchemaChangeBase(type, policy, originSchema); + } + } + } + } + + if (!typeMap.isEmpty()) { + for (Map.Entry<SchemaChangeType, List<AlterColumn>> kv : typeMap.entrySet()) { + SchemaChangePolicy policy = policyMap.get(kv.getKey()); + doSchemaChangeBase(kv.getKey(), policy, originSchema); + if (policy == SchemaChangePolicy.ENABLE) { + try { + switch (kv.getKey()) { + case ADD_COLUMN: + doAddColumn(kv.getValue(), TableIdentifier.of(database, table)); + break; + case DROP_COLUMN: + doDropColumn(kv.getKey(), originSchema); + break; + case RENAME_COLUMN: + doRenameColumn(kv.getKey(), originSchema); + + break; + case CHANGE_COLUMN_TYPE: + doChangeColumnType(kv.getKey(), originSchema); + break; + default: + } + } catch (Exception e) { + if (exceptionPolicy == SchemaUpdateExceptionPolicy.THROW_WITH_STOP) { + throw new SchemaChangeHandleException( + String.format("Apply alter column failed, origin schema: %s", originSchema), e); + } + LOGGER.warn("Apply alter column failed, origin schema: {}", originSchema, e); + handleDirtyData(data, originData, database, table, DirtyType.HANDLE_ALTER_TABLE_ERROR, e); + } + } + } + } + } + + private void doAddColumn(List<AlterColumn> alterColumns, TableIdentifier tableId) { + List<TableChange> tableChanges = new ArrayList<>(); + Table table = catalog.loadTable(tableId); + Transaction transaction = table.newTransaction(); + + alterColumns.forEach(alterColumn -> { + Column column = alterColumn.getNewColumn(); + LogicalType dataType = dynamicSchemaFormat.sqlType2FlinkType(column.getJdbcType()); + TableChange.ColumnPosition position = + column.getPosition().getPositionType() == PositionType.FIRST ? TableChange.ColumnPosition.first() + : TableChange.ColumnPosition.after(column.getName()); + TableChange.AddColumn addColumn = new TableChange.AddColumn(new String[]{column.getName()}, + dataType, column.isNullable(), column.getComment(), position); + tableChanges.add(addColumn); + }); + IcebergSchemaChangeUtils.applySchemaChanges(transaction.updateSchema(), tableChanges); + transaction.commitTransaction(); + } + + private String doChangeColumnType(SchemaChangeType type, String originSchema) { + LOGGER.warn("Unsupported for {}: {}", type, originSchema); + return null; + } + + private String doRenameColumn(SchemaChangeType type, String originSchema) { + LOGGER.warn("Unsupported for {}: {}", type, originSchema); + return null; + } + + private String doDropColumn(SchemaChangeType type, String originSchema) { + LOGGER.warn("Unsupported for {}: {}", type, originSchema); + return null; + } + + private void doSchemaChangeBase(SchemaChangeType type, SchemaChangePolicy policy, String schema) { + if (policy == null) { + LOGGER.warn("Unsupported for {}: {}", type, schema); + return; + } + switch (policy) { + case LOG: + LOGGER.warn("Unsupported for {}: {}", type, schema); + break; + case ERROR: + throw new SchemaChangeHandleException(String.format("Unsupported for %s: %s", type, schema)); + default: + } + } + + @Override + public void doCreateTable(byte[] originData, String database, String table, SchemaChangeType type, + String originSchema, JsonNode data, CreateTableOperation operation) { + SchemaChangePolicy policy = policyMap.get(type); + if (policy == SchemaChangePolicy.ENABLE) { + try { + TableIdentifier tableId = TableIdentifier.of(database, table); + List<String> pkListStr = dynamicSchemaFormat.extractPrimaryKeyNames(data); + RowType rowType = dynamicSchemaFormat.extractSchema(data, pkListStr); + Schema schema = FlinkSchemaUtil.convert(FlinkSchemaUtil.toSchema(rowType)); + IcebergSchemaChangeUtils.createTable(catalog, tableId, asNamespaceCatalog, schema); + return; + } catch (Exception e) { + if (exceptionPolicy == SchemaUpdateExceptionPolicy.THROW_WITH_STOP) { + throw new SchemaChangeHandleException( + String.format("Drop column failed, origin schema: %s", originSchema), e); + } + handleDirtyData(data, originData, database, table, DirtyType.CREATE_TABLE_ERROR, e); + return; + } + } + doSchemaChangeBase(type, policy, originSchema); + } + + @Override + public void doDropTable(SchemaChangeType type, String originSchema) { + SchemaChangePolicy policy = policyMap.get(SchemaChangeType.DROP_TABLE); + if (policy == SchemaChangePolicy.ENABLE) { + LOGGER.warn("Unsupported for {}: {}", type, originSchema); + return; + } + doSchemaChangeBase(type, policy, originSchema); + } + + @Override + public void doRenameTable(SchemaChangeType type, String originSchema) { + SchemaChangePolicy policy = policyMap.get(SchemaChangeType.RENAME_TABLE); + if (policy == SchemaChangePolicy.ENABLE) { + LOGGER.warn("Unsupported for {}: {}", type, originSchema); + return; + } + doSchemaChangeBase(type, policy, originSchema); + } + + @Override + public void doTruncateTable(SchemaChangeType type, String originSchema) { Review Comment: It is recommend to change it as a default implemention in the supper class. ########## inlong-sort/sort-flink/sort-flink-v1.13/sort-connectors/iceberg/src/main/java/org/apache/inlong/sort/iceberg/schema/IcebergSchemaChangeHelper.java: ########## @@ -0,0 +1,257 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.inlong.sort.iceberg.schema; + +import org.apache.inlong.sort.base.dirty.DirtySinkHelper; +import org.apache.inlong.sort.base.dirty.DirtyType; +import org.apache.inlong.sort.base.format.JsonDynamicSchemaFormat; +import org.apache.inlong.sort.base.metric.sub.SinkTableMetricData; +import org.apache.inlong.sort.base.schema.SchemaChangeHandleException; +import org.apache.inlong.sort.base.schema.SchemaChangeHelper; +import org.apache.inlong.sort.base.sink.SchemaUpdateExceptionPolicy; +import org.apache.inlong.sort.iceberg.sink.multiple.IcebergSchemaChangeUtils; +import org.apache.inlong.sort.protocol.ddl.enums.PositionType; +import org.apache.inlong.sort.protocol.ddl.expressions.AlterColumn; +import org.apache.inlong.sort.protocol.ddl.expressions.Column; +import org.apache.inlong.sort.protocol.ddl.operations.AlterOperation; +import org.apache.inlong.sort.protocol.ddl.operations.CreateTableOperation; +import org.apache.inlong.sort.protocol.enums.SchemaChangePolicy; +import org.apache.inlong.sort.protocol.enums.SchemaChangeType; +import org.apache.inlong.sort.schema.TableChange; +import org.apache.inlong.sort.util.SchemaChangeUtils; + +import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode; +import org.apache.flink.table.types.logical.LogicalType; +import org.apache.flink.table.types.logical.RowType; +import org.apache.flink.util.Preconditions; +import org.apache.iceberg.Schema; +import org.apache.iceberg.Table; +import org.apache.iceberg.Transaction; +import org.apache.iceberg.catalog.Catalog; +import org.apache.iceberg.catalog.SupportsNamespaces; +import org.apache.iceberg.catalog.TableIdentifier; +import org.apache.iceberg.flink.FlinkSchemaUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + +public class IcebergSchemaChangeHelper extends SchemaChangeHelper { + + private static final Logger LOGGER = LoggerFactory.getLogger(IcebergSchemaChangeHelper.class); + private transient Catalog catalog; + + private transient SupportsNamespaces asNamespaceCatalog; + + public IcebergSchemaChangeHelper(JsonDynamicSchemaFormat dynamicSchemaFormat, boolean schemaChange, + Map<SchemaChangeType, SchemaChangePolicy> policyMap, String databasePattern, String tablePattern, + SchemaUpdateExceptionPolicy exceptionPolicy, + SinkTableMetricData metricData, DirtySinkHelper<Object> dirtySinkHelper, + Catalog catalog, + SupportsNamespaces asNamespaceCatalog) { + super(dynamicSchemaFormat, schemaChange, policyMap, databasePattern, + tablePattern, exceptionPolicy, metricData, dirtySinkHelper); + this.catalog = catalog; + this.asNamespaceCatalog = asNamespaceCatalog; + } + @Override + public void handleAlterOperation(String database, String table, byte[] originData, + String originSchema, JsonNode data, AlterOperation operation) { + if (operation.getAlterColumns() == null || operation.getAlterColumns().isEmpty()) { + if (exceptionPolicy == SchemaUpdateExceptionPolicy.THROW_WITH_STOP) { + throw new SchemaChangeHandleException( + String.format("Alter columns is empty, origin schema: %s", originSchema)); + } + LOGGER.warn("Alter columns is empty, origin schema: {}", originSchema); + return; + } + + Map<SchemaChangeType, List<AlterColumn>> typeMap = new LinkedHashMap<>(); + for (AlterColumn alterColumn : operation.getAlterColumns()) { + Set<SchemaChangeType> types = null; + try { + types = SchemaChangeUtils.extractSchemaChangeType(alterColumn); + Preconditions.checkState(!types.isEmpty(), "Schema change types is empty"); + } catch (Exception e) { + if (exceptionPolicy == SchemaUpdateExceptionPolicy.THROW_WITH_STOP) { + throw new SchemaChangeHandleException( + String.format("Extract schema change type failed, origin schema: %s", originSchema), e); + } + LOGGER.warn("Extract schema change type failed, origin schema: {}", originSchema, e); + } + if (types == null) { + continue; + } + if (types.size() == 1) { + SchemaChangeType type = types.stream().findFirst().get(); + typeMap.computeIfAbsent(type, k -> new ArrayList<>()).add(alterColumn); + } else { + // Handle change column, it only exists change column type and rename column in this scenario for now. + for (SchemaChangeType type : types) { + SchemaChangePolicy policy = policyMap.get(type); + if (policy == SchemaChangePolicy.ENABLE) { + LOGGER.warn("Unsupported for {}: {}", type, originSchema); + } else { + doSchemaChangeBase(type, policy, originSchema); + } + } + } + } + + if (!typeMap.isEmpty()) { + for (Map.Entry<SchemaChangeType, List<AlterColumn>> kv : typeMap.entrySet()) { + SchemaChangePolicy policy = policyMap.get(kv.getKey()); + doSchemaChangeBase(kv.getKey(), policy, originSchema); + if (policy == SchemaChangePolicy.ENABLE) { + try { + switch (kv.getKey()) { + case ADD_COLUMN: + doAddColumn(kv.getValue(), TableIdentifier.of(database, table)); + break; + case DROP_COLUMN: + doDropColumn(kv.getKey(), originSchema); + break; + case RENAME_COLUMN: + doRenameColumn(kv.getKey(), originSchema); + + break; + case CHANGE_COLUMN_TYPE: + doChangeColumnType(kv.getKey(), originSchema); + break; + default: + } + } catch (Exception e) { + if (exceptionPolicy == SchemaUpdateExceptionPolicy.THROW_WITH_STOP) { + throw new SchemaChangeHandleException( + String.format("Apply alter column failed, origin schema: %s", originSchema), e); + } + LOGGER.warn("Apply alter column failed, origin schema: {}", originSchema, e); + handleDirtyData(data, originData, database, table, DirtyType.HANDLE_ALTER_TABLE_ERROR, e); + } + } + } + } + } + + private void doAddColumn(List<AlterColumn> alterColumns, TableIdentifier tableId) { + List<TableChange> tableChanges = new ArrayList<>(); + Table table = catalog.loadTable(tableId); + Transaction transaction = table.newTransaction(); + + alterColumns.forEach(alterColumn -> { + Column column = alterColumn.getNewColumn(); + LogicalType dataType = dynamicSchemaFormat.sqlType2FlinkType(column.getJdbcType()); + TableChange.ColumnPosition position = + column.getPosition().getPositionType() == PositionType.FIRST ? TableChange.ColumnPosition.first() + : TableChange.ColumnPosition.after(column.getName()); + TableChange.AddColumn addColumn = new TableChange.AddColumn(new String[]{column.getName()}, + dataType, column.isNullable(), column.getComment(), position); + tableChanges.add(addColumn); + }); + IcebergSchemaChangeUtils.applySchemaChanges(transaction.updateSchema(), tableChanges); + transaction.commitTransaction(); + } + + private String doChangeColumnType(SchemaChangeType type, String originSchema) { + LOGGER.warn("Unsupported for {}: {}", type, originSchema); + return null; + } + + private String doRenameColumn(SchemaChangeType type, String originSchema) { + LOGGER.warn("Unsupported for {}: {}", type, originSchema); + return null; + } + + private String doDropColumn(SchemaChangeType type, String originSchema) { + LOGGER.warn("Unsupported for {}: {}", type, originSchema); + return null; + } + + private void doSchemaChangeBase(SchemaChangeType type, SchemaChangePolicy policy, String schema) { Review Comment: It is recommend to change it as a default implemention in the supper class. ########## inlong-sort/sort-flink/sort-flink-v1.13/sort-connectors/iceberg/src/main/java/org/apache/inlong/sort/iceberg/schema/IcebergSchemaChangeHelper.java: ########## @@ -0,0 +1,257 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.inlong.sort.iceberg.schema; + +import org.apache.inlong.sort.base.dirty.DirtySinkHelper; +import org.apache.inlong.sort.base.dirty.DirtyType; +import org.apache.inlong.sort.base.format.JsonDynamicSchemaFormat; +import org.apache.inlong.sort.base.metric.sub.SinkTableMetricData; +import org.apache.inlong.sort.base.schema.SchemaChangeHandleException; +import org.apache.inlong.sort.base.schema.SchemaChangeHelper; +import org.apache.inlong.sort.base.sink.SchemaUpdateExceptionPolicy; +import org.apache.inlong.sort.iceberg.sink.multiple.IcebergSchemaChangeUtils; +import org.apache.inlong.sort.protocol.ddl.enums.PositionType; +import org.apache.inlong.sort.protocol.ddl.expressions.AlterColumn; +import org.apache.inlong.sort.protocol.ddl.expressions.Column; +import org.apache.inlong.sort.protocol.ddl.operations.AlterOperation; +import org.apache.inlong.sort.protocol.ddl.operations.CreateTableOperation; +import org.apache.inlong.sort.protocol.enums.SchemaChangePolicy; +import org.apache.inlong.sort.protocol.enums.SchemaChangeType; +import org.apache.inlong.sort.schema.TableChange; +import org.apache.inlong.sort.util.SchemaChangeUtils; + +import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode; +import org.apache.flink.table.types.logical.LogicalType; +import org.apache.flink.table.types.logical.RowType; +import org.apache.flink.util.Preconditions; +import org.apache.iceberg.Schema; +import org.apache.iceberg.Table; +import org.apache.iceberg.Transaction; +import org.apache.iceberg.catalog.Catalog; +import org.apache.iceberg.catalog.SupportsNamespaces; +import org.apache.iceberg.catalog.TableIdentifier; +import org.apache.iceberg.flink.FlinkSchemaUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + +public class IcebergSchemaChangeHelper extends SchemaChangeHelper { + + private static final Logger LOGGER = LoggerFactory.getLogger(IcebergSchemaChangeHelper.class); + private transient Catalog catalog; + + private transient SupportsNamespaces asNamespaceCatalog; + + public IcebergSchemaChangeHelper(JsonDynamicSchemaFormat dynamicSchemaFormat, boolean schemaChange, + Map<SchemaChangeType, SchemaChangePolicy> policyMap, String databasePattern, String tablePattern, + SchemaUpdateExceptionPolicy exceptionPolicy, + SinkTableMetricData metricData, DirtySinkHelper<Object> dirtySinkHelper, + Catalog catalog, + SupportsNamespaces asNamespaceCatalog) { + super(dynamicSchemaFormat, schemaChange, policyMap, databasePattern, + tablePattern, exceptionPolicy, metricData, dirtySinkHelper); + this.catalog = catalog; + this.asNamespaceCatalog = asNamespaceCatalog; + } + @Override + public void handleAlterOperation(String database, String table, byte[] originData, + String originSchema, JsonNode data, AlterOperation operation) { + if (operation.getAlterColumns() == null || operation.getAlterColumns().isEmpty()) { + if (exceptionPolicy == SchemaUpdateExceptionPolicy.THROW_WITH_STOP) { + throw new SchemaChangeHandleException( + String.format("Alter columns is empty, origin schema: %s", originSchema)); + } + LOGGER.warn("Alter columns is empty, origin schema: {}", originSchema); + return; + } + + Map<SchemaChangeType, List<AlterColumn>> typeMap = new LinkedHashMap<>(); + for (AlterColumn alterColumn : operation.getAlterColumns()) { + Set<SchemaChangeType> types = null; + try { + types = SchemaChangeUtils.extractSchemaChangeType(alterColumn); + Preconditions.checkState(!types.isEmpty(), "Schema change types is empty"); + } catch (Exception e) { + if (exceptionPolicy == SchemaUpdateExceptionPolicy.THROW_WITH_STOP) { + throw new SchemaChangeHandleException( + String.format("Extract schema change type failed, origin schema: %s", originSchema), e); + } + LOGGER.warn("Extract schema change type failed, origin schema: {}", originSchema, e); + } + if (types == null) { + continue; + } + if (types.size() == 1) { + SchemaChangeType type = types.stream().findFirst().get(); + typeMap.computeIfAbsent(type, k -> new ArrayList<>()).add(alterColumn); + } else { + // Handle change column, it only exists change column type and rename column in this scenario for now. + for (SchemaChangeType type : types) { + SchemaChangePolicy policy = policyMap.get(type); + if (policy == SchemaChangePolicy.ENABLE) { + LOGGER.warn("Unsupported for {}: {}", type, originSchema); + } else { + doSchemaChangeBase(type, policy, originSchema); + } + } + } + } + + if (!typeMap.isEmpty()) { + for (Map.Entry<SchemaChangeType, List<AlterColumn>> kv : typeMap.entrySet()) { + SchemaChangePolicy policy = policyMap.get(kv.getKey()); + doSchemaChangeBase(kv.getKey(), policy, originSchema); + if (policy == SchemaChangePolicy.ENABLE) { + try { + switch (kv.getKey()) { + case ADD_COLUMN: + doAddColumn(kv.getValue(), TableIdentifier.of(database, table)); + break; + case DROP_COLUMN: + doDropColumn(kv.getKey(), originSchema); + break; + case RENAME_COLUMN: + doRenameColumn(kv.getKey(), originSchema); + + break; + case CHANGE_COLUMN_TYPE: + doChangeColumnType(kv.getKey(), originSchema); + break; + default: + } + } catch (Exception e) { + if (exceptionPolicy == SchemaUpdateExceptionPolicy.THROW_WITH_STOP) { + throw new SchemaChangeHandleException( + String.format("Apply alter column failed, origin schema: %s", originSchema), e); + } + LOGGER.warn("Apply alter column failed, origin schema: {}", originSchema, e); + handleDirtyData(data, originData, database, table, DirtyType.HANDLE_ALTER_TABLE_ERROR, e); + } + } + } + } + } + + private void doAddColumn(List<AlterColumn> alterColumns, TableIdentifier tableId) { + List<TableChange> tableChanges = new ArrayList<>(); + Table table = catalog.loadTable(tableId); + Transaction transaction = table.newTransaction(); + + alterColumns.forEach(alterColumn -> { + Column column = alterColumn.getNewColumn(); + LogicalType dataType = dynamicSchemaFormat.sqlType2FlinkType(column.getJdbcType()); + TableChange.ColumnPosition position = + column.getPosition().getPositionType() == PositionType.FIRST ? TableChange.ColumnPosition.first() + : TableChange.ColumnPosition.after(column.getName()); + TableChange.AddColumn addColumn = new TableChange.AddColumn(new String[]{column.getName()}, + dataType, column.isNullable(), column.getComment(), position); + tableChanges.add(addColumn); + }); + IcebergSchemaChangeUtils.applySchemaChanges(transaction.updateSchema(), tableChanges); + transaction.commitTransaction(); + } + + private String doChangeColumnType(SchemaChangeType type, String originSchema) { + LOGGER.warn("Unsupported for {}: {}", type, originSchema); + return null; + } + + private String doRenameColumn(SchemaChangeType type, String originSchema) { + LOGGER.warn("Unsupported for {}: {}", type, originSchema); + return null; + } + + private String doDropColumn(SchemaChangeType type, String originSchema) { + LOGGER.warn("Unsupported for {}: {}", type, originSchema); + return null; + } + + private void doSchemaChangeBase(SchemaChangeType type, SchemaChangePolicy policy, String schema) { + if (policy == null) { + LOGGER.warn("Unsupported for {}: {}", type, schema); + return; + } + switch (policy) { + case LOG: + LOGGER.warn("Unsupported for {}: {}", type, schema); + break; + case ERROR: + throw new SchemaChangeHandleException(String.format("Unsupported for %s: %s", type, schema)); + default: + } + } + + @Override + public void doCreateTable(byte[] originData, String database, String table, SchemaChangeType type, + String originSchema, JsonNode data, CreateTableOperation operation) { + SchemaChangePolicy policy = policyMap.get(type); + if (policy == SchemaChangePolicy.ENABLE) { + try { + TableIdentifier tableId = TableIdentifier.of(database, table); + List<String> pkListStr = dynamicSchemaFormat.extractPrimaryKeyNames(data); + RowType rowType = dynamicSchemaFormat.extractSchema(data, pkListStr); + Schema schema = FlinkSchemaUtil.convert(FlinkSchemaUtil.toSchema(rowType)); + IcebergSchemaChangeUtils.createTable(catalog, tableId, asNamespaceCatalog, schema); + return; + } catch (Exception e) { + if (exceptionPolicy == SchemaUpdateExceptionPolicy.THROW_WITH_STOP) { + throw new SchemaChangeHandleException( + String.format("Drop column failed, origin schema: %s", originSchema), e); + } + handleDirtyData(data, originData, database, table, DirtyType.CREATE_TABLE_ERROR, e); + return; + } + } + doSchemaChangeBase(type, policy, originSchema); + } + + @Override + public void doDropTable(SchemaChangeType type, String originSchema) { + SchemaChangePolicy policy = policyMap.get(SchemaChangeType.DROP_TABLE); + if (policy == SchemaChangePolicy.ENABLE) { + LOGGER.warn("Unsupported for {}: {}", type, originSchema); + return; + } + doSchemaChangeBase(type, policy, originSchema); + } + + @Override + public void doRenameTable(SchemaChangeType type, String originSchema) { Review Comment: It is recommend to change it as a default implemention in the supper class. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
