Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

*:fix a bunch of functions. #3805

Merged
merged 13 commits into from
Jan 17, 2022
Merged

*:fix a bunch of functions. #3805

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
c8e8aff
update.
ywqzzy Jan 5, 2022
36c5ef6
update.
ywqzzy Jan 5, 2022
a9fdf35
Update dbms/src/Functions/FunctionsConditional.h
ywqzzy Jan 5, 2022
8c34a9d
Update dbms/src/Functions/FunctionsComparison.h
ywqzzy Jan 5, 2022
635a53a
Update dbms/src/Functions/FunctionsConditional.h
ywqzzy Jan 5, 2022
16335f0
Update dbms/src/Functions/FunctionsDateTime.h
ywqzzy Jan 5, 2022
a24785f
Update dbms/src/Functions/FunctionsDateTime.h
ywqzzy Jan 5, 2022
df68ee8
Merge branch 'master' into clean_functionBinaryArithmetic
ywqzzy Jan 11, 2022
6e95cf8
Update dbms/src/Functions/FunctionsComparison.h
ywqzzy Jan 12, 2022
6492da6
Update dbms/src/Functions/FunctionsDateTime.h
ywqzzy Jan 12, 2022
730f9e8
update.
ywqzzy Jan 13, 2022
2ec0991
Merge branch 'clean_functionBinaryArithmetic' of https://github.com/y…
ywqzzy Jan 13, 2022
f6ac8fb
Merge branch 'master' into clean_functionBinaryArithmetic
ti-chi-bot Jan 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
156 changes: 77 additions & 79 deletions dbms/src/Functions/FunctionBinaryArithmetic.h
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 3 additions & 4 deletions dbms/src/Functions/FunctionUnaryArithmetic.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
#include <IO/WriteHelpers.h>
#include <Interpreters/ExpressionActions.h>
#include <common/intExp.h>
#include <fmt/core.h>

#include <boost/integer/common_factor.hpp>
#include <ext/range.h>
Expand Down Expand Up @@ -154,7 +155,6 @@ class FunctionUnaryArithmetic : public IFunction
DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
{
DataTypePtr result;

if (!(checkType<DataTypeUInt8>(arguments, result)
|| checkType<DataTypeUInt16>(arguments, result)
|| checkType<DataTypeUInt32>(arguments, result)
Expand All @@ -170,7 +170,7 @@ class FunctionUnaryArithmetic : public IFunction
|| checkType<DataTypeDecimal256>(arguments, result)
|| checkType<DataTypeFloat64>(arguments, result)))
throw Exception(
"Illegal type " + arguments[0]->getName() + " of argument of function " + getName(),
fmt::format("Illegal type {} of argument of function {}", arguments[0]->getName(), getName()),
ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);

return result;
Expand All @@ -193,8 +193,7 @@ class FunctionUnaryArithmetic : public IFunction
|| executeType<Float32>(block, arguments, result)
|| executeType<Float64>(block, arguments, result)))
throw Exception(
"Illegal column " + block.getByPosition(arguments[0]).column->getName()
+ " of argument of function " + getName(),
fmt::format("Illegal column {} of argument of function {}", block.getByPosition(arguments[0]).column->getName(), getName()),
ErrorCodes::ILLEGAL_COLUMN);
}

Expand Down
248 changes: 137 additions & 111 deletions dbms/src/Functions/FunctionsCoding.h
View file
Open in desktop

Large diffs are not rendered by default.

73 changes: 34 additions & 39 deletions dbms/src/Functions/FunctionsComparison.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
#include <Functions/IFunction.h>
#include <IO/ReadBufferFromMemory.h>
#include <IO/ReadHelpers.h>
#include <fmt/core.h>

#include <limits>
#include <type_traits>
Expand Down Expand Up @@ -953,9 +954,9 @@ class FunctionComparison : public IFunction
|| executeNumRightType<T0, Float64>(block, result, col_left, col_right_untyped))
return true;
else
throw Exception("Illegal column " + col_right_untyped->getName()
+ " of second argument of function " + getName(),
ErrorCodes::ILLEGAL_COLUMN);
throw Exception(
fmt::format("Illegal column {} of second argument of function {}", col_right_untyped->getName(), getName()),
ErrorCodes::ILLEGAL_COLUMN);
}
else if (auto col_left = checkAndGetColumnConst<ColumnVector<T0>>(col_left_untyped))
{
Expand All @@ -971,9 +972,9 @@ class FunctionComparison : public IFunction
|| executeNumConstRightType<T0, Float64>(block, result, col_left, col_right_untyped))
return true;
else
throw Exception("Illegal column " + col_right_untyped->getName()
+ " of second argument of function " + getName(),
ErrorCodes::ILLEGAL_COLUMN);
throw Exception(
fmt::format("Illegal column {} of second argument of function {}", col_right_untyped->getName(), getName()),
ErrorCodes::ILLEGAL_COLUMN);
}

