Skip to content

[C++][Compute] Normalize decimal value arguments in choose DispatchBest #78

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

Draft
zanmato1984 wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

[C++][Compute] Normalize decimal value arguments in choose DispatchBest #78

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
14 changes: 14 additions & 0 deletions cpp/src/arrow/compute/expression_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -938,6 +938,20 @@ TEST(Expression, BindWithImplicitCastsForCaseWhenOnDecimal) {
/*bound_out=*/nullptr, *exciting_schema);
}

TEST(Expression, BindWithImplicitCastsForChooseOnDecimal) {
auto schema = arrow::schema({field("indices", int64()),
field("dec128_3_2", decimal128(3, 2)),
field("dec128_4_3", decimal128(4, 3))});

ExpectBindsTo(
call("choose",
{field_ref("indices"), field_ref("dec128_3_2"), field_ref("dec128_4_3")}),
call("choose",
{field_ref("indices"), cast(field_ref("dec128_3_2"), decimal128(4, 3)),
field_ref("dec128_4_3")}),
/*bound_out=*/nullptr, *schema);
}

TEST(Expression, BindNestedCall) {
auto expr = add(field_ref("a"),
call("subtract", {call("multiply", {field_ref("b"), field_ref("c")}),
Expand Down
28 changes: 24 additions & 4 deletions cpp/src/arrow/compute/kernels/scalar_if_else.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2752,11 +2752,28 @@ struct ChooseFunction : ScalarFunction {
*it = type;
}
}
if (HasDecimal(*types)) {
RETURN_NOT_OK(CastDecimalArgs(types->data() + 1, types->size() - 1));
}
if (auto kernel = DispatchExactImpl(this, {types->front(), types->back()})) {
return kernel;
}
return arrow::compute::detail::NoMatchingKernel(this, *types);
}

static std::shared_ptr<MatchConstraint> DecimalMatchConstraint() {
static auto constraint =
MatchConstraint::Make([](const std::vector<TypeHolder>& types) -> bool {
DCHECK_GE(types.size(), 2);
DCHECK(std::all_of(types.begin() + 1, types.end(), [](const TypeHolder& type) {
return is_decimal(type.id());
}));
return std::all_of(
types.begin() + 2, types.end(),
[&types](const TypeHolder& type) { return type == types[1]; });
});
return constraint;
}
};

void AddCaseWhenKernel(const std::shared_ptr<CaseWhenFunction>& scalar_function,
Expand Down Expand Up @@ -2852,9 +2869,10 @@ void AddNestedCoalesceKernels(const std::shared_ptr<ScalarFunction>& scalar_func
}

void AddChooseKernel(const std::shared_ptr<ScalarFunction>& scalar_function,
detail::GetTypeId get_id, ArrayKernelExec exec) {
detail::GetTypeId get_id, ArrayKernelExec exec,
std::shared_ptr<MatchConstraint> constraint = nullptr) {
ScalarKernel kernel(KernelSignature::Make({Type::INT64, InputType(get_id.id)}, LastType,
/*is_varargs=*/true),
/*is_varargs=*/true, std::move(constraint)),
exec);
kernel.null_handling = NullHandling::COMPUTED_PREALLOCATE;
kernel.mem_allocation = MemAllocation::PREALLOCATE;
Expand Down Expand Up @@ -2975,8 +2993,10 @@ void RegisterScalarIfElse(FunctionRegistry* registry) {
AddPrimitiveChooseKernels(func, {boolean(), null(), float16()});
AddChooseKernel(func, Type::FIXED_SIZE_BINARY,
ChooseFunctor<FixedSizeBinaryType>::Exec);
AddChooseKernel(func, Type::DECIMAL128, ChooseFunctor<FixedSizeBinaryType>::Exec);
AddChooseKernel(func, Type::DECIMAL256, ChooseFunctor<FixedSizeBinaryType>::Exec);
AddChooseKernel(func, Type::DECIMAL128, ChooseFunctor<FixedSizeBinaryType>::Exec,
ChooseFunction::DecimalMatchConstraint());
AddChooseKernel(func, Type::DECIMAL256, ChooseFunctor<FixedSizeBinaryType>::Exec,
ChooseFunction::DecimalMatchConstraint());
for (const auto& ty : BaseBinaryTypes()) {
AddChooseKernel(func, ty, GenerateTypeAgnosticVarBinaryBase<ChooseFunctor>(ty));
}
Expand Down
2 changes: 2 additions & 0 deletions cpp/src/arrow/compute/kernels/scalar_if_else_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3899,6 +3899,8 @@ TEST(TestChooseKernel, DispatchBest) {
// Other arguments promoted separately from index
EXPECT_EQ((std::vector<TypeHolder>{int64(), int32(), int32()}),
Check({int8(), int32(), uint8()}));
EXPECT_EQ((std::vector<TypeHolder>{int64(), decimal128(4, 3), decimal128(4, 3)}),
Check({int8(), decimal128(3, 2), decimal128(4, 3)}));
}

TEST(TestChooseKernel, Errors) {
Expand Down
Loading