thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-18 21:51:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix tests.

Browse Source
This commit is contained in:
Nikolai Kochetov 2020-09-16 17:41:01 +03:00
parent 8be45dd3cc
commit 8de76709fb
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Processors/QueryPlan/CreatingSetsStep.cpp
View File

@ -121,6 +121,9 @@ void addCreatingSetsStep(
for (auto & [description, set] : subqueries_for_sets) for (auto & [description, set] : subqueries_for_sets)
{ {
if (!set.source)
continue;
auto plan = std::move(set.source); auto plan = std::move(set.source);
std::string type = (set.join != nullptr) ? "JOIN" std::string type = (set.join != nullptr) ? "JOIN"
: "subquery"; : "subquery";
@ -139,6 +142,12 @@ void addCreatingSetsStep(
plans.emplace_back(std::move(plan)); plans.emplace_back(std::move(plan));
} }
if (plans.size() == 1)
{
query_plan = std::move(*plans.front());
return;
}
auto creating_sets = std::make_unique<CreatingSetsStep>(std::move(input_streams)); auto creating_sets = std::make_unique<CreatingSetsStep>(std::move(input_streams));
creating_sets->setStepDescription("Create sets before main query execution"); creating_sets->setStepDescription("Create sets before main query execution");
query_plan.unitePlans(std::move(creating_sets), std::move(plans)); query_plan.unitePlans(std::move(creating_sets), std::move(plans));