Skip to content

ARROW-14095: [C++] subtract(timestamp, duration) -> timestamp kernel #12137

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 3 commits into from
Closed

ARROW-14095: [C++] subtract(timestamp, duration) -> timestamp kernel #12137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
216f307
SubtractTimestampAndDuration
rok Jan 13, 2022
7d5d865
Add ReplaceTemporalTypes
rok Jan 19, 2022
2c3614e
Review feedback
rok Jan 28, 2022
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
74 changes: 74 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 @@ -1030,6 +1030,80 @@ TEST_F(ScalarTemporalTest, TestTemporalSubtractDateAndDurationChecked) {
CheckScalarBinary(op, dates64, durations_us, timestamps_us);
}

TEST_F(ScalarTemporalTest, TestTemporalSubtractTimestampAndDuration) {
std::string op = "subtract";
for (auto tz : {"", "UTC", "Pacific/Marquesas"}) {
auto timestamp_unit_s = timestamp(TimeUnit::SECOND, tz);
auto duration_unit_s = duration(TimeUnit::SECOND);
auto timestamp_unit_ms = timestamp(TimeUnit::MILLI, tz);
auto duration_unit_ms = duration(TimeUnit::MILLI);
auto timestamp_unit_us = timestamp(TimeUnit::MICRO, tz);
auto duration_unit_us = duration(TimeUnit::MICRO);
auto timestamp_unit_ns = timestamp(TimeUnit::NANO, tz);
auto duration_unit_ns = duration(TimeUnit::NANO);

CheckScalarBinary(op, ArrayFromJSON(timestamp_unit_s, times_seconds_precision2),
ArrayFromJSON(duration_unit_s, seconds_between),
ArrayFromJSON(timestamp_unit_s, times_seconds_precision));
CheckScalarBinary(op, ArrayFromJSON(timestamp_unit_ms, times_seconds_precision2),
ArrayFromJSON(duration_unit_ms, milliseconds_between),
ArrayFromJSON(timestamp_unit_ms, times_seconds_precision));
CheckScalarBinary(op, ArrayFromJSON(timestamp_unit_us, times_seconds_precision2),
ArrayFromJSON(duration_unit_us, microseconds_between),
ArrayFromJSON(timestamp_unit_us, times_seconds_precision));
CheckScalarBinary(op, ArrayFromJSON(timestamp_unit_ns, times_seconds_precision2),
ArrayFromJSON(duration_unit_ns, nanoseconds_between),
ArrayFromJSON(timestamp_unit_ns, times_seconds_precision));
}

auto seconds_3 = ArrayFromJSON(timestamp(TimeUnit::SECOND), R"([3, null])");
auto milliseconds_2k = ArrayFromJSON(duration(TimeUnit::MILLI), R"([2000, null])");
auto milliseconds_1k = ArrayFromJSON(timestamp(TimeUnit::MILLI), R"([1000, null])");
CheckScalarBinary(op, seconds_3, milliseconds_2k, milliseconds_1k);

auto seconds_3_tz = ArrayFromJSON(timestamp(TimeUnit::SECOND, "UTC"), R"([3, null])");
auto milliseconds_1k_tz =
ArrayFromJSON(timestamp(TimeUnit::MILLI, "UTC"), R"([1000, null])");
CheckScalarBinary(op, seconds_3_tz, milliseconds_2k, milliseconds_1k_tz);
}

TEST_F(ScalarTemporalTest, TestTemporalSubtractCheckedTimestampAndDuration) {
std::string op = "subtract_checked";
for (auto tz : {"", "UTC", "Pacific/Marquesas"}) {
auto timestamp_unit_s = timestamp(TimeUnit::SECOND, tz);
auto duration_unit_s = duration(TimeUnit::SECOND);
auto timestamp_unit_ms = timestamp(TimeUnit::MILLI, tz);
auto duration_unit_ms = duration(TimeUnit::MILLI);
auto timestamp_unit_us = timestamp(TimeUnit::MICRO, tz);
auto duration_unit_us = duration(TimeUnit::MICRO);
auto timestamp_unit_ns = timestamp(TimeUnit::NANO, tz);
auto duration_unit_ns = duration(TimeUnit::NANO);

CheckScalarBinary(op, ArrayFromJSON(timestamp_unit_s, times_seconds_precision2),
ArrayFromJSON(duration_unit_s, seconds_between),
ArrayFromJSON(timestamp_unit_s, times_seconds_precision));
CheckScalarBinary(op, ArrayFromJSON(timestamp_unit_ms, times_seconds_precision2),
ArrayFromJSON(duration_unit_ms, milliseconds_between),
ArrayFromJSON(timestamp_unit_ms, times_seconds_precision));
CheckScalarBinary(op, ArrayFromJSON(timestamp_unit_us, times_seconds_precision2),
ArrayFromJSON(duration_unit_us, microseconds_between),
ArrayFromJSON(timestamp_unit_us, times_seconds_precision));
CheckScalarBinary(op, ArrayFromJSON(timestamp_unit_ns, times_seconds_precision2),
ArrayFromJSON(duration_unit_ns, nanoseconds_between),
ArrayFromJSON(timestamp_unit_ns, times_seconds_precision));
}

auto seconds_3 = ArrayFromJSON(timestamp(TimeUnit::SECOND), R"([3, null])");
auto milliseconds_2k = ArrayFromJSON(duration(TimeUnit::MILLI), R"([2000, null])");
auto milliseconds_1k = ArrayFromJSON(timestamp(TimeUnit::MILLI), R"([1000, null])");
CheckScalarBinary(op, seconds_3, milliseconds_2k, milliseconds_1k);

auto seconds_3_tz = ArrayFromJSON(timestamp(TimeUnit::SECOND, "UTC"), R"([3, null])");
auto milliseconds_1k_tz =
ArrayFromJSON(timestamp(TimeUnit::MILLI, "UTC"), R"([1000, null])");
CheckScalarBinary(op, seconds_3_tz, milliseconds_2k, milliseconds_1k_tz);
}

TEST_F(ScalarTemporalTest, TestTemporalDifferenceWeeks) {
auto raw_days = ArrayFromJSON(timestamp(TimeUnit::SECOND), R"([
"2021-08-09", "2021-08-10", "2021-08-11", "2021-08-12", "2021-08-13", "2021-08-14", "2021-08-15",
Expand Down
4 changes: 2 additions & 2 deletions docs/source/cpp/compute.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,9 +450,9 @@ Mixed time resolution temporal inputs will be cast to finest input resolution.
+------------------+--------+----------------------------+----------------------------+-------+
| sign | Unary | Numeric | Int8/Float32/Float64 | \(2) |
+------------------+--------+----------------------------+----------------------------+-------+
| subtract | Binary | Numeric/Date/Duration | Numeric/Date/Duration | \(1) |
| subtract | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+----------------------------+----------------------------+-------+
| subtract_checked | Binary | Numeric/Date/Duration | Numeric/Date/Duration | \(1) |
| subtract_checked | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+----------------------------+----------------------------+-------+

* \(1) Precision and scale of computed DECIMAL results
Expand Down