From 0faab7ff12192f3e764a2cc1a8603ff4ff9af9f6 Mon Sep 17 00:00:00 2001 From: Nikolai Kochetov Date: Tue, 30 Apr 2019 12:43:51 +0300 Subject: [PATCH] Disable pushing exceptions to ports from ISource. --- dbms/src/Processors/ISource.cpp | 14 +++++++------- dbms/src/Processors/ISource.h | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dbms/src/Processors/ISource.cpp b/dbms/src/Processors/ISource.cpp index 89231769dc7..53375f5b3c4 100644 --- a/dbms/src/Processors/ISource.cpp +++ b/dbms/src/Processors/ISource.cpp @@ -43,7 +43,7 @@ ISource::Status ISource::prepare() void ISource::work() { - try +/// try { current_chunk = generate(); if (!std::get(current_chunk)) @@ -51,12 +51,12 @@ void ISource::work() else has_input = true; } - catch (Exception &) - { - current_chunk = std::current_exception(); - has_input = true; - got_exception = true; - } +// catch (Exception &) +// { +// current_chunk = std::current_exception(); +// has_input = true; +// got_exception = true; +// } } } diff --git a/dbms/src/Processors/ISource.h b/dbms/src/Processors/ISource.h index b1669860192..5b05ae0b200 100644 --- a/dbms/src/Processors/ISource.h +++ b/dbms/src/Processors/ISource.h @@ -12,7 +12,7 @@ protected: OutputPort & output; bool has_input = false; bool finished = false; - bool got_exception = false; + [[maybe_unused]] bool got_exception = false; Port::Data current_chunk; virtual Chunk generate() = 0;