From 30c800bb69b622d05a992979993ee945fe81f6ad Mon Sep 17 00:00:00 2001 From: Alexey Milovidov Date: Thu, 23 Apr 2015 00:26:12 +0300 Subject: [PATCH] dbms: fixed error [#METR-16053]. --- dbms/include/DB/DataStreams/UnionBlockInputStream.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dbms/include/DB/DataStreams/UnionBlockInputStream.h b/dbms/include/DB/DataStreams/UnionBlockInputStream.h index 60e163e13f..b2dc4c4ef7 100644 --- a/dbms/include/DB/DataStreams/UnionBlockInputStream.h +++ b/dbms/include/DB/DataStreams/UnionBlockInputStream.h @@ -28,8 +28,10 @@ using Poco::SharedPtr; class UnionBlockInputStream : public IProfilingBlockInputStream { public: - UnionBlockInputStream(BlockInputStreams inputs, unsigned max_threads) - : output_queue(max_threads), handler(*this), processor(inputs, max_threads, handler) + UnionBlockInputStream(BlockInputStreams inputs, size_t max_threads) : + output_queue(std::min(inputs.size(), max_threads)), + handler(*this), + processor(inputs, max_threads, handler) { children = inputs; } -- GitLab