Skip to content

ARROW-14101: [C++] multiply(duration, integer) -> duration kernel#12215

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

ARROW-14101: [C++] multiply(duration, integer) -> duration kernel #12215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e3fa8fe
multiply(duration, integer) -> duration
rok Feb 22, 2022
c797d52
Review feedback
rok Feb 22, 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
7 changes: 7 additions & 0 deletions cpp/src/arrow/compute/kernels/codegen_internal_test.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -202,6 +202,8 @@ TEST(TestDispatchBest, CommonTemporalResolution) {
ASSERT_EQ(TimeUnit::MILLI, CommonTemporalResolution(args.data(), args.size()));
args = {time64(TimeUnit::MICRO), duration(TimeUnit::NANO)};
ASSERT_EQ(TimeUnit::NANO, CommonTemporalResolution(args.data(), args.size()));
args = {duration(TimeUnit::SECOND), int64()};
ASSERT_EQ(TimeUnit::SECOND, CommonTemporalResolution(args.data(), args.size()));
Comment on lines 205 to 206

@pitroupitrouFeb 22, 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.

This looks unexpected to me since int64 is not a temporal at all. @lidavidm What do you think?

@lidavidmlidavidmFeb 22, 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.

I think this is fine, but maybe we need a better name for what this function does.

That said, I don't think this change is needed for this function to work, anyways. There's only a single temporal argument so there isn't really a meaningful common resolution to cast to.

@pitroupitrouFeb 22, 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.

To be honest, the function doesn't seem to have changed :-). It's just the additional test that surprised me (but adding a test for existing behaviour is useful, thank you @rok ).

@rokrokFeb 22, 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.

Well duration has a unit and int64 is dimensionless. The goal of the function is to find the best common unit and I'd argue it still does.

}

