Fix: set scan_ranges after preparing node (#3738) (#3745)

StarRocks · Mar 1, 2022 · 56f91e3 · 56f91e3
1 parent 2c852f1
commit 56f91e3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/be/src/exec/vectorized/olap_scan_node.cpp b/be/src/exec/vectorized/olap_scan_node.cpp
@@ -56,8 +56,6 @@ Status OlapScanNode::prepare(RuntimeState* state) {
     }
     _runtime_state = state;
 
-    RETURN_IF_ERROR(_capture_tablet_rowsets());
-
     return Status::OK();
 }
 
@@ -321,6 +319,8 @@ Status OlapScanNode::set_scan_ranges(const std::vector<TScanRangeParams>& scan_r
         COUNTER_UPDATE(_tablet_counter, 1);
     }
 
+    RETURN_IF_ERROR(_capture_tablet_rowsets());
+
     return Status::OK();
 }
 

diff --git a/be/src/runtime/plan_fragment_executor.cpp b/be/src/runtime/plan_fragment_executor.cpp
@@ -141,6 +141,7 @@ Status PlanFragmentExecutor::prepare(const TExecPlanFragmentParams& request) {
         _runtime_state->set_batch_size(config::vector_chunk_size);
     }
 
+    RETURN_IF_ERROR(_plan->prepare(_runtime_state));
     // set scan ranges
     std::vector<ExecNode*> scan_nodes;
     std::vector<TScanRangeParams> no_scan_ranges;
@@ -156,8 +157,6 @@ Status PlanFragmentExecutor::prepare(const TExecPlanFragmentParams& request) {
         VLOG(1) << "scan_node_Id=" << scan_node->id() << " size=" << scan_ranges.size();
     }
 
-    RETURN_IF_ERROR(_plan->prepare(_runtime_state));
-
     _runtime_state->set_per_fragment_instance_idx(params.sender_id);
     _runtime_state->set_num_per_fragment_instances(params.num_senders);