thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-30 05:30:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove accidental changes

Browse Source
This commit is contained in:
Alexander Kuzmenkov 2020-08-27 21:49:06 +03:00
parent 54b3047d19
commit 2bef406200
3 changed files with 2 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
base/daemon/BaseDaemon.cpp
View File

@ -153,7 +153,7 @@ static void signalHandler(int sig, siginfo_t * info, void * context)
if (sig != SIGTSTP) /// This signal is used for debugging.
{
/// The time that is usually enough for separate thread to print info into log.
sleepForSeconds(1);
sleepForSeconds(10);
call_default_signal_handler(sig);
}

1
src/Interpreters/ClientInfo.h
View File

@ -59,7 +59,6 @@ public:
String initial_query_id;
Poco::Net::SocketAddress initial_address;
__uint128_t trace_id;
UInt64 span_id;
UInt64 parent_span_id;

59
src/Storages/StorageFile.cpp
View File

@ -199,45 +199,6 @@ StorageFile::StorageFile(CommonArguments args)
setInMemoryMetadata(storage_metadata);
}
struct ScopedExceptionHint
{
std::string hint;
// Format message with fmt::format
template <typename ...Fmt>
ScopedExceptionHint(Fmt&&... fmt)
: hint(fmt::format(std::forward<Fmt>(fmt)...))
{
fprintf(stderr, "hint %s created\n", hint.c_str());
}
~ScopedExceptionHint()
{
fprintf(stderr, "hint %s is being destroyed\n", hint.c_str());
std::exception_ptr exception = std::current_exception();
if (exception)
{
try {
std::rethrow_exception(exception);
}
catch (Exception & e)
{
e.addMessage(hint);
fprintf(stderr, "added hint %s\n", hint.c_str());
}
catch (...)
{
fprintf(stderr, "unknown exception\n");
// pass?
}
}
else
{
fprintf(stderr, "no exception\n");
}
}
};
class StorageFileSource : public SourceWithProgress
{
public:
@ -356,28 +317,10 @@ public:
if (!column_defaults.empty())
reader = std::make_shared<AddingDefaultsBlockInputStream>(reader, column_defaults, context);
ScopedExceptionHint("Reading prefix of file '{}'", current_path);
reader->readPrefix();
}
ScopedExceptionHint("Reader->read() {}", reader->getName());
Block res;
try
{
res = reader->read();
}
catch (Exception & e)
{
e.addMessage("Error while reading from '{}'", current_path);
throw;
}
catch (...)
{
throw;
}
if (res)
if (auto res = reader->read())
{
Columns columns = res.getColumns();
UInt64 num_rows = res.rows();