mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-09-20 08:40:50 +00:00
Fixes for clang-tidy on clang-10
This commit is contained in:
parent
8fc59ef405
commit
c805ed4dea
@ -158,12 +158,12 @@ static std::string getExtraExceptionInfo(const std::exception & e)
|
|||||||
String msg;
|
String msg;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
if (auto file_exception = dynamic_cast<const Poco::FileException *>(&e))
|
if (auto * file_exception = dynamic_cast<const Poco::FileException *>(&e))
|
||||||
{
|
{
|
||||||
if (file_exception->code() == ENOSPC)
|
if (file_exception->code() == ENOSPC)
|
||||||
getNoSpaceLeftInfoMessage(file_exception->message(), msg);
|
getNoSpaceLeftInfoMessage(file_exception->message(), msg);
|
||||||
}
|
}
|
||||||
else if (auto errno_exception = dynamic_cast<const DB::ErrnoException *>(&e))
|
else if (auto * errno_exception = dynamic_cast<const DB::ErrnoException *>(&e))
|
||||||
{
|
{
|
||||||
if (errno_exception->getErrno() == ENOSPC && errno_exception->getPath())
|
if (errno_exception->getErrno() == ENOSPC && errno_exception->getPath())
|
||||||
getNoSpaceLeftInfoMessage(errno_exception->getPath().value(), msg);
|
getNoSpaceLeftInfoMessage(errno_exception->getPath().value(), msg);
|
||||||
@ -266,7 +266,7 @@ int getCurrentExceptionCode()
|
|||||||
|
|
||||||
void rethrowFirstException(const Exceptions & exceptions)
|
void rethrowFirstException(const Exceptions & exceptions)
|
||||||
{
|
{
|
||||||
for (auto & exception : exceptions)
|
for (const auto & exception : exceptions)
|
||||||
if (exception)
|
if (exception)
|
||||||
std::rethrow_exception(exception);
|
std::rethrow_exception(exception);
|
||||||
}
|
}
|
||||||
|
@ -127,7 +127,7 @@ void MemoryTracker::alloc(Int64 size)
|
|||||||
|
|
||||||
updatePeak(will_be);
|
updatePeak(will_be);
|
||||||
|
|
||||||
if (auto loaded_next = parent.load(std::memory_order_relaxed))
|
if (auto * loaded_next = parent.load(std::memory_order_relaxed))
|
||||||
loaded_next->alloc(size);
|
loaded_next->alloc(size);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -173,7 +173,7 @@ void MemoryTracker::free(Int64 size)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (auto loaded_next = parent.load(std::memory_order_relaxed))
|
if (auto * loaded_next = parent.load(std::memory_order_relaxed))
|
||||||
loaded_next->free(size);
|
loaded_next->free(size);
|
||||||
|
|
||||||
if (metric != CurrentMetrics::end())
|
if (metric != CurrentMetrics::end())
|
||||||
@ -227,7 +227,7 @@ namespace CurrentMemoryTracker
|
|||||||
{
|
{
|
||||||
void alloc(Int64 size)
|
void alloc(Int64 size)
|
||||||
{
|
{
|
||||||
if (auto memory_tracker = DB::CurrentThread::getMemoryTracker())
|
if (auto * memory_tracker = DB::CurrentThread::getMemoryTracker())
|
||||||
{
|
{
|
||||||
Int64 & untracked = DB::CurrentThread::getUntrackedMemory();
|
Int64 & untracked = DB::CurrentThread::getUntrackedMemory();
|
||||||
untracked += size;
|
untracked += size;
|
||||||
@ -250,7 +250,7 @@ namespace CurrentMemoryTracker
|
|||||||
|
|
||||||
void free(Int64 size)
|
void free(Int64 size)
|
||||||
{
|
{
|
||||||
if (auto memory_tracker = DB::CurrentThread::getMemoryTracker())
|
if (auto * memory_tracker = DB::CurrentThread::getMemoryTracker())
|
||||||
{
|
{
|
||||||
Int64 & untracked = DB::CurrentThread::getUntrackedMemory();
|
Int64 & untracked = DB::CurrentThread::getUntrackedMemory();
|
||||||
untracked -= size;
|
untracked -= size;
|
||||||
@ -265,7 +265,7 @@ namespace CurrentMemoryTracker
|
|||||||
|
|
||||||
DB::SimpleActionLock getCurrentMemoryTrackerActionLock()
|
DB::SimpleActionLock getCurrentMemoryTrackerActionLock()
|
||||||
{
|
{
|
||||||
auto memory_tracker = DB::CurrentThread::getMemoryTracker();
|
auto * memory_tracker = DB::CurrentThread::getMemoryTracker();
|
||||||
if (!memory_tracker)
|
if (!memory_tracker)
|
||||||
return {};
|
return {};
|
||||||
return memory_tracker->blocker.cancel();
|
return memory_tracker->blocker.cancel();
|
||||||
|
@ -165,7 +165,7 @@ void SensitiveDataMasker::addMaskingRule(
|
|||||||
size_t SensitiveDataMasker::wipeSensitiveData(std::string & data) const
|
size_t SensitiveDataMasker::wipeSensitiveData(std::string & data) const
|
||||||
{
|
{
|
||||||
size_t matches = 0;
|
size_t matches = 0;
|
||||||
for (auto & rule : all_masking_rules)
|
for (const auto & rule : all_masking_rules)
|
||||||
matches += rule->apply(data);
|
matches += rule->apply(data);
|
||||||
return matches;
|
return matches;
|
||||||
}
|
}
|
||||||
|
@ -35,7 +35,7 @@ void * SharedLibrary::getImpl(const std::string & name, bool no_throw)
|
|||||||
{
|
{
|
||||||
dlerror();
|
dlerror();
|
||||||
|
|
||||||
auto res = dlsym(handle, name.c_str());
|
auto * res = dlsym(handle, name.c_str());
|
||||||
|
|
||||||
if (char * error = dlerror())
|
if (char * error = dlerror())
|
||||||
{
|
{
|
||||||
|
@ -264,7 +264,7 @@ static void toStringEveryLineImpl(const StackTrace::Frames & frames, size_t offs
|
|||||||
for (size_t i = offset; i < size; ++i)
|
for (size_t i = offset; i < size; ++i)
|
||||||
{
|
{
|
||||||
const void * virtual_addr = frames[i];
|
const void * virtual_addr = frames[i];
|
||||||
auto object = symbol_index.findObject(virtual_addr);
|
auto * object = symbol_index.findObject(virtual_addr);
|
||||||
uintptr_t virtual_offset = object ? uintptr_t(object->address_begin) : 0;
|
uintptr_t virtual_offset = object ? uintptr_t(object->address_begin) : 0;
|
||||||
const void * physical_addr = reinterpret_cast<const void *>(uintptr_t(virtual_addr) - virtual_offset);
|
const void * physical_addr = reinterpret_cast<const void *>(uintptr_t(virtual_addr) - virtual_offset);
|
||||||
|
|
||||||
@ -282,7 +282,7 @@ static void toStringEveryLineImpl(const StackTrace::Frames & frames, size_t offs
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
auto symbol = symbol_index.findSymbol(virtual_addr);
|
auto * symbol = symbol_index.findSymbol(virtual_addr);
|
||||||
if (symbol)
|
if (symbol)
|
||||||
{
|
{
|
||||||
int status = 0;
|
int status = 0;
|
||||||
|
Loading…
Reference in New Issue
Block a user