return false;
Expand Down Expand Up @@ -1061,10 +1062,9 @@ class FunctionComparison : public IFunction
c1_fixed_string->getN(),
c_res->getData());
else
throw Exception("Illegal columns "
+ c0->getName() + " and " + c1->getName()
+ " of arguments of function " + getName(),
ErrorCodes::ILLEGAL_COLUMN);
throw Exception(
fmt::format("Illegal columns {} and {} of arguments of function {}", c0->getName(), c1->getName(), getName()),
ErrorCodes::ILLEGAL_COLUMN);

block.getByPosition(result).column = std::move(c_res);
return true;
Expand Down Expand Up @@ -1161,10 +1161,9 @@ class FunctionComparison : public IFunction
collator,
c_res->getData());
else
throw Exception("Illegal columns "
+ c0->getName() + " and " + c1->getName()
+ " of arguments of function " + getName(),
ErrorCodes::ILLEGAL_COLUMN);
throw Exception(
fmt::format("Illegal columns {} and {} of arguments of function {}", c0->getName(), c1->getName(), getName()),
ErrorCodes::ILLEGAL_COLUMN);

block.getByPosition(result).column = std::move(c_res);
return true;
Expand Down Expand Up @@ -1220,12 +1219,11 @@ class FunctionComparison : public IFunction
|| (is_enum8 = checkAndGetDataType<DataTypeEnum8>(number_type))
|| (is_enum16 = checkAndGetDataType<DataTypeEnum16>(number_type));

const auto column_string = checkAndGetColumnConst<ColumnString>(column_string_untyped);
const auto * column_string = checkAndGetColumnConst<ColumnString>(column_string_untyped);
if (!column_string || !legal_types)
throw Exception{
"Illegal columns " + col_left_untyped->getName() + " and " + col_right_untyped->getName()
+ " of arguments of function " + getName(),
ErrorCodes::ILLEGAL_COLUMN};
throw Exception(
fmt::format("Illegal columns {} and {} of arguments of function {}", col_left_untyped->getName(), col_right_untyped->getName(), getName()),
ErrorCodes::ILLEGAL_COLUMN);

StringRef string_value = column_string->getDataAt(0);

Expand All @@ -1235,7 +1233,7 @@ class FunctionComparison : public IFunction
ReadBufferFromMemory in(string_value.data, string_value.size);
readDateText(date, in);
if (!in.eof())
throw Exception("String is too long for Date: " + string_value.toString());
throw Exception(fmt::format("String is too long for Date: {}", string_value));

ColumnPtr parsed_const_date_holder = DataTypeDate().createColumnConst(block.rows(), UInt64(date));
const ColumnConst * parsed_const_date = static_cast<const ColumnConst *>(parsed_const_date_holder.get());
Expand All @@ -1255,7 +1253,7 @@ class FunctionComparison : public IFunction
ReadBufferFromMemory in(string_value.data, string_value.size);
readDateTimeText(date_time, in);
if (!in.eof())
throw Exception("String is too long for DateTime: " + string_value.toString());
throw Exception(fmt::format("String is too long for DateTime: {}", string_value));

ColumnPtr parsed_const_date_time_holder = DataTypeDateTime().createColumnConst(block.rows(), UInt64(date_time));
const ColumnConst * parsed_const_date_time = static_cast<const ColumnConst *>(parsed_const_date_time_holder.get());
Expand Down Expand Up @@ -1310,8 +1308,8 @@ class FunctionComparison : public IFunction
ColumnsWithTypeAndName x(tuple_size);
ColumnsWithTypeAndName y(tuple_size);

auto x_const = checkAndGetColumnConst<ColumnTuple>(c0.column.get());
auto y_const = checkAndGetColumnConst<ColumnTuple>(c1.column.get());
const auto * x_const = checkAndGetColumnConst<ColumnTuple>(c0.column.get());
const auto * y_const = checkAndGetColumnConst<ColumnTuple>(c1.column.get());

Columns x_columns;
Columns y_columns;
Expand Down Expand Up @@ -1546,8 +1544,7 @@ class FunctionComparison : public IFunction
bool left_is_fixed_string = false;
const DataTypeTuple * left_tuple = nullptr;

