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

[only test] #45558

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
+48 −52
Draft

[only test] #45558

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 9 additions & 3 deletions be/src/vec/exprs/vectorized_fn_call.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,11 @@ Status VectorizedFnCall::prepare(RuntimeState* state, const RowDescriptor& desc,
ColumnsWithTypeAndName argument_template;
argument_template.reserve(_children.size());
for (auto child : _children) {
argument_template.emplace_back(nullptr, child->data_type(), child->expr_name());
std::shared_ptr<ColumnPtrWrapper> const_col;
RETURN_IF_ERROR(child->open(state, context, FunctionContext::FRAGMENT_LOCAL));
RETURN_IF_ERROR(child->get_const_col(context, &const_col));
argument_template.emplace_back(const_col ? const_col->column_ptr : nullptr,
child->data_type(), child->expr_name());
}

_expr_name = fmt::format("VectorizedFnCall[{}](arguments={},return={})", _fn.name.function_name,
Expand Down Expand Up @@ -122,8 +126,10 @@ Status VectorizedFnCall::prepare(RuntimeState* state, const RowDescriptor& desc,
Status VectorizedFnCall::open(RuntimeState* state, VExprContext* context,
FunctionContext::FunctionStateScope scope) {
DCHECK(_prepare_finished);
for (auto& i : _children) {
RETURN_IF_ERROR(i->open(state, context, scope));
if (scope != FunctionContext::FRAGMENT_LOCAL) {
for (auto& i : _children) {
RETURN_IF_ERROR(i->open(state, context, scope));
}
}
RETURN_IF_ERROR(VExpr::init_function_context(state, context, scope, _function));
if (scope == FunctionContext::FRAGMENT_LOCAL) {
Expand Down
3 changes: 1 addition & 2 deletions be/src/vec/exprs/vexpr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -532,8 +532,7 @@ Status VExpr::get_const_col(VExprContext* context,
return Status::OK();
}

if (_constant_col != nullptr) {
DCHECK(column_wrapper != nullptr);
if (_constant_col != nullptr && column_wrapper != nullptr) {
*column_wrapper = _constant_col;
return Status::OK();
}
Expand Down
61 changes: 22 additions & 39 deletions be/src/vec/functions/function.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,45 +296,28 @@ DataTypePtr FunctionBuilderImpl::get_return_type(const ColumnsWithTypeAndName& a

bool FunctionBuilderImpl::is_date_or_datetime_or_decimal(
const DataTypePtr& return_type, const DataTypePtr& func_return_type) const {
return (is_date_or_datetime(return_type->is_nullable()
? ((DataTypeNullable*)return_type.get())->get_nested_type()
: return_type) &&
is_date_or_datetime(
func_return_type->is_nullable()
? ((DataTypeNullable*)func_return_type.get())->get_nested_type()
: func_return_type)) ||
(is_date_v2_or_datetime_v2(
return_type->is_nullable()
? ((DataTypeNullable*)return_type.get())->get_nested_type()
: return_type) &&
is_date_v2_or_datetime_v2(
func_return_type->is_nullable()
? ((DataTypeNullable*)func_return_type.get())->get_nested_type()
: func_return_type)) ||
// For some date functions such as str_to_date(string, string), return_type will
// be datetimev2 if users enable datev2 but get_return_type(arguments) will still
// return datetime. We need keep backward compatibility here.
(is_date_v2_or_datetime_v2(
return_type->is_nullable()
? ((DataTypeNullable*)return_type.get())->get_nested_type()
: return_type) &&
is_date_or_datetime(
func_return_type->is_nullable()
? ((DataTypeNullable*)func_return_type.get())->get_nested_type()
: func_return_type)) ||
(is_date_or_datetime(return_type->is_nullable()
? ((DataTypeNullable*)return_type.get())->get_nested_type()
: return_type) &&
is_date_v2_or_datetime_v2(
func_return_type->is_nullable()
? ((DataTypeNullable*)func_return_type.get())->get_nested_type()
: func_return_type)) ||
(is_decimal(return_type->is_nullable()
? ((DataTypeNullable*)return_type.get())->get_nested_type()
: return_type) &&
is_decimal(func_return_type->is_nullable()
? ((DataTypeNullable*)func_return_type.get())->get_nested_type()
: func_return_type));
auto expect_return_type = remove_nullable(return_type);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

等https://github.com/apache/doris/pull/45159合入再来改这块儿吧

auto real_return_type = remove_nullable(func_return_type);

auto check_date_and_datetime = [&]() -> bool {
return (is_date_or_datetime(expect_return_type) && is_date_or_datetime(real_return_type)) ||
(is_date_v2_or_datetime_v2(expect_return_type) &&
is_date_v2_or_datetime_v2(real_return_type));
};

// It is required that both types are either Decimal32, Decimal64, or Decimal128,
// and the scale must be the same. Due to differences between FE and BE code,
// no requirements are currently enforced for precision.

auto check_decimal = [&]() -> bool {
if (is_decimal(expect_return_type) && is_decimal(real_return_type)) {
return (expect_return_type->get_type_id() == real_return_type->get_type_id()) &&
(expect_return_type->get_scale() == real_return_type->get_scale());
}
return false;
};

return check_date_and_datetime() || check_decimal();
}

bool FunctionBuilderImpl::is_array_nested_type_date_or_datetime_or_decimal(
Expand Down
10 changes: 5 additions & 5 deletions be/src/vec/functions/function.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,11 +274,11 @@ class FunctionBuilderImpl : public IFunctionBuilder {
is_nothing(((DataTypeNullable*)func_return_type.get())->get_nested_type())) ||
is_date_or_datetime_or_decimal(return_type, func_return_type) ||
is_array_nested_type_date_or_datetime_or_decimal(return_type, func_return_type))) {
LOG_WARNING(
"function return type check failed, function_name={}, "
"expect_return_type={}, real_return_type={}, input_arguments={}",
get_name(), return_type->get_name(), func_return_type->get_name(),
get_types_string(arguments));
throw doris::Exception(ErrorCode::INVALID_ARGUMENT,
"function return type check failed, function_name={}, "
"expect_return_type={}, real_return_type={}, input_arguments={}",
get_name(), return_type->get_name(),
func_return_type->get_name(), get_types_string(arguments));
return nullptr;
}
return build_impl(arguments, return_type);
Expand Down
14 changes: 11 additions & 3 deletions be/src/vec/functions/round.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -692,15 +692,23 @@ class FunctionRounding : public IFunction {
}

/// Get result types by argument types. If the function does not apply to these arguments, throw an exception.
DataTypePtr get_return_type_impl(const DataTypes& arguments) const override {
DataTypePtr get_return_type_impl(const ColumnsWithTypeAndName& arguments) const override {
if ((arguments.empty()) || (arguments.size() > 2)) {
throw doris::Exception(
ErrorCode::INVALID_ARGUMENT,
"Number of arguments for function {}, doesn't match: should be 1 or 2. ",
get_name());
}

return arguments[0];
// Keep consistent with FE's roundRule.
if (arguments.size() == 1 ||
!WhichDataType {arguments[0].type->get_type_id()}.is_decimal()) {
return arguments[0].type;
} else {
return vectorized::create_decimal(arguments[0].type->get_precision(),
std::min(arguments[1].column->get_int(0),
(Int64)arguments[0].type->get_scale()),
false);
}
}

static Status get_scale_arg(const ColumnWithTypeAndName& arguments, Int16* scale) {
Expand Down
Loading