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

Missing many files in last commit

Browse Source 
In last commit, a lot of files has been missed
This commit is contained in:
morningman
2018-10-31 16:19:21 +08:00
parent 5d3fc80067
commit 051aced48d
596 changed files with 16703 additions and 18103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
be/src/runtime/mem_tracker.cpp
View File

@ -310,17 +310,18 @@ Status MemTracker::MemLimitExceeded(RuntimeState* state, const std::string& deta
// Choose which tracker to log the usage of. Default to the process tracker so we can
// get the full view of memory consumption.
MemTracker* tracker_to_log = process_tracker;
if (state != nullptr && state->query_mem_tracker()->has_limit()) {
MemTracker* query_tracker = state->query_mem_tracker();
const int64_t query_capacity = query_tracker->limit() - query_tracker->consumption();
ss << "Memory left in query limit: "
<< PrettyPrinter::print(query_capacity, TUnit::BYTES) << std::endl;
// Log the query tracker only if the query limit was closer to being exceeded.
if (query_capacity < process_capacity) tracker_to_log = query_tracker;
}
ss << tracker_to_log->LogUsage();
//Status status = Status::MemLimitExceeded(ss.str());
// FIXME(cmy): call LogUsage() lead to crash here, fix it later
// MemTracker* tracker_to_log = process_tracker;
// if (state != nullptr && state->query_mem_tracker()->has_limit()) {
// MemTracker* query_tracker = state->query_mem_tracker();
// const int64_t query_capacity = query_tracker->limit() - query_tracker->consumption();
// ss << "Memory left in query limit: "
// << PrettyPrinter::print(query_capacity, TUnit::BYTES) << std::endl;
// // Log the query tracker only if the query limit was closer to being exceeded.
// if (query_capacity < process_capacity) tracker_to_log = query_tracker;
// }
// ss << tracker_to_log->LogUsage();
// Status status = Status::MemLimitExceeded(ss.str());
Status status = Status::MEM_LIMIT_EXCEEDED;
if (state != nullptr) state->log_error(status.get_error_msg());
return status;