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

Fix AggregatingTransform.

Browse Source
This commit is contained in:
Nikolai Kochetov 2019-04-10 17:52:08 +03:00
parent c4c98c3a99
commit 3d1be12b79
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dbms/src/Processors/Transforms/AggregatingTransform.cpp
View File

@ -61,8 +61,8 @@ namespace
class SourceFromInputStream : public ISource
{
public:
SourceFromInputStream(Block header, BlockInputStreamPtr stream)
: ISource(std::move(header)), stream(std::move(stream)) {}
SourceFromInputStream(Block header, AggregatingTransformParamsPtr params_, BlockInputStreamPtr stream)
: ISource(std::move(header)), params(std::move(params_)), stream(std::move(stream)) {}
String getName() const override { return "SourceFromInputStream"; }
@ -85,6 +85,8 @@ namespace
}
private:
/// Store params because aggregator must be destroyed after stream. Order is important.
AggregatingTransformParamsPtr params;
BlockInputStreamPtr stream;
};
}
@ -246,7 +248,7 @@ void AggregatingTransform::initGenerate()
if (!params->aggregator.hasTemporaryFiles())
{
auto stream = params->aggregator.mergeAndConvertToBlocks(many_data->variants, params->final, max_threads);
processors.emplace_back(std::make_shared<SourceFromInputStream>(stream->getHeader(), std::move(stream)));
processors.emplace_back(std::make_shared<SourceFromInputStream>(stream->getHeader(), params, std::move(stream)));
}
else
{