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

Fixed error [#CLICKHOUSE-2873].

Browse Source
This commit is contained in:
Alexey Milovidov 2017-03-07 23:11:39 +03:00
parent cfbf2ea94d
commit e20441eee6
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dbms/include/DB/Functions/FunctionsConditional.h
View File

@ -1344,7 +1344,7 @@ private:
else else
{ {
block.getByPosition(result).column = std::make_shared<ColumnNullable>( block.getByPosition(result).column = std::make_shared<ColumnNullable>(
result_column, static_cast<const ColumnNullable &>(*arg_cond.column).getNullMapColumn()); materializeColumnIfConst(result_column), static_cast<const ColumnNullable &>(*arg_cond.column).getNullMapColumn());
} }
return true; return true;
@ -1425,7 +1425,7 @@ private:
else if (cond_const_col) else if (cond_const_col)
{ {
block.safeGetByPosition(result).column = cond_const_col->getData() block.safeGetByPosition(result).column = cond_const_col->getData()
? block.safeGetByPosition(result).type->createColumn() ? block.safeGetByPosition(result).type->createColumn()->cloneResized(block.rows())
: makeNullableColumnIfNot(arg_else.column); : makeNullableColumnIfNot(arg_else.column);
} }
else else
@ -1457,7 +1457,7 @@ private:
{ {
block.safeGetByPosition(result).column = cond_const_col->getData() block.safeGetByPosition(result).column = cond_const_col->getData()
? makeNullableColumnIfNot(arg_then.column) ? makeNullableColumnIfNot(arg_then.column)
: block.safeGetByPosition(result).type->createColumn(); : block.safeGetByPosition(result).type->createColumn()->cloneResized(block.rows());
} }
else else
throw Exception("Illegal column " + cond_col->getName() + " of first argument of function " + getName() throw Exception("Illegal column " + cond_col->getName() + " of first argument of function " + getName()
@ -1543,7 +1543,8 @@ private:
result_nested_column = temporary_block.getByPosition(3).column; result_nested_column = temporary_block.getByPosition(3).column;
} }
block.getByPosition(result).column = std::make_shared<ColumnNullable>(result_nested_column, result_null_mask); block.getByPosition(result).column = std::make_shared<ColumnNullable>(
materializeColumnIfConst(result_nested_column), materializeColumnIfConst(result_null_mask));
return true; return true;
} }