From 2f7ab2bca4715b0c2f13547b5ee7a0e26b8f48df Mon Sep 17 00:00:00 2001 From: Nikolai Kochetov Date: Wed, 16 Sep 2020 19:30:48 +0300 Subject: [PATCH] Fix tests. --- src/Processors/QueryPipeline.cpp | 6 +++--- src/Processors/QueryPipeline.h | 4 +++- src/Processors/QueryPlan/CreatingSetsStep.cpp | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/Processors/QueryPipeline.cpp b/src/Processors/QueryPipeline.cpp index 7f7e2391bde..bef0c0a3047 100644 --- a/src/Processors/QueryPipeline.cpp +++ b/src/Processors/QueryPipeline.cpp @@ -263,15 +263,15 @@ QueryPipeline QueryPipeline::unitePipelines( } -void QueryPipeline::addCreatingSetsTransform() +void QueryPipeline::addCreatingSetsTransform(SubqueryForSet subquery_for_set, const SizeLimits & limits, const Context & context) { - pipeline.resize(1); + resize(1); auto transform = std::make_shared( pipeline.getHeader(), getOutputStream().header, std::move(subquery_for_set), - network_transfer_limits, + limits, context)); InputPort * totals_port = nullptr; diff --git a/src/Processors/QueryPipeline.h b/src/Processors/QueryPipeline.h index e2083ddae66..66947bc9fa5 100644 --- a/src/Processors/QueryPipeline.h +++ b/src/Processors/QueryPipeline.h @@ -26,6 +26,8 @@ class QueryPlan; struct SubqueryForSet; using SubqueriesForSets = std::unordered_map; +struct SizeLimits; + class QueryPipeline { public: @@ -89,7 +91,7 @@ public: /// Pipeline must have same header. void addDelayingPipeline(QueryPipeline pipeline); - void addCreatingSetsTransform(); + void addCreatingSetsTransform(SubqueryForSet subquery_for_set, const SizeLimits & limits, const Context & context); PipelineExecutorPtr execute(); diff --git a/src/Processors/QueryPlan/CreatingSetsStep.cpp b/src/Processors/QueryPlan/CreatingSetsStep.cpp index 6a7cfc5ced8..4de11d0791d 100644 --- a/src/Processors/QueryPlan/CreatingSetsStep.cpp +++ b/src/Processors/QueryPlan/CreatingSetsStep.cpp @@ -39,7 +39,7 @@ CreatingSetStep::CreatingSetStep( void CreatingSetStep::transformPipeline(QueryPipeline & pipeline) { - pipeline.addCreatingSetsTransform(); + pipeline.addCreatingSetsTransform(std::move(subquery_for_set), network_transfer_limits, context); } void CreatingSetStep::describeActions(FormatSettings & settings) const