thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-22 23:52:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Addition to prev. revision #4150

Browse Source
This commit is contained in:
Alexey Milovidov 2019-01-25 21:44:30 +03:00
parent 468f8b4cfb
commit 253ac93459
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dbms/src/Common/CurrentThread.cpp
View File

@ -71,6 +71,9 @@ std::shared_ptr<InternalTextLogsQueue> CurrentThread::getInternalTextLogsQueue()
ThreadGroupStatusPtr CurrentThread::getGroup()
{
if (!current_thread)
return nullptr;
return get().getThreadGroup();
}

2
dbms/src/DataStreams/AsynchronousBlockInputStream.cpp
View File

@ -35,7 +35,7 @@ void AsynchronousBlockInputStream::next()
{
ready.reset();
pool.schedule([this, thread_group=CurrentThread::getGroup()] ()
pool.schedule([this, thread_group = CurrentThread::getGroup()] ()
{
CurrentMetrics::Increment metric_increment{CurrentMetrics::QueryThread};

2
dbms/src/DataStreams/MergingAggregatedMemoryEfficientBlockInputStream.cpp
View File

@ -195,7 +195,7 @@ void MergingAggregatedMemoryEfficientBlockInputStream::start()
*/
for (size_t i = 0; i < merging_threads; ++i)
pool.schedule([this, thread_group=CurrentThread::getGroup()] () { mergeThread(thread_group); });
pool.schedule([this, thread_group = CurrentThread::getGroup()] () { mergeThread(thread_group); });
}
}

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

@ -37,7 +37,6 @@ String ThreadStatus::getQueryID()
void CurrentThread::defaultThreadDeleter()
{
ThreadStatus & thread = CurrentThread::get();
LOG_TRACE(thread.log, "Thread " << thread.thread_number << " exited");
thread.detachQuery(true, true);
}