ARROW-14100: [C++] subtract(duration, duration) -> duration kernel#12141

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-14100: [C++] subtract(duration, duration) -> duration kernel #12141

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
f38de69
Subtract duration
rok Jan 13, 2022
eaa5c63
Add ReplaceTemporalTypes
rok Jan 19, 2022
4f6675d
Review feedback
rok Feb 15, 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
16 changes: 16 additions & 0 deletions cpp/src/arrow/compute/kernels/scalar_arithmetic.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2660,6 +2660,13 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
std::move(exec)));
}

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

// Add subtract(time32, time32) -> duration
for (auto unit : {TimeUnit::SECOND, TimeUnit::MILLI}) {
InputType in_type(match::Time32TypeUnit(unit));
Expand DownExpand Up@@ -2714,6 +2721,15 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
OutputType(FirstType), std::move(exec)));
}

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

// Add subtract_checked(date32, date32) -> duration(TimeUnit::SECOND)
auto exec_date_32_checked =
ScalarBinaryEqualTypes<Int64Type, Date32Type, SubtractCheckedDate32>::Exec;
Expand Down
26 changes: 26 additions & 0 deletions cpp/src/arrow/compute/kernels/scalar_temporal_test.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1429,6 +1429,32 @@ TEST_F(ScalarTemporalTest, TestTemporalSubtractTimeAndDuration) {
}
}

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

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

for (auto unit : TimeUnit::values()) {
auto duration_ty = duration(unit);
auto arr1 = ArrayFromJSON(duration_ty, R"([-9223372036854775808, null])");
auto arr2 = ArrayFromJSON(duration_ty, R"([1, null])");
auto arr3 = ArrayFromJSON(duration_ty, R"([9223372036854775807, null])");

CheckScalarBinary("subtract", arr1, arr2, arr3);
EXPECT_RAISES_WITH_MESSAGE_THAT(Invalid, ::testing::HasSubstr("overflow"),
CallFunction("subtract_checked", {arr1, arr2}));
}
}

@pitroupitrouFeb 15, 2022

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add tests for overflowing inputs?

@rokrokFeb 16, 2022

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added. However it seems as it duration is not treated as int64_there and overflow is not detected?

@rokrokFeb 16, 2022

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Never mind. I was using the wrong operator.


@edponceedponceJan 18, 2022

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add tests with valid values.

@rokrokJan 18, 2022

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you mean like these?

I'd like to enable cases like subtract(duration[ms], duration[us]) -> duration[us]. I'll ping when it's done.

@rokrokJan 19, 2022

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, this now covers cases like subtract(duration[ms], duration[us]) -> duration[us].

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
66 changes: 33 additions & 33 deletions docs/source/cpp/compute.rst
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -423,39 +423,39 @@ floating-point arguments will cast all arguments to floating-point, while mixed
decimal and integer arguments will cast all arguments to decimals.
Mixed time resolution temporal inputs will be cast to finest input resolution.

+------------------+--------+----------------------------+----------------------------+-------+
| Function name | Arity | Input types | Output type | Notes |
+==================+========+============================+============================+=======+
| abs | Unary | Numeric | Numeric | |
+------------------+--------+----------------------------+----------------------------+-------+
| abs_checked | Unary | Numeric | Numeric | |
+------------------+--------+----------------------------+----------------------------+-------+
| add | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+----------------------------+----------------------------+-------+
| add_checked | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+----------------------------+----------------------------+-------+
| divide | Binary | Numeric | Numeric | \(1) |
+------------------+--------+----------------------------+----------------------------+-------+
| divide_checked | Binary | Numeric | Numeric | \(1) |
+------------------+--------+----------------------------+----------------------------+-------+
| multiply | Binary | Numeric | Numeric | \(1) |
+------------------+--------+----------------------------+----------------------------+-------+
| multiply_checked | Binary | Numeric | Numeric | \(1) |
+------------------+--------+----------------------------+----------------------------+-------+
| negate | Unary | Numeric | Numeric | |
+------------------+--------+----------------------------+----------------------------+-------+
| negate_checked | Unary | Signed Numeric | Signed Numeric | |
+------------------+--------+----------------------------+----------------------------+-------+
| power | Binary | Numeric | Numeric | |
+------------------+--------+----------------------------+----------------------------+-------+
| power_checked | Binary | Numeric | Numeric | |
+------------------+--------+----------------------------+----------------------------+-------+
| sign | Unary | Numeric | Int8/Float32/Float64 | \(2) |
+------------------+--------+----------------------------+----------------------------+-------+
| subtract | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+----------------------------+----------------------------+-------+
| subtract_checked | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+----------------------------+----------------------------+-------+
+------------------+--------+------------------+----------------------+-------+
| Function name | Arity | Input types | Output type | Notes |
+==================+========+==================+======================+=======+
| abs | Unary | Numeric | Numeric | |
+------------------+--------+------------------+----------------------+-------+
| abs_checked | Unary | Numeric | Numeric | |
+------------------+--------+------------------+----------------------+-------+
| add | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+------------------+----------------------+-------+
| add_checked | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+------------------+----------------------+-------+
| divide | Binary | Numeric | Numeric | \(1) |
+------------------+--------+------------------+----------------------+-------+
| divide_checked | Binary | Numeric | Numeric | \(1) |
+------------------+--------+------------------+----------------------+-------+
| multiply | Binary | Numeric | Numeric | \(1) |
+------------------+--------+------------------+----------------------+-------+
| multiply_checked | Binary | Numeric | Numeric | \(1) |
+------------------+--------+------------------+----------------------+-------+
| negate | Unary | Numeric | Numeric | |
+------------------+--------+------------------+----------------------+-------+
| negate_checked | Unary | Signed Numeric | Signed Numeric | |
+------------------+--------+------------------+----------------------+-------+
| power | Binary | Numeric | Numeric | |
+------------------+--------+------------------+----------------------+-------+
| power_checked | Binary | Numeric | Numeric | |
+------------------+--------+------------------+----------------------+-------+
| sign | Unary | Numeric | Int8/Float32/Float64 | \(2) |
+------------------+--------+------------------+----------------------+-------+
| subtract | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+------------------+----------------------+-------+
| subtract_checked | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+------------------+----------------------+-------+

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

Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
ARROW-14100: [C++] subtract(duration, duration) -> duration kernel#12141

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-14100: [C++] subtract(duration, duration) -> duration kernel
#12141
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
f38de69

