not pass format encode because it has been in the table definition

risingwavelabs · Nov 5, 2024 · 47a190f · 47a190f
1 parent 322cbf0
commit 47a190f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 20 deletions.
diff --git a/src/frontend/src/handler/alter_table_column.rs b/src/frontend/src/handler/alter_table_column.rs
@@ -140,7 +140,6 @@ pub async fn get_replace_table_plan(
     table_name: ObjectName,
     new_definition: Statement,
     old_catalog: &Arc<TableCatalog>,
-    format_encode: Option<FormatEncodeOptions>,
     new_version_columns: Option<Vec<ColumnCatalog>>, // only provided in auto schema change
 ) -> Result<(
     Option<Source>,
@@ -161,12 +160,17 @@ pub async fn get_replace_table_plan(
         with_version_column,
         wildcard_idx,
         cdc_table_info,
+        format_encode,
         ..
     } = new_definition
     else {
         panic!("unexpected statement type: {:?}", new_definition);
     };
 
+    let format_encode = format_encode
+        .clone()
+        .map(|format_encode| format_encode.into_v2_with_warning());
+
     let (mut graph, table, source, job_type) = generate_stream_graph_for_replace_table(
         session,
         table_name,
@@ -307,6 +311,7 @@ pub async fn handle_alter_table_column(
     else {
         panic!("unexpected statement: {:?}", definition);
     };
+
     let format_encode = format_encode
         .clone()
         .map(|format_encode| format_encode.into_v2_with_warning());
@@ -430,15 +435,8 @@ pub async fn handle_alter_table_column(
         _ => unreachable!(),
     };
 
-    let (source, table, graph, col_index_mapping, job_type) = get_replace_table_plan(
-        &session,
-        table_name,
-        definition,
-        &original_catalog,
-        format_encode,
-        None,
-    )
-    .await?;
+    let (source, table, graph, col_index_mapping, job_type) =
+        get_replace_table_plan(&session, table_name, definition, &original_catalog, None).await?;
 
     let catalog_writer = session.catalog_writer()?;
 

diff --git a/src/frontend/src/handler/alter_table_with_sr.rs b/src/frontend/src/handler/alter_table_with_sr.rs
@@ -64,6 +64,7 @@ pub async fn handle_refresh_schema(
         format_encode.unwrap()
     };
 
+    // NOTE(st1page): since we have not implemented alter format encode for table, it is actually no use.
     let definition = alter_definition_format_encode(
         &original_table.definition,
         format_encode.row_options.clone(),
@@ -75,15 +76,8 @@ pub async fn handle_refresh_schema(
         .unwrap();
 
     let (source, table, graph, col_index_mapping, job_type) = {
-        let result = get_replace_table_plan(
-            &session,
-            table_name,
-            definition,
-            &original_table,
-            Some(format_encode),
-            None,
-        )
-        .await;
+        let result =
+            get_replace_table_plan(&session, table_name, definition, &original_table, None).await;
         match result {
             Ok((source, table, graph, col_index_mapping, job_type)) => {
                 Ok((source, table, graph, col_index_mapping, job_type))

diff --git a/src/frontend/src/rpc/mod.rs b/src/frontend/src/rpc/mod.rs
@@ -105,7 +105,6 @@ async fn get_new_table_plan(
         table_name,
         new_table_definition,
         &original_catalog,
-        None,
         Some(new_version_columns),
     )
     .await?;