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

Merge branch 'master' into andrewgolman-add_topkweighed

Browse Source
This commit is contained in:
Alexey Milovidov 2019-02-11 00:15:35 +03:00
commit 47bffbf760
9 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dbms/programs/server/MetricsTransmitter.cpp
View File

@ -41,7 +41,7 @@ void MetricsTransmitter::run()
const auto & config = context.getConfigRef();
auto interval = config.getInt(config_name + ".interval", 60);
const std::string thread_name = "MericsTrns " + std::to_string(interval) + "s";
const std::string thread_name = "MericsTx" + std::to_string(interval) + "s";
setThreadName(thread_name.c_str());
const auto get_next_time = [](size_t seconds)

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

@ -1,4 +1,5 @@
#include "AsynchronousBlockInputStream.h"
#include <Common/setThreadName.h>
#include <Common/CurrentThread.h>

1
dbms/src/DataStreams/AsynchronousBlockInputStream.h
View File

@ -3,7 +3,6 @@
#include <Poco/Event.h>
#include <DataStreams/IBlockInputStream.h>
#include <Common/setThreadName.h>
#include <Common/CurrentMetrics.h>
#include <Common/ThreadPool.h>
#include <Common/MemoryTracker.h>

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

@ -90,7 +90,7 @@ void PushingToViewsBlockOutputStream::write(const Block & block)
auto thread_group = CurrentThread::getGroup();
pool.schedule([=]
{
setThreadName("PushingToViewsBlockOutputStream");
setThreadName("PushingToViews");
if (thread_group)
CurrentThread::attachToIfDetached(thread_group);
process(block, view_num);

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

@ -1867,7 +1867,7 @@ SessionCleaner::~SessionCleaner()
void SessionCleaner::run()
{
setThreadName("HTTPSessionCleaner");
setThreadName("SessionCleaner");
std::unique_lock lock{mutex};

1
dbms/src/Storages/MergeTree/ReplicatedMergeTreeCleanupThread.cpp
View File

@ -1,6 +1,5 @@
#include <Storages/MergeTree/ReplicatedMergeTreeCleanupThread.h>
#include <Storages/StorageReplicatedMergeTree.h>
#include <Common/setThreadName.h>
#include <Poco/Timestamp.h>
#include <random>

1
dbms/src/Storages/MergeTree/ReplicatedMergeTreePartCheckThread.cpp
View File

@ -2,7 +2,6 @@
#include <Storages/MergeTree/checkDataPart.h>
#include <Storages/MergeTree/ReplicatedMergeTreePartHeader.h>
#include <Storages/StorageReplicatedMergeTree.h>
#include <Common/setThreadName.h>
namespace ProfileEvents

1
dbms/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.cpp
View File

@ -3,7 +3,6 @@
#include <Storages/MergeTree/ReplicatedMergeTreeRestartingThread.h>
#include <Storages/MergeTree/ReplicatedMergeTreeQuorumEntry.h>
#include <Storages/MergeTree/ReplicatedMergeTreeAddress.h>
#include <Common/setThreadName.h>
#include <Common/ZooKeeper/KeeperException.h>
#include <Common/randomSeed.h>

1
dbms/src/Storages/StorageReplicatedMergeTree.cpp
View File

@ -38,7 +38,6 @@
#include <Common/Macros.h>
#include <Storages/VirtualColumnUtils.h>
#include <Common/formatReadable.h>
#include <Common/setThreadName.h>
#include <Common/escapeForFileName.h>
#include <Common/StringUtils/StringUtils.h>
#include <Common/typeid_cast.h>