Subtract duration


rok Jan 13, 2022
eaa5c63

Add ReplaceTemporalTypes


rok Jan 19, 2022
4f6675d

Review feedback


rok Feb 15, 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


16 changes: 16 additions & 0 deletions
cpp/src/arrow/compute/kernels/scalar_arithmetic.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2660,6 +2660,13 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
 std::move(exec)));
 }

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

 // Add subtract(time32, time32) -> duration
 for (auto unit : {TimeUnit::SECOND, TimeUnit::MILLI}) {
 InputType in_type(match::Time32TypeUnit(unit));
Expand DownExpand Up@@ -2714,6 +2721,15 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
 OutputType(FirstType), std::move(exec)));
 }

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

 // Add subtract_checked(date32, date32) -> duration(TimeUnit::SECOND)
 auto exec_date_32_checked =
 ScalarBinaryEqualTypes<Int64Type, Date32Type, SubtractCheckedDate32>::Exec;
Expand Down

26 changes: 26 additions & 0 deletions
cpp/src/arrow/compute/kernels/scalar_temporal_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1429,6 +1429,32 @@ TEST_F(ScalarTemporalTest, TestTemporalSubtractTimeAndDuration) {
 }
}

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

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

 for (auto unit : TimeUnit::values()) {
 auto duration_ty = duration(unit);
 auto arr1 = ArrayFromJSON(duration_ty, R"([-9223372036854775808, null])");
 auto arr2 = ArrayFromJSON(duration_ty, R"([1, null])");
 auto arr3 = ArrayFromJSON(duration_ty, R"([9223372036854775807, null])");

 CheckScalarBinary("subtract", arr1, arr2, arr3);
 EXPECT_RAISES_WITH_MESSAGE_THAT(Invalid, ::testing::HasSubstr("overflow"),
 CallFunction("subtract_checked", {arr1, arr2}));
 }
}
@pitroupitrouFeb 15, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add tests for overflowing inputs?
@rokrokFeb 16, 2022

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added. However it seems as it duration is not treated as int64_there and overflow is not detected?
@rokrokFeb 16, 2022

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Never mind. I was using the wrong operator.

@edponceedponceJan 18, 2022

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add tests with valid values.
@rokrokJan 18, 2022

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you mean like these?
I'd like to enable cases like subtract(duration[ms], duration[us]) -> duration[us]. I'll ping when it's done.
@rokrokJan 19, 2022

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, this now covers cases like subtract(duration[ms], duration[us]) -> duration[us].
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

66 changes: 33 additions & 33 deletions
docs/source/cpp/compute.rst

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -423,39 +423,39 @@ floating-point arguments will cast all arguments to floating-point, while mixed
decimal and integer arguments will cast all arguments to decimals.
Mixed time resolution temporal inputs will be cast to finest input resolution.

+------------------+--------+----------------------------+----------------------------+-------+
| Function name | Arity | Input types | Output type | Notes |
+==================+========+============================+============================+=======+
| abs | Unary | Numeric | Numeric | |
+------------------+--------+----------------------------+----------------------------+-------+
| abs_checked | Unary | Numeric | Numeric | |
+------------------+--------+----------------------------+----------------------------+-------+
| add | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+----------------------------+----------------------------+-------+
| add_checked | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+----------------------------+----------------------------+-------+
| divide | Binary | Numeric | Numeric | \(1) |
+------------------+--------+----------------------------+----------------------------+-------+
| divide_checked | Binary | Numeric | Numeric | \(1) |
+------------------+--------+----------------------------+----------------------------+-------+
| multiply | Binary | Numeric | Numeric | \(1) |
+------------------+--------+----------------------------+----------------------------+-------+
| multiply_checked | Binary | Numeric | Numeric | \(1) |
+------------------+--------+----------------------------+----------------------------+-------+
| negate | Unary | Numeric | Numeric | |
+------------------+--------+----------------------------+----------------------------+-------+
| negate_checked | Unary | Signed Numeric | Signed Numeric | |
+------------------+--------+----------------------------+----------------------------+-------+
| power | Binary | Numeric | Numeric | |
+------------------+--------+----------------------------+----------------------------+-------+
| power_checked | Binary | Numeric | Numeric | |
+------------------+--------+----------------------------+----------------------------+-------+
| sign | Unary | Numeric | Int8/Float32/Float64 | \(2) |
+------------------+--------+----------------------------+----------------------------+-------+
| subtract | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+----------------------------+----------------------------+-------+
| subtract_checked | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+----------------------------+----------------------------+-------+
+------------------+--------+------------------+----------------------+-------+
| Function name | Arity | Input types | Output type | Notes |
+==================+========+==================+======================+=======+
| abs | Unary | Numeric | Numeric | |
+------------------+--------+------------------+----------------------+-------+
| abs_checked | Unary | Numeric | Numeric | |
+------------------+--------+------------------+----------------------+-------+
| add | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+------------------+----------------------+-------+
| add_checked | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+------------------+----------------------+-------+
| divide | Binary | Numeric | Numeric | \(1) |
+------------------+--------+------------------+----------------------+-------+
| divide_checked | Binary | Numeric | Numeric | \(1) |
+------------------+--------+------------------+----------------------+-------+
| multiply | Binary | Numeric | Numeric | \(1) |
+------------------+--------+------------------+----------------------+-------+
| multiply_checked | Binary | Numeric | Numeric | \(1) |
+------------------+--------+------------------+----------------------+-------+
| negate | Unary | Numeric | Numeric | |
+------------------+--------+------------------+----------------------+-------+
| negate_checked | Unary | Signed Numeric | Signed Numeric | |
+------------------+--------+------------------+----------------------+-------+
| power | Binary | Numeric | Numeric | |
+------------------+--------+------------------+----------------------+-------+
| power_checked | Binary | Numeric | Numeric | |
+------------------+--------+------------------+----------------------+-------+
| sign | Unary | Numeric | Int8/Float32/Float64 | \(2) |
+------------------+--------+------------------+----------------------+-------+
| subtract | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+------------------+----------------------+-------+
| subtract_checked | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+------------------+----------------------+-------+

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

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ARROW-14100: [C++] subtract(duration, duration) -> duration kernel#12141

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-14100: [C++] subtract(duration, duration) -> duration kernel
#12141
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
f38de69

