diff --git a/src/Processors/Executors/PullingAsyncPipelineExecutor.cpp b/src/Processors/Executors/PullingAsyncPipelineExecutor.cpp index c975153d317..f1626414375 100644 --- a/src/Processors/Executors/PullingAsyncPipelineExecutor.cpp +++ b/src/Processors/Executors/PullingAsyncPipelineExecutor.cpp @@ -110,8 +110,7 @@ bool PullingAsyncPipelineExecutor::pull(Chunk & chunk, uint64_t milliseconds) data->thread = ThreadFromGlobalPool(std::move(func)); } - if (data->has_exception) - std::rethrow_exception(std::move(data->exception)); + data->rethrowExceptionIfHas(); bool is_execution_finished = lazy_format ? lazy_format->isFinished() : data->is_finished.load(); diff --git a/tests/queries/0_stateless/01752_distributed_query_sigsegv.reference b/tests/queries/0_stateless/01752_distributed_query_sigsegv.reference new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/queries/0_stateless/01752_distributed_query_sigsegv.sql b/tests/queries/0_stateless/01752_distributed_query_sigsegv.sql new file mode 100644 index 00000000000..a6936aec913 --- /dev/null +++ b/tests/queries/0_stateless/01752_distributed_query_sigsegv.sql @@ -0,0 +1,8 @@ +-- this is enough to trigger the regression +SELECT throwIf(dummy = 0) FROM remote('127.1', system.one); -- { serverError 395 } + +-- these are just in case +SELECT throwIf(dummy = 0) FROM remote('127.{1,2}', system.one); -- { serverError 395 } +SELECT throwIf(dummy = 0) FROM remote('127.{1,2}', system.one) SETTINGS prefer_localhost_replica=0; -- { serverError 395 } +SELECT throwIf(dummy = 0) FROM remote('127.{1,2}', system.one) SETTINGS prefer_localhost_replica=0, distributed_group_by_no_merge=1; -- { serverError 395 } +SELECT throwIf(dummy = 0) FROM remote('127.{1,2}', system.one) SETTINGS prefer_localhost_replica=0, distributed_group_by_no_merge=2; -- { serverError 395 }