Skip to content

ARROW-12975: [C++][Python] if_else kernel doesn't support upcasting #10472

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

Closed
nirandaperera wants to merge 5 commits into from
Closed

ARROW-12975: [C++][Python] if_else kernel doesn't support upcasting #10472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1ac7902
adding dispatch best
nirandaperera Jun 7, 2021
0743242
fixing errors
nirandaperera Jun 7, 2021
bb9a0a9
Update cpp/src/arrow/compute/kernels/scalar_if_else.cc
nirandaperera Jun 7, 2021
de2c6ed
Update cpp/src/arrow/compute/kernels/scalar_if_else.cc
nirandaperera Jun 7, 2021
cda32a7
allowing null type for 0th arg
nirandaperera Jun 7, 2021
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
35 changes: 33 additions & 2 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 @@ -543,7 +543,38 @@ struct ResolveIfElseExec {
}
};

void AddPrimitiveIfElseKernels(const std::shared_ptr<ScalarFunction>& scalar_function,
struct IfElseFunction : ScalarFunction {
using ScalarFunction::ScalarFunction;

Result<const Kernel*> DispatchBest(std::vector<ValueDescr>* values) const override {
RETURN_NOT_OK(CheckArity(*values));

using arrow::compute::detail::DispatchExactImpl;
if (auto kernel = DispatchExactImpl(this, *values)) return kernel;

// if 0th descriptor is null, replace with bool
if (values->at(0).type->id() == Type::NA) {
values->at(0).type = boolean();
}

// if-else 0'th descriptor is bool, so skip it
std::vector<ValueDescr> values_copy(values->begin() + 1, values->end());
internal::EnsureDictionaryDecoded(&values_copy);
internal::ReplaceNullWithOtherType(&values_copy);

if (auto type = internal::CommonNumeric(values_copy)) {
internal::ReplaceTypes(type, &values_copy);
}

std::move(values_copy.begin(), values_copy.end(), values->begin() + 1);

if (auto kernel = DispatchExactImpl(this, *values)) return kernel;

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

void AddPrimitiveIfElseKernels(const std::shared_ptr<IfElseFunction>& scalar_function,
const std::vector<std::shared_ptr<DataType>>& types) {
for (auto&& type : types) {
auto exec = internal::GenerateTypeAgnosticPrimitive<ResolveIfElseExec>(*type);
Expand Down Expand Up @@ -572,7 +603,7 @@ void RegisterScalarIfElse(FunctionRegistry* registry) {
scalar_kernel.null_handling = NullHandling::COMPUTED_NO_PREALLOCATE;
scalar_kernel.mem_allocation = MemAllocation::NO_PREALLOCATE;

auto func = std::make_shared<ScalarFunction>("if_else", Arity::Ternary(), &if_else_doc);
auto func = std::make_shared<IfElseFunction>("if_else", Arity::Ternary(), &if_else_doc);

AddPrimitiveIfElseKernels(func, NumericTypes());
AddPrimitiveIfElseKernels(func, TemporalTypes());
Expand Down
37 changes: 37 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 @@ -271,5 +271,42 @@ TEST_F(TestIfElseKernel, IfElseNull) {
ArrayFromJSON(null(), "[null, null, null, null]"));
}

TEST_F(TestIfElseKernel, IfElseMultiType) {
CheckWithDifferentShapes(ArrayFromJSON(boolean(), "[true, true, true, false]"),
ArrayFromJSON(int32(), "[1, 2, 3, 4]"),
ArrayFromJSON(float32(), "[5, 6, 7, 8]"),
ArrayFromJSON(float32(), "[1, 2, 3, 8]"));
}

TEST_F(TestIfElseKernel, IfElseDispatchBest) {
std::string name = "if_else";
CheckDispatchBest(name, {boolean(), int32(), int32()}, {boolean(), int32(), int32()});
CheckDispatchBest(name, {boolean(), int32(), null()}, {boolean(), int32(), int32()});
CheckDispatchBest(name, {boolean(), null(), int32()}, {boolean(), int32(), int32()});

CheckDispatchBest(name, {boolean(), int32(), int8()}, {boolean(), int32(), int32()});
CheckDispatchBest(name, {boolean(), int32(), int16()}, {boolean(), int32(), int32()});
CheckDispatchBest(name, {boolean(), int32(), int32()}, {boolean(), int32(), int32()});
CheckDispatchBest(name, {boolean(), int32(), int64()}, {boolean(), int64(), int64()});

CheckDispatchBest(name, {boolean(), int32(), uint8()}, {boolean(), int32(), int32()});
CheckDispatchBest(name, {boolean(), int32(), uint16()}, {boolean(), int32(), int32()});
CheckDispatchBest(name, {boolean(), int32(), uint32()}, {boolean(), int64(), int64()});
CheckDispatchBest(name, {boolean(), int32(), uint64()}, {boolean(), int64(), int64()});

CheckDispatchBest(name, {boolean(), uint8(), uint8()}, {boolean(), uint8(), uint8()});
CheckDispatchBest(name, {boolean(), uint8(), uint16()},
{boolean(), uint16(), uint16()});

CheckDispatchBest(name, {boolean(), int32(), float32()},
{boolean(), float32(), float32()});
CheckDispatchBest(name, {boolean(), float32(), int64()},
{boolean(), float32(), float32()});
CheckDispatchBest(name, {boolean(), float64(), int32()},
{boolean(), float64(), float64()});

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

} // namespace compute
} // namespace arrow