From eaabdc2a40efa2011f48a13b25c096999cda7d64 Mon Sep 17 00:00:00 2001 From: Shanicky Chen Date: Tue, 14 Nov 2023 17:31:30 +0800 Subject: [PATCH] fix conflict Signed-off-by: Shanicky Chen --- src/meta/service/src/ddl_service.rs | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/src/meta/service/src/ddl_service.rs b/src/meta/service/src/ddl_service.rs index c0276fdea68f2..ed869f7101dc8 100644 --- a/src/meta/service/src/ddl_service.rs +++ b/src/meta/service/src/ddl_service.rs @@ -277,11 +277,15 @@ impl DdlService for DdlServiceImpl { { let source = source.as_mut().unwrap(); let table_id = table.id; - fill_table_source(source, source_id, &mut table, table_id, &mut fragment_graph); + fill_table_stream_graph_info( + Some((source, source_id)), + (&mut table, table_id), + TableJobType::General, + &mut fragment_graph, + ); } let table_col_index_mapping = ColIndexMapping::from_protobuf(&change.table_col_index_mapping.unwrap()); - let stream_job = StreamingJob::Table(source, table, TableJobType::General); ReplaceTableInfo { @@ -327,9 +331,13 @@ impl DdlService for DdlServiceImpl { { let source = source.as_mut().unwrap(); let table_id = table.id; - fill_table_source(source, source_id, &mut table, table_id, &mut fragment_graph); + fill_table_stream_graph_info( + Some((source, source_id)), + (&mut table, table_id), + TableJobType::General, + &mut fragment_graph, + ); } - let table_col_index_mapping = ColIndexMapping::from_protobuf(&change.table_col_index_mapping.unwrap()); let stream_job = StreamingJob::Table(source, table, TableJobType::General); @@ -981,4 +989,4 @@ fn fill_table_stream_graph_info( } }); } -} \ No newline at end of file +}