From f301e60ef5690b34156ace73d0d3d1a0327ad050 Mon Sep 17 00:00:00 2001 From: Nikolai Kochetov Date: Tue, 26 Nov 2019 13:14:56 +0300 Subject: [PATCH] Fix InterpreterSelectWithUnionQuery::getCommonHeaderForUnion --- dbms/src/Columns/getLeastSuperColumn.cpp | 2 +- dbms/src/Columns/getLeastSuperColumn.h | 2 +- dbms/src/Interpreters/InterpreterSelectWithUnionQuery.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dbms/src/Columns/getLeastSuperColumn.cpp b/dbms/src/Columns/getLeastSuperColumn.cpp index 11c5b1b58f..663337b6f8 100644 --- a/dbms/src/Columns/getLeastSuperColumn.cpp +++ b/dbms/src/Columns/getLeastSuperColumn.cpp @@ -18,7 +18,7 @@ static bool sameConstants(const IColumn & a, const IColumn & b) return assert_cast(a).getField() == assert_cast(b).getField(); } -ColumnWithTypeAndName getLeastSuperColumn(std::vector columns) +ColumnWithTypeAndName getLeastSuperColumn(const std::vector & columns) { if (columns.empty()) throw Exception("Logical error: no src columns for supercolumn", ErrorCodes::LOGICAL_ERROR); diff --git a/dbms/src/Columns/getLeastSuperColumn.h b/dbms/src/Columns/getLeastSuperColumn.h index d761de29a9..cd8dc53a89 100644 --- a/dbms/src/Columns/getLeastSuperColumn.h +++ b/dbms/src/Columns/getLeastSuperColumn.h @@ -7,6 +7,6 @@ namespace DB { /// getLeastSupertype + related column changes -ColumnWithTypeAndName getLeastSuperColumn(std::vector columns); +ColumnWithTypeAndName getLeastSuperColumn(const std::vector & columns); } diff --git a/dbms/src/Interpreters/InterpreterSelectWithUnionQuery.cpp b/dbms/src/Interpreters/InterpreterSelectWithUnionQuery.cpp index 93916db4a1..2d7fde7287 100644 --- a/dbms/src/Interpreters/InterpreterSelectWithUnionQuery.cpp +++ b/dbms/src/Interpreters/InterpreterSelectWithUnionQuery.cpp @@ -126,7 +126,7 @@ Block InterpreterSelectWithUnionQuery::getCommonHeaderForUnion(const Blocks & he ErrorCodes::UNION_ALL_RESULT_STRUCTURES_MISMATCH); } - std::vector columns(num_columns); + std::vector columns(num_selects); for (size_t column_num = 0; column_num < num_columns; ++column_num) { -- GitLab