thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-12-12 17:32:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix build

Browse Source
This commit is contained in:
Nikolai Kochetov 2018-03-19 22:01:11 +03:00
parent 1f51f57ac3
commit 10ea41f720
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dbms/src/Functions/FunctionsTuple.cpp
View File

@ -69,19 +69,19 @@ public:
void executeImpl(Block & block, const ColumnNumbers & arguments, size_t result) override
{
size_t tuple_size = arguments.size();
Columns tuple_columns(tuple_size);
MutableColumns tuple_columns(tuple_size);
for (size_t i = 0; i < tuple_size; ++i)
{
tuple_columns[i] = block.getByPosition(arguments[i]).column;
tuple_columns[i] = block.getByPosition(arguments[i]).column->assumeMutable();
/** If tuple is mixed of constant and not constant columns,
* convert all to non-constant columns,
* because many places in code expect all non-constant columns in non-constant tuple.
*/
if (ColumnPtr converted = tuple_columns[i]->convertToFullColumnIfConst())
tuple_columns[i] = converted;
if (MutableColumnPtr converted = tuple_columns[i]->convertToFullColumnIfConst())
tuple_columns[i] = std::move(converted);
}
block.getByPosition(result).column = ColumnTuple::create(tuple_columns);
block.getByPosition(result).column = ColumnTuple::create(std::move(tuple_columns));
}
};
@ -169,7 +169,7 @@ public:
/// Wrap into Arrays
for (auto it = array_offsets.rbegin(); it != array_offsets.rend(); ++it)
res = ColumnArray::create(res, *it);
res = ColumnArray::create(res->assumeMutable(), *it);
block.getByPosition(result).column = res;
}