thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-24 02:30:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove useless code

Browse Source
This commit is contained in:
Alexey Milovidov 2020-05-01 22:01:02 +03:00
parent 600b396f1b
commit 93c3a83af2
2 changed files with 39 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/Interpreters/ProcessList.cpp
View File

@ -151,14 +151,12 @@ ProcessList::EntryPtr ProcessList::insert(const String & query_, const IAST * as
} }
auto process_it = processes.emplace(processes.end(), auto process_it = processes.emplace(processes.end(),
query_, client_info, settings.max_memory_usage, settings.memory_tracker_fault_probability, priorities.insert(settings.priority)); query_, client_info, priorities.insert(settings.priority));
res = std::make_shared<Entry>(*this, process_it); res = std::make_shared<Entry>(*this, process_it);
process_it->query_context = &query_context; process_it->query_context = &query_context;
if (!client_info.current_query_id.empty())
{
ProcessListForUser & user_process_list = user_to_queries[client_info.current_user]; ProcessListForUser & user_process_list = user_to_queries[client_info.current_user];
user_process_list.queries.emplace(client_info.current_query_id, &res->get()); user_process_list.queries.emplace(client_info.current_query_id, &res->get());
@ -177,7 +175,7 @@ ProcessList::EntryPtr ProcessList::insert(const String & query_, const IAST * as
thread_group->query = process_it->query; thread_group->query = process_it->query;
/// Set query-level memory trackers /// Set query-level memory trackers
thread_group->memory_tracker.setOrRaiseHardLimit(process_it->max_memory_usage); thread_group->memory_tracker.setOrRaiseHardLimit(settings.max_memory_usage);
if (query_context.hasTraceCollector()) if (query_context.hasTraceCollector())
{ {
@ -187,8 +185,8 @@ ProcessList::EntryPtr ProcessList::insert(const String & query_, const IAST * as
} }
thread_group->memory_tracker.setDescription("(for query)"); thread_group->memory_tracker.setDescription("(for query)");
if (process_it->memory_tracker_fault_probability) if (settings.memory_tracker_fault_probability)
thread_group->memory_tracker.setFaultProbability(process_it->memory_tracker_fault_probability); thread_group->memory_tracker.setFaultProbability(settings.memory_tracker_fault_probability);
/// NOTE: Do not set the limit for thread-level memory tracker since it could show unreal values /// NOTE: Do not set the limit for thread-level memory tracker since it could show unreal values
/// since allocation and deallocation could happen in different threads /// since allocation and deallocation could happen in different threads
@ -203,7 +201,6 @@ ProcessList::EntryPtr ProcessList::insert(const String & query_, const IAST * as
else if (settings.max_network_bandwidth_for_all_users) else if (settings.max_network_bandwidth_for_all_users)
user_process_list.user_throttler = total_network_throttler; user_process_list.user_throttler = total_network_throttler;
} }
}
if (!total_network_throttler && settings.max_network_bandwidth_for_all_users) if (!total_network_throttler && settings.max_network_bandwidth_for_all_users)
{ {
@ -270,16 +267,12 @@ ProcessListEntry::~ProcessListEntry()
QueryStatus::QueryStatus( QueryStatus::QueryStatus(
const String & query_, const String & query_,
const ClientInfo & client_info_, const ClientInfo & client_info_,
size_t max_memory_usage_,
double memory_tracker_fault_probability_,
QueryPriorities::Handle && priority_handle_) QueryPriorities::Handle && priority_handle_)
: :
query(query_), query(query_),
client_info(client_info_), client_info(client_info_),
priority_handle(std::move(priority_handle_)), priority_handle(std::move(priority_handle_)),
num_queries_increment{CurrentMetrics::Query}, num_queries_increment{CurrentMetrics::Query}
max_memory_usage(max_memory_usage_),
memory_tracker_fault_probability(memory_tracker_fault_probability_)
{ {
} }

5
src/Interpreters/ProcessList.h
View File

@ -99,9 +99,6 @@ protected:
CurrentMetrics::Increment num_queries_increment{CurrentMetrics::Query}; CurrentMetrics::Increment num_queries_increment{CurrentMetrics::Query};
size_t max_memory_usage = 0;
double memory_tracker_fault_probability = 0.0;
std::atomic<bool> is_killed { false }; std::atomic<bool> is_killed { false };
void setUserProcessList(ProcessListForUser * user_process_list_); void setUserProcessList(ProcessListForUser * user_process_list_);
@ -132,8 +129,6 @@ public:
QueryStatus( QueryStatus(
const String & query_, const String & query_,
const ClientInfo & client_info_, const ClientInfo & client_info_,
size_t max_memory_usage,
double memory_tracker_fault_probability,
QueryPriorities::Handle && priority_handle_); QueryPriorities::Handle && priority_handle_);
~QueryStatus(); ~QueryStatus();