[BugFix] Acquire rowsets at querying (backport #13830)

StarRocks · Nov 25, 2022 · 6c82c74 · 6c82c74
1 parent b101696
commit 6c82c74
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/be/src/exec/pipeline/olap_scan_operator.cpp b/be/src/exec/pipeline/olap_scan_operator.cpp
@@ -45,7 +45,11 @@ Status OlapScanOperator::do_prepare(RuntimeState*) {
     return Status::OK();
 }
 
-void OlapScanOperator::do_close(RuntimeState*) {}
+void OlapScanOperator::do_close(RuntimeState*) {
+    for (const auto& rowsets_per_tablet : _tablet_rowsets) {
+        Rowset::release_readers(rowsets_per_tablet);
+    }
+}
 
 Status OlapScanOperator::_capture_tablet_rowsets() {
     const auto& morsels = this->morsel_queue()->morsels();
@@ -74,6 +78,7 @@ Status OlapScanOperator::_capture_tablet_rowsets() {
         {
             std::shared_lock l(tablet->get_header_lock());
             RETURN_IF_ERROR(tablet->capture_consistent_rowsets(Version(0, version), &_tablet_rowsets[i]));
+            Rowset::acquire_readers(_tablet_rowsets[i]);
         }
     }
 

diff --git a/be/src/exec/vectorized/olap_scan_node.cpp b/be/src/exec/vectorized/olap_scan_node.cpp
@@ -194,6 +194,10 @@ Status OlapScanNode::close(RuntimeState* state) {
         release_large_columns<BinaryColumn>(runtime_state()->chunk_size() * 512);
     }
 
+    for (const auto& rowsets_per_tablet : _tablet_rowsets) {
+        Rowset::release_readers(rowsets_per_tablet);
+    }
+
     return ScanNode::close(state);
 }
 
@@ -570,6 +574,7 @@ Status OlapScanNode::_capture_tablet_rowsets() {
         {
             std::shared_lock l(tablet->get_header_lock());
             RETURN_IF_ERROR(tablet->capture_consistent_rowsets(Version(0, version), &_tablet_rowsets[i]));
+            Rowset::acquire_readers(_tablet_rowsets[i]);
         }
     }