false
|| (left_is_date = checkAndGetDataType<DataTypeDate>(arguments[0].get()) || checkAndGetDataType<DataTypeMyDate>(arguments[0].get()))
(left_is_date = checkAndGetDataType<DataTypeDate>(arguments[0].get()) || checkAndGetDataType<DataTypeMyDate>(arguments[0].get()))
|| (left_is_date_time = checkAndGetDataType<DataTypeDateTime>(arguments[0].get()) || checkAndGetDataType<DataTypeMyDateTime>(arguments[0].get()))
|| (left_is_enum8 = checkAndGetDataType<DataTypeEnum8>(arguments[0].get()))
|| (left_is_enum16 = checkAndGetDataType<DataTypeEnum16>(arguments[0].get()))
Expand All @@ -1565,8 +1562,7 @@ class FunctionComparison : public IFunction
bool right_is_fixed_string = false;
const DataTypeTuple * right_tuple = nullptr;

false
|| (right_is_date = checkAndGetDataType<DataTypeDate>(arguments[1].get()) || checkAndGetDataType<DataTypeMyDate>(arguments[1].get()))
(right_is_date = checkAndGetDataType<DataTypeDate>(arguments[1].get()) || checkAndGetDataType<DataTypeMyDate>(arguments[1].get()))
|| (right_is_date_time = checkAndGetDataType<DataTypeDateTime>(arguments[1].get()) || checkAndGetDataType<DataTypeMyDateTime>(arguments[1].get()))
|| (right_is_enum8 = checkAndGetDataType<DataTypeEnum8>(arguments[1].get()))
|| (right_is_enum16 = checkAndGetDataType<DataTypeEnum16>(arguments[1].get()))
Expand All @@ -1589,10 +1585,9 @@ class FunctionComparison : public IFunction
|| (left_is_string && right_is_enum)
|| (left_tuple && right_tuple && left_tuple->getElements().size() == right_tuple->getElements().size())
|| (arguments[0]->equals(*arguments[1]))))
throw Exception("Illegal types of arguments (" + arguments[0]->getName() + ", " + arguments[1]->getName() + ")"
" of function "
+ getName(),
ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
throw Exception(
fmt::format("Illegal types of arguments ({}, {}) of function {}", arguments[0]->getName(), arguments[1]->getName(), getName()),
ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);

if (left_tuple && right_tuple)
{
Expand Down Expand Up @@ -1623,8 +1618,9 @@ class FunctionComparison : public IFunction
};

if (!callOnBasicTypes<true, true, true, false>(left_number, right_number, call))
throw Exception("Wrong call for " + getName() + " with " + col_left.type->getName() + " and " + col_right.type->getName(),
ErrorCodes::LOGICAL_ERROR);
throw Exception(
fmt::format("Wrong call for {} with {} and {}", getName(), col_left.type->getName(), col_right.type->getName()),
ErrorCodes::LOGICAL_ERROR);
}

void executeImpl(Block & block, const ColumnNumbers & arguments, size_t result) const override
Expand All @@ -1650,9 +1646,9 @@ class FunctionComparison : public IFunction
|| executeNumLeftType<Int64>(block, result, col_left_untyped, col_right_untyped)
|| executeNumLeftType<Float32>(block, result, col_left_untyped, col_right_untyped)
|| executeNumLeftType<Float64>(block, result, col_left_untyped, col_right_untyped)))
throw Exception("Illegal column " + col_left_untyped->getName()
+ " of first argument of function " + getName(),
ErrorCodes::ILLEGAL_COLUMN);
throw Exception(
fmt::format("Illegal column {} of first argument of function {}", col_left_untyped->getName(), getName()),
ErrorCodes::ILLEGAL_COLUMN);
}
else if (IsDecimalDataType(col_with_type_and_name_left.type) || IsDecimalDataType(col_with_type_and_name_right.type))
executeDecimal(block, result, col_with_type_and_name_left, col_with_type_and_name_right);
Expand Down Expand Up @@ -1686,9 +1682,8 @@ class FunctionStrcmp : public FunctionComparison<CmpOp, NameStrcmp>
bool success = executeString<ColumnInt8>(block, result, col_left_untyped, col_right_untyped);
if (!success)
{
throw Exception("Function " + getName() + " executed on invalid arguments "
+ "[col_left=" + col_left_untyped->getName() + "]"
+ "[col_right=" + col_right_untyped->getName() + "]");
throw Exception(
fmt::format("Function {} executed on invalid arguments [col_left={}] [col_right={}]", getName(), col_left_untyped->getName(), col_right_untyped->getName()));
}
}

Expand Down
Loading