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

Don't print exception twice in client in case of exception in parallel parsing

Browse Source
This commit is contained in:
avogar 2022-01-11 18:37:07 +03:00
parent 35cad3968f
commit 0ae0aa712b
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
programs/client/Client.cpp
View File

@ -1,23 +1,17 @@
#include <stdlib.h>
#include <fcntl.h>
#include <signal.h>
#include <map>
#include <iostream>
#include <fstream>
#include <iomanip>
#include <unordered_set>
#include <algorithm>
#include <optional>
#include <base/scope_guard_safe.h>
#include <boost/program_options.hpp>
#include <boost/algorithm/string/replace.hpp>
#include <Poco/String.h>
#include <filesystem>
#include <string>
#include "Client.h"
#include "Core/Protocol.h"
#include <base/argsToConfig.h>
#include <base/find_symbols.h>
#include <Common/config_version.h>

3
src/Formats/FormatFactory.cpp
View File

@ -191,7 +191,8 @@ InputFormatPtr FormatFactory::getInput(
ParallelParsingInputFormat::Params params{
buf, sample, parser_creator, file_segmentation_engine, name, settings.max_threads, settings.min_chunk_bytes_for_parallel_parsing};
buf, sample, parser_creator, file_segmentation_engine, name, settings.max_threads, settings.min_chunk_bytes_for_parallel_parsing,
context->getApplicationType() == Context::ApplicationType::SERVER};
return std::make_shared<ParallelParsingInputFormat>(params);
}

3
src/Processors/Formats/Impl/ParallelParsingInputFormat.cpp
View File

@ -137,7 +137,8 @@ void ParallelParsingInputFormat::onBackgroundException(size_t offset)
if (e->getLineNumber() != -1)
e->setLineNumber(e->getLineNumber() + offset);
}
tryLogCurrentException(__PRETTY_FUNCTION__);
if (is_server)
tryLogCurrentException(__PRETTY_FUNCTION__);
parsing_finished = true;
first_parser_finished.set();
reader_condvar.notify_all();

4
src/Processors/Formats/Impl/ParallelParsingInputFormat.h
View File

@ -82,6 +82,7 @@ public:
String format_name;
size_t max_threads;
size_t min_chunk_bytes;
bool is_server;
};
explicit ParallelParsingInputFormat(Params params)
@ -90,6 +91,7 @@ public:
, file_segmentation_engine(params.file_segmentation_engine)
, format_name(params.format_name)
, min_chunk_bytes(params.min_chunk_bytes)
, is_server(params.is_server)
, pool(params.max_threads)
{
// One unit for each thread, including segmentator and reader, plus a
@ -203,6 +205,8 @@ private:
std::atomic<bool> parsing_started{false};
std::atomic<bool> parsing_finished{false};
const bool is_server;
/// There are multiple "parsers", that's why we use thread pool.
ThreadPool pool;
/// Reading and segmentating the file