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

[enhancement] Refactor to improve the usability of MemTracker (step2) (#10823)

Browse Source
This commit is contained in:
Xinyi Zou
2022-07-21 17:11:28 +08:00
committed by GitHub
parent 5f6f35e886
commit 4960043f5e
316 changed files with 2145 additions and 4369 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
be/src/runtime/fold_constant_executor.cpp
View File

@ -27,7 +27,7 @@
#include "gen_cpp/internal_service.pb.h"
#include "runtime/exec_env.h"
#include "runtime/large_int_value.h"
#include "runtime/mem_tracker.h"
#include "runtime/memory/mem_tracker.h"
#include "runtime/runtime_state.h"
#include "runtime/thread_context.h"
#include "runtime/tuple_row.h"
@ -51,7 +51,7 @@ Status FoldConstantExecutor::fold_constant_expr(const TFoldConstantParams& param
// init
RETURN_IF_ERROR(_init(query_globals));
// only after init operation, _mem_tracker is ready
SCOPED_SWITCH_THREAD_LOCAL_MEM_TRACKER(_mem_tracker);
SCOPED_CONSUME_MEM_TRACKER(_mem_tracker.get());
for (const auto& m : expr_map) {
PExprResultMap pexpr_result_map;
@ -103,7 +103,7 @@ Status FoldConstantExecutor::fold_constant_vexpr(const TFoldConstantParams& para
// init
RETURN_IF_ERROR(_init(query_globals));
// only after init operation, _mem_tracker is ready
SCOPED_SWITCH_THREAD_LOCAL_MEM_TRACKER(_mem_tracker);
SCOPED_CONSUME_MEM_TRACKER(_mem_tracker.get());
for (const auto& m : expr_map) {
PExprResultMap pexpr_result_map;
@ -179,8 +179,8 @@ Status FoldConstantExecutor::_init(const TQueryGlobals& query_globals) {
_runtime_profile = _runtime_state->runtime_profile();
_runtime_profile->set_name("FoldConstantExpr");
_mem_tracker = MemTracker::create_tracker(-1, "FoldConstantExpr",
_runtime_state->instance_mem_tracker());
SCOPED_ATTACH_TASK(_runtime_state.get());
_mem_tracker = std::make_unique<MemTracker>("FoldConstantExpr");
_mem_pool.reset(new MemPool(_mem_tracker.get()));
return Status::OK();
@ -188,7 +188,7 @@ Status FoldConstantExecutor::_init(const TQueryGlobals& query_globals) {
template <typename Context>
Status FoldConstantExecutor::_prepare_and_open(Context* ctx) {
RETURN_IF_ERROR(ctx->prepare(_runtime_state.get(), RowDescriptor(), _mem_tracker));
RETURN_IF_ERROR(ctx->prepare(_runtime_state.get(), RowDescriptor()));
return ctx->open(_runtime_state.get());
}