fix conflicts

risingwavelabs · Feb 5, 2025 · 5ea883d · 5ea883d
1 parent ceefc31
commit 5ea883d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/src/frontend/src/optimizer/plan_node/stream_sync_log_store.rs b/src/frontend/src/optimizer/plan_node/stream_sync_log_store.rs
@@ -76,7 +76,7 @@ impl StreamNode for StreamSyncLogStore {
             .with_id(state.gen_table_id_wrapped())
             .to_internal_table_prost()
             .into();
-        NodeBody::SyncLogStore(SyncLogStoreNode { log_store_table })
+        NodeBody::SyncLogStore(Box::new(SyncLogStoreNode { log_store_table }))
     }
 }
 

diff --git a/src/prost/build.rs b/src/prost/build.rs
@@ -159,6 +159,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         .boxed(".stream_plan.StreamNode.node_body.global_approx_percentile")
         .boxed(".stream_plan.StreamNode.node_body.row_merge")
         .boxed(".stream_plan.StreamNode.node_body.as_of_join")
+        .boxed(".stream_plan.StreamNode.node_body.sync_log_store")
         // `Udf` is 248 bytes, while 2nd largest field is 32 bytes.
         .boxed(".expr.ExprNode.rex_node.udf")
         // Eq + Hash are for plan nodes to do common sub-plan detection.

diff --git a/src/stream/src/from_proto/sync_log_store.rs b/src/stream/src/from_proto/sync_log_store.rs
@@ -62,19 +62,15 @@ impl ExecutorBuilder for SyncLogStoreExecutorBuilder {
         let buffer_max_size = 1000;
         let [upstream] = params.input.try_into().unwrap();
 
-        let seq_id = FIRST_SEQ_ID;
-
         let executor = SyncedKvLogStoreExecutor::new(
             actor_context,
             table_id,
             metrics,
             serde,
-            seq_id,
             store,
             buffer_max_size,
             upstream,
-        )
-        .await;
+        );
         Ok((params.info, executor).into())
     }
 }