Skip to content

[C++][Compute] Tighten if_else exact dispatch for parameterized value types #79

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] Tighten if_else exact dispatch for parameterized value types #79

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
22 changes: 22 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,28 @@ TEST(Expression, BindWithImplicitCastsForCaseWhenOnDecimal) {
/*bound_out=*/nullptr, *exciting_schema);
}

TEST(Expression, BindWithImplicitCastsForIfElseOnDecimal) {
auto exciting_schema = schema({field("cond", boolean()),
field("dec128_3_2", decimal128(3, 2)),
field("dec128_4_3", decimal128(4, 3)),
field("dec256_3_2", decimal256(3, 2))});

ExpectBindsTo(
call("if_else",
{field_ref("cond"), field_ref("dec128_3_2"), field_ref("dec128_4_3")}),
call("if_else",
{field_ref("cond"), cast(field_ref("dec128_3_2"), decimal128(4, 3)),
field_ref("dec128_4_3")}),
/*bound_out=*/nullptr, *exciting_schema);
ExpectBindsTo(
call("if_else",
{field_ref("cond"), field_ref("dec128_3_2"), field_ref("dec256_3_2")}),
call("if_else",
{field_ref("cond"), cast(field_ref("dec128_3_2"), decimal256(3, 2)),
field_ref("dec256_3_2")}),
/*bound_out=*/nullptr, *exciting_schema);
}

TEST(Expression, BindNestedCall) {
auto expr = add(field_ref("a"),
call("subtract", {call("multiply", {field_ref("b"), field_ref("c")}),
Expand Down
30 changes: 25 additions & 5 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 @@ -1285,6 +1285,15 @@ struct IfElseFunction : ScalarFunction {

return arrow::compute::detail::NoMatchingKernel(this, *types);
}

static std::shared_ptr<MatchConstraint> ValueTypesMatchConstraint() {
static auto constraint =
MatchConstraint::Make([](const std::vector<TypeHolder>& types) -> bool {
DCHECK_EQ(types.size(), 3);
return types[1] == types[2];
});
return constraint;
}
};

void AddNullIfElseKernel(const std::shared_ptr<IfElseFunction>& scalar_function) {
Expand Down Expand Up @@ -1314,6 +1323,8 @@ void AddPrimitiveIfElseKernels(const std::shared_ptr<ScalarFunction>& scalar_fun
} else {
sig = KernelSignature::Make({boolean(), type, type}, type);
}
sig = KernelSignature::Make(sig->in_types(), sig->out_type(), sig->is_varargs(),
IfElseFunction::ValueTypesMatchConstraint());
ScalarKernel kernel(std::move(sig), exec);
kernel.null_handling = NullHandling::COMPUTED_PREALLOCATE;
kernel.mem_allocation = MemAllocation::PREALLOCATE;
Expand All @@ -1331,7 +1342,10 @@ void AddBinaryIfElseKernels(const std::shared_ptr<IfElseFunction>& scalar_functi
/*AllocateMem=*/std::true_type>(
*type);
// cond array needs to be boolean always
ScalarKernel kernel({boolean(), type, type}, type, exec);
ScalarKernel kernel(
KernelSignature::Make({boolean(), type, type}, type, /*is_varargs=*/false,
IfElseFunction::ValueTypesMatchConstraint()),
exec);
kernel.null_handling = NullHandling::COMPUTED_NO_PREALLOCATE;
kernel.mem_allocation = MemAllocation::NO_PREALLOCATE;
kernel.can_write_into_slices = false;
Expand All @@ -1343,8 +1357,11 @@ void AddBinaryIfElseKernels(const std::shared_ptr<IfElseFunction>& scalar_functi
template <typename T>
void AddFixedWidthIfElseKernel(const std::shared_ptr<IfElseFunction>& scalar_function) {
auto type_id = T::type_id;
ScalarKernel kernel({boolean(), InputType(type_id), InputType(type_id)}, LastType,
ResolveIfElseExec<T, /*AllocateMem=*/std::false_type>::Exec);
ScalarKernel kernel(
KernelSignature::Make({boolean(), InputType(type_id), InputType(type_id)}, LastType,
/*is_varargs=*/false,
IfElseFunction::ValueTypesMatchConstraint()),
ResolveIfElseExec<T, /*AllocateMem=*/std::false_type>::Exec);
kernel.null_handling = NullHandling::COMPUTED_PREALLOCATE;
kernel.mem_allocation = MemAllocation::PREALLOCATE;
kernel.can_write_into_slices = true;
Expand All @@ -1357,8 +1374,11 @@ void AddNestedIfElseKernels(const std::shared_ptr<IfElseFunction>& scalar_functi
{Type::LIST, Type::LARGE_LIST, Type::LIST_VIEW, Type::LARGE_LIST_VIEW,
Type::FIXED_SIZE_LIST, Type::MAP, Type::STRUCT, Type::DENSE_UNION,
Type::SPARSE_UNION, Type::DICTIONARY}) {
ScalarKernel kernel({boolean(), InputType(type_id), InputType(type_id)}, LastType,
NestedIfElseExec::Exec);
ScalarKernel kernel(
KernelSignature::Make({boolean(), InputType(type_id), InputType(type_id)},
LastType, /*is_varargs=*/false,
IfElseFunction::ValueTypesMatchConstraint()),
NestedIfElseExec::Exec);
kernel.null_handling = NullHandling::COMPUTED_NO_PREALLOCATE;
kernel.mem_allocation = MemAllocation::NO_PREALLOCATE;
kernel.can_write_into_slices = false;
Expand Down
17 changes: 17 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 @@ -500,6 +500,8 @@ TEST_F(TestIfElseKernel, IfElseDispatchBest) {
{boolean(), float32(), float32()});
CheckDispatchBest(name, {boolean(), float64(), int32()},
{boolean(), float64(), float64()});
CheckDispatchBest(name, {boolean(), decimal128(3, 2), decimal128(4, 3)},
{boolean(), decimal128(4, 3), decimal128(4, 3)});

CheckDispatchBest(name, {null(), uint8(), int8()}, {boolean(), int16(), int16()});

Expand All @@ -517,6 +519,21 @@ TEST_F(TestIfElseKernel, IfElseDispatchBest) {
{boolean(), date32(), date32()});
}

TEST_F(TestIfElseKernel, IfElseDispatchExact) {
CheckDispatchExact("if_else", {boolean(), decimal128(3, 2), decimal128(3, 2)});
CheckDispatchExactFails("if_else",
{boolean(), decimal128(3, 2), decimal128(4, 3)});
CheckDispatchExactFails(
"if_else",
{boolean(), timestamp(TimeUnit::SECOND), timestamp(TimeUnit::SECOND, "UTC")});
CheckDispatchExactFails("if_else",
{boolean(), fixed_size_binary(3), fixed_size_binary(4)});
CheckDispatchExactFails("if_else", {boolean(), list(int32()), list(int64())});
CheckDispatchExactFails("if_else",
{boolean(), dictionary(int8(), int32()),
dictionary(int8(), int64())});
}

template <typename Type>
class TestIfElseBaseBinary : public ::testing::Test {};

Expand Down
Loading