Rectification of FunctionsComparison [#CLICKHOUSE-2]

This commit is contained in:
Alexey Milovidov 2018-09-02 04:40:47 +03:00
parent f47c30c85b
commit 3a24e636db
6 changed files with 8 additions and 14 deletions

View File

@ -17,8 +17,7 @@ void FunctionComparison<EqualsOp, NameEquals>::executeTupleImpl(Block & block, s
const ColumnsWithTypeAndName & y, size_t tuple_size, const ColumnsWithTypeAndName & y, size_t tuple_size,
size_t input_rows_count) size_t input_rows_count)
{ {
return executeTupleEqualityImpl<FunctionComparison<EqualsOp, NameEquals>, FunctionAnd>(block, result, x, y, return executeTupleEqualityImpl<FunctionEquals, FunctionAnd>(block, result, x, y, tuple_size, input_rows_count);
tuple_size, input_rows_count);
} }
} }

View File

@ -17,9 +17,7 @@ void FunctionComparison<GreaterOp, NameGreater>::executeTupleImpl(Block & block,
const ColumnsWithTypeAndName & y, size_t tuple_size, const ColumnsWithTypeAndName & y, size_t tuple_size,
size_t input_rows_count) size_t input_rows_count)
{ {
return executeTupleLessGreaterImpl< return executeTupleLessGreaterImpl<FunctionGreater, FunctionGreater>(block, result, x, y, tuple_size, input_rows_count);
FunctionComparison<GreaterOp, NameGreater>,
FunctionComparison<GreaterOp, NameGreater>>(block, result, x, y, tuple_size, input_rows_count);
} }
} }

View File

@ -18,8 +18,8 @@ void FunctionComparison<GreaterOrEqualsOp, NameGreaterOrEquals>::executeTupleImp
size_t input_rows_count) size_t input_rows_count)
{ {
return executeTupleLessGreaterImpl< return executeTupleLessGreaterImpl<
FunctionComparison<GreaterOp, NameGreater>, FunctionComparison<GreaterOp, NameGreater>,
FunctionComparison<GreaterOrEqualsOp, NameGreaterOrEquals>>(block, result, x, y, tuple_size, input_rows_count); FunctionGreaterOrEquals>(block, result, x, y, tuple_size, input_rows_count);
} }
} }

View File

@ -17,9 +17,7 @@ void FunctionComparison<LessOp, NameLess>::executeTupleImpl(Block & block, size_
const ColumnsWithTypeAndName & y, size_t tuple_size, const ColumnsWithTypeAndName & y, size_t tuple_size,
size_t input_rows_count) size_t input_rows_count)
{ {
return executeTupleLessGreaterImpl< return executeTupleLessGreaterImpl<FunctionLess, FunctionLess>(block, result, x, y, tuple_size, input_rows_count);
FunctionComparison<LessOp, NameLess>,
FunctionComparison<LessOp, NameLess>>(block, result, x, y, tuple_size, input_rows_count);
} }
} }

View File

@ -18,8 +18,8 @@ void FunctionComparison<LessOrEqualsOp, NameLessOrEquals>::executeTupleImpl(Bloc
size_t input_rows_count) size_t input_rows_count)
{ {
return executeTupleLessGreaterImpl< return executeTupleLessGreaterImpl<
FunctionComparison<LessOp, NameLess>, FunctionComparison<LessOp, NameLess>,
FunctionComparison<LessOrEqualsOp, NameLessOrEquals>>(block, result, x, y, tuple_size, input_rows_count); FunctionLessOrEquals>(block, result, x, y, tuple_size, input_rows_count);
} }
} }

View File

@ -17,8 +17,7 @@ void FunctionComparison<NotEqualsOp, NameNotEquals>::executeTupleImpl(Block & bl
const ColumnsWithTypeAndName & y, size_t tuple_size, const ColumnsWithTypeAndName & y, size_t tuple_size,
size_t input_rows_count) size_t input_rows_count)
{ {
return executeTupleEqualityImpl<FunctionComparison<NotEqualsOp, NameNotEquals>, FunctionOr>(block, result, x, y, return executeTupleEqualityImpl<FunctionNotEquals, NameNotEquals>, FunctionOr>(block, result, x, y, tuple_size, input_rows_count);
tuple_size, input_rows_count);
} }
} }