workaround for optional in proto

Signed-off-by: Eurekaaw <[email protected]>

Author: y-wei

dashboard/proto/gen/batch_plan.ts

@@ -25,7 +25,10 @@ message RowSeqScanNode {
   // Whether the order on output columns should be preserved.
   bool ordered = 5;
 
-  optional uint32 chunk_size = 6;
+  message ChunkSize { 
+    uint32 chunk_size = 1; 
+  } 
+  ChunkSize chunk_size = 6;
 }
 
 message SysRowSeqScanNode {

proto/batch_plan.proto

@@ -241,12 +241,13 @@ impl BoxedExecutorBuilder for RowSeqScanExecutorBuilder {
         let ordered = seq_scan_node.ordered;
 
         let epoch = source.epoch.clone();
-        let chunk_size = source.context.get_config().developer.batch_chunk_size.min(
-            seq_scan_node
-                .chunk_size
-                .unwrap_or(source.context.get_config().developer.batch_chunk_size as u32)
-                as usize,
-        );
+        let chunk_size = if let Some(chunk_size_) = &seq_scan_node.chunk_size {
+            chunk_size_
+                .get_chunk_size()
+                .min(source.context.get_config().developer.batch_chunk_size as u32)
+        } else {
+            source.context.get_config().developer.batch_chunk_size as u32
+        };
         let metrics = source.context().task_metrics();
 
         dispatch_state_store!(source.context().state_store(), state_store, {
@@ -267,7 +268,7 @@ impl BoxedExecutorBuilder for RowSeqScanExecutorBuilder {
                 scan_ranges,
                 ordered,
                 epoch,
-                chunk_size,
+                chunk_size as usize,
                 source.plan_node().get_identity().clone(),
                 metrics,
             )))

src/batch/src/executor/row_seq_scan.rs

@@ -20,6 +20,7 @@ use risingwave_common::error::Result;
 use risingwave_common::types::ScalarImpl;
 use risingwave_common::util::scan_range::{is_full_range, ScanRange};
 use risingwave_pb::batch_plan::plan_node::NodeBody;
+use risingwave_pb::batch_plan::row_seq_scan_node::ChunkSize;
 use risingwave_pb::batch_plan::{RowSeqScanNode, SysRowSeqScanNode};
 use risingwave_pb::plan_common::ColumnDesc as ProstColumnDesc;
 
@@ -240,7 +241,11 @@ impl ToBatchProst for BatchSeqScan {
                 // To be filled by the scheduler.
                 vnode_bitmap: None,
                 ordered: !self.order().is_any(),
-                chunk_size: self.logical.chunk_size(),
+                chunk_size: if let Some(chunk_size) = self.logical.chunk_size() {
+                    Some(ChunkSize { chunk_size })
+                } else {
+                    None
+                },
             })
         }
     }