Subtract duration


rok Jan 13, 2022
eaa5c63

Add ReplaceTemporalTypes


rok Jan 19, 2022
4f6675d

Review feedback


rok Feb 15, 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


16 changes: 16 additions & 0 deletions
cpp/src/arrow/compute/kernels/scalar_arithmetic.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2660,6 +2660,13 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
 std::move(exec)));
 }

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

 // Add subtract(time32, time32) -> duration
 for (auto unit : {TimeUnit::SECOND, TimeUnit::MILLI}) {
 InputType in_type(match::Time32TypeUnit(unit));
Expand DownExpand Up@@ -2714,6 +2721,15 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
 OutputType(FirstType), std::move(exec)));
 }

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

 // Add subtract_checked(date32, date32) -> duration(TimeUnit::SECOND)
 auto exec_date_32_checked =
 ScalarBinaryEqualTypes<Int64Type, Date32Type, SubtractCheckedDate32>::Exec;
Expand Down

26 changes: 26 additions & 0 deletions
cpp/src/arrow/compute/kernels/scalar_temporal_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1429,6 +1429,32 @@ TEST_F(ScalarTemporalTest, TestTemporalSubtractTimeAndDuration) {
 }
}

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

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

 for (auto unit : TimeUnit::values()) {
 auto duration_ty = duration(unit);
 auto arr1 = ArrayFromJSON(duration_ty, R"([-9223372036854775808, null])");
 auto arr2 = ArrayFromJSON(duration_ty, R"([1, null])");
 auto arr3 = ArrayFromJSON(duration_ty, R"([9223372036854775807, null])");

 CheckScalarBinary("subtract", arr1, arr2, arr3);
 EXPECT_RAISES_WITH_MESSAGE_THAT(Invalid, ::testing::HasSubstr("overflow"),
 CallFunction("subtract_checked", {arr1, arr2}));
 }
}
@pitroupitrouFeb 15, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add tests for overflowing inputs?
@rokrokFeb 16, 2022

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added. However it seems as it duration is not treated as int64_there and overflow is not detected?
@rokrokFeb 16, 2022

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Never mind. I was using the wrong operator.

@edponceedponceJan 18, 2022

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add tests with valid values.
@rokrokJan 18, 2022

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you mean like these?
I'd like to enable cases like subtract(duration[ms], duration[us]) -> duration[us]. I'll ping when it's done.
@rokrokJan 19, 2022

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, this now covers cases like subtract(duration[ms], duration[us]) -> duration[us].
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

66 changes: 33 additions & 33 deletions
docs/source/cpp/compute.rst

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -423,39 +423,39 @@ floating-point arguments will cast all arguments to floating-point, while mixed
decimal and integer arguments will cast all arguments to decimals.
Mixed time resolution temporal inputs will be cast to finest input resolution.

+------------------+--------+----------------------------+----------------------------+-------+
| Function name | Arity | Input types | Output type | Notes |
+==================+========+============================+============================+=======+
| abs | Unary | Numeric | Numeric | |
+------------------+--------+----------------------------+----------------------------+-------+
| abs_checked | Unary | Numeric | Numeric | |
+------------------+--------+----------------------------+----------------------------+-------+
| add | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+----------------------------+----------------------------+-------+
| add_checked | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+----------------------------+----------------------------+-------+
| divide | Binary | Numeric | Numeric | \(1) |
+------------------+--------+----------------------------+----------------------------+-------+
| divide_checked | Binary | Numeric | Numeric | \(1) |
+------------------+--------+----------------------------+----------------------------+-------+
| multiply | Binary | Numeric | Numeric | \(1) |
+------------------+--------+----------------------------+----------------------------+-------+
| multiply_checked | Binary | Numeric | Numeric | \(1) |
+------------------+--------+----------------------------+----------------------------+-------+
| negate | Unary | Numeric | Numeric | |
+------------------+--------+----------------------------+----------------------------+-------+
| negate_checked | Unary | Signed Numeric | Signed Numeric | |
+------------------+--------+----------------------------+----------------------------+-------+
| power | Binary | Numeric | Numeric | |
+------------------+--------+----------------------------+----------------------------+-------+
| power_checked | Binary | Numeric | Numeric | |
+------------------+--------+----------------------------+----------------------------+-------+
| sign | Unary | Numeric | Int8/Float32/Float64 | \(2) |
+------------------+--------+----------------------------+----------------------------+-------+
| subtract | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+----------------------------+----------------------------+-------+
| subtract_checked | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+----------------------------+----------------------------+-------+
+------------------+--------+------------------+----------------------+-------+
| Function name | Arity | Input types | Output type | Notes |
+==================+========+==================+======================+=======+
| abs | Unary | Numeric | Numeric | |
+------------------+--------+------------------+----------------------+-------+
| abs_checked | Unary | Numeric | Numeric | |
+------------------+--------+------------------+----------------------+-------+
| add | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+------------------+----------------------+-------+
| add_checked | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+------------------+----------------------+-------+
| divide | Binary | Numeric | Numeric | \(1) |
+------------------+--------+------------------+----------------------+-------+
| divide_checked | Binary | Numeric | Numeric | \(1) |
+------------------+--------+------------------+----------------------+-------+
| multiply | Binary | Numeric | Numeric | \(1) |
+------------------+--------+------------------+----------------------+-------+
| multiply_checked | Binary | Numeric | Numeric | \(1) |
+------------------+--------+------------------+----------------------+-------+
| negate | Unary | Numeric | Numeric | |
+------------------+--------+------------------+----------------------+-------+
| negate_checked | Unary | Signed Numeric | Signed Numeric | |
+------------------+--------+------------------+----------------------+-------+
| power | Binary | Numeric | Numeric | |
+------------------+--------+------------------+----------------------+-------+
| power_checked | Binary | Numeric | Numeric | |
+------------------+--------+------------------+----------------------+-------+
| sign | Unary | Numeric | Int8/Float32/Float64 | \(2) |
+------------------+--------+------------------+----------------------+-------+
| subtract | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+------------------+----------------------+-------+
| subtract_checked | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+------------------+----------------------+-------+

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

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ARROW-14100: [C++] subtract(duration, duration) -> duration kernel#12141

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-14100: [C++] subtract(duration, duration) -> duration kernel
#12141
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
f38de69

