Skip to content

ARROW-14099: [C++] add(duration, duration) -> duration kernel #12383

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
rok wants to merge 1 commit into from
Closed

ARROW-14099: [C++] add(duration, duration) -> duration kernel #12383

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
16 changes: 16 additions & 0 deletions cpp/src/arrow/compute/kernels/scalar_arithmetic.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1568,6 +1568,7 @@ ArrayKernelExec ArithmeticExecFromOp(detail::GetTypeId get_id) {
return KernelGenerator<Int32Type, Int32Type, Op>::Exec;
case Type::UINT32:
return KernelGenerator<UInt32Type, UInt32Type, Op>::Exec;
case Type::DURATION:
case Type::INT64:
case Type::TIMESTAMP:
return KernelGenerator<Int64Type, Int64Type, Op>::Exec;
Expand Down Expand Up @@ -2545,6 +2546,13 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
std::move(exec)));
}

// Add add(duration, duration) -> duration
for (auto unit : TimeUnit::values()) {
InputType in_type(match::DurationTypeUnit(unit));
auto exec = ArithmeticExecFromOp<ScalarBinaryEqualTypes, Add>(Type::DURATION);
DCHECK_OK(add->AddKernel({in_type, in_type}, duration(unit), std::move(exec)));
}

DCHECK_OK(registry->AddFunction(std::move(add)));

// ----------------------------------------------------------------------
Expand All @@ -2561,6 +2569,14 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
std::move(exec)));
}

// Add add(duration, duration) -> duration
for (auto unit : TimeUnit::values()) {
InputType in_type(match::DurationTypeUnit(unit));
auto exec = ArithmeticExecFromOp<ScalarBinaryEqualTypes, Add>(Type::DURATION);
DCHECK_OK(
add_checked->AddKernel({in_type, in_type}, duration(unit), std::move(exec)));
}

DCHECK_OK(registry->AddFunction(std::move(add_checked)));

// ----------------------------------------------------------------------
Expand Down
16 changes: 16 additions & 0 deletions cpp/src/arrow/compute/kernels/scalar_temporal_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1004,6 +1004,22 @@ TEST_F(ScalarTemporalTest, TestTemporalAddDateAndDuration) {
}
}

TEST_F(ScalarTemporalTest, TestTemporalAddDuration) {
for (auto op : {"add", "add_checked"}) {
for (auto u : TimeUnit::values()) {
auto unit = duration(u);
CheckScalarBinary(op, ArrayFromJSON(unit, times_s),
ArrayFromJSON(unit, seconds_between_time),
ArrayFromJSON(unit, times_s2));
}

auto seconds_1 = ArrayFromJSON(duration(TimeUnit::SECOND), R"([1, null])");
auto milliseconds_2k = ArrayFromJSON(duration(TimeUnit::MILLI), R"([2000, null])");
auto milliseconds_3k = ArrayFromJSON(duration(TimeUnit::MILLI), R"([3000, null])");
CheckScalarBinary(op, seconds_1, milliseconds_2k, milliseconds_3k);
}
}

TEST_F(ScalarTemporalTest, TestTemporalSubtractDateAndDuration) {
for (auto op : {"subtract", "subtract_checked"}) {
std::string milliseconds_between_time_and_date =
Expand Down