From b4c610a8e72dc41d2b5d2cc1626be1526e23513f Mon Sep 17 00:00:00 2001 From: Alexey Milovidov Date: Tue, 25 Jul 2017 01:41:35 +0300 Subject: [PATCH] Fixed errors [#CLICKHOUSE-2]. --- dbms/src/Functions/FunctionsNull.cpp | 2 +- dbms/src/Functions/IFunction.cpp | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dbms/src/Functions/FunctionsNull.cpp b/dbms/src/Functions/FunctionsNull.cpp index 7e35ba0e1b0..f10c5339567 100644 --- a/dbms/src/Functions/FunctionsNull.cpp +++ b/dbms/src/Functions/FunctionsNull.cpp @@ -96,7 +96,7 @@ void FunctionIsNotNull::executeImpl(Block & block, const ColumnNumbers & argumen }; FunctionIsNull{}.executeImpl(temp_block, {0}, 1); - FunctionNot{}.executeImpl(temp_block, {1}, 2); + FunctionNot{}.execute(temp_block, {1}, 2); block.getByPosition(result).column = std::move(temp_block.getByPosition(2).column); } diff --git a/dbms/src/Functions/IFunction.cpp b/dbms/src/Functions/IFunction.cpp index ccb1f68e05c..6fe66910cfe 100644 --- a/dbms/src/Functions/IFunction.cpp +++ b/dbms/src/Functions/IFunction.cpp @@ -163,10 +163,7 @@ bool defaultImplementationForConstantArguments( { const ColumnWithTypeAndName & column = block.getByPosition(args[arg_num]); - /// Don't materialize NULL constant column, because it is needed for subsequent defaultImplementationForNulls. - - if (column.column->isNull() - || arguments_to_remain_constants.end() != std::find(arguments_to_remain_constants.begin(), arguments_to_remain_constants.end(), arg_num)) + if (arguments_to_remain_constants.end() != std::find(arguments_to_remain_constants.begin(), arguments_to_remain_constants.end(), arg_num)) temporary_block.insert(column); else temporary_block.insert({ static_cast(column.column.get())->getDataColumnPtr(), column.type, column.name });