refactor: re-generate hint file after alter table operations (#17511)

* refator: re-generate hint file after alter table operations

* tweak stateless test

Author: dantengsky

src/query/service/src/interpreters/interpreter_table_modify_column.rs

@@ -57,6 +57,7 @@ use databend_storages_common_table_meta::meta::SnapshotId;
 use databend_storages_common_table_meta::table::OPT_KEY_BLOOM_INDEX_COLUMNS;
 
 use crate::interpreters::common::check_referenced_computed_columns;
+use crate::interpreters::interpreter_table_add_column::commit_table_meta;
 use crate::interpreters::Interpreter;
 use crate::pipelines::PipelineBuildResult;
 use crate::schedulers::build_query_pipeline_without_render_result_set;
@@ -276,18 +277,14 @@ impl ModifyTableColumnInterpreter {
 
         // if don't need rebuild table, only update table meta.
         if modified_field_indices.is_empty() {
-            let table_id = table_info.ident.table_id;
-            let table_version = table_info.ident.seq;
-
-            let req = UpdateTableMetaReq {
-                table_id,
-                seq: MatchSeq::Exact(table_version),
-                new_table_meta: table_info.meta,
-            };
-
-            let _resp = catalog
-                .update_single_table_meta(req, table.get_table_info())
-                .await?;
+            commit_table_meta(
+                &self.ctx,
+                table.as_ref(),
+                &table_info,
+                table_info.meta.clone(),
+                catalog,
+            )
+            .await?;
 
             return Ok(PipelineBuildResult::create());
         }

src/query/service/src/interpreters/interpreter_table_modify_comment.rs

@@ -18,12 +18,11 @@ use databend_common_catalog::table::TableExt;
 use databend_common_exception::ErrorCode;
 use databend_common_exception::Result;
 use databend_common_meta_app::schema::DatabaseType;
-use databend_common_meta_app::schema::UpdateTableMetaReq;
-use databend_common_meta_types::MatchSeq;
 use databend_common_sql::plans::ModifyTableCommentPlan;
 use databend_common_storages_stream::stream_table::STREAM_ENGINE;
 use databend_common_storages_view::view_table::VIEW_ENGINE;
 
+use crate::interpreters::interpreter_table_add_column::commit_table_meta;
 use crate::interpreters::Interpreter;
 use crate::pipelines::PipelineBuildResult;
 use crate::sessions::QueryContext;
@@ -83,18 +82,17 @@ impl Interpreter for ModifyTableCommentInterpreter {
             }
 
             let catalog = self.ctx.get_catalog(self.plan.catalog.as_str()).await?;
-            let table_id = table_info.ident.table_id;
-            let table_version = table_info.ident.seq;
             let mut new_table_meta = table_info.meta.clone();
             new_table_meta.comment = self.plan.new_comment.clone();
 
-            let req = UpdateTableMetaReq {
-                table_id,
-                seq: MatchSeq::Exact(table_version),
+            commit_table_meta(
+                &self.ctx,
+                table.as_ref(),
+                table_info,
                 new_table_meta,
-            };
-
-            catalog.update_single_table_meta(req, table_info).await?;
+                catalog,
+            )
+            .await?;
         };
 
         Ok(PipelineBuildResult::create())

src/query/service/src/interpreters/interpreter_table_rename_column.rs

@@ -19,15 +19,14 @@ use databend_common_exception::ErrorCode;
 use databend_common_exception::Result;
 use databend_common_expression::DataSchema;
 use databend_common_meta_app::schema::DatabaseType;
-use databend_common_meta_app::schema::UpdateTableMetaReq;
-use databend_common_meta_types::MatchSeq;
 use databend_common_sql::plans::RenameTableColumnPlan;
 use databend_common_sql::BloomIndexColumns;
 use databend_common_storages_stream::stream_table::STREAM_ENGINE;
 use databend_common_storages_view::view_table::VIEW_ENGINE;
 use databend_storages_common_table_meta::table::OPT_KEY_BLOOM_INDEX_COLUMNS;
 
 use crate::interpreters::common::check_referenced_computed_columns;
+use crate::interpreters::interpreter_table_add_column::commit_table_meta;
 use crate::interpreters::interpreter_table_create::is_valid_column;
 use crate::interpreters::Interpreter;
 use crate::pipelines::PipelineBuildResult;
@@ -120,16 +119,14 @@ impl Interpreter for RenameTableColumnInterpreter {
                 }
             }
 
-            let table_id = table_info.ident.table_id;
-            let table_version = table_info.ident.seq;
-
-            let req = UpdateTableMetaReq {
-                table_id,
-                seq: MatchSeq::Exact(table_version),
+            commit_table_meta(
+                &self.ctx,
+                table.as_ref(),
+                table_info,
                 new_table_meta,
-            };
-
-            let _resp = catalog.update_single_table_meta(req, table_info).await?;
+                catalog,
+            )
+            .await?;
         };
 
         Ok(PipelineBuildResult::create())

