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

Remove obsolete pointer for trace collector in context.

Browse Source
This commit is contained in:
Ivan Lezhankin 2020-01-24 18:40:08 +03:00
parent a982309cff
commit 09b39b78e4
2 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dbms/src/Interpreters/Context.cpp
View File

@ -166,7 +166,6 @@ struct ContextShared
RemoteHostFilter remote_host_filter; /// Allowed URL from config.xml RemoteHostFilter remote_host_filter; /// Allowed URL from config.xml
std::unique_ptr<TraceCollector> trace_collector; /// Thread collecting traces from threads executing queries
/// Named sessions. The user could specify session identifier to reuse settings and temporary tables in subsequent requests. /// Named sessions. The user could specify session identifier to reuse settings and temporary tables in subsequent requests.
class SessionKeyHash class SessionKeyHash
@ -302,11 +301,6 @@ struct ContextShared
ext::Singleton<TraceCollector>()->stop(); ext::Singleton<TraceCollector>()->stop();
} }
bool hasTraceCollector()
{
return trace_collector != nullptr;
}
void initializeTraceCollector(std::shared_ptr<TraceLog> trace_log) void initializeTraceCollector(std::shared_ptr<TraceLog> trace_log)
{ {
if (trace_log == nullptr) if (trace_log == nullptr)
@ -1701,11 +1695,6 @@ void Context::initializeSystemLogs()
shared->system_logs.emplace(*global_context, getConfigRef()); shared->system_logs.emplace(*global_context, getConfigRef());
} }
bool Context::hasTraceCollector()
{
return shared->hasTraceCollector();
}
void Context::initializeTraceCollector() void Context::initializeTraceCollector()
{ {
shared->initializeTraceCollector(getTraceLog()); shared->initializeTraceCollector(getTraceLog());

2
dbms/src/Interpreters/ThreadStatusExt.cpp
View File

@ -155,7 +155,7 @@ void ThreadStatus::finalizePerformanceCounters()
void ThreadStatus::initQueryProfiler() void ThreadStatus::initQueryProfiler()
{ {
/// query profilers are useless without trace collector /// query profilers are useless without trace collector
if (!global_context || !global_context->hasTraceCollector()) if (!global_context)
return; return;
const auto & settings = query_context->getSettingsRef(); const auto & settings = query_context->getSettingsRef();