2

xinyiZzz · Mar 17, 2024 · 86b9f79 · 86b9f79
1 parent 63c76dc
commit 86b9f79
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/be/src/olap/memtable.cpp b/be/src/olap/memtable.cpp
@@ -162,6 +162,8 @@ MemTable::~MemTable() {
     _output_mutable_block.clear_column_data();
     _row_in_blocks.clear();
     _agg_functions.clear();
+    _input_mutable_block.clear();
+    _output_mutable_block.clear();
 }
 
 int RowInBlockComparator::operator()(const RowInBlock* left, const RowInBlock* right) const {

diff --git a/be/src/vec/exec/scan/vscan_node.h b/be/src/vec/exec/scan/vscan_node.h
@@ -99,6 +99,7 @@ class ScannerDelegate {
         if (!st.ok()) {
             LOG(WARNING) << "close scanner failed, st = " << st;
         }
+        _scanner.reset();
     }
     ScannerDelegate(ScannerDelegate&&) = delete;
 };

diff --git a/be/src/vec/exec/scan/vscanner.h b/be/src/vec/exec/scan/vscanner.h
@@ -61,7 +61,15 @@ class VScanner {
     VScanner(RuntimeState* state, pipeline::ScanLocalStateBase* local_state, int64_t limit,
              RuntimeProfile* profile);
 
-    virtual ~VScanner() = default;
+    virtual ~VScanner() {
+        SCOPED_SWITCH_THREAD_MEM_TRACKER_LIMITER(_state->query_mem_tracker());
+        _input_block.clear();
+        _conjuncts.clear();
+        _projections.clear();
+        _origin_block.clear();
+        _common_expr_ctxs_push_down.clear();
+        _stale_expr_ctxs.clear();
+    }
 
     virtual Status init() { return Status::OK(); }