tests/suites/5_ee/04_attach_read_only/02_0004_attach_table.result

@@ -66,6 +66,14 @@ Error: APIError: QueryFailed: [2004]Columns [c_not_exist] do not exist in the ta
 #############################
 >>>> drop table if exists attach_tbl
 >>>> alter table base RENAME COLUMN c2 to c2_new
+'ATTACH' after 'ALTER TABLE RENAME COLUMN' should see the new name of column
+>>>> drop table if exists attach_tbl2
+>>>> desc attach_tbl2
+c1	VARCHAR	YES	NULL	
+c2_new	VARCHAR	YES	NULL	
+c3	VARCHAR	YES	NULL	
+c4	VARCHAR	YES	NULL	
+<<<<
 >>>> insert into base values('c1', 'c2_new', 'c3', 'c4')
 1
 select all should work

tests/suites/5_ee/04_attach_read_only/02_0004_attach_table.sh

@@ -91,6 +91,12 @@ stmt "drop table if exists attach_tbl"
 echo "attach table attach_tbl (c2, c4) 's3://testbucket/admin/data/$base_storage_prefix' connection=(connection_name ='my_conn')" | $BENDSQL_CLIENT_CONNECT
 
 stmt "alter table base RENAME COLUMN c2 to c2_new"
+
+echo "'ATTACH' after 'ALTER TABLE RENAME COLUMN' should see the new name of column"
+stmt "drop table if exists attach_tbl2"
+echo "attach table attach_tbl2 's3://testbucket/admin/data/$base_storage_prefix' connection=(connection_name ='my_conn')" | $BENDSQL_CLIENT_CONNECT
+query "desc attach_tbl2"
+
 stmt "insert into base values('c1', 'c2_new', 'c3', 'c4')"
 
 echo "select all should work"

tests/suites/5_ee/04_attach_read_only/04_0007_attach_table_entity_comment.result

@@ -5,3 +5,12 @@ tbl comment
 check column comment
 c1	c1 comment
 c2	c2 comment
+>>>> alter table comment_base rename column c1 to c1_new
+c1_new	c1 comment
+c2	c2 comment
+>>>> alter table comment_base comment = 'new tbl comment'
+>>>> select comment from system.tables where name = 'att_comment'
+new tbl comment
+>>>> ALTER TABLE comment_base MODIFY COLUMN c1_new int comment 'new comment of c1_new'
+c1_new	new comment of c1_new
+c2	c2 comment

tests/suites/5_ee/04_attach_read_only/04_0007_attach_table_entity_comment.sh

@@ -25,5 +25,23 @@ echo "check column comment"
 echo "select name, comment from system.columns where table = 'att_comment' order by name" | $BENDSQL_CLIENT_CONNECT
 
 
+# alter table rename column should generate new hint file
+stmt "alter table comment_base rename column c1 to c1_new"
+echo "drop table if exists att_comment" | $BENDSQL_CLIENT_CONNECT
+echo "attach table att_comment 's3://testbucket/admin/$storage_prefix' connection=(access_key_id ='minioadmin' secret_access_key ='minioadmin' endpoint_url='${STORAGE_S3_ENDPOINT_URL}');" | $BENDSQL_CLIENT_CONNECT
+echo "select name, comment from system.columns where table = 'att_comment' order by name" | $BENDSQL_CLIENT_CONNECT
+
+# alter table rename comment should generate new hint file
+stmt "alter table comment_base comment = 'new tbl comment'"
+echo "drop table if exists att_comment" | $BENDSQL_CLIENT_CONNECT
+echo "attach table att_comment 's3://testbucket/admin/$storage_prefix' connection=(access_key_id ='minioadmin' secret_access_key ='minioadmin' endpoint_url='${STORAGE_S3_ENDPOINT_URL}');" | $BENDSQL_CLIENT_CONNECT
+stmt "select comment from system.tables where name = 'att_comment'"
+
+# alter table modify column comment should generate new hint file
+stmt "ALTER TABLE comment_base MODIFY COLUMN c1_new int comment 'new comment of c1_new'"
+echo "drop table if exists att_comment" | $BENDSQL_CLIENT_CONNECT
+echo "attach table att_comment 's3://testbucket/admin/$storage_prefix' connection=(access_key_id ='minioadmin' secret_access_key ='minioadmin' endpoint_url='${STORAGE_S3_ENDPOINT_URL}');" | $BENDSQL_CLIENT_CONNECT
+echo "select name, comment from system.columns where table = 'att_comment' order by name" | $BENDSQL_CLIENT_CONNECT
+
 echo "drop table if exists comment_base" | $BENDSQL_CLIENT_CONNECT
 echo "drop table if exists att_comment" | $BENDSQL_CLIENT_CONNECT