This is an automated email from the ASF dual-hosted git repository. snuyanzin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/flink.git
commit 512fdb2b125d956a379733c197709cdf574dffef Author: Sergey Nuyanzin <[email protected]> AuthorDate: Mon Dec 1 19:25:45 2025 +0100 [FLINK-38756][table] Group and reorder converters in registration logica This closes #27292. --- .../operations/converters/SqlNodeConverters.java | 111 ++++++++++++--------- 1 file changed, 66 insertions(+), 45 deletions(-) diff --git a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/operations/converters/SqlNodeConverters.java b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/operations/converters/SqlNodeConverters.java index bd7c1e45962..110d9267ad3 100644 --- a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/operations/converters/SqlNodeConverters.java +++ b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/operations/converters/SqlNodeConverters.java @@ -59,63 +59,84 @@ public class SqlNodeConverters { static { // register all the converters here - register(new SqlCreateCatalogConverter()); - register(new SqlAlterCatalogOptionsConverter()); - register(new SqlAlterCatalogResetConverter()); - register(new SqlAlterCatalogCommentConverter()); - register(new SqlCreateViewConverter()); - register(new SqlAlterViewRenameConverter()); - register(new SqlAlterViewPropertiesConverter()); - register(new SqlAlterViewAsConverter()); - register(new SqlAlterTableAddPartitionConverter()); - register(new SqlAlterTableDropPartitionConverter()); + register(new SqlDescribeFunctionConverter()); + register(new SqlDescribeJobConverter()); + register(new SqlProcedureCallConverter()); register(new SqlQueryConverter()); - register(new SqlShowPartitionsConverter()); - register(new SqlTruncateTableConverter()); + register(new SqlShowDatabasesConverter()); register(new SqlShowFunctionsConverter()); - register(new SqlShowModelsConverter()); - register(new SqlShowCreateModelConverter()); + register(new SqlShowPartitionsConverter()); register(new SqlShowProcedureConverter()); - register(new SqlReplaceTableAsConverter()); - register(new SqlProcedureCallConverter()); - register(new SqlShowDatabasesConverter()); - register(new SqlShowCreateCatalogConverter()); - register(new SqlDescribeCatalogConverter()); - register(new SqlDescribeJobConverter()); - register(new SqlCreateOrAlterMaterializedTableConverter()); - register(new SqlCreateModelConverter()); - register(new SqlAlterMaterializedTableRefreshConverter()); - register(new SqlAlterMaterializedTableSuspendConverter()); - register(new SqlAlterMaterializedTableResumeConverter()); - register(new SqlAlterMaterializedTableAsQueryConverter()); - register(new SqlAlterMaterializedTableAddDistributionConverter()); - register(new SqlAlterMaterializedTableModifyDistributionConverter()); - register(new SqlAlterMaterializedTableDropDistributionConverter()); - register(new SqlAlterModelRenameConverter()); - register(new SqlAlterModelResetConverter()); - register(new SqlAlterModelSetConverter()); - register(new SqlDropMaterializedTableConverter()); - register(new SqlDropModelConverter()); - register(new SqlShowTablesConverter()); - register(new SqlShowCatalogsConverter()); - register(new SqlDescribeFunctionConverter()); - register(new SqlDescribeModelConverter()); - register(new SqlCreateTableAsConverter()); - register(new SqlCreateTableConverter()); - register(new SqlCreateTableLikeConverter()); + + registerCatalogConverters(); + registerMaterializedTableConverters(); + registerModelConverters(); + registerTableConverters(); + registerViewConverters(); + } + + private static void registerTableConverters() { + register(new SqlAlterTableAddDistributionConverter()); + register(new SqlAlterTableAddPartitionConverter()); register(new SqlAlterTableDropPrimaryKeyConverter()); register(new SqlAlterTableDropColumnConverter()); register(new SqlAlterTableDropConstraintConverter()); - register(new SqlAlterTableDropWatermarkConverter()); register(new SqlAlterTableDropDistributionConverter()); - register(new SqlAlterTableAddDistributionConverter()); + register(new SqlAlterTableDropPartitionConverter()); + register(new SqlAlterTableDropWatermarkConverter()); register(new SqlAlterTableModifyDistributionConverter()); + register(new SqlAlterTableOptionsConverter()); register(new SqlAlterTableRenameColumnConverter()); + register(new SqlAlterTableRenameConverter()); register(new SqlAlterTableResetConverter()); - register(new SqlAlterTableOptionsConverter()); register(new SqlAlterTableSchemaModifyConverter()); register(new SqlAlterTableSchemaAddConverter()); - register(new SqlAlterTableRenameConverter()); + register(new SqlCreateTableAsConverter()); + register(new SqlCreateTableConverter()); + register(new SqlCreateTableLikeConverter()); + register(new SqlReplaceTableAsConverter()); + register(new SqlShowTablesConverter()); + register(new SqlTruncateTableConverter()); + } + + private static void registerViewConverters() { + register(new SqlAlterViewAsConverter()); + register(new SqlAlterViewPropertiesConverter()); + register(new SqlAlterViewRenameConverter()); + register(new SqlCreateViewConverter()); + } + + private static void registerCatalogConverters() { + register(new SqlAlterCatalogCommentConverter()); + register(new SqlAlterCatalogOptionsConverter()); + register(new SqlAlterCatalogResetConverter()); + register(new SqlCreateCatalogConverter()); + register(new SqlDescribeCatalogConverter()); + register(new SqlShowCatalogsConverter()); + register(new SqlShowCreateCatalogConverter()); + } + + private static void registerMaterializedTableConverters() { + register(new SqlAlterMaterializedTableAddDistributionConverter()); + register(new SqlAlterMaterializedTableAsQueryConverter()); + register(new SqlAlterMaterializedTableDropDistributionConverter()); + register(new SqlAlterMaterializedTableModifyDistributionConverter()); + register(new SqlAlterMaterializedTableRefreshConverter()); + register(new SqlAlterMaterializedTableResumeConverter()); + register(new SqlAlterMaterializedTableSuspendConverter()); + register(new SqlCreateOrAlterMaterializedTableConverter()); + register(new SqlDropMaterializedTableConverter()); + } + + private static void registerModelConverters() { + register(new SqlAlterModelRenameConverter()); + register(new SqlAlterModelResetConverter()); + register(new SqlAlterModelSetConverter()); + register(new SqlCreateModelConverter()); + register(new SqlDescribeModelConverter()); + register(new SqlDropModelConverter()); + register(new SqlShowCreateModelConverter()); + register(new SqlShowModelsConverter()); } /**
