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

dbms: fix [#METR-19266]

Browse Source
This commit is contained in:
Alexey Arno 2016-08-15 15:42:12 +03:00
parent f4e77aaf97
commit e19cd2e464
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
dbms/src/Functions/IFunction.cpp
View File

@ -358,21 +358,27 @@ Block IFunction::createBlockWithNestedColumns(const Block & block, ColumnNumbers
for (size_t i = 0; i < block.columns(); ++i) for (size_t i = 0; i < block.columns(); ++i)
{ {
const auto & col = block.unsafeGetByPosition(i); const auto & col = block.unsafeGetByPosition(i);
bool is_inserted = false;
bool found = (i == args[j]); if (i == args[j])
//bool found = std::binary_search(args.begin(), args.end(), i);
if (found && col.column->isNullable())
{ {
auto nullable_col = static_cast<const ColumnNullable *>(col.column.get()); ++j;
ColumnPtr nested_col = nullable_col->getNestedColumn();
auto nullable_type = static_cast<const DataTypeNullable *>(col.type.get()); if (col.column->isNullable())
DataTypePtr nested_type = nullable_type->getNestedType(); {
auto nullable_col = static_cast<const ColumnNullable *>(col.column.get());
ColumnPtr nested_col = nullable_col->getNestedColumn();
res.insert(i, {nested_col, nested_type, col.name}); auto nullable_type = static_cast<const DataTypeNullable *>(col.type.get());
DataTypePtr nested_type = nullable_type->getNestedType();
res.insert(i, {nested_col, nested_type, col.name});
is_inserted = true;
}
} }
else
if (!is_inserted)
res.insert(i, col); res.insert(i, col);
} }