TEST(TestDispatchBest, ReplaceTemporalTypes) {
Expand DownExpand Up@@ -268,6 +270,11 @@ TEST(TestDispatchBest, ReplaceTemporalTypes) {
ReplaceTemporalTypes(ty, &args);
AssertTypeEqual(args[0].type, time64(TimeUnit::NANO));
AssertTypeEqual(args[1].type, duration(TimeUnit::NANO));

args = {duration(TimeUnit::SECOND), int64()};
ReplaceTemporalTypes(CommonTemporalResolution(args.data(), args.size()), &args);
AssertTypeEqual(args[0].type, duration(TimeUnit::SECOND));
AssertTypeEqual(args[1].type, int64());
}

} // namespace internal
Expand Down
43 changes: 42 additions & 1 deletion cpp/src/arrow/compute/kernels/scalar_arithmetic.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,6 +44,7 @@ namespace internal {

using applicator::ScalarBinary;
using applicator::ScalarBinaryEqualTypes;
using applicator::ScalarBinaryNotNull;
using applicator::ScalarBinaryNotNullEqualTypes;
using applicator::ScalarUnary;
using applicator::ScalarUnaryNotNull;
Expand DownExpand Up@@ -1647,8 +1648,8 @@ ArrayKernelExec ArithmeticExecFromOp(detail::GetTypeId get_id) {
return KernelGenerator<Int32Type, Int32Type, Op>::Exec;
case Type::UINT32:
return KernelGenerator<UInt32Type, UInt32Type, Op>::Exec;
case Type::DURATION:
case Type::INT64:
case Type::DURATION:
case Type::TIMESTAMP:
return KernelGenerator<Int64Type, Int64Type, Op>::Exec;
case Type::UINT64:
Expand DownExpand Up@@ -2802,23 +2803,63 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
// ----------------------------------------------------------------------
auto multiply = MakeArithmeticFunction<Multiply>("multiply", &mul_doc);
AddDecimalBinaryKernels<Multiply>("multiply", multiply.get());

// Add multiply(duration, int64) -> duration
for (auto unit : TimeUnit::values()) {
auto exec1 = ArithmeticExecFromOp<ScalarBinaryEqualTypes, Multiply>(Type::DURATION);
DCHECK_OK(
multiply->AddKernel({duration(unit), int64()}, duration(unit), std::move(exec1)));
auto exec2 = ArithmeticExecFromOp<ScalarBinaryEqualTypes, Multiply>(Type::DURATION);
DCHECK_OK(
multiply->AddKernel({int64(), duration(unit)}, duration(unit), std::move(exec2)));
}

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

// ----------------------------------------------------------------------
auto multiply_checked = MakeArithmeticFunctionNotNull<MultiplyChecked>(
"multiply_checked", &mul_checked_doc);
AddDecimalBinaryKernels<MultiplyChecked>("multiply_checked", multiply_checked.get());

// Add multiply_checked(duration, int64) -> duration
for (auto unit : TimeUnit::values()) {
auto exec1 =
ArithmeticExecFromOp<ScalarBinaryEqualTypes, MultiplyChecked>(Type::DURATION);
DCHECK_OK(multiply_checked->AddKernel({duration(unit), int64()}, duration(unit),
std::move(exec1)));
auto exec2 =
ArithmeticExecFromOp<ScalarBinaryEqualTypes, MultiplyChecked>(Type::DURATION);
DCHECK_OK(multiply_checked->AddKernel({int64(), duration(unit)}, duration(unit),
std::move(exec2)));
}

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

// ----------------------------------------------------------------------
auto divide = MakeArithmeticFunctionNotNull<Divide>("divide", &div_doc);
AddDecimalBinaryKernels<Divide>("divide", divide.get());

// Add divide(duration, int64) -> duration
for (auto unit : TimeUnit::values()) {
auto exec = ScalarBinaryNotNull<DurationType, DurationType, Int64Type, Divide>::Exec;
DCHECK_OK(
divide->AddKernel({duration(unit), int64()}, duration(unit), std::move(exec)));
}
DCHECK_OK(registry->AddFunction(std::move(divide)));

// ----------------------------------------------------------------------
auto divide_checked =
MakeArithmeticFunctionNotNull<DivideChecked>("divide_checked", &div_checked_doc);
AddDecimalBinaryKernels<DivideChecked>("divide_checked", divide_checked.get());

// Add divide_checked(duration, int64) -> duration
for (auto unit : TimeUnit::values()) {
auto exec =
ScalarBinaryNotNull<DurationType, DurationType, Int64Type, DivideChecked>::Exec;
DCHECK_OK(divide_checked->AddKernel({duration(unit), int64()}, duration(unit),
std::move(exec)));
}

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

// ----------------------------------------------------------------------
Expand Down
44 changes: 44 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@@ -1455,6 +1455,50 @@ TEST_F(ScalarTemporalTest, TestTemporalSubtractDuration) {
}
}

TEST_F(ScalarTemporalTest, TestTemporalMultiplyDuration) {
std::shared_ptr<Array> max_array;
auto max = std::numeric_limits<int64_t>::max();
ArrayFromVector<Int64Type, int64_t>({max, max, max, max, max}, &max_array);

for (auto u : TimeUnit::values()) {
auto unit = duration(u);
auto durations = ArrayFromJSON(unit, R"([0, -1, 2, 6, null])");
auto multipliers = ArrayFromJSON(int64(), R"([0, 3, 2, 7, null])");
auto durations_multiplied = ArrayFromJSON(unit, R"([0, -3, 4, 42, null])");

CheckScalarBinary("multiply", durations, multipliers, durations_multiplied);
CheckScalarBinary("multiply", multipliers, durations, durations_multiplied);
CheckScalarBinary("multiply_checked", durations, multipliers, durations_multiplied);
CheckScalarBinary("multiply_checked", multipliers, durations, durations_multiplied);

EXPECT_RAISES_WITH_MESSAGE_THAT(
Invalid, ::testing::HasSubstr("Invalid: overflow"),
CallFunction("multiply_checked", {durations, max_array}));
EXPECT_RAISES_WITH_MESSAGE_THAT(
Invalid, ::testing::HasSubstr("Invalid: overflow"),
CallFunction("multiply_checked", {max_array, durations}));
}
}

TEST_F(ScalarTemporalTest, TestTemporalDivideDuration) {
for (auto u : TimeUnit::values()) {
auto unit = duration(u);
auto divided_durations = ArrayFromJSON(unit, R"([0, -1, -2, 6, null])");
auto divisors = ArrayFromJSON(int64(), R"([3, 3, -2, 7, null])");
auto durations = ArrayFromJSON(unit, R"([1, -3, 4, 42, null])");
auto zeros = ArrayFromJSON(int64(), R"([0, 0, 0, 0, null])");
CheckScalarBinary("divide", durations, divisors, divided_durations);
CheckScalarBinary("divide_checked", durations, divisors, divided_durations);

@pitroupitrouFeb 22, 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.

Also check that division by zero raises?

@rokrokFeb 22, 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.


EXPECT_RAISES_WITH_MESSAGE_THAT(Invalid,
::testing::HasSubstr("Invalid: divide by zero"),
CallFunction("divide", {durations, zeros}));
EXPECT_RAISES_WITH_MESSAGE_THAT(Invalid,
::testing::HasSubstr("Invalid: divide by zero"),
CallFunction("divide_checked", {durations, zeros}));
}
}

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
8 changes: 4 additions & 4 deletions docs/source/cpp/compute.rst
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -441,13 +441,13 @@ Mixed time resolution temporal inputs will be cast to finest input resolution.
+------------------+--------+------------------+----------------------+-------+
| add_checked | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+------------------+----------------------+-------+
| divide | Binary | Numeric| Numeric | \(1) |
| divide | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+------------------+----------------------+-------+
| divide_checked | Binary | Numeric| Numeric | \(1) |
| divide_checked | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+------------------+----------------------+-------+
| multiply | Binary | Numeric| Numeric | \(1) |
| multiply | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
Comment thread
rok marked this conversation as resolved.
Outdated
+------------------+--------+------------------+----------------------+-------+
| multiply_checked | Binary | Numeric| Numeric | \(1) |
| multiply_checked | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+------------------+----------------------+-------+
| negate | Unary | Numeric | Numeric | |
+------------------+--------+------------------+----------------------+-------+
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
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;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
ARROW-14101: [C++] multiply(duration, integer) -> duration kernel by rok · Pull Request #12215 · apache/arrow · GitHub
Skip to content
ARROW-14101: [C++] multiply(duration, integer) -> duration kernel#12215

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
2
commits into

from

 Closed


ARROW-14101: [C++] multiply(duration, integer) -> duration kernel
#12215
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
e3fa8fe

multiply(duration, integer) -> duration


rok Feb 22, 2022
c797d52

Review feedback


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


7 changes: 7 additions & 0 deletions
cpp/src/arrow/compute/kernels/codegen_internal_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -202,6 +202,8 @@ TEST(TestDispatchBest, CommonTemporalResolution) {
 ASSERT_EQ(TimeUnit::MILLI, CommonTemporalResolution(args.data(), args.size()));
 args = {time64(TimeUnit::MICRO), duration(TimeUnit::NANO)};
 ASSERT_EQ(TimeUnit::NANO, CommonTemporalResolution(args.data(), args.size()));
 args = {duration(TimeUnit::SECOND), int64()};
 ASSERT_EQ(TimeUnit::SECOND, CommonTemporalResolution(args.data(), args.size()));

Comment on lines

205
 to 
206

@pitroupitrouFeb 22, 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.

This looks unexpected to me since int64 is not a temporal at all. @lidavidm What do you think?
@lidavidmlidavidmFeb 22, 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.

I think this is fine, but maybe we need a better name for what this function does.
That said, I don't think this change is needed for this function to work, anyways. There's only a single temporal argument so there isn't really a meaningful common resolution to cast to.
@pitroupitrouFeb 22, 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.

To be honest, the function doesn't seem to have changed :-). It's just the additional test that surprised me (but adding a test for existing behaviour is useful, thank you @rok ).
@rokrokFeb 22, 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.

Well duration has a unit and int64 is dimensionless. The goal of the function is to find the best common unit and I'd argue it still does.
}

TEST(TestDispatchBest, ReplaceTemporalTypes) {
Expand DownExpand Up@@ -268,6 +270,11 @@ TEST(TestDispatchBest, ReplaceTemporalTypes) {
 ReplaceTemporalTypes(ty, &args);
 AssertTypeEqual(args[0].type, time64(TimeUnit::NANO));
 AssertTypeEqual(args[1].type, duration(TimeUnit::NANO));

 args = {duration(TimeUnit::SECOND), int64()};
 ReplaceTemporalTypes(CommonTemporalResolution(args.data(), args.size()), &args);
 AssertTypeEqual(args[0].type, duration(TimeUnit::SECOND));
 AssertTypeEqual(args[1].type, int64());
}

} // namespace internal
Expand Down

43 changes: 42 additions & 1 deletion
cpp/src/arrow/compute/kernels/scalar_arithmetic.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,6 +44,7 @@ namespace internal {

using applicator::ScalarBinary;
using applicator::ScalarBinaryEqualTypes;
using applicator::ScalarBinaryNotNull;
using applicator::ScalarBinaryNotNullEqualTypes;
using applicator::ScalarUnary;
using applicator::ScalarUnaryNotNull;
Expand DownExpand Up@@ -1647,8 +1648,8 @@ ArrayKernelExec ArithmeticExecFromOp(detail::GetTypeId get_id) {
 return KernelGenerator<Int32Type, Int32Type, Op>::Exec;
 case Type::UINT32:
 return KernelGenerator<UInt32Type, UInt32Type, Op>::Exec;
 case Type::DURATION:
 case Type::INT64:
 case Type::DURATION:
 case Type::TIMESTAMP:
 return KernelGenerator<Int64Type, Int64Type, Op>::Exec;
 case Type::UINT64:
Expand DownExpand Up@@ -2802,23 +2803,63 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
 // ----------------------------------------------------------------------
 auto multiply = MakeArithmeticFunction<Multiply>("multiply", &mul_doc);
 AddDecimalBinaryKernels<Multiply>("multiply", multiply.get());

 // Add multiply(duration, int64) -> duration
 for (auto unit : TimeUnit::values()) {
 auto exec1 = ArithmeticExecFromOp<ScalarBinaryEqualTypes, Multiply>(Type::DURATION);
 DCHECK_OK(
 multiply->AddKernel({duration(unit), int64()}, duration(unit), std::move(exec1)));
 auto exec2 = ArithmeticExecFromOp<ScalarBinaryEqualTypes, Multiply>(Type::DURATION);
 DCHECK_OK(
 multiply->AddKernel({int64(), duration(unit)}, duration(unit), std::move(exec2)));
 }

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

 // ----------------------------------------------------------------------
 auto multiply_checked = MakeArithmeticFunctionNotNull<MultiplyChecked>(
 "multiply_checked", &mul_checked_doc);
 AddDecimalBinaryKernels<MultiplyChecked>("multiply_checked", multiply_checked.get());

 // Add multiply_checked(duration, int64) -> duration
 for (auto unit : TimeUnit::values()) {
 auto exec1 =
 ArithmeticExecFromOp<ScalarBinaryEqualTypes, MultiplyChecked>(Type::DURATION);
 DCHECK_OK(multiply_checked->AddKernel({duration(unit), int64()}, duration(unit),
 std::move(exec1)));
 auto exec2 =
 ArithmeticExecFromOp<ScalarBinaryEqualTypes, MultiplyChecked>(Type::DURATION);
 DCHECK_OK(multiply_checked->AddKernel({int64(), duration(unit)}, duration(unit),
 std::move(exec2)));
 }

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

 // ----------------------------------------------------------------------
 auto divide = MakeArithmeticFunctionNotNull<Divide>("divide", &div_doc);
 AddDecimalBinaryKernels<Divide>("divide", divide.get());

 // Add divide(duration, int64) -> duration
 for (auto unit : TimeUnit::values()) {
 auto exec = ScalarBinaryNotNull<DurationType, DurationType, Int64Type, Divide>::Exec;
 DCHECK_OK(
 divide->AddKernel({duration(unit), int64()}, duration(unit), std::move(exec)));
 }
 DCHECK_OK(registry->AddFunction(std::move(divide)));

 // ----------------------------------------------------------------------
 auto divide_checked =
 MakeArithmeticFunctionNotNull<DivideChecked>("divide_checked", &div_checked_doc);
 AddDecimalBinaryKernels<DivideChecked>("divide_checked", divide_checked.get());

 // Add divide_checked(duration, int64) -> duration
 for (auto unit : TimeUnit::values()) {
 auto exec =
 ScalarBinaryNotNull<DurationType, DurationType, Int64Type, DivideChecked>::Exec;
 DCHECK_OK(divide_checked->AddKernel({duration(unit), int64()}, duration(unit),
 std::move(exec)));
 }

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

 // ----------------------------------------------------------------------
Expand Down

44 changes: 44 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@@ -1455,6 +1455,50 @@ TEST_F(ScalarTemporalTest, TestTemporalSubtractDuration) {
 }
}

TEST_F(ScalarTemporalTest, TestTemporalMultiplyDuration) {
 std::shared_ptr<Array> max_array;
 auto max = std::numeric_limits<int64_t>::max();
 ArrayFromVector<Int64Type, int64_t>({max, max, max, max, max}, &max_array);

 for (auto u : TimeUnit::values()) {
 auto unit = duration(u);
 auto durations = ArrayFromJSON(unit, R"([0, -1, 2, 6, null])");
 auto multipliers = ArrayFromJSON(int64(), R"([0, 3, 2, 7, null])");
 auto durations_multiplied = ArrayFromJSON(unit, R"([0, -3, 4, 42, null])");

 CheckScalarBinary("multiply", durations, multipliers, durations_multiplied);
 CheckScalarBinary("multiply", multipliers, durations, durations_multiplied);
 CheckScalarBinary("multiply_checked", durations, multipliers, durations_multiplied);
 CheckScalarBinary("multiply_checked", multipliers, durations, durations_multiplied);

 EXPECT_RAISES_WITH_MESSAGE_THAT(
 Invalid, ::testing::HasSubstr("Invalid: overflow"),
 CallFunction("multiply_checked", {durations, max_array}));
 EXPECT_RAISES_WITH_MESSAGE_THAT(
 Invalid, ::testing::HasSubstr("Invalid: overflow"),
 CallFunction("multiply_checked", {max_array, durations}));
 }
}

TEST_F(ScalarTemporalTest, TestTemporalDivideDuration) {
 for (auto u : TimeUnit::values()) {
 auto unit = duration(u);
 auto divided_durations = ArrayFromJSON(unit, R"([0, -1, -2, 6, null])");
 auto divisors = ArrayFromJSON(int64(), R"([3, 3, -2, 7, null])");
 auto durations = ArrayFromJSON(unit, R"([1, -3, 4, 42, null])");
 auto zeros = ArrayFromJSON(int64(), R"([0, 0, 0, 0, null])");
 CheckScalarBinary("divide", durations, divisors, divided_durations);
 CheckScalarBinary("divide_checked", durations, divisors, divided_durations);
@pitroupitrouFeb 22, 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.

Also check that division by zero raises?
@rokrokFeb 22, 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.

 EXPECT_RAISES_WITH_MESSAGE_THAT(Invalid,
 ::testing::HasSubstr("Invalid: divide by zero"),
 CallFunction("divide", {durations, zeros}));
 EXPECT_RAISES_WITH_MESSAGE_THAT(Invalid,
 ::testing::HasSubstr("Invalid: divide by zero"),
 CallFunction("divide_checked", {durations, zeros}));
 }
}

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

8 changes: 4 additions & 4 deletions
docs/source/cpp/compute.rst

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -441,13 +441,13 @@ Mixed time resolution temporal inputs will be cast to finest input resolution.
+------------------+--------+------------------+----------------------+-------+
| add_checked | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+------------------+----------------------+-------+
| divide | Binary | Numeric| Numeric | \(1) |
| divide | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+------------------+----------------------+-------+
| divide_checked | Binary | Numeric| Numeric | \(1) |
| divide_checked | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+------------------+----------------------+-------+
| multiply | Binary | Numeric| Numeric | \(1) |
| multiply | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
Comment thread
rok marked this conversation as resolved.


Outdated

+------------------+--------+------------------+----------------------+-------+
| multiply_checked | Binary | Numeric| Numeric | \(1) |
| multiply_checked | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+------------------+----------------------+-------+
| negate | Unary | Numeric | Numeric | |
+------------------+--------+------------------+----------------------+-------+
Expand Down

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

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
2
commits into

from

 Closed


ARROW-14101: [C++] multiply(duration, integer) -> duration kernel
#12215
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
e3fa8fe

multiply(duration, integer) -> duration


rok Feb 22, 2022
c797d52

Review feedback


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


7 changes: 7 additions & 0 deletions
cpp/src/arrow/compute/kernels/codegen_internal_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -202,6 +202,8 @@ TEST(TestDispatchBest, CommonTemporalResolution) {
 ASSERT_EQ(TimeUnit::MILLI, CommonTemporalResolution(args.data(), args.size()));
 args = {time64(TimeUnit::MICRO), duration(TimeUnit::NANO)};
 ASSERT_EQ(TimeUnit::NANO, CommonTemporalResolution(args.data(), args.size()));
 args = {duration(TimeUnit::SECOND), int64()};
 ASSERT_EQ(TimeUnit::SECOND, CommonTemporalResolution(args.data(), args.size()));

Comment on lines

205
 to 
206

@pitroupitrouFeb 22, 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.

This looks unexpected to me since int64 is not a temporal at all. @lidavidm What do you think?
@lidavidmlidavidmFeb 22, 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.

I think this is fine, but maybe we need a better name for what this function does.
That said, I don't think this change is needed for this function to work, anyways. There's only a single temporal argument so there isn't really a meaningful common resolution to cast to.
@pitroupitrouFeb 22, 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.

To be honest, the function doesn't seem to have changed :-). It's just the additional test that surprised me (but adding a test for existing behaviour is useful, thank you @rok ).
@rokrokFeb 22, 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.

Well duration has a unit and int64 is dimensionless. The goal of the function is to find the best common unit and I'd argue it still does.
}

TEST(TestDispatchBest, ReplaceTemporalTypes) {
Expand DownExpand Up@@ -268,6 +270,11 @@ TEST(TestDispatchBest, ReplaceTemporalTypes) {
 ReplaceTemporalTypes(ty, &args);
 AssertTypeEqual(args[0].type, time64(TimeUnit::NANO));
 AssertTypeEqual(args[1].type, duration(TimeUnit::NANO));

 args = {duration(TimeUnit::SECOND), int64()};
 ReplaceTemporalTypes(CommonTemporalResolution(args.data(), args.size()), &args);
 AssertTypeEqual(args[0].type, duration(TimeUnit::SECOND));
 AssertTypeEqual(args[1].type, int64());
}

} // namespace internal
Expand Down

43 changes: 42 additions & 1 deletion
cpp/src/arrow/compute/kernels/scalar_arithmetic.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,6 +44,7 @@ namespace internal {

using applicator::ScalarBinary;
using applicator::ScalarBinaryEqualTypes;
using applicator::ScalarBinaryNotNull;
using applicator::ScalarBinaryNotNullEqualTypes;
using applicator::ScalarUnary;
using applicator::ScalarUnaryNotNull;
Expand DownExpand Up@@ -1647,8 +1648,8 @@ ArrayKernelExec ArithmeticExecFromOp(detail::GetTypeId get_id) {
 return KernelGenerator<Int32Type, Int32Type, Op>::Exec;
 case Type::UINT32:
 return KernelGenerator<UInt32Type, UInt32Type, Op>::Exec;
 case Type::DURATION:
 case Type::INT64:
 case Type::DURATION:
 case Type::TIMESTAMP:
 return KernelGenerator<Int64Type, Int64Type, Op>::Exec;
 case Type::UINT64:
Expand DownExpand Up@@ -2802,23 +2803,63 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
 // ----------------------------------------------------------------------
 auto multiply = MakeArithmeticFunction<Multiply>("multiply", &mul_doc);
 AddDecimalBinaryKernels<Multiply>("multiply", multiply.get());

 // Add multiply(duration, int64) -> duration
 for (auto unit : TimeUnit::values()) {
 auto exec1 = ArithmeticExecFromOp<ScalarBinaryEqualTypes, Multiply>(Type::DURATION);
 DCHECK_OK(
 multiply->AddKernel({duration(unit), int64()}, duration(unit), std::move(exec1)));
 auto exec2 = ArithmeticExecFromOp<ScalarBinaryEqualTypes, Multiply>(Type::DURATION);
 DCHECK_OK(
 multiply->AddKernel({int64(), duration(unit)}, duration(unit), std::move(exec2)));
 }

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

 // ----------------------------------------------------------------------
 auto multiply_checked = MakeArithmeticFunctionNotNull<MultiplyChecked>(
 "multiply_checked", &mul_checked_doc);
 AddDecimalBinaryKernels<MultiplyChecked>("multiply_checked", multiply_checked.get());

 // Add multiply_checked(duration, int64) -> duration
 for (auto unit : TimeUnit::values()) {
 auto exec1 =
 ArithmeticExecFromOp<ScalarBinaryEqualTypes, MultiplyChecked>(Type::DURATION);
 DCHECK_OK(multiply_checked->AddKernel({duration(unit), int64()}, duration(unit),
 std::move(exec1)));
 auto exec2 =
 ArithmeticExecFromOp<ScalarBinaryEqualTypes, MultiplyChecked>(Type::DURATION);
 DCHECK_OK(multiply_checked->AddKernel({int64(), duration(unit)}, duration(unit),
 std::move(exec2)));
 }

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

 // ----------------------------------------------------------------------
 auto divide = MakeArithmeticFunctionNotNull<Divide>("divide", &div_doc);
 AddDecimalBinaryKernels<Divide>("divide", divide.get());

 // Add divide(duration, int64) -> duration
 for (auto unit : TimeUnit::values()) {
 auto exec = ScalarBinaryNotNull<DurationType, DurationType, Int64Type, Divide>::Exec;
 DCHECK_OK(
 divide->AddKernel({duration(unit), int64()}, duration(unit), std::move(exec)));
 }
 DCHECK_OK(registry->AddFunction(std::move(divide)));

 // ----------------------------------------------------------------------
 auto divide_checked =
 MakeArithmeticFunctionNotNull<DivideChecked>("divide_checked", &div_checked_doc);
 AddDecimalBinaryKernels<DivideChecked>("divide_checked", divide_checked.get());

 // Add divide_checked(duration, int64) -> duration
 for (auto unit : TimeUnit::values()) {
 auto exec =
 ScalarBinaryNotNull<DurationType, DurationType, Int64Type, DivideChecked>::Exec;
 DCHECK_OK(divide_checked->AddKernel({duration(unit), int64()}, duration(unit),
 std::move(exec)));
 }

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

 // ----------------------------------------------------------------------
Expand Down

44 changes: 44 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@@ -1455,6 +1455,50 @@ TEST_F(ScalarTemporalTest, TestTemporalSubtractDuration) {
 }
}

TEST_F(ScalarTemporalTest, TestTemporalMultiplyDuration) {
 std::shared_ptr<Array> max_array;
 auto max = std::numeric_limits<int64_t>::max();
 ArrayFromVector<Int64Type, int64_t>({max, max, max, max, max}, &max_array);

 for (auto u : TimeUnit::values()) {
 auto unit = duration(u);
 auto durations = ArrayFromJSON(unit, R"([0, -1, 2, 6, null])");
 auto multipliers = ArrayFromJSON(int64(), R"([0, 3, 2, 7, null])");
 auto durations_multiplied = ArrayFromJSON(unit, R"([0, -3, 4, 42, null])");

 CheckScalarBinary("multiply", durations, multipliers, durations_multiplied);
 CheckScalarBinary("multiply", multipliers, durations, durations_multiplied);
 CheckScalarBinary("multiply_checked", durations, multipliers, durations_multiplied);
 CheckScalarBinary("multiply_checked", multipliers, durations, durations_multiplied);

 EXPECT_RAISES_WITH_MESSAGE_THAT(
 Invalid, ::testing::HasSubstr("Invalid: overflow"),
 CallFunction("multiply_checked", {durations, max_array}));
 EXPECT_RAISES_WITH_MESSAGE_THAT(
 Invalid, ::testing::HasSubstr("Invalid: overflow"),
 CallFunction("multiply_checked", {max_array, durations}));
 }
}

TEST_F(ScalarTemporalTest, TestTemporalDivideDuration) {
 for (auto u : TimeUnit::values()) {
 auto unit = duration(u);
 auto divided_durations = ArrayFromJSON(unit, R"([0, -1, -2, 6, null])");
 auto divisors = ArrayFromJSON(int64(), R"([3, 3, -2, 7, null])");
 auto durations = ArrayFromJSON(unit, R"([1, -3, 4, 42, null])");
 auto zeros = ArrayFromJSON(int64(), R"([0, 0, 0, 0, null])");
 CheckScalarBinary("divide", durations, divisors, divided_durations);
 CheckScalarBinary("divide_checked", durations, divisors, divided_durations);
@pitroupitrouFeb 22, 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.

Also check that division by zero raises?
@rokrokFeb 22, 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.

 EXPECT_RAISES_WITH_MESSAGE_THAT(Invalid,
 ::testing::HasSubstr("Invalid: divide by zero"),
 CallFunction("divide", {durations, zeros}));
 EXPECT_RAISES_WITH_MESSAGE_THAT(Invalid,
 ::testing::HasSubstr("Invalid: divide by zero"),
 CallFunction("divide_checked", {durations, zeros}));
 }
}

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

8 changes: 4 additions & 4 deletions
docs/source/cpp/compute.rst

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -441,13 +441,13 @@ Mixed time resolution temporal inputs will be cast to finest input resolution.
+------------------+--------+------------------+----------------------+-------+
| add_checked | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+------------------+----------------------+-------+
| divide | Binary | Numeric| Numeric | \(1) |
| divide | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+------------------+----------------------+-------+
| divide_checked | Binary | Numeric| Numeric | \(1) |
| divide_checked | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+------------------+----------------------+-------+
| multiply | Binary | Numeric| Numeric | \(1) |
| multiply | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
Comment thread
rok marked this conversation as resolved.


Outdated

+------------------+--------+------------------+----------------------+-------+
| multiply_checked | Binary | Numeric| Numeric | \(1) |
| multiply_checked | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+------------------+----------------------+-------+
| negate | Unary | Numeric | Numeric | |
+------------------+--------+------------------+----------------------+-------+
Expand Down

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

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
2
commits into

from

 Closed


ARROW-14101: [C++] multiply(duration, integer) -> duration kernel
#12215
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
e3fa8fe

multiply(duration, integer) -> duration


rok Feb 22, 2022
c797d52

Review feedback


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


7 changes: 7 additions & 0 deletions
cpp/src/arrow/compute/kernels/codegen_internal_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -202,6 +202,8 @@ TEST(TestDispatchBest, CommonTemporalResolution) {
 ASSERT_EQ(TimeUnit::MILLI, CommonTemporalResolution(args.data(), args.size()));
 args = {time64(TimeUnit::MICRO), duration(TimeUnit::NANO)};
 ASSERT_EQ(TimeUnit::NANO, CommonTemporalResolution(args.data(), args.size()));
 args = {duration(TimeUnit::SECOND), int64()};
 ASSERT_EQ(TimeUnit::SECOND, CommonTemporalResolution(args.data(), args.size()));

Comment on lines

205
 to 
206

@pitroupitrouFeb 22, 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.

This looks unexpected to me since int64 is not a temporal at all. @lidavidm What do you think?
@lidavidmlidavidmFeb 22, 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.

I think this is fine, but maybe we need a better name for what this function does.
That said, I don't think this change is needed for this function to work, anyways. There's only a single temporal argument so there isn't really a meaningful common resolution to cast to.
@pitroupitrouFeb 22, 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.

To be honest, the function doesn't seem to have changed :-). It's just the additional test that surprised me (but adding a test for existing behaviour is useful, thank you @rok ).
@rokrokFeb 22, 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.

Well duration has a unit and int64 is dimensionless. The goal of the function is to find the best common unit and I'd argue it still does.
}

TEST(TestDispatchBest, ReplaceTemporalTypes) {
Expand DownExpand Up@@ -268,6 +270,11 @@ TEST(TestDispatchBest, ReplaceTemporalTypes) {
 ReplaceTemporalTypes(ty, &args);
 AssertTypeEqual(args[0].type, time64(TimeUnit::NANO));
 AssertTypeEqual(args[1].type, duration(TimeUnit::NANO));

 args = {duration(TimeUnit::SECOND), int64()};
 ReplaceTemporalTypes(CommonTemporalResolution(args.data(), args.size()), &args);
 AssertTypeEqual(args[0].type, duration(TimeUnit::SECOND));
 AssertTypeEqual(args[1].type, int64());
}

} // namespace internal
Expand Down

43 changes: 42 additions & 1 deletion
cpp/src/arrow/compute/kernels/scalar_arithmetic.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,6 +44,7 @@ namespace internal {

using applicator::ScalarBinary;
using applicator::ScalarBinaryEqualTypes;
using applicator::ScalarBinaryNotNull;
using applicator::ScalarBinaryNotNullEqualTypes;
using applicator::ScalarUnary;
using applicator::ScalarUnaryNotNull;
Expand DownExpand Up@@ -1647,8 +1648,8 @@ ArrayKernelExec ArithmeticExecFromOp(detail::GetTypeId get_id) {
 return KernelGenerator<Int32Type, Int32Type, Op>::Exec;
 case Type::UINT32:
 return KernelGenerator<UInt32Type, UInt32Type, Op>::Exec;
 case Type::DURATION:
 case Type::INT64:
 case Type::DURATION:
 case Type::TIMESTAMP:
 return KernelGenerator<Int64Type, Int64Type, Op>::Exec;
 case Type::UINT64:
Expand DownExpand Up@@ -2802,23 +2803,63 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
 // ----------------------------------------------------------------------
 auto multiply = MakeArithmeticFunction<Multiply>("multiply", &mul_doc);
 AddDecimalBinaryKernels<Multiply>("multiply", multiply.get());

 // Add multiply(duration, int64) -> duration
 for (auto unit : TimeUnit::values()) {
 auto exec1 = ArithmeticExecFromOp<ScalarBinaryEqualTypes, Multiply>(Type::DURATION);
 DCHECK_OK(
 multiply->AddKernel({duration(unit), int64()}, duration(unit), std::move(exec1)));
 auto exec2 = ArithmeticExecFromOp<ScalarBinaryEqualTypes, Multiply>(Type::DURATION);
 DCHECK_OK(
 multiply->AddKernel({int64(), duration(unit)}, duration(unit), std::move(exec2)));
 }

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

 // ----------------------------------------------------------------------
 auto multiply_checked = MakeArithmeticFunctionNotNull<MultiplyChecked>(
 "multiply_checked", &mul_checked_doc);
 AddDecimalBinaryKernels<MultiplyChecked>("multiply_checked", multiply_checked.get());

 // Add multiply_checked(duration, int64) -> duration
 for (auto unit : TimeUnit::values()) {
 auto exec1 =
 ArithmeticExecFromOp<ScalarBinaryEqualTypes, MultiplyChecked>(Type::DURATION);
 DCHECK_OK(multiply_checked->AddKernel({duration(unit), int64()}, duration(unit),
 std::move(exec1)));
 auto exec2 =
 ArithmeticExecFromOp<ScalarBinaryEqualTypes, MultiplyChecked>(Type::DURATION);
 DCHECK_OK(multiply_checked->AddKernel({int64(), duration(unit)}, duration(unit),
 std::move(exec2)));
 }

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

 // ----------------------------------------------------------------------
 auto divide = MakeArithmeticFunctionNotNull<Divide>("divide", &div_doc);
 AddDecimalBinaryKernels<Divide>("divide", divide.get());

 // Add divide(duration, int64) -> duration
 for (auto unit : TimeUnit::values()) {
 auto exec = ScalarBinaryNotNull<DurationType, DurationType, Int64Type, Divide>::Exec;
 DCHECK_OK(
 divide->AddKernel({duration(unit), int64()}, duration(unit), std::move(exec)));
 }
 DCHECK_OK(registry->AddFunction(std::move(divide)));

 // ----------------------------------------------------------------------
 auto divide_checked =
 MakeArithmeticFunctionNotNull<DivideChecked>("divide_checked", &div_checked_doc);
 AddDecimalBinaryKernels<DivideChecked>("divide_checked", divide_checked.get());

 // Add divide_checked(duration, int64) -> duration
 for (auto unit : TimeUnit::values()) {
 auto exec =
 ScalarBinaryNotNull<DurationType, DurationType, Int64Type, DivideChecked>::Exec;
 DCHECK_OK(divide_checked->AddKernel({duration(unit), int64()}, duration(unit),
 std::move(exec)));
 }

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

 // ----------------------------------------------------------------------
Expand Down

44 changes: 44 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@@ -1455,6 +1455,50 @@ TEST_F(ScalarTemporalTest, TestTemporalSubtractDuration) {
 }
}

TEST_F(ScalarTemporalTest, TestTemporalMultiplyDuration) {
 std::shared_ptr<Array> max_array;
 auto max = std::numeric_limits<int64_t>::max();
 ArrayFromVector<Int64Type, int64_t>({max, max, max, max, max}, &max_array);

 for (auto u : TimeUnit::values()) {
 auto unit = duration(u);
 auto durations = ArrayFromJSON(unit, R"([0, -1, 2, 6, null])");
 auto multipliers = ArrayFromJSON(int64(), R"([0, 3, 2, 7, null])");
 auto durations_multiplied = ArrayFromJSON(unit, R"([0, -3, 4, 42, null])");

 CheckScalarBinary("multiply", durations, multipliers, durations_multiplied);
 CheckScalarBinary("multiply", multipliers, durations, durations_multiplied);
 CheckScalarBinary("multiply_checked", durations, multipliers, durations_multiplied);
 CheckScalarBinary("multiply_checked", multipliers, durations, durations_multiplied);

 EXPECT_RAISES_WITH_MESSAGE_THAT(
 Invalid, ::testing::HasSubstr("Invalid: overflow"),
 CallFunction("multiply_checked", {durations, max_array}));
 EXPECT_RAISES_WITH_MESSAGE_THAT(
 Invalid, ::testing::HasSubstr("Invalid: overflow"),
 CallFunction("multiply_checked", {max_array, durations}));
 }
}

TEST_F(ScalarTemporalTest, TestTemporalDivideDuration) {
 for (auto u : TimeUnit::values()) {
 auto unit = duration(u);
 auto divided_durations = ArrayFromJSON(unit, R"([0, -1, -2, 6, null])");
 auto divisors = ArrayFromJSON(int64(), R"([3, 3, -2, 7, null])");
 auto durations = ArrayFromJSON(unit, R"([1, -3, 4, 42, null])");
 auto zeros = ArrayFromJSON(int64(), R"([0, 0, 0, 0, null])");
 CheckScalarBinary("divide", durations, divisors, divided_durations);
 CheckScalarBinary("divide_checked", durations, divisors, divided_durations);
@pitroupitrouFeb 22, 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.

Also check that division by zero raises?
@rokrokFeb 22, 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.

 EXPECT_RAISES_WITH_MESSAGE_THAT(Invalid,
 ::testing::HasSubstr("Invalid: divide by zero"),
 CallFunction("divide", {durations, zeros}));
 EXPECT_RAISES_WITH_MESSAGE_THAT(Invalid,
 ::testing::HasSubstr("Invalid: divide by zero"),
 CallFunction("divide_checked", {durations, zeros}));
 }
}

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

8 changes: 4 additions & 4 deletions
docs/source/cpp/compute.rst

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -441,13 +441,13 @@ Mixed time resolution temporal inputs will be cast to finest input resolution.
+------------------+--------+------------------+----------------------+-------+
| add_checked | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+------------------+----------------------+-------+
| divide | Binary | Numeric| Numeric | \(1) |
| divide | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+------------------+----------------------+-------+
| divide_checked | Binary | Numeric| Numeric | \(1) |
| divide_checked | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+------------------+----------------------+-------+
| multiply | Binary | Numeric| Numeric | \(1) |
| multiply | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
Comment thread
rok marked this conversation as resolved.


Outdated

+------------------+--------+------------------+----------------------+-------+
| multiply_checked | Binary | Numeric| Numeric | \(1) |
| multiply_checked | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+------------------+----------------------+-------+
| negate | Unary | Numeric | Numeric | |
+------------------+--------+------------------+----------------------+-------+
Expand Down

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

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
2
commits into

from

 Closed


ARROW-14101: [C++] multiply(duration, integer) -> duration kernel
#12215
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
e3fa8fe

multiply(duration, integer) -> duration


rok Feb 22, 2022
c797d52

Review feedback


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


7 changes: 7 additions & 0 deletions
cpp/src/arrow/compute/kernels/codegen_internal_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -202,6 +202,8 @@ TEST(TestDispatchBest, CommonTemporalResolution) {
 ASSERT_EQ(TimeUnit::MILLI, CommonTemporalResolution(args.data(), args.size()));
 args = {time64(TimeUnit::MICRO), duration(TimeUnit::NANO)};
 ASSERT_EQ(TimeUnit::NANO, CommonTemporalResolution(args.data(), args.size()));
 args = {duration(TimeUnit::SECOND), int64()};
 ASSERT_EQ(TimeUnit::SECOND, CommonTemporalResolution(args.data(), args.size()));

Comment on lines

205
 to 
206

@pitroupitrouFeb 22, 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.

This looks unexpected to me since int64 is not a temporal at all. @lidavidm What do you think?
@lidavidmlidavidmFeb 22, 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.

I think this is fine, but maybe we need a better name for what this function does.
That said, I don't think this change is needed for this function to work, anyways. There's only a single temporal argument so there isn't really a meaningful common resolution to cast to.
@pitroupitrouFeb 22, 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.

To be honest, the function doesn't seem to have changed :-). It's just the additional test that surprised me (but adding a test for existing behaviour is useful, thank you @rok ).
@rokrokFeb 22, 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.

Well duration has a unit and int64 is dimensionless. The goal of the function is to find the best common unit and I'd argue it still does.
}

TEST(TestDispatchBest, ReplaceTemporalTypes) {
Expand DownExpand Up@@ -268,6 +270,11 @@ TEST(TestDispatchBest, ReplaceTemporalTypes) {
 ReplaceTemporalTypes(ty, &args);
 AssertTypeEqual(args[0].type, time64(TimeUnit::NANO));
 AssertTypeEqual(args[1].type, duration(TimeUnit::NANO));

 args = {duration(TimeUnit::SECOND), int64()};
 ReplaceTemporalTypes(CommonTemporalResolution(args.data(), args.size()), &args);
 AssertTypeEqual(args[0].type, duration(TimeUnit::SECOND));
 AssertTypeEqual(args[1].type, int64());
}

} // namespace internal
Expand Down

43 changes: 42 additions & 1 deletion
cpp/src/arrow/compute/kernels/scalar_arithmetic.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,6 +44,7 @@ namespace internal {

using applicator::ScalarBinary;
using applicator::ScalarBinaryEqualTypes;
using applicator::ScalarBinaryNotNull;
using applicator::ScalarBinaryNotNullEqualTypes;
using applicator::ScalarUnary;
using applicator::ScalarUnaryNotNull;
Expand DownExpand Up@@ -1647,8 +1648,8 @@ ArrayKernelExec ArithmeticExecFromOp(detail::GetTypeId get_id) {
 return KernelGenerator<Int32Type, Int32Type, Op>::Exec;
 case Type::UINT32:
 return KernelGenerator<UInt32Type, UInt32Type, Op>::Exec;
 case Type::DURATION:
 case Type::INT64:
 case Type::DURATION:
 case Type::TIMESTAMP:
 return KernelGenerator<Int64Type, Int64Type, Op>::Exec;
 case Type::UINT64:
Expand DownExpand Up@@ -2802,23 +2803,63 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
 // ----------------------------------------------------------------------
 auto multiply = MakeArithmeticFunction<Multiply>("multiply", &mul_doc);
 AddDecimalBinaryKernels<Multiply>("multiply", multiply.get());

 // Add multiply(duration, int64) -> duration
 for (auto unit : TimeUnit::values()) {
 auto exec1 = ArithmeticExecFromOp<ScalarBinaryEqualTypes, Multiply>(Type::DURATION);
 DCHECK_OK(
 multiply->AddKernel({duration(unit), int64()}, duration(unit), std::move(exec1)));
 auto exec2 = ArithmeticExecFromOp<ScalarBinaryEqualTypes, Multiply>(Type::DURATION);
 DCHECK_OK(
 multiply->AddKernel({int64(), duration(unit)}, duration(unit), std::move(exec2)));
 }

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

 // ----------------------------------------------------------------------
 auto multiply_checked = MakeArithmeticFunctionNotNull<MultiplyChecked>(
 "multiply_checked", &mul_checked_doc);
 AddDecimalBinaryKernels<MultiplyChecked>("multiply_checked", multiply_checked.get());

 // Add multiply_checked(duration, int64) -> duration
 for (auto unit : TimeUnit::values()) {
 auto exec1 =
 ArithmeticExecFromOp<ScalarBinaryEqualTypes, MultiplyChecked>(Type::DURATION);
 DCHECK_OK(multiply_checked->AddKernel({duration(unit), int64()}, duration(unit),
 std::move(exec1)));
 auto exec2 =
 ArithmeticExecFromOp<ScalarBinaryEqualTypes, MultiplyChecked>(Type::DURATION);
 DCHECK_OK(multiply_checked->AddKernel({int64(), duration(unit)}, duration(unit),
 std::move(exec2)));
 }

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

 // ----------------------------------------------------------------------
 auto divide = MakeArithmeticFunctionNotNull<Divide>("divide", &div_doc);
 AddDecimalBinaryKernels<Divide>("divide", divide.get());

 // Add divide(duration, int64) -> duration
 for (auto unit : TimeUnit::values()) {
 auto exec = ScalarBinaryNotNull<DurationType, DurationType, Int64Type, Divide>::Exec;
 DCHECK_OK(
 divide->AddKernel({duration(unit), int64()}, duration(unit), std::move(exec)));
 }
 DCHECK_OK(registry->AddFunction(std::move(divide)));

 // ----------------------------------------------------------------------
 auto divide_checked =
 MakeArithmeticFunctionNotNull<DivideChecked>("divide_checked", &div_checked_doc);
 AddDecimalBinaryKernels<DivideChecked>("divide_checked", divide_checked.get());

 // Add divide_checked(duration, int64) -> duration
 for (auto unit : TimeUnit::values()) {
 auto exec =
 ScalarBinaryNotNull<DurationType, DurationType, Int64Type, DivideChecked>::Exec;
 DCHECK_OK(divide_checked->AddKernel({duration(unit), int64()}, duration(unit),
 std::move(exec)));
 }

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

 // ----------------------------------------------------------------------
Expand Down

44 changes: 44 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@@ -1455,6 +1455,50 @@ TEST_F(ScalarTemporalTest, TestTemporalSubtractDuration) {
 }
}

TEST_F(ScalarTemporalTest, TestTemporalMultiplyDuration) {
 std::shared_ptr<Array> max_array;
 auto max = std::numeric_limits<int64_t>::max();
 ArrayFromVector<Int64Type, int64_t>({max, max, max, max, max}, &max_array);

 for (auto u : TimeUnit::values()) {
 auto unit = duration(u);
 auto durations = ArrayFromJSON(unit, R"([0, -1, 2, 6, null])");
 auto multipliers = ArrayFromJSON(int64(), R"([0, 3, 2, 7, null])");
 auto durations_multiplied = ArrayFromJSON(unit, R"([0, -3, 4, 42, null])");

 CheckScalarBinary("multiply", durations, multipliers, durations_multiplied);
 CheckScalarBinary("multiply", multipliers, durations, durations_multiplied);
 CheckScalarBinary("multiply_checked", durations, multipliers, durations_multiplied);
 CheckScalarBinary("multiply_checked", multipliers, durations, durations_multiplied);

 EXPECT_RAISES_WITH_MESSAGE_THAT(
 Invalid, ::testing::HasSubstr("Invalid: overflow"),
 CallFunction("multiply_checked", {durations, max_array}));
 EXPECT_RAISES_WITH_MESSAGE_THAT(
 Invalid, ::testing::HasSubstr("Invalid: overflow"),
 CallFunction("multiply_checked", {max_array, durations}));
 }
}

TEST_F(ScalarTemporalTest, TestTemporalDivideDuration) {
 for (auto u : TimeUnit::values()) {
 auto unit = duration(u);
 auto divided_durations = ArrayFromJSON(unit, R"([0, -1, -2, 6, null])");
 auto divisors = ArrayFromJSON(int64(), R"([3, 3, -2, 7, null])");
 auto durations = ArrayFromJSON(unit, R"([1, -3, 4, 42, null])");
 auto zeros = ArrayFromJSON(int64(), R"([0, 0, 0, 0, null])");
 CheckScalarBinary("divide", durations, divisors, divided_durations);
 CheckScalarBinary("divide_checked", durations, divisors, divided_durations);
@pitroupitrouFeb 22, 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.

Also check that division by zero raises?
@rokrokFeb 22, 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.

 EXPECT_RAISES_WITH_MESSAGE_THAT(Invalid,
 ::testing::HasSubstr("Invalid: divide by zero"),
 CallFunction("divide", {durations, zeros}));
 EXPECT_RAISES_WITH_MESSAGE_THAT(Invalid,
 ::testing::HasSubstr("Invalid: divide by zero"),
 CallFunction("divide_checked", {durations, zeros}));
 }
}

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

8 changes: 4 additions & 4 deletions
docs/source/cpp/compute.rst

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -441,13 +441,13 @@ Mixed time resolution temporal inputs will be cast to finest input resolution.
+------------------+--------+------------------+----------------------+-------+
| add_checked | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+------------------+----------------------+-------+
| divide | Binary | Numeric| Numeric | \(1) |
| divide | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+------------------+----------------------+-------+
| divide_checked | Binary | Numeric| Numeric | \(1) |
| divide_checked | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+------------------+----------------------+-------+
| multiply | Binary | Numeric| Numeric | \(1) |
| multiply | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
Comment thread
rok marked this conversation as resolved.


Outdated

+------------------+--------+------------------+----------------------+-------+
| multiply_checked | Binary | Numeric| Numeric | \(1) |
| multiply_checked | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+------------------+----------------------+-------+
| negate | Unary | Numeric | Numeric | |
+------------------+--------+------------------+----------------------+-------+
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
ARROW-14101: [C++] multiply(duration, integer) -> duration kernel by rok · Pull Request #12215 · apache/arrow · GitHub
Skip to content
ARROW-14101: [C++] multiply(duration, integer) -> duration kernel#12215

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
2
commits into

from

 Closed


ARROW-14101: [C++] multiply(duration, integer) -> duration kernel
#12215
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
e3fa8fe

multiply(duration, integer) -> duration


rok Feb 22, 2022
c797d52

Review feedback


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


7 changes: 7 additions & 0 deletions
cpp/src/arrow/compute/kernels/codegen_internal_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -202,6 +202,8 @@ TEST(TestDispatchBest, CommonTemporalResolution) {
 ASSERT_EQ(TimeUnit::MILLI, CommonTemporalResolution(args.data(), args.size()));
 args = {time64(TimeUnit::MICRO), duration(TimeUnit::NANO)};
 ASSERT_EQ(TimeUnit::NANO, CommonTemporalResolution(args.data(), args.size()));
 args = {duration(TimeUnit::SECOND), int64()};
 ASSERT_EQ(TimeUnit::SECOND, CommonTemporalResolution(args.data(), args.size()));

Comment on lines

205
 to 
206

@pitroupitrouFeb 22, 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.

This looks unexpected to me since int64 is not a temporal at all. @lidavidm What do you think?
@lidavidmlidavidmFeb 22, 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.

I think this is fine, but maybe we need a better name for what this function does.
That said, I don't think this change is needed for this function to work, anyways. There's only a single temporal argument so there isn't really a meaningful common resolution to cast to.
@pitroupitrouFeb 22, 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.

To be honest, the function doesn't seem to have changed :-). It's just the additional test that surprised me (but adding a test for existing behaviour is useful, thank you @rok ).
@rokrokFeb 22, 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.

Well duration has a unit and int64 is dimensionless. The goal of the function is to find the best common unit and I'd argue it still does.
}

TEST(TestDispatchBest, ReplaceTemporalTypes) {
Expand DownExpand Up@@ -268,6 +270,11 @@ TEST(TestDispatchBest, ReplaceTemporalTypes) {
 ReplaceTemporalTypes(ty, &args);
 AssertTypeEqual(args[0].type, time64(TimeUnit::NANO));
 AssertTypeEqual(args[1].type, duration(TimeUnit::NANO));

 args = {duration(TimeUnit::SECOND), int64()};
 ReplaceTemporalTypes(CommonTemporalResolution(args.data(), args.size()), &args);
 AssertTypeEqual(args[0].type, duration(TimeUnit::SECOND));
 AssertTypeEqual(args[1].type, int64());
}

} // namespace internal
Expand Down

43 changes: 42 additions & 1 deletion
cpp/src/arrow/compute/kernels/scalar_arithmetic.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,6 +44,7 @@ namespace internal {

using applicator::ScalarBinary;
using applicator::ScalarBinaryEqualTypes;
using applicator::ScalarBinaryNotNull;
using applicator::ScalarBinaryNotNullEqualTypes;
using applicator::ScalarUnary;
using applicator::ScalarUnaryNotNull;
Expand DownExpand Up@@ -1647,8 +1648,8 @@ ArrayKernelExec ArithmeticExecFromOp(detail::GetTypeId get_id) {
 return KernelGenerator<Int32Type, Int32Type, Op>::Exec;
 case Type::UINT32:
 return KernelGenerator<UInt32Type, UInt32Type, Op>::Exec;
 case Type::DURATION:
 case Type::INT64:
 case Type::DURATION:
 case Type::TIMESTAMP:
 return KernelGenerator<Int64Type, Int64Type, Op>::Exec;
 case Type::UINT64:
Expand DownExpand Up@@ -2802,23 +2803,63 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
 // ----------------------------------------------------------------------
 auto multiply = MakeArithmeticFunction<Multiply>("multiply", &mul_doc);
 AddDecimalBinaryKernels<Multiply>("multiply", multiply.get());

 // Add multiply(duration, int64) -> duration
 for (auto unit : TimeUnit::values()) {
 auto exec1 = ArithmeticExecFromOp<ScalarBinaryEqualTypes, Multiply>(Type::DURATION);
 DCHECK_OK(
 multiply->AddKernel({duration(unit), int64()}, duration(unit), std::move(exec1)));
 auto exec2 = ArithmeticExecFromOp<ScalarBinaryEqualTypes, Multiply>(Type::DURATION);
 DCHECK_OK(
 multiply->AddKernel({int64(), duration(unit)}, duration(unit), std::move(exec2)));
 }

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

 // ----------------------------------------------------------------------
 auto multiply_checked = MakeArithmeticFunctionNotNull<MultiplyChecked>(
 "multiply_checked", &mul_checked_doc);
 AddDecimalBinaryKernels<MultiplyChecked>("multiply_checked", multiply_checked.get());

 // Add multiply_checked(duration, int64) -> duration
 for (auto unit : TimeUnit::values()) {
 auto exec1 =
 ArithmeticExecFromOp<ScalarBinaryEqualTypes, MultiplyChecked>(Type::DURATION);
 DCHECK_OK(multiply_checked->AddKernel({duration(unit), int64()}, duration(unit),
 std::move(exec1)));
 auto exec2 =
 ArithmeticExecFromOp<ScalarBinaryEqualTypes, MultiplyChecked>(Type::DURATION);
 DCHECK_OK(multiply_checked->AddKernel({int64(), duration(unit)}, duration(unit),
 std::move(exec2)));
 }

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

 // ----------------------------------------------------------------------
 auto divide = MakeArithmeticFunctionNotNull<Divide>("divide", &div_doc);
 AddDecimalBinaryKernels<Divide>("divide", divide.get());

 // Add divide(duration, int64) -> duration
 for (auto unit : TimeUnit::values()) {
 auto exec = ScalarBinaryNotNull<DurationType, DurationType, Int64Type, Divide>::Exec;
 DCHECK_OK(
 divide->AddKernel({duration(unit), int64()}, duration(unit), std::move(exec)));
 }
 DCHECK_OK(registry->AddFunction(std::move(divide)));

 // ----------------------------------------------------------------------
 auto divide_checked =
 MakeArithmeticFunctionNotNull<DivideChecked>("divide_checked", &div_checked_doc);
 AddDecimalBinaryKernels<DivideChecked>("divide_checked", divide_checked.get());

 // Add divide_checked(duration, int64) -> duration
 for (auto unit : TimeUnit::values()) {
 auto exec =
 ScalarBinaryNotNull<DurationType, DurationType, Int64Type, DivideChecked>::Exec;
 DCHECK_OK(divide_checked->AddKernel({duration(unit), int64()}, duration(unit),
 std::move(exec)));
 }

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

 // ----------------------------------------------------------------------
Expand Down

44 changes: 44 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@@ -1455,6 +1455,50 @@ TEST_F(ScalarTemporalTest, TestTemporalSubtractDuration) {
 }
}

TEST_F(ScalarTemporalTest, TestTemporalMultiplyDuration) {
 std::shared_ptr<Array> max_array;
 auto max = std::numeric_limits<int64_t>::max();
 ArrayFromVector<Int64Type, int64_t>({max, max, max, max, max}, &max_array);

 for (auto u : TimeUnit::values()) {
 auto unit = duration(u);
 auto durations = ArrayFromJSON(unit, R"([0, -1, 2, 6, null])");
 auto multipliers = ArrayFromJSON(int64(), R"([0, 3, 2, 7, null])");
 auto durations_multiplied = ArrayFromJSON(unit, R"([0, -3, 4, 42, null])");

 CheckScalarBinary("multiply", durations, multipliers, durations_multiplied);
 CheckScalarBinary("multiply", multipliers, durations, durations_multiplied);
 CheckScalarBinary("multiply_checked", durations, multipliers, durations_multiplied);
 CheckScalarBinary("multiply_checked", multipliers, durations, durations_multiplied);

 EXPECT_RAISES_WITH_MESSAGE_THAT(
 Invalid, ::testing::HasSubstr("Invalid: overflow"),
 CallFunction("multiply_checked", {durations, max_array}));
 EXPECT_RAISES_WITH_MESSAGE_THAT(
 Invalid, ::testing::HasSubstr("Invalid: overflow"),
 CallFunction("multiply_checked", {max_array, durations}));
 }
}

TEST_F(ScalarTemporalTest, TestTemporalDivideDuration) {
 for (auto u : TimeUnit::values()) {
 auto unit = duration(u);
 auto divided_durations = ArrayFromJSON(unit, R"([0, -1, -2, 6, null])");
 auto divisors = ArrayFromJSON(int64(), R"([3, 3, -2, 7, null])");
 auto durations = ArrayFromJSON(unit, R"([1, -3, 4, 42, null])");
 auto zeros = ArrayFromJSON(int64(), R"([0, 0, 0, 0, null])");
 CheckScalarBinary("divide", durations, divisors, divided_durations);
 CheckScalarBinary("divide_checked", durations, divisors, divided_durations);
@pitroupitrouFeb 22, 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.

Also check that division by zero raises?
@rokrokFeb 22, 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.

 EXPECT_RAISES_WITH_MESSAGE_THAT(Invalid,
 ::testing::HasSubstr("Invalid: divide by zero"),
 CallFunction("divide", {durations, zeros}));
 EXPECT_RAISES_WITH_MESSAGE_THAT(Invalid,
 ::testing::HasSubstr("Invalid: divide by zero"),
 CallFunction("divide_checked", {durations, zeros}));
 }
}

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

8 changes: 4 additions & 4 deletions
docs/source/cpp/compute.rst

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -441,13 +441,13 @@ Mixed time resolution temporal inputs will be cast to finest input resolution.
+------------------+--------+------------------+----------------------+-------+
| add_checked | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+------------------+----------------------+-------+
| divide | Binary | Numeric| Numeric | \(1) |
| divide | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+------------------+----------------------+-------+
| divide_checked | Binary | Numeric| Numeric | \(1) |
| divide_checked | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+------------------+----------------------+-------+
| multiply | Binary | Numeric| Numeric | \(1) |
| multiply | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
Comment thread
rok marked this conversation as resolved.


Outdated

+------------------+--------+------------------+----------------------+-------+
| multiply_checked | Binary | Numeric| Numeric | \(1) |
| multiply_checked | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+------------------+----------------------+-------+
| negate | Unary | Numeric | Numeric | |
+------------------+--------+------------------+----------------------+-------+
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
ARROW-14101: [C++] multiply(duration, integer) -> duration kernel by rok · Pull Request #12215 · apache/arrow · GitHub
Skip to content
ARROW-14101: [C++] multiply(duration, integer) -> duration kernel#12215

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
2
commits into

from

 Closed


ARROW-14101: [C++] multiply(duration, integer) -> duration kernel
#12215
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
e3fa8fe

multiply(duration, integer) -> duration


rok Feb 22, 2022
c797d52

Review feedback


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


7 changes: 7 additions & 0 deletions
cpp/src/arrow/compute/kernels/codegen_internal_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -202,6 +202,8 @@ TEST(TestDispatchBest, CommonTemporalResolution) {
 ASSERT_EQ(TimeUnit::MILLI, CommonTemporalResolution(args.data(), args.size()));
 args = {time64(TimeUnit::MICRO), duration(TimeUnit::NANO)};
 ASSERT_EQ(TimeUnit::NANO, CommonTemporalResolution(args.data(), args.size()));
 args = {duration(TimeUnit::SECOND), int64()};
 ASSERT_EQ(TimeUnit::SECOND, CommonTemporalResolution(args.data(), args.size()));

Comment on lines

205
 to 
206

@pitroupitrouFeb 22, 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.

This looks unexpected to me since int64 is not a temporal at all. @lidavidm What do you think?
@lidavidmlidavidmFeb 22, 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.

I think this is fine, but maybe we need a better name for what this function does.
That said, I don't think this change is needed for this function to work, anyways. There's only a single temporal argument so there isn't really a meaningful common resolution to cast to.
@pitroupitrouFeb 22, 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.

To be honest, the function doesn't seem to have changed :-). It's just the additional test that surprised me (but adding a test for existing behaviour is useful, thank you @rok ).
@rokrokFeb 22, 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.

Well duration has a unit and int64 is dimensionless. The goal of the function is to find the best common unit and I'd argue it still does.
}

TEST(TestDispatchBest, ReplaceTemporalTypes) {
Expand DownExpand Up@@ -268,6 +270,11 @@ TEST(TestDispatchBest, ReplaceTemporalTypes) {
 ReplaceTemporalTypes(ty, &args);
 AssertTypeEqual(args[0].type, time64(TimeUnit::NANO));
 AssertTypeEqual(args[1].type, duration(TimeUnit::NANO));

 args = {duration(TimeUnit::SECOND), int64()};
 ReplaceTemporalTypes(CommonTemporalResolution(args.data(), args.size()), &args);
 AssertTypeEqual(args[0].type, duration(TimeUnit::SECOND));
 AssertTypeEqual(args[1].type, int64());
}

} // namespace internal
Expand Down

43 changes: 42 additions & 1 deletion
cpp/src/arrow/compute/kernels/scalar_arithmetic.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,6 +44,7 @@ namespace internal {

using applicator::ScalarBinary;
using applicator::ScalarBinaryEqualTypes;
using applicator::ScalarBinaryNotNull;
using applicator::ScalarBinaryNotNullEqualTypes;
using applicator::ScalarUnary;
using applicator::ScalarUnaryNotNull;
Expand DownExpand Up@@ -1647,8 +1648,8 @@ ArrayKernelExec ArithmeticExecFromOp(detail::GetTypeId get_id) {
 return KernelGenerator<Int32Type, Int32Type, Op>::Exec;
 case Type::UINT32:
 return KernelGenerator<UInt32Type, UInt32Type, Op>::Exec;
 case Type::DURATION:
 case Type::INT64:
 case Type::DURATION:
 case Type::TIMESTAMP:
 return KernelGenerator<Int64Type, Int64Type, Op>::Exec;
 case Type::UINT64:
Expand DownExpand Up@@ -2802,23 +2803,63 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
 // ----------------------------------------------------------------------
 auto multiply = MakeArithmeticFunction<Multiply>("multiply", &mul_doc);
 AddDecimalBinaryKernels<Multiply>("multiply", multiply.get());

 // Add multiply(duration, int64) -> duration
 for (auto unit : TimeUnit::values()) {
 auto exec1 = ArithmeticExecFromOp<ScalarBinaryEqualTypes, Multiply>(Type::DURATION);
 DCHECK_OK(
 multiply->AddKernel({duration(unit), int64()}, duration(unit), std::move(exec1)));
 auto exec2 = ArithmeticExecFromOp<ScalarBinaryEqualTypes, Multiply>(Type::DURATION);
 DCHECK_OK(
 multiply->AddKernel({int64(), duration(unit)}, duration(unit), std::move(exec2)));
 }

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

 // ----------------------------------------------------------------------
 auto multiply_checked = MakeArithmeticFunctionNotNull<MultiplyChecked>(
 "multiply_checked", &mul_checked_doc);
 AddDecimalBinaryKernels<MultiplyChecked>("multiply_checked", multiply_checked.get());

 // Add multiply_checked(duration, int64) -> duration
 for (auto unit : TimeUnit::values()) {
 auto exec1 =
 ArithmeticExecFromOp<ScalarBinaryEqualTypes, MultiplyChecked>(Type::DURATION);
 DCHECK_OK(multiply_checked->AddKernel({duration(unit), int64()}, duration(unit),
 std::move(exec1)));
 auto exec2 =
 ArithmeticExecFromOp<ScalarBinaryEqualTypes, MultiplyChecked>(Type::DURATION);
 DCHECK_OK(multiply_checked->AddKernel({int64(), duration(unit)}, duration(unit),
 std::move(exec2)));
 }

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

 // ----------------------------------------------------------------------
 auto divide = MakeArithmeticFunctionNotNull<Divide>("divide", &div_doc);
 AddDecimalBinaryKernels<Divide>("divide", divide.get());

 // Add divide(duration, int64) -> duration
 for (auto unit : TimeUnit::values()) {
 auto exec = ScalarBinaryNotNull<DurationType, DurationType, Int64Type, Divide>::Exec;
 DCHECK_OK(
 divide->AddKernel({duration(unit), int64()}, duration(unit), std::move(exec)));
 }
 DCHECK_OK(registry->AddFunction(std::move(divide)));

 // ----------------------------------------------------------------------
 auto divide_checked =
 MakeArithmeticFunctionNotNull<DivideChecked>("divide_checked", &div_checked_doc);
 AddDecimalBinaryKernels<DivideChecked>("divide_checked", divide_checked.get());

 // Add divide_checked(duration, int64) -> duration
 for (auto unit : TimeUnit::values()) {
 auto exec =
 ScalarBinaryNotNull<DurationType, DurationType, Int64Type, DivideChecked>::Exec;
 DCHECK_OK(divide_checked->AddKernel({duration(unit), int64()}, duration(unit),
 std::move(exec)));
 }

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

 // ----------------------------------------------------------------------
Expand Down

44 changes: 44 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@@ -1455,6 +1455,50 @@ TEST_F(ScalarTemporalTest, TestTemporalSubtractDuration) {
 }
}

TEST_F(ScalarTemporalTest, TestTemporalMultiplyDuration) {
 std::shared_ptr<Array> max_array;
 auto max = std::numeric_limits<int64_t>::max();
 ArrayFromVector<Int64Type, int64_t>({max, max, max, max, max}, &max_array);

 for (auto u : TimeUnit::values()) {
 auto unit = duration(u);
 auto durations = ArrayFromJSON(unit, R"([0, -1, 2, 6, null])");
 auto multipliers = ArrayFromJSON(int64(), R"([0, 3, 2, 7, null])");
 auto durations_multiplied = ArrayFromJSON(unit, R"([0, -3, 4, 42, null])");

 CheckScalarBinary("multiply", durations, multipliers, durations_multiplied);
 CheckScalarBinary("multiply", multipliers, durations, durations_multiplied);
 CheckScalarBinary("multiply_checked", durations, multipliers, durations_multiplied);
 CheckScalarBinary("multiply_checked", multipliers, durations, durations_multiplied);

 EXPECT_RAISES_WITH_MESSAGE_THAT(
 Invalid, ::testing::HasSubstr("Invalid: overflow"),
 CallFunction("multiply_checked", {durations, max_array}));
 EXPECT_RAISES_WITH_MESSAGE_THAT(
 Invalid, ::testing::HasSubstr("Invalid: overflow"),
 CallFunction("multiply_checked", {max_array, durations}));
 }
}

TEST_F(ScalarTemporalTest, TestTemporalDivideDuration) {
 for (auto u : TimeUnit::values()) {
 auto unit = duration(u);
 auto divided_durations = ArrayFromJSON(unit, R"([0, -1, -2, 6, null])");
 auto divisors = ArrayFromJSON(int64(), R"([3, 3, -2, 7, null])");
 auto durations = ArrayFromJSON(unit, R"([1, -3, 4, 42, null])");
 auto zeros = ArrayFromJSON(int64(), R"([0, 0, 0, 0, null])");
 CheckScalarBinary("divide", durations, divisors, divided_durations);
 CheckScalarBinary("divide_checked", durations, divisors, divided_durations);
@pitroupitrouFeb 22, 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.

Also check that division by zero raises?
@rokrokFeb 22, 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.

 EXPECT_RAISES_WITH_MESSAGE_THAT(Invalid,
 ::testing::HasSubstr("Invalid: divide by zero"),
 CallFunction("divide", {durations, zeros}));
 EXPECT_RAISES_WITH_MESSAGE_THAT(Invalid,
 ::testing::HasSubstr("Invalid: divide by zero"),
 CallFunction("divide_checked", {durations, zeros}));
 }
}

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

8 changes: 4 additions & 4 deletions
docs/source/cpp/compute.rst

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -441,13 +441,13 @@ Mixed time resolution temporal inputs will be cast to finest input resolution.
+------------------+--------+------------------+----------------------+-------+
| add_checked | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+------------------+----------------------+-------+
| divide | Binary | Numeric| Numeric | \(1) |
| divide | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+------------------+----------------------+-------+
| divide_checked | Binary | Numeric| Numeric | \(1) |
| divide_checked | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+------------------+----------------------+-------+
| multiply | Binary | Numeric| Numeric | \(1) |
| multiply | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
Comment thread
rok marked this conversation as resolved.


Outdated

+------------------+--------+------------------+----------------------+-------+
| multiply_checked | Binary | Numeric| Numeric | \(1) |
| multiply_checked | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+------------------+----------------------+-------+
| negate | Unary | Numeric | Numeric | |
+------------------+--------+------------------+----------------------+-------+
Expand Down

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

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
2
commits into

from

 Closed


ARROW-14101: [C++] multiply(duration, integer) -> duration kernel
#12215
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
e3fa8fe

multiply(duration, integer) -> duration


rok Feb 22, 2022
c797d52

Review feedback


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


7 changes: 7 additions & 0 deletions
cpp/src/arrow/compute/kernels/codegen_internal_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -202,6 +202,8 @@ TEST(TestDispatchBest, CommonTemporalResolution) {
 ASSERT_EQ(TimeUnit::MILLI, CommonTemporalResolution(args.data(), args.size()));
 args = {time64(TimeUnit::MICRO), duration(TimeUnit::NANO)};
 ASSERT_EQ(TimeUnit::NANO, CommonTemporalResolution(args.data(), args.size()));
 args = {duration(TimeUnit::SECOND), int64()};
 ASSERT_EQ(TimeUnit::SECOND, CommonTemporalResolution(args.data(), args.size()));

Comment on lines

205
 to 
206

@pitroupitrouFeb 22, 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.

This looks unexpected to me since int64 is not a temporal at all. @lidavidm What do you think?
@lidavidmlidavidmFeb 22, 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.

I think this is fine, but maybe we need a better name for what this function does.
That said, I don't think this change is needed for this function to work, anyways. There's only a single temporal argument so there isn't really a meaningful common resolution to cast to.
@pitroupitrouFeb 22, 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.

To be honest, the function doesn't seem to have changed :-). It's just the additional test that surprised me (but adding a test for existing behaviour is useful, thank you @rok ).
@rokrokFeb 22, 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.

Well duration has a unit and int64 is dimensionless. The goal of the function is to find the best common unit and I'd argue it still does.
}

TEST(TestDispatchBest, ReplaceTemporalTypes) {
Expand DownExpand Up@@ -268,6 +270,11 @@ TEST(TestDispatchBest, ReplaceTemporalTypes) {
 ReplaceTemporalTypes(ty, &args);
 AssertTypeEqual(args[0].type, time64(TimeUnit::NANO));
 AssertTypeEqual(args[1].type, duration(TimeUnit::NANO));

 args = {duration(TimeUnit::SECOND), int64()};
 ReplaceTemporalTypes(CommonTemporalResolution(args.data(), args.size()), &args);
 AssertTypeEqual(args[0].type, duration(TimeUnit::SECOND));
 AssertTypeEqual(args[1].type, int64());
}

} // namespace internal
Expand Down

43 changes: 42 additions & 1 deletion
cpp/src/arrow/compute/kernels/scalar_arithmetic.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,6 +44,7 @@ namespace internal {

using applicator::ScalarBinary;
using applicator::ScalarBinaryEqualTypes;
using applicator::ScalarBinaryNotNull;
using applicator::ScalarBinaryNotNullEqualTypes;
using applicator::ScalarUnary;
using applicator::ScalarUnaryNotNull;
Expand DownExpand Up@@ -1647,8 +1648,8 @@ ArrayKernelExec ArithmeticExecFromOp(detail::GetTypeId get_id) {
 return KernelGenerator<Int32Type, Int32Type, Op>::Exec;
 case Type::UINT32:
 return KernelGenerator<UInt32Type, UInt32Type, Op>::Exec;
 case Type::DURATION:
 case Type::INT64:
 case Type::DURATION:
 case Type::TIMESTAMP:
 return KernelGenerator<Int64Type, Int64Type, Op>::Exec;
 case Type::UINT64:
Expand DownExpand Up@@ -2802,23 +2803,63 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
 // ----------------------------------------------------------------------
 auto multiply = MakeArithmeticFunction<Multiply>("multiply", &mul_doc);
 AddDecimalBinaryKernels<Multiply>("multiply", multiply.get());

 // Add multiply(duration, int64) -> duration
 for (auto unit : TimeUnit::values()) {
 auto exec1 = ArithmeticExecFromOp<ScalarBinaryEqualTypes, Multiply>(Type::DURATION);
 DCHECK_OK(
 multiply->AddKernel({duration(unit), int64()}, duration(unit), std::move(exec1)));
 auto exec2 = ArithmeticExecFromOp<ScalarBinaryEqualTypes, Multiply>(Type::DURATION);
 DCHECK_OK(
 multiply->AddKernel({int64(), duration(unit)}, duration(unit), std::move(exec2)));
 }

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

 // ----------------------------------------------------------------------
 auto multiply_checked = MakeArithmeticFunctionNotNull<MultiplyChecked>(
 "multiply_checked", &mul_checked_doc);
 AddDecimalBinaryKernels<MultiplyChecked>("multiply_checked", multiply_checked.get());

 // Add multiply_checked(duration, int64) -> duration
 for (auto unit : TimeUnit::values()) {
 auto exec1 =
 ArithmeticExecFromOp<ScalarBinaryEqualTypes, MultiplyChecked>(Type::DURATION);
 DCHECK_OK(multiply_checked->AddKernel({duration(unit), int64()}, duration(unit),
 std::move(exec1)));
 auto exec2 =
 ArithmeticExecFromOp<ScalarBinaryEqualTypes, MultiplyChecked>(Type::DURATION);
 DCHECK_OK(multiply_checked->AddKernel({int64(), duration(unit)}, duration(unit),
 std::move(exec2)));
 }

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

 // ----------------------------------------------------------------------
 auto divide = MakeArithmeticFunctionNotNull<Divide>("divide", &div_doc);
 AddDecimalBinaryKernels<Divide>("divide", divide.get());

 // Add divide(duration, int64) -> duration
 for (auto unit : TimeUnit::values()) {
 auto exec = ScalarBinaryNotNull<DurationType, DurationType, Int64Type, Divide>::Exec;
 DCHECK_OK(
 divide->AddKernel({duration(unit), int64()}, duration(unit), std::move(exec)));
 }
 DCHECK_OK(registry->AddFunction(std::move(divide)));

 // ----------------------------------------------------------------------
 auto divide_checked =
 MakeArithmeticFunctionNotNull<DivideChecked>("divide_checked", &div_checked_doc);
 AddDecimalBinaryKernels<DivideChecked>("divide_checked", divide_checked.get());

 // Add divide_checked(duration, int64) -> duration
 for (auto unit : TimeUnit::values()) {
 auto exec =
 ScalarBinaryNotNull<DurationType, DurationType, Int64Type, DivideChecked>::Exec;
 DCHECK_OK(divide_checked->AddKernel({duration(unit), int64()}, duration(unit),
 std::move(exec)));
 }

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

 // ----------------------------------------------------------------------
Expand Down

44 changes: 44 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@@ -1455,6 +1455,50 @@ TEST_F(ScalarTemporalTest, TestTemporalSubtractDuration) {
 }
}

TEST_F(ScalarTemporalTest, TestTemporalMultiplyDuration) {
 std::shared_ptr<Array> max_array;
 auto max = std::numeric_limits<int64_t>::max();
 ArrayFromVector<Int64Type, int64_t>({max, max, max, max, max}, &max_array);

 for (auto u : TimeUnit::values()) {
 auto unit = duration(u);
 auto durations = ArrayFromJSON(unit, R"([0, -1, 2, 6, null])");
 auto multipliers = ArrayFromJSON(int64(), R"([0, 3, 2, 7, null])");
 auto durations_multiplied = ArrayFromJSON(unit, R"([0, -3, 4, 42, null])");

 CheckScalarBinary("multiply", durations, multipliers, durations_multiplied);
 CheckScalarBinary("multiply", multipliers, durations, durations_multiplied);
 CheckScalarBinary("multiply_checked", durations, multipliers, durations_multiplied);
 CheckScalarBinary("multiply_checked", multipliers, durations, durations_multiplied);

 EXPECT_RAISES_WITH_MESSAGE_THAT(
 Invalid, ::testing::HasSubstr("Invalid: overflow"),
 CallFunction("multiply_checked", {durations, max_array}));
 EXPECT_RAISES_WITH_MESSAGE_THAT(
 Invalid, ::testing::HasSubstr("Invalid: overflow"),
 CallFunction("multiply_checked", {max_array, durations}));
 }
}

TEST_F(ScalarTemporalTest, TestTemporalDivideDuration) {
 for (auto u : TimeUnit::values()) {
 auto unit = duration(u);
 auto divided_durations = ArrayFromJSON(unit, R"([0, -1, -2, 6, null])");
 auto divisors = ArrayFromJSON(int64(), R"([3, 3, -2, 7, null])");
 auto durations = ArrayFromJSON(unit, R"([1, -3, 4, 42, null])");
 auto zeros = ArrayFromJSON(int64(), R"([0, 0, 0, 0, null])");
 CheckScalarBinary("divide", durations, divisors, divided_durations);
 CheckScalarBinary("divide_checked", durations, divisors, divided_durations);
@pitroupitrouFeb 22, 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.

Also check that division by zero raises?
@rokrokFeb 22, 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.

 EXPECT_RAISES_WITH_MESSAGE_THAT(Invalid,
 ::testing::HasSubstr("Invalid: divide by zero"),
 CallFunction("divide", {durations, zeros}));
 EXPECT_RAISES_WITH_MESSAGE_THAT(Invalid,
 ::testing::HasSubstr("Invalid: divide by zero"),
 CallFunction("divide_checked", {durations, zeros}));
 }
}

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

8 changes: 4 additions & 4 deletions
docs/source/cpp/compute.rst

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -441,13 +441,13 @@ Mixed time resolution temporal inputs will be cast to finest input resolution.
+------------------+--------+------------------+----------------------+-------+
| add_checked | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+------------------+----------------------+-------+
| divide | Binary | Numeric| Numeric | \(1) |
| divide | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+------------------+----------------------+-------+
| divide_checked | Binary | Numeric| Numeric | \(1) |
| divide_checked | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+------------------+----------------------+-------+
| multiply | Binary | Numeric| Numeric | \(1) |
| multiply | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
Comment thread
rok marked this conversation as resolved.


Outdated

+------------------+--------+------------------+----------------------+-------+
| multiply_checked | Binary | Numeric| Numeric | \(1) |
| multiply_checked | Binary | Numeric/Temporal | Numeric/Temporal | \(1) |
+------------------+--------+------------------+----------------------+-------+
| negate | Unary | Numeric | Numeric | |
+------------------+--------+------------------+----------------------+-------+
Expand Down