database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[enhancement](memtracker) Improve readability (#15716)

Browse Source
This commit is contained in:
Xinyi Zou
2023-01-16 16:30:35 +08:00
committed by GitHub
parent b7f43441e3
commit 97fcad76f8
49 changed files with 114 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
be/src/exec/exec_node.cpp
View File

@ -142,18 +142,8 @@ Status ExecNode::prepare(RuntimeState* state) {
std::bind<int64_t>(&RuntimeProfile::units_per_second, _rows_returned_counter,
runtime_profile()->total_time_counter()),
"");
_mem_tracker_held =
std::make_unique<MemTracker>("ExecNode:" + _runtime_profile->name(),
_runtime_profile.get(), nullptr, "PeakMemoryUsage");
// Only when the query profile is enabled, the node allocated memory will be track through the mem hook,
// otherwise _mem_tracker_growh is nullptr, and SCOPED_CONSUME_MEM_TRACKER will do nothing.
if (state->query_options().__isset.is_report_success &&
state->query_options().is_report_success) {
_mem_tracker_growh = std::make_shared<MemTracker>(
"ExecNode:MemoryOnlyTrackAlloc:" + _runtime_profile->name(), _runtime_profile.get(),
nullptr, "MemoryOnlyTrackAllocNoConsiderFree", true);
}
SCOPED_CONSUME_MEM_TRACKER(mem_tracker_growh());
_mem_tracker = std::make_unique<MemTracker>("ExecNode:" + _runtime_profile->name(),
_runtime_profile.get(), nullptr, "PeakMemoryUsage");
if (_vconjunct_ctx_ptr) {
RETURN_IF_ERROR((*_vconjunct_ctx_ptr)->prepare(state, intermediate_row_desc()));
@ -176,7 +166,6 @@ Status ExecNode::prepare(RuntimeState* state) {
}
Status ExecNode::alloc_resource(doris::RuntimeState* state) {
SCOPED_CONSUME_MEM_TRACKER(mem_tracker_growh());
if (_vconjunct_ctx_ptr) {
RETURN_IF_ERROR((*_vconjunct_ctx_ptr)->open(state));
}