Subtract duration


rok Jan 13, 2022
eaa5c63

Add ReplaceTemporalTypes


rok Jan 19, 2022
4f6675d

Review feedback


rok Feb 15, 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


16 changes: 16 additions & 0 deletions
cpp/src/arrow/compute/kernels/scalar_arithmetic.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2660,6 +2660,13 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
 std::move(exec)));
 }

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

 // Add subtract(time32, time32) -> duration
 for (auto unit : {TimeUnit::SECOND, TimeUnit::MILLI}) {
 InputType in_type(match::Time32TypeUnit(unit));
Expand DownExpand Up@@ -2714,6 +2721,15 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
 OutputType(FirstType), std::move(exec)));
 }

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

 // Add subtract_checked(date32, date32) -> duration(TimeUnit::SECOND)
 auto exec_date_32_checked =
 ScalarBinaryEqualTypes<Int64Type, Date32Type, SubtractCheckedDate32>::Exec;
Expand Down

26 changes: 26 additions & 0 deletions
cpp/src/arrow/compute/kernels/scalar_temporal_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1429,6 +1429,32 @@ TEST_F(ScalarTemporalTest, TestTemporalSubtractTimeAndDuration) {
 }
}

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

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

 for (auto unit : TimeUnit::values()) {
 auto duration_ty = duration(unit);
 auto arr1 = ArrayFromJSON(duration_ty, R"([-9223372036854775808, null])");
 auto arr2 = ArrayFromJSON(duration_ty, R"([1, null])");
 auto arr3 = ArrayFromJSON(duration_ty, R"([9223372036854775807, null])");

 CheckScalarBinary("subtract", arr1, arr2, arr3);
 EXPECT_RAISES_WITH_MESSAGE_THAT(Invalid, ::testing::HasSubstr("overflow"),
 CallFunction("subtract_checked", {arr1, arr2}));
 }
}
@pitroupitrouFeb 15, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add tests for overflowing inputs?
@rokrokFeb 16, 2022

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added. However it seems as it duration is not treated as int64_there and overflow is not detected?
@rokrokFeb 16, 2022

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Never mind. I was using the wrong operator.

@edponceedponceJan 18, 2022

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add tests with valid values.
@rokrokJan 18, 2022

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you mean like these?
I'd like to enable cases like subtract(duration[ms], duration[us]) -> duration[us]. I'll ping when it's done.
@rokrokJan 19, 2022

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, this now covers cases like subtract(duration[ms], duration[us]) -> duration[us].
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

66 changes: 33 additions & 33 deletions
docs/source/cpp/compute.rst

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -423,39 +423,39 @@ floating-point arguments will cast all arguments to floating-point, while mixed
decimal and integer arguments will cast all arguments to decimals.
Mixed time resolution temporal inputs will be cast to finest input resolution.

+------------------+--------+----------------------------+----------------------------+-------+
| Function name | Arity | Input types | Output type | Notes |
+==================+========+============================+============================+=======+
| abs | Unary | Numeric | Numeric | |
+------------------+--------+----------------------------+----------------------------+-------+
| abs_checked | Unary | Numeric | Numeric | |
+------------------+--------+----------------------------+----------------------------+-------+
| add | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+----------------------------+----------------------------+-------+
| add_checked | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+----------------------------+----------------------------+-------+
| divide | Binary | Numeric | Numeric | \(1) |
+------------------+--------+----------------------------+----------------------------+-------+
| divide_checked | Binary | Numeric | Numeric | \(1) |
+------------------+--------+----------------------------+----------------------------+-------+
| multiply | Binary | Numeric | Numeric | \(1) |
+------------------+--------+----------------------------+----------------------------+-------+
| multiply_checked | Binary | Numeric | Numeric | \(1) |
+------------------+--------+----------------------------+----------------------------+-------+
| negate | Unary | Numeric | Numeric | |
+------------------+--------+----------------------------+----------------------------+-------+
| negate_checked | Unary | Signed Numeric | Signed Numeric | |
+------------------+--------+----------------------------+----------------------------+-------+
| power | Binary | Numeric | Numeric | |
+------------------+--------+----------------------------+----------------------------+-------+
| power_checked | Binary | Numeric | Numeric | |
+------------------+--------+----------------------------+----------------------------+-------+
| sign | Unary | Numeric | Int8/Float32/Float64 | \(2) |
+------------------+--------+----------------------------+----------------------------+-------+
| subtract | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+----------------------------+----------------------------+-------+
| subtract_checked | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+----------------------------+----------------------------+-------+
+------------------+--------+------------------+----------------------+-------+
| Function name | Arity | Input types | Output type | Notes |
+==================+========+==================+======================+=======+
| abs | Unary | Numeric | Numeric | |
+------------------+--------+------------------+----------------------+-------+
| abs_checked | Unary | Numeric | Numeric | |
+------------------+--------+------------------+----------------------+-------+
| add | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+------------------+----------------------+-------+
| add_checked | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+------------------+----------------------+-------+
| divide | Binary | Numeric | Numeric | \(1) |
+------------------+--------+------------------+----------------------+-------+
| divide_checked | Binary | Numeric | Numeric | \(1) |
+------------------+--------+------------------+----------------------+-------+
| multiply | Binary | Numeric | Numeric | \(1) |
+------------------+--------+------------------+----------------------+-------+
| multiply_checked | Binary | Numeric | Numeric | \(1) |
+------------------+--------+------------------+----------------------+-------+
| negate | Unary | Numeric | Numeric | |
+------------------+--------+------------------+----------------------+-------+
| negate_checked | Unary | Signed Numeric | Signed Numeric | |
+------------------+--------+------------------+----------------------+-------+
| power | Binary | Numeric | Numeric | |
+------------------+--------+------------------+----------------------+-------+
| power_checked | Binary | Numeric | Numeric | |
+------------------+--------+------------------+----------------------+-------+
| sign | Unary | Numeric | Int8/Float32/Float64 | \(2) |
+------------------+--------+------------------+----------------------+-------+
| subtract | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+------------------+----------------------+-------+
| subtract_checked | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+------------------+----------------------+-------+

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

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
ARROW-14100: [C++] subtract(duration, duration) -> duration kernel#12141

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-14100: [C++] subtract(duration, duration) -> duration kernel
#12141
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
f38de69

