thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-25 00:52:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix distinct.

Browse Source
This commit is contained in:
Nikolai Kochetov 2019-05-14 16:13:12 +03:00
parent a43f789338
commit cc09bb5557
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dbms/src/Processors/QueryPipeline.cpp
View File

@ -255,7 +255,7 @@ void QueryPipeline::resize(size_t num_streams)
if (num_streams == getNumStreams())
return;
has_mixed_streams = true;
has_resize = true;
auto resize = std::make_shared<ResizeProcessor>(current_header, getNumStreams(), num_streams);
auto stream = streams.begin();

4
dbms/src/Processors/QueryPipeline.h
View File

@ -56,7 +56,7 @@ public:
void addDelayedStream(ProcessorPtr source);
bool hasDelayedStream() const { return delayed_stream_port; }
/// Check if resize transform was used. (In that case another distinct transform will be added).
bool hasMixedStreams() const { return has_mixed_streams; }
bool hasMixedStreams() const { return has_resize || hasMoreThanOneStream(); }
void resize(size_t num_streams);
@ -97,7 +97,7 @@ private:
OutputPort * delayed_stream_port = nullptr;
/// If resize processor was added to pipeline.
bool has_mixed_streams = false;
bool has_resize = false;
/// Common header for each stream.
Block current_header;