thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-12-19 04:42:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix unresolved conflicts

Browse Source
This commit is contained in:
Nikita Lapkov 2019-02-09 22:26:51 +00:00
parent b8d78807fe
commit 7c0339bc5e
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -274,7 +274,15 @@ struct ContextShared
databases.clear();
}
<<<<<<< HEAD
/// Preemptive destruction is important, because these objects may have a refcount to ContextShared (cyclic reference).
/// TODO: Get rid of this.
embedded_dictionaries.reset();
external_dictionaries.reset();
external_models.reset();
background_pool.reset();
schedule_pool.reset();
/// Close trace pipe - definitely nobody needs to write there after
/// databases shutdown
trace_pipe.close();
@ -288,16 +296,6 @@ struct ContextShared
trace_pipe.open();
trace_collector.reset(new TraceCollector(trace_log, trace_collector_stop.get_future()));
trace_collector_thread.start(*trace_collector);
=======
/// Preemptive destruction is important, because these objects may have a refcount to ContextShared (cyclic reference).
/// TODO: Get rid of this.
embedded_dictionaries.reset();
external_dictionaries.reset();
external_models.reset();
background_pool.reset();
schedule_pool.reset();
>>>>>>> parent/master
}
private:
@ -1623,10 +1621,10 @@ TraceLog * Context::getTraceLog()
{
auto lock = getLock();
if (!system_logs || !system_logs->trace_log)
if (!shared->system_logs || !shared->system_logs->trace_log)
return nullptr;
return system_logs->trace_log.get();
return shared->system_logs->trace_log.get();
}

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

@ -135,7 +135,7 @@ namespace {
void queryProfilerTimerHandler(int /* sig */, siginfo_t * /* info */, void * context) {
DB::WriteBufferFromFileDescriptor out(trace_pipe.fds_rw[1]);
const std::string & query_id = CurrentThread::getCurrentQueryID();
const std::string & query_id = CurrentThread::getQueryId();
DB::writePODBinary(*reinterpret_cast<const ucontext_t *>(context), out);
DB::writeStringBinary(query_id, out);