Subtract duration


rok Jan 13, 2022
eaa5c63

Add ReplaceTemporalTypes


rok Jan 19, 2022
4f6675d

Review feedback


rok Feb 15, 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


16 changes: 16 additions & 0 deletions
cpp/src/arrow/compute/kernels/scalar_arithmetic.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2660,6 +2660,13 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
 std::move(exec)));
 }

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

 // Add subtract(time32, time32) -> duration
 for (auto unit : {TimeUnit::SECOND, TimeUnit::MILLI}) {
 InputType in_type(match::Time32TypeUnit(unit));
Expand DownExpand Up@@ -2714,6 +2721,15 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
 OutputType(FirstType), std::move(exec)));
 }

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

 // Add subtract_checked(date32, date32) -> duration(TimeUnit::SECOND)
 auto exec_date_32_checked =
 ScalarBinaryEqualTypes<Int64Type, Date32Type, SubtractCheckedDate32>::Exec;
Expand Down

26 changes: 26 additions & 0 deletions
cpp/src/arrow/compute/kernels/scalar_temporal_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1429,6 +1429,32 @@ TEST_F(ScalarTemporalTest, TestTemporalSubtractTimeAndDuration) {
 }
}

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

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

 for (auto unit : TimeUnit::values()) {
 auto duration_ty = duration(unit);
 auto arr1 = ArrayFromJSON(duration_ty, R"([-9223372036854775808, null])");
 auto arr2 = ArrayFromJSON(duration_ty, R"([1, null])");
 auto arr3 = ArrayFromJSON(duration_ty, R"([9223372036854775807, null])");

 CheckScalarBinary("subtract", arr1, arr2, arr3);
 EXPECT_RAISES_WITH_MESSAGE_THAT(Invalid, ::testing::HasSubstr("overflow"),
 CallFunction("subtract_checked", {arr1, arr2}));
 }
}
@pitroupitrouFeb 15, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add tests for overflowing inputs?
@rokrokFeb 16, 2022

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added. However it seems as it duration is not treated as int64_there and overflow is not detected?
@rokrokFeb 16, 2022

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Never mind. I was using the wrong operator.

@edponceedponceJan 18, 2022

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add tests with valid values.
@rokrokJan 18, 2022

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you mean like these?
I'd like to enable cases like subtract(duration[ms], duration[us]) -> duration[us]. I'll ping when it's done.
@rokrokJan 19, 2022

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, this now covers cases like subtract(duration[ms], duration[us]) -> duration[us].
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

66 changes: 33 additions & 33 deletions
docs/source/cpp/compute.rst

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -423,39 +423,39 @@ floating-point arguments will cast all arguments to floating-point, while mixed
decimal and integer arguments will cast all arguments to decimals.
Mixed time resolution temporal inputs will be cast to finest input resolution.

+------------------+--------+----------------------------+----------------------------+-------+
| Function name | Arity | Input types | Output type | Notes |
+==================+========+============================+============================+=======+
| abs | Unary | Numeric | Numeric | |
+------------------+--------+----------------------------+----------------------------+-------+
| abs_checked | Unary | Numeric | Numeric | |
+------------------+--------+----------------------------+----------------------------+-------+
| add | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+----------------------------+----------------------------+-------+
| add_checked | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+----------------------------+----------------------------+-------+
| divide | Binary | Numeric | Numeric | \(1) |
+------------------+--------+----------------------------+----------------------------+-------+
| divide_checked | Binary | Numeric | Numeric | \(1) |
+------------------+--------+----------------------------+----------------------------+-------+
| multiply | Binary | Numeric | Numeric | \(1) |
+------------------+--------+----------------------------+----------------------------+-------+
| multiply_checked | Binary | Numeric | Numeric | \(1) |
+------------------+--------+----------------------------+----------------------------+-------+
| negate | Unary | Numeric | Numeric | |
+------------------+--------+----------------------------+----------------------------+-------+
| negate_checked | Unary | Signed Numeric | Signed Numeric | |
+------------------+--------+----------------------------+----------------------------+-------+
| power | Binary | Numeric | Numeric | |
+------------------+--------+----------------------------+----------------------------+-------+
| power_checked | Binary | Numeric | Numeric | |
+------------------+--------+----------------------------+----------------------------+-------+
| sign | Unary | Numeric | Int8/Float32/Float64 | \(2) |
+------------------+--------+----------------------------+----------------------------+-------+
| subtract | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+----------------------------+----------------------------+-------+
| subtract_checked | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+----------------------------+----------------------------+-------+
+------------------+--------+------------------+----------------------+-------+
| Function name | Arity | Input types | Output type | Notes |
+==================+========+==================+======================+=======+
| abs | Unary | Numeric | Numeric | |
+------------------+--------+------------------+----------------------+-------+
| abs_checked | Unary | Numeric | Numeric | |
+------------------+--------+------------------+----------------------+-------+
| add | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+------------------+----------------------+-------+
| add_checked | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+------------------+----------------------+-------+
| divide | Binary | Numeric | Numeric | \(1) |
+------------------+--------+------------------+----------------------+-------+
| divide_checked | Binary | Numeric | Numeric | \(1) |
+------------------+--------+------------------+----------------------+-------+
| multiply | Binary | Numeric | Numeric | \(1) |
+------------------+--------+------------------+----------------------+-------+
| multiply_checked | Binary | Numeric | Numeric | \(1) |
+------------------+--------+------------------+----------------------+-------+
| negate | Unary | Numeric | Numeric | |
+------------------+--------+------------------+----------------------+-------+
| negate_checked | Unary | Signed Numeric | Signed Numeric | |
+------------------+--------+------------------+----------------------+-------+
| power | Binary | Numeric | Numeric | |
+------------------+--------+------------------+----------------------+-------+
| power_checked | Binary | Numeric | Numeric | |
+------------------+--------+------------------+----------------------+-------+
| sign | Unary | Numeric | Int8/Float32/Float64 | \(2) |
+------------------+--------+------------------+----------------------+-------+
| subtract | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+------------------+----------------------+-------+
| subtract_checked | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+------------------+----------------------+-------+

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

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ARROW-14100: [C++] subtract(duration, duration) -> duration kernel#12141

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-14100: [C++] subtract(duration, duration) -> duration kernel
#12141
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
f38de69

