Skip to content

remove explicit memtracker from scannode #9350

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
dataroaring wants to merge 3 commits into from
Closed

remove explicit memtracker from scannode #9350

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6a8e7b6
remove explicit memtracker from scannode
dataroaring May 3, 2022
4567e29
remove block_mem_tracker from VOlapScanNode
dataroaring May 8, 2022
bd0592e
Merge remote-tracking branch 'upstream/master' into useless_code
dataroaring May 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion be/src/exec/olap_scan_node.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ OlapScanNode::OlapScanNode(ObjectPool* pool, const TPlanNode& tnode, const Descr
_transfer_done(false),
_status(Status::OK()),
_resource_info(nullptr),
_buffered_bytes(0),
_eval_conjuncts_fn(nullptr),
_runtime_filter_descs(tnode.runtime_filters) {}

Expand Down
1 change: 0 additions & 1 deletion be/src/exec/olap_scan_node.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,6 @@ class OlapScanNode : public ScanNode {

TResourceInfo* _resource_info;

int64_t _buffered_bytes;
// Count the memory consumption of Rowset Reader and Tablet Reader in OlapScanner.
std::shared_ptr<MemTracker> _scanner_mem_tracker;
EvalConjunctsFn _eval_conjuncts_fn;
Expand Down
6 changes: 0 additions & 6 deletions be/src/vec/exec/volap_scan_node.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,8 @@ void VOlapScanNode::transfer_thread(RuntimeState* state) {
for (int i = 0; i < pre_block_count; ++i) {
auto block = new Block(_tuple_desc->slots(), _block_size);
_free_blocks.emplace_back(block);
_buffered_bytes += block->allocated_bytes();
}

_block_mem_tracker->consume(_buffered_bytes);

// read from scanner
while (LIKELY(status.ok())) {
int assigned_thread_num = _start_scanner_thread_task(state, block_per_scanner);
Expand Down Expand Up @@ -320,7 +317,6 @@ Status VOlapScanNode::start_scan_thread(RuntimeState* state) {
_transfer_done = true;
return Status::OK();
}
_block_mem_tracker = MemTracker::create_virtual_tracker(-1, "VOlapScanNode:Block");

// ranges constructed from scan keys
std::vector<std::unique_ptr<OlapScanRange>> cond_ranges;
Expand Down Expand Up @@ -420,7 +416,6 @@ Status VOlapScanNode::close(RuntimeState* state) {
std::for_each(_scan_blocks.begin(), _scan_blocks.end(), std::default_delete<Block>());
_scan_row_batches_bytes = 0;
std::for_each(_free_blocks.begin(), _free_blocks.end(), std::default_delete<Block>());
_block_mem_tracker->release(_buffered_bytes);

// OlapScanNode terminate by exception
// so that initiative close the Scanner
Expand Down Expand Up @@ -547,7 +542,6 @@ Block* VOlapScanNode::_alloc_block(bool& get_free_block) {
get_free_block = false;

auto block = new Block(_tuple_desc->slots(), _block_size);
_buffered_bytes += block->allocated_bytes();
return block;
}

Expand Down
2 changes: 0 additions & 2 deletions be/src/vec/exec/volap_scan_node.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,6 @@ class VOlapScanNode final : public OlapScanNode {
std::list<VOlapScanner*> _volap_scanners;
std::mutex _volap_scanners_lock;

std::shared_ptr<MemTracker> _block_mem_tracker;

int _max_materialized_blocks;

size_t _block_size = 0;
Expand Down