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

libing8719 · Mar 1, 2022 · 172f07f · 172f07f
1 parent 680cbb1
commit 172f07f
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
@@ -62,8 +62,6 @@ Status OlapScanNode::prepare(RuntimeState* state) {
     }
     _runtime_state = state;
 
-    RETURN_IF_ERROR(_capture_tablet_rowsets());
-
     return Status::OK();
 }
 
@@ -326,6 +324,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
@@ -124,6 +124,7 @@ Status PlanFragmentExecutor::prepare(const TExecPlanFragmentParams& request) {
         static_cast<ExchangeNode*>(exch_node)->set_num_senders(num_senders);
     }
 
+    RETURN_IF_ERROR(_plan->prepare(_runtime_state));
     // set scan ranges
     std::vector<ExecNode*> scan_nodes;
     std::vector<TScanRangeParams> no_scan_ranges;
@@ -139,8 +140,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);