Subtract duration


rok Jan 13, 2022
eaa5c63

Add ReplaceTemporalTypes


rok Jan 19, 2022
4f6675d

Review feedback


rok Feb 15, 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


16 changes: 16 additions & 0 deletions
cpp/src/arrow/compute/kernels/scalar_arithmetic.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2660,6 +2660,13 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
 std::move(exec)));
 }

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

 // Add subtract(time32, time32) -> duration
 for (auto unit : {TimeUnit::SECOND, TimeUnit::MILLI}) {
 InputType in_type(match::Time32TypeUnit(unit));
Expand DownExpand Up@@ -2714,6 +2721,15 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
 OutputType(FirstType), std::move(exec)));
 }

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

 // Add subtract_checked(date32, date32) -> duration(TimeUnit::SECOND)
 auto exec_date_32_checked =
 ScalarBinaryEqualTypes<Int64Type, Date32Type, SubtractCheckedDate32>::Exec;
Expand Down

26 changes: 26 additions & 0 deletions
cpp/src/arrow/compute/kernels/scalar_temporal_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1429,6 +1429,32 @@ TEST_F(ScalarTemporalTest, TestTemporalSubtractTimeAndDuration) {
 }
}

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

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

 for (auto unit : TimeUnit::values()) {
 auto duration_ty = duration(unit);
 auto arr1 = ArrayFromJSON(duration_ty, R"([-9223372036854775808, null])");
 auto arr2 = ArrayFromJSON(duration_ty, R"([1, null])");
 auto arr3 = ArrayFromJSON(duration_ty, R"([9223372036854775807, null])");

 CheckScalarBinary("subtract", arr1, arr2, arr3);
 EXPECT_RAISES_WITH_MESSAGE_THAT(Invalid, ::testing::HasSubstr("overflow"),
 CallFunction("subtract_checked", {arr1, arr2}));
 }
}
@pitroupitrouFeb 15, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add tests for overflowing inputs?
@rokrokFeb 16, 2022

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added. However it seems as it duration is not treated as int64_there and overflow is not detected?
@rokrokFeb 16, 2022

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Never mind. I was using the wrong operator.

@edponceedponceJan 18, 2022

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add tests with valid values.
@rokrokJan 18, 2022

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you mean like these?
I'd like to enable cases like subtract(duration[ms], duration[us]) -> duration[us]. I'll ping when it's done.
@rokrokJan 19, 2022

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, this now covers cases like subtract(duration[ms], duration[us]) -> duration[us].
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

66 changes: 33 additions & 33 deletions
docs/source/cpp/compute.rst

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -423,39 +423,39 @@ floating-point arguments will cast all arguments to floating-point, while mixed
decimal and integer arguments will cast all arguments to decimals.
Mixed time resolution temporal inputs will be cast to finest input resolution.

+------------------+--------+----------------------------+----------------------------+-------+
| Function name | Arity | Input types | Output type | Notes |
+==================+========+============================+============================+=======+
| abs | Unary | Numeric | Numeric | |
+------------------+--------+----------------------------+----------------------------+-------+
| abs_checked | Unary | Numeric | Numeric | |
+------------------+--------+----------------------------+----------------------------+-------+
| add | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+----------------------------+----------------------------+-------+
| add_checked | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+----------------------------+----------------------------+-------+
| divide | Binary | Numeric | Numeric | \(1) |
+------------------+--------+----------------------------+----------------------------+-------+
| divide_checked | Binary | Numeric | Numeric | \(1) |
+------------------+--------+----------------------------+----------------------------+-------+
| multiply | Binary | Numeric | Numeric | \(1) |
+------------------+--------+----------------------------+----------------------------+-------+
| multiply_checked | Binary | Numeric | Numeric | \(1) |
+------------------+--------+----------------------------+----------------------------+-------+
| negate | Unary | Numeric | Numeric | |
+------------------+--------+----------------------------+----------------------------+-------+
| negate_checked | Unary | Signed Numeric | Signed Numeric | |
+------------------+--------+----------------------------+----------------------------+-------+
| power | Binary | Numeric | Numeric | |
+------------------+--------+----------------------------+----------------------------+-------+
| power_checked | Binary | Numeric | Numeric | |
+------------------+--------+----------------------------+----------------------------+-------+
| sign | Unary | Numeric | Int8/Float32/Float64 | \(2) |
+------------------+--------+----------------------------+----------------------------+-------+
| subtract | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+----------------------------+----------------------------+-------+
| subtract_checked | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+----------------------------+----------------------------+-------+
+------------------+--------+------------------+----------------------+-------+
| Function name | Arity | Input types | Output type | Notes |
+==================+========+==================+======================+=======+
| abs | Unary | Numeric | Numeric | |
+------------------+--------+------------------+----------------------+-------+
| abs_checked | Unary | Numeric | Numeric | |
+------------------+--------+------------------+----------------------+-------+
| add | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+------------------+----------------------+-------+
| add_checked | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+------------------+----------------------+-------+
| divide | Binary | Numeric | Numeric | \(1) |
+------------------+--------+------------------+----------------------+-------+
| divide_checked | Binary | Numeric | Numeric | \(1) |
+------------------+--------+------------------+----------------------+-------+
| multiply | Binary | Numeric | Numeric | \(1) |
+------------------+--------+------------------+----------------------+-------+
| multiply_checked | Binary | Numeric | Numeric | \(1) |
+------------------+--------+------------------+----------------------+-------+
| negate | Unary | Numeric | Numeric | |
+------------------+--------+------------------+----------------------+-------+
| negate_checked | Unary | Signed Numeric | Signed Numeric | |
+------------------+--------+------------------+----------------------+-------+
| power | Binary | Numeric | Numeric | |
+------------------+--------+------------------+----------------------+-------+
| power_checked | Binary | Numeric | Numeric | |
+------------------+--------+------------------+----------------------+-------+
| sign | Unary | Numeric | Int8/Float32/Float64 | \(2) |
+------------------+--------+------------------+----------------------+-------+
| subtract | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+------------------+----------------------+-------+
| subtract_checked | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+------------------+----------------------+-------+

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

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ARROW-14100: [C++] subtract(duration, duration) -> duration kernel#12141

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-14100: [C++] subtract(duration, duration) -> duration kernel
#12141
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
f38de69

