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

Merge pull request #31400 from ClickHouse/remove-thread-local-std-string

Browse Source 
Remove thread_local std::string
This commit is contained in:
alexey-milovidov 2021-11-17 10:29:34 +03:00 committed by GitHub
commit 2a5c70c5f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/Common/setThreadName.cpp
View File

@ -12,6 +12,8 @@
#include <Common/Exception.h> #include <Common/Exception.h>
#include <Common/setThreadName.h> #include <Common/setThreadName.h>
#define THREAD_NAME_SIZE 16
namespace DB namespace DB
{ {
@ -23,13 +25,13 @@ namespace ErrorCodes
/// Cache thread_name to avoid prctl(PR_GET_NAME) for query_log/text_log /// Cache thread_name to avoid prctl(PR_GET_NAME) for query_log/text_log
static thread_local std::string thread_name; static thread_local char thread_name[THREAD_NAME_SIZE]{};
void setThreadName(const char * name) void setThreadName(const char * name)
{ {
#ifndef NDEBUG #ifndef NDEBUG
if (strlen(name) > 15) if (strlen(name) > THREAD_NAME_SIZE - 1)
throw DB::Exception("Thread name cannot be longer than 15 bytes", DB::ErrorCodes::PTHREAD_ERROR); throw DB::Exception("Thread name cannot be longer than 15 bytes", DB::ErrorCodes::PTHREAD_ERROR);
#endif #endif
@ -45,28 +47,25 @@ void setThreadName(const char * name)
#endif #endif
DB::throwFromErrno("Cannot set thread name with prctl(PR_SET_NAME, ...)", DB::ErrorCodes::PTHREAD_ERROR); DB::throwFromErrno("Cannot set thread name with prctl(PR_SET_NAME, ...)", DB::ErrorCodes::PTHREAD_ERROR);
thread_name = name; memcpy(thread_name, name, 1 + strlen(name));
} }
const std::string & getThreadName() const char * getThreadName()
{ {
if (!thread_name.empty()) if (thread_name[0])
return thread_name; return thread_name;
thread_name.resize(16);
#if defined(__APPLE__) || defined(OS_SUNOS) #if defined(__APPLE__) || defined(OS_SUNOS)
if (pthread_getname_np(pthread_self(), thread_name.data(), thread_name.size())) if (pthread_getname_np(pthread_self(), thread_name, THREAD_NAME_SIZE))
throw DB::Exception("Cannot get thread name with pthread_getname_np()", DB::ErrorCodes::PTHREAD_ERROR); throw DB::Exception("Cannot get thread name with pthread_getname_np()", DB::ErrorCodes::PTHREAD_ERROR);
#elif defined(__FreeBSD__) #elif defined(__FreeBSD__)
// TODO: make test. freebsd will have this function soon https://freshbsd.org/commit/freebsd/r337983 // TODO: make test. freebsd will have this function soon https://freshbsd.org/commit/freebsd/r337983
// if (pthread_get_name_np(pthread_self(), thread_name.data(), thread_name.size())) // if (pthread_get_name_np(pthread_self(), thread_name, THREAD_NAME_SIZE))
// throw DB::Exception("Cannot get thread name with pthread_get_name_np()", DB::ErrorCodes::PTHREAD_ERROR); // throw DB::Exception("Cannot get thread name with pthread_get_name_np()", DB::ErrorCodes::PTHREAD_ERROR);
#else #else
if (0 != prctl(PR_GET_NAME, thread_name.data(), 0, 0, 0)) if (0 != prctl(PR_GET_NAME, thread_name, 0, 0, 0))
DB::throwFromErrno("Cannot get thread name with prctl(PR_GET_NAME)", DB::ErrorCodes::PTHREAD_ERROR); DB::throwFromErrno("Cannot get thread name with prctl(PR_GET_NAME)", DB::ErrorCodes::PTHREAD_ERROR);
#endif #endif
thread_name.resize(std::strlen(thread_name.data()));
return thread_name; return thread_name;
} }

2
src/Common/setThreadName.h
View File

@ -7,4 +7,4 @@
*/ */
void setThreadName(const char * name); void setThreadName(const char * name);
const std::string & getThreadName(); const char * getThreadName();

43
src/Databases/MySQL/MaterializedMySQLSyncThread.cpp
View File

@ -3,26 +3,27 @@
#if USE_MYSQL #if USE_MYSQL
#include <Databases/MySQL/MaterializedMySQLSyncThread.h> #include <Databases/MySQL/MaterializedMySQLSyncThread.h>
# include <cstdlib> #include <cstdlib>
# include <random> #include <random>
# include <Columns/ColumnTuple.h> #include <string_view>
# include <Columns/ColumnDecimal.h> #include <Columns/ColumnTuple.h>
# include <QueryPipeline/QueryPipelineBuilder.h> #include <Columns/ColumnDecimal.h>
# include <Processors/Executors/PullingPipelineExecutor.h> #include <QueryPipeline/QueryPipelineBuilder.h>
# include <Processors/Executors/CompletedPipelineExecutor.h> #include <Processors/Executors/PullingPipelineExecutor.h>
# include <Processors/Sources/SourceFromSingleChunk.h> #include <Processors/Executors/CompletedPipelineExecutor.h>
# include <Processors/Transforms/CountingTransform.h> #include <Processors/Sources/SourceFromSingleChunk.h>
# include <Databases/MySQL/DatabaseMaterializedMySQL.h> #include <Processors/Transforms/CountingTransform.h>
# include <Databases/MySQL/MaterializeMetadata.h> #include <Databases/MySQL/DatabaseMaterializedMySQL.h>
# include <Processors/Sources/MySQLSource.h> #include <Databases/MySQL/MaterializeMetadata.h>
# include <IO/ReadBufferFromString.h> #include <Processors/Sources/MySQLSource.h>
# include <Interpreters/Context.h> #include <IO/ReadBufferFromString.h>
# include <Interpreters/executeQuery.h> #include <Interpreters/Context.h>
# include <Storages/StorageMergeTree.h> #include <Interpreters/executeQuery.h>
# include <Common/quoteString.h> #include <Storages/StorageMergeTree.h>
# include <Common/setThreadName.h> #include <Common/quoteString.h>
# include <base/sleep.h> #include <Common/setThreadName.h>
# include <base/bit_cast.h> #include <base/sleep.h>
#include <base/bit_cast.h>
namespace DB namespace DB
{ {
@ -765,7 +766,7 @@ void MaterializedMySQLSyncThread::executeDDLAtomic(const QueryEvent & query_even
bool MaterializedMySQLSyncThread::isMySQLSyncThread() bool MaterializedMySQLSyncThread::isMySQLSyncThread()
{ {
return getThreadName() == MYSQL_BACKGROUND_THREAD_NAME; return getThreadName() == std::string_view(MYSQL_BACKGROUND_THREAD_NAME);
} }
void MaterializedMySQLSyncThread::setSynchronizationThreadException(const std::exception_ptr & exception) void MaterializedMySQLSyncThread::setSynchronizationThreadException(const std::exception_ptr & exception)