Subtract duration


rok Jan 13, 2022
eaa5c63

Add ReplaceTemporalTypes


rok Jan 19, 2022
4f6675d

Review feedback


rok Feb 15, 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


16 changes: 16 additions & 0 deletions
cpp/src/arrow/compute/kernels/scalar_arithmetic.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2660,6 +2660,13 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
 std::move(exec)));
 }

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

 // Add subtract(time32, time32) -> duration
 for (auto unit : {TimeUnit::SECOND, TimeUnit::MILLI}) {
 InputType in_type(match::Time32TypeUnit(unit));
Expand DownExpand Up@@ -2714,6 +2721,15 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
 OutputType(FirstType), std::move(exec)));
 }

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

 // Add subtract_checked(date32, date32) -> duration(TimeUnit::SECOND)
 auto exec_date_32_checked =
 ScalarBinaryEqualTypes<Int64Type, Date32Type, SubtractCheckedDate32>::Exec;
Expand Down

26 changes: 26 additions & 0 deletions
cpp/src/arrow/compute/kernels/scalar_temporal_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1429,6 +1429,32 @@ TEST_F(ScalarTemporalTest, TestTemporalSubtractTimeAndDuration) {
 }
}

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

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

 for (auto unit : TimeUnit::values()) {
 auto duration_ty = duration(unit);
 auto arr1 = ArrayFromJSON(duration_ty, R"([-9223372036854775808, null])");
 auto arr2 = ArrayFromJSON(duration_ty, R"([1, null])");
 auto arr3 = ArrayFromJSON(duration_ty, R"([9223372036854775807, null])");

 CheckScalarBinary("subtract", arr1, arr2, arr3);
 EXPECT_RAISES_WITH_MESSAGE_THAT(Invalid, ::testing::HasSubstr("overflow"),
 CallFunction("subtract_checked", {arr1, arr2}));
 }
}
@pitroupitrouFeb 15, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add tests for overflowing inputs?
@rokrokFeb 16, 2022

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added. However it seems as it duration is not treated as int64_there and overflow is not detected?
@rokrokFeb 16, 2022

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Never mind. I was using the wrong operator.

@edponceedponceJan 18, 2022

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add tests with valid values.
@rokrokJan 18, 2022

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you mean like these?
I'd like to enable cases like subtract(duration[ms], duration[us]) -> duration[us]. I'll ping when it's done.
@rokrokJan 19, 2022

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, this now covers cases like subtract(duration[ms], duration[us]) -> duration[us].
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

66 changes: 33 additions & 33 deletions
docs/source/cpp/compute.rst

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -423,39 +423,39 @@ floating-point arguments will cast all arguments to floating-point, while mixed
decimal and integer arguments will cast all arguments to decimals.
Mixed time resolution temporal inputs will be cast to finest input resolution.

+------------------+--------+----------------------------+----------------------------+-------+
| Function name | Arity | Input types | Output type | Notes |
+==================+========+============================+============================+=======+
| abs | Unary | Numeric | Numeric | |
+------------------+--------+----------------------------+----------------------------+-------+
| abs_checked | Unary | Numeric | Numeric | |
+------------------+--------+----------------------------+----------------------------+-------+
| add | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+----------------------------+----------------------------+-------+
| add_checked | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+----------------------------+----------------------------+-------+
| divide | Binary | Numeric | Numeric | \(1) |
+------------------+--------+----------------------------+----------------------------+-------+
| divide_checked | Binary | Numeric | Numeric | \(1) |
+------------------+--------+----------------------------+----------------------------+-------+
| multiply | Binary | Numeric | Numeric | \(1) |
+------------------+--------+----------------------------+----------------------------+-------+
| multiply_checked | Binary | Numeric | Numeric | \(1) |
+------------------+--------+----------------------------+----------------------------+-------+
| negate | Unary | Numeric | Numeric | |
+------------------+--------+----------------------------+----------------------------+-------+
| negate_checked | Unary | Signed Numeric | Signed Numeric | |
+------------------+--------+----------------------------+----------------------------+-------+
| power | Binary | Numeric | Numeric | |
+------------------+--------+----------------------------+----------------------------+-------+
| power_checked | Binary | Numeric | Numeric | |
+------------------+--------+----------------------------+----------------------------+-------+
| sign | Unary | Numeric | Int8/Float32/Float64 | \(2) |
+------------------+--------+----------------------------+----------------------------+-------+
| subtract | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+----------------------------+----------------------------+-------+
| subtract_checked | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+----------------------------+----------------------------+-------+
+------------------+--------+------------------+----------------------+-------+
| Function name | Arity | Input types | Output type | Notes |
+==================+========+==================+======================+=======+
| abs | Unary | Numeric | Numeric | |
+------------------+--------+------------------+----------------------+-------+
| abs_checked | Unary | Numeric | Numeric | |
+------------------+--------+------------------+----------------------+-------+
| add | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+------------------+----------------------+-------+
| add_checked | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+------------------+----------------------+-------+
| divide | Binary | Numeric | Numeric | \(1) |
+------------------+--------+------------------+----------------------+-------+
| divide_checked | Binary | Numeric | Numeric | \(1) |
+------------------+--------+------------------+----------------------+-------+
| multiply | Binary | Numeric | Numeric | \(1) |
+------------------+--------+------------------+----------------------+-------+
| multiply_checked | Binary | Numeric | Numeric | \(1) |
+------------------+--------+------------------+----------------------+-------+
| negate | Unary | Numeric | Numeric | |
+------------------+--------+------------------+----------------------+-------+
| negate_checked | Unary | Signed Numeric | Signed Numeric | |
+------------------+--------+------------------+----------------------+-------+
| power | Binary | Numeric | Numeric | |
+------------------+--------+------------------+----------------------+-------+
| power_checked | Binary | Numeric | Numeric | |
+------------------+--------+------------------+----------------------+-------+
| sign | Unary | Numeric | Int8/Float32/Float64 | \(2) |
+------------------+--------+------------------+----------------------+-------+
| subtract | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+------------------+----------------------+-------+
| subtract_checked | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+------------------+----------------------+-------+

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

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
ARROW-14100: [C++] subtract(duration, duration) -> duration kernel#12141

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-14100: [C++] subtract(duration, duration) -> duration kernel
#12141
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
f38de69

Subtract duration


rok Jan 13, 2022
eaa5c63

Add ReplaceTemporalTypes


rok Jan 19, 2022
4f6675d

Review feedback


rok Feb 15, 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


16 changes: 16 additions & 0 deletions
cpp/src/arrow/compute/kernels/scalar_arithmetic.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2660,6 +2660,13 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
 std::move(exec)));
 }

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

 // Add subtract(time32, time32) -> duration
 for (auto unit : {TimeUnit::SECOND, TimeUnit::MILLI}) {
 InputType in_type(match::Time32TypeUnit(unit));
Expand DownExpand Up@@ -2714,6 +2721,15 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
 OutputType(FirstType), std::move(exec)));
 }

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

 // Add subtract_checked(date32, date32) -> duration(TimeUnit::SECOND)
 auto exec_date_32_checked =
 ScalarBinaryEqualTypes<Int64Type, Date32Type, SubtractCheckedDate32>::Exec;
Expand Down

26 changes: 26 additions & 0 deletions
cpp/src/arrow/compute/kernels/scalar_temporal_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1429,6 +1429,32 @@ TEST_F(ScalarTemporalTest, TestTemporalSubtractTimeAndDuration) {
 }
}

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

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

 for (auto unit : TimeUnit::values()) {
 auto duration_ty = duration(unit);
 auto arr1 = ArrayFromJSON(duration_ty, R"([-9223372036854775808, null])");
 auto arr2 = ArrayFromJSON(duration_ty, R"([1, null])");
 auto arr3 = ArrayFromJSON(duration_ty, R"([9223372036854775807, null])");

 CheckScalarBinary("subtract", arr1, arr2, arr3);
 EXPECT_RAISES_WITH_MESSAGE_THAT(Invalid, ::testing::HasSubstr("overflow"),
 CallFunction("subtract_checked", {arr1, arr2}));
 }
}
@pitroupitrouFeb 15, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add tests for overflowing inputs?
@rokrokFeb 16, 2022

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added. However it seems as it duration is not treated as int64_there and overflow is not detected?
@rokrokFeb 16, 2022

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Never mind. I was using the wrong operator.

@edponceedponceJan 18, 2022

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add tests with valid values.
@rokrokJan 18, 2022

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you mean like these?
I'd like to enable cases like subtract(duration[ms], duration[us]) -> duration[us]. I'll ping when it's done.
@rokrokJan 19, 2022

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, this now covers cases like subtract(duration[ms], duration[us]) -> duration[us].
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

66 changes: 33 additions & 33 deletions
docs/source/cpp/compute.rst

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -423,39 +423,39 @@ floating-point arguments will cast all arguments to floating-point, while mixed
decimal and integer arguments will cast all arguments to decimals.
Mixed time resolution temporal inputs will be cast to finest input resolution.

+------------------+--------+----------------------------+----------------------------+-------+
| Function name | Arity | Input types | Output type | Notes |
+==================+========+============================+============================+=======+
| abs | Unary | Numeric | Numeric | |
+------------------+--------+----------------------------+----------------------------+-------+
| abs_checked | Unary | Numeric | Numeric | |
+------------------+--------+----------------------------+----------------------------+-------+
| add | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+----------------------------+----------------------------+-------+
| add_checked | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+----------------------------+----------------------------+-------+
| divide | Binary | Numeric | Numeric | \(1) |
+------------------+--------+----------------------------+----------------------------+-------+
| divide_checked | Binary | Numeric | Numeric | \(1) |
+------------------+--------+----------------------------+----------------------------+-------+
| multiply | Binary | Numeric | Numeric | \(1) |
+------------------+--------+----------------------------+----------------------------+-------+
| multiply_checked | Binary | Numeric | Numeric | \(1) |
+------------------+--------+----------------------------+----------------------------+-------+
| negate | Unary | Numeric | Numeric | |
+------------------+--------+----------------------------+----------------------------+-------+
| negate_checked | Unary | Signed Numeric | Signed Numeric | |
+------------------+--------+----------------------------+----------------------------+-------+
| power | Binary | Numeric | Numeric | |
+------------------+--------+----------------------------+----------------------------+-------+
| power_checked | Binary | Numeric | Numeric | |
+------------------+--------+----------------------------+----------------------------+-------+
| sign | Unary | Numeric | Int8/Float32/Float64 | \(2) |
+------------------+--------+----------------------------+----------------------------+-------+
| subtract | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+----------------------------+----------------------------+-------+
| subtract_checked | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+----------------------------+----------------------------+-------+
+------------------+--------+------------------+----------------------+-------+
| Function name | Arity | Input types | Output type | Notes |
+==================+========+==================+======================+=======+
| abs | Unary | Numeric | Numeric | |
+------------------+--------+------------------+----------------------+-------+
| abs_checked | Unary | Numeric | Numeric | |
+------------------+--------+------------------+----------------------+-------+
| add | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+------------------+----------------------+-------+
| add_checked | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+------------------+----------------------+-------+
| divide | Binary | Numeric | Numeric | \(1) |
+------------------+--------+------------------+----------------------+-------+
| divide_checked | Binary | Numeric | Numeric | \(1) |
+------------------+--------+------------------+----------------------+-------+
| multiply | Binary | Numeric | Numeric | \(1) |
+------------------+--------+------------------+----------------------+-------+
| multiply_checked | Binary | Numeric | Numeric | \(1) |
+------------------+--------+------------------+----------------------+-------+
| negate | Unary | Numeric | Numeric | |
+------------------+--------+------------------+----------------------+-------+
| negate_checked | Unary | Signed Numeric | Signed Numeric | |
+------------------+--------+------------------+----------------------+-------+
| power | Binary | Numeric | Numeric | |
+------------------+--------+------------------+----------------------+-------+
| power_checked | Binary | Numeric | Numeric | |
+------------------+--------+------------------+----------------------+-------+
| sign | Unary | Numeric | Int8/Float32/Float64 | \(2) |
+------------------+--------+------------------+----------------------+-------+
| subtract | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+------------------+----------------------+-------+
| subtract_checked | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+------------------+----------------------+-------+

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

Expand Down