ARROW-15919: [C++] Add function not commutative with timestamps & duration maths#12612

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

ARROW-15919: [C++] Add function not commutative with timestamps & duration maths #12612

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0e7faba
Temporal add/add_checked should be commutative.
rok Mar 11, 2022
2c13914
Review feedback
rok Mar 16, 2022
0d424da
Review feedback
rok Mar 17, 2022
acabb81
Review feedback
rok Mar 17, 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
4 changes: 4 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@@ -182,6 +182,8 @@ TEST(TestDispatchBest, CommonTemporalResolution) {
ASSERT_EQ(TimeUnit::MILLI, CommonTemporalResolution(args.data(), args.size()));
args = {duration(TimeUnit::SECOND), time32(TimeUnit::SECOND)};
ASSERT_EQ(TimeUnit::SECOND, CommonTemporalResolution(args.data(), args.size()));
args = {duration(TimeUnit::SECOND), time64(TimeUnit::NANO)};
ASSERT_EQ(TimeUnit::NANO, CommonTemporalResolution(args.data(), args.size()));
args = {time64(TimeUnit::MICRO), duration(TimeUnit::NANO)};
ASSERT_EQ(TimeUnit::NANO, CommonTemporalResolution(args.data(), args.size()));
args = {timestamp(TimeUnit::SECOND, tz), timestamp(TimeUnit::MICRO)};
Expand All@@ -204,6 +206,8 @@ TEST(TestDispatchBest, CommonTemporalResolution) {
ASSERT_EQ(TimeUnit::NANO, CommonTemporalResolution(args.data(), args.size()));
args = {duration(TimeUnit::SECOND), int64()};
ASSERT_EQ(TimeUnit::SECOND, CommonTemporalResolution(args.data(), args.size()));
args = {duration(TimeUnit::MILLI), timestamp(TimeUnit::SECOND, tz)};
ASSERT_EQ(TimeUnit::MILLI, CommonTemporalResolution(args.data(), args.size()));
}

TEST(TestDispatchBest, ReplaceTemporalTypes) {
Expand Down
157 changes: 64 additions & 93 deletions cpp/src/arrow/compute/kernels/scalar_arithmetic.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -240,23 +240,12 @@ struct SubtractCheckedDate32 {
}
};

template <bool is_32bit, int64_t multiple>
template <int64_t multiple>
struct AddTimeDuration {
template <typename T, typename Arg0, typename Arg1>
static enable_if_t<is_32bit, T> Call(KernelContext*, Arg0 left, Arg1 right,
Status* st) {
T result = arrow::internal::SafeSignedAdd(left, static_cast<T>(right));
if (result < 0 || multiple <= result) {
*st = Status::Invalid(result, " is not within the acceptable range of ", "[0, ",
multiple, ") s");
}
return result;
}

template <typename T, typename Arg0, typename Arg1>
static enable_if_t<!is_32bit, T> Call(KernelContext*, Arg0 left, Arg1 right,
Status* st) {
T result = arrow::internal::SafeSignedAdd(left, right);
static T Call(KernelContext*, Arg0 left, Arg1 right, Status* st) {
T result =
arrow::internal::SafeSignedAdd(static_cast<T>(left), static_cast<T>(right));
if (result < 0 || multiple <= result) {
*st = Status::Invalid(result, " is not within the acceptable range of ", "[0, ",
multiple, ") s");
Expand All@@ -265,27 +254,13 @@ struct AddTimeDuration {
}
};

template <bool is_32bit, int64_t multiple>
template <int64_t multiple>
struct AddTimeDurationChecked {
template <typename T, typename Arg0, typename Arg1>
static enable_if_t<is_32bit, T> Call(KernelContext*, Arg0 left, Arg1 right,
Status* st) {
T result = 0;
if (ARROW_PREDICT_FALSE(AddWithOverflow(left, static_cast<T>(right), &result))) {
*st = Status::Invalid("overflow");
}
if (result < 0 || multiple <= result) {
*st = Status::Invalid(result, " is not within the acceptable range of ", "[0, ",
multiple, ") s");
}
return result;
}

template <typename T, typename Arg0, typename Arg1>
static enable_if_t<!is_32bit, T> Call(KernelContext*, Arg0 left, Arg1 right,
Status* st) {
static T Call(KernelContext*, Arg0 left, Arg1 right, Status* st) {
T result = 0;
if (ARROW_PREDICT_FALSE(AddWithOverflow(left, static_cast<T>(right), &result))) {
if (ARROW_PREDICT_FALSE(
AddWithOverflow(static_cast<T>(left), static_cast<T>(right), &result))) {
*st = Status::Invalid("overflow");
}
if (result < 0 || multiple <= result) {
Expand All@@ -296,50 +271,23 @@ struct AddTimeDurationChecked {
}
};

template <bool is_32bit, int64_t multiple>
template <int64_t multiple>
struct SubtractTimeDuration {
template <typename T, typename Arg0, typename Arg1>
static enable_if_t<is_32bit, T> Call(KernelContext*, Arg0 left, Arg1 right,
Status* st) {
static T Call(KernelContext*, Arg0 left, Arg1 right, Status* st) {
T result = arrow::internal::SafeSignedSubtract(left, static_cast<T>(right));
if (result < 0 || multiple <= result) {
*st = Status::Invalid(result, " is not within the acceptable range of ", "[0, ",
multiple, ") s");
}
return result;
}

template <typename T, typename Arg0, typename Arg1>
static enable_if_t<!is_32bit, T> Call(KernelContext*, Arg0 left, Arg1 right,
Status* st) {
T result = arrow::internal::SafeSignedSubtract(left, right);
if (result < 0 || multiple <= result) {
*st = Status::Invalid(result, " is not within the acceptable range of ", "[0, ",
multiple, ") s");
}
return result;
}
};

template <bool is_32bit, int64_t multiple>
template <int64_t multiple>
struct SubtractTimeDurationChecked {
template <typename T, typename Arg0, typename Arg1>
static enable_if_t<is_32bit, T> Call(KernelContext*, Arg0 left, Arg1 right,
Status* st) {
T result = 0;
if (ARROW_PREDICT_FALSE(SubtractWithOverflow(left, static_cast<T>(right), &result))) {
*st = Status::Invalid("overflow");
}
if (result < 0 || multiple <= result) {
*st = Status::Invalid(result, " is not within the acceptable range of ", "[0, ",
multiple, ") s");
}
return result;
}

template <typename T, typename Arg0, typename Arg1>
static enable_if_t<!is_32bit, T> Call(KernelContext*, Arg0 left, Arg1 right,
Status* st) {
static T Call(KernelContext*, Arg0 left, Arg1 right, Status* st) {
T result = 0;
if (ARROW_PREDICT_FALSE(SubtractWithOverflow(left, static_cast<T>(right), &result))) {
*st = Status::Invalid("overflow");
Expand DownExpand Up@@ -2269,34 +2217,58 @@ std::shared_ptr<ScalarFunction> MakeArithmeticFunctionFloatingPointNotNull(
return func;
}

template <template <bool, int64_t> class Op>
void AddArithmeticFunctionTimeDurations(std::shared_ptr<ScalarFunction> func) {
template <template <int64_t> class Op>
void AddArithmeticFunctionTimeDuration(std::shared_ptr<ScalarFunction> func) {
// Add Op(time32, duration) -> time32
TimeUnit::type unit = TimeUnit::SECOND;
auto exec_1 = ScalarBinary<Time32Type, Time32Type, DurationType, Op<true, 86400>>::Exec;
auto exec_1 = ScalarBinary<Time32Type, Time32Type, DurationType, Op<86400>>::Exec;
DCHECK_OK(func->AddKernel({time32(unit), duration(unit)}, OutputType(FirstType),
std::move(exec_1)));

unit = TimeUnit::MILLI;
auto exec_2 =
ScalarBinary<Time32Type, Time32Type, DurationType, Op<true, 86400000>>::Exec;
auto exec_2 = ScalarBinary<Time32Type, Time32Type, DurationType, Op<86400000>>::Exec;
DCHECK_OK(func->AddKernel({time32(unit), duration(unit)}, OutputType(FirstType),
std::move(exec_2)));

// Add Op(time64, duration) -> time64
unit = TimeUnit::MICRO;
auto exec_3 =
ScalarBinary<Time64Type, Time64Type, DurationType, Op<false, 86400000000>>::Exec;
auto exec_3 = ScalarBinary<Time64Type, Time64Type, DurationType, Op<86400000000>>::Exec;
DCHECK_OK(func->AddKernel({time64(unit), duration(unit)}, OutputType(FirstType),
std::move(exec_3)));

unit = TimeUnit::NANO;
auto exec_4 =
ScalarBinary<Time64Type, Time64Type, DurationType, Op<false, 86400000000000>>::Exec;
ScalarBinary<Time64Type, Time64Type, DurationType, Op<86400000000000>>::Exec;
DCHECK_OK(func->AddKernel({time64(unit), duration(unit)}, OutputType(FirstType),
std::move(exec_4)));
}

template <template <int64_t> class Op>
void AddArithmeticFunctionDurationTime(std::shared_ptr<ScalarFunction> func) {
// Add Op(duration, time32) -> time32
TimeUnit::type unit = TimeUnit::SECOND;
auto exec_1 = ScalarBinary<Time32Type, DurationType, Time32Type, Op<86400>>::Exec;
DCHECK_OK(func->AddKernel({duration(unit), time32(unit)}, OutputType(LastType),
std::move(exec_1)));

unit = TimeUnit::MILLI;
auto exec_2 = ScalarBinary<Time32Type, DurationType, Time32Type, Op<86400000>>::Exec;
DCHECK_OK(func->AddKernel({duration(unit), time32(unit)}, OutputType(LastType),
std::move(exec_2)));

// Add Op(duration, time64) -> time64
unit = TimeUnit::MICRO;
auto exec_3 = ScalarBinary<Time64Type, DurationType, Time64Type, Op<86400000000>>::Exec;
DCHECK_OK(func->AddKernel({duration(unit), time64(unit)}, OutputType(LastType),
std::move(exec_3)));

unit = TimeUnit::NANO;
auto exec_4 =
ScalarBinary<Time64Type, DurationType, Time64Type, Op<86400000000000>>::Exec;
DCHECK_OK(func->AddKernel({duration(unit), time64(unit)}, OutputType(LastType),
std::move(exec_4)));
}

const FunctionDoc absolute_value_doc{
"Calculate the absolute value of the argument element-wise",
("Results will wrap around on integer overflow.\n"
Expand DownExpand Up@@ -2638,8 +2610,8 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
for (auto unit : TimeUnit::values()) {
InputType in_type(match::TimestampTypeUnit(unit));
auto exec = ScalarBinary<Int64Type, Int64Type, Int64Type, Add>::Exec;
DCHECK_OK(add->AddKernel({in_type, duration(unit)}, OutputType(FirstType),
std::move(exec)));
DCHECK_OK(add->AddKernel({in_type, duration(unit)}, OutputType(FirstType), exec));
DCHECK_OK(add->AddKernel({duration(unit), in_type}, OutputType(LastType), exec));
}

// Add add(duration, duration) -> duration
Expand All@@ -2649,7 +2621,8 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
DCHECK_OK(add->AddKernel({in_type, in_type}, duration(unit), std::move(exec)));
}

AddArithmeticFunctionTimeDurations<AddTimeDuration>(add);
AddArithmeticFunctionTimeDuration<AddTimeDuration>(add);
AddArithmeticFunctionDurationTime<AddTimeDuration>(add);

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

Expand All@@ -2662,8 +2635,10 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
for (auto unit : TimeUnit::values()) {
InputType in_type(match::TimestampTypeUnit(unit));
auto exec = ScalarBinary<Int64Type, Int64Type, Int64Type, AddChecked>::Exec;
DCHECK_OK(add_checked->AddKernel({in_type, duration(unit)}, OutputType(FirstType),
std::move(exec)));
DCHECK_OK(
add_checked->AddKernel({in_type, duration(unit)}, OutputType(FirstType), exec));
DCHECK_OK(
add_checked->AddKernel({duration(unit), in_type}, OutputType(LastType), exec));
}

// Add add(duration, duration) -> duration
Expand All@@ -2674,7 +2649,8 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
add_checked->AddKernel({in_type, in_type}, duration(unit), std::move(exec)));
}

AddArithmeticFunctionTimeDurations<AddTimeDurationChecked>(add_checked);
AddArithmeticFunctionTimeDuration<AddTimeDurationChecked>(add_checked);
AddArithmeticFunctionDurationTime<AddTimeDurationChecked>(add_checked);

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

Expand DownExpand Up@@ -2732,7 +2708,7 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
DCHECK_OK(subtract->AddKernel({in_type_date_64, in_type_date_64},
duration(TimeUnit::MILLI), std::move(exec_date_64)));

AddArithmeticFunctionTimeDurations<SubtractTimeDuration>(subtract);
AddArithmeticFunctionTimeDuration<SubtractTimeDuration>(subtract);

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

Expand DownExpand Up@@ -2798,7 +2774,7 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
subtract_checked->AddKernel({in_type, in_type}, duration(unit), std::move(exec)));
}

AddArithmeticFunctionTimeDurations<SubtractTimeDurationChecked>(subtract_checked);
AddArithmeticFunctionTimeDuration<SubtractTimeDurationChecked>(subtract_checked);

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

Expand All@@ -2808,12 +2784,9 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {

// 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)));
auto exec = ArithmeticExecFromOp<ScalarBinaryEqualTypes, Multiply>(Type::DURATION);
DCHECK_OK(multiply->AddKernel({duration(unit), int64()}, duration(unit), exec));
DCHECK_OK(multiply->AddKernel({int64(), duration(unit)}, duration(unit), exec));
}

DCHECK_OK(registry->AddFunction(std::move(multiply)));
Expand All@@ -2825,14 +2798,12 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {

// 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 =
auto exec =
ArithmeticExecFromOp<ScalarBinaryEqualTypes, MultiplyChecked>(Type::DURATION);
DCHECK_OK(multiply_checked->AddKernel({int64(), duration(unit)}, duration(unit),
std::move(exec2)));
DCHECK_OK(
multiply_checked->AddKernel({duration(unit), int64()}, duration(unit), exec));
DCHECK_OK(
multiply_checked->AddKernel({int64(), duration(unit)}, duration(unit), exec));
}

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

Skip to content
ARROW-15919: [C++] Add function not commutative with timestamps & duration maths#12612

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

from

 Closed


ARROW-15919: [C++] Add function not commutative with timestamps & duration maths
#12612
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
0e7faba

Temporal add/add_checked should be commutative.


rok Mar 11, 2022
2c13914

Review feedback


rok Mar 16, 2022
0d424da

Review feedback


rok Mar 17, 2022
acabb81

Review feedback


rok Mar 17, 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


4 changes: 4 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@@ -182,6 +182,8 @@ TEST(TestDispatchBest, CommonTemporalResolution) {
 ASSERT_EQ(TimeUnit::MILLI, CommonTemporalResolution(args.data(), args.size()));
 args = {duration(TimeUnit::SECOND), time32(TimeUnit::SECOND)};
 ASSERT_EQ(TimeUnit::SECOND, CommonTemporalResolution(args.data(), args.size()));
 args = {duration(TimeUnit::SECOND), time64(TimeUnit::NANO)};
 ASSERT_EQ(TimeUnit::NANO, CommonTemporalResolution(args.data(), args.size()));
 args = {time64(TimeUnit::MICRO), duration(TimeUnit::NANO)};
 ASSERT_EQ(TimeUnit::NANO, CommonTemporalResolution(args.data(), args.size()));
 args = {timestamp(TimeUnit::SECOND, tz), timestamp(TimeUnit::MICRO)};
Expand All@@ -204,6 +206,8 @@ TEST(TestDispatchBest, CommonTemporalResolution) {
 ASSERT_EQ(TimeUnit::NANO, CommonTemporalResolution(args.data(), args.size()));
 args = {duration(TimeUnit::SECOND), int64()};
 ASSERT_EQ(TimeUnit::SECOND, CommonTemporalResolution(args.data(), args.size()));
 args = {duration(TimeUnit::MILLI), timestamp(TimeUnit::SECOND, tz)};
 ASSERT_EQ(TimeUnit::MILLI, CommonTemporalResolution(args.data(), args.size()));
}

TEST(TestDispatchBest, ReplaceTemporalTypes) {
Expand Down

157 changes: 64 additions & 93 deletions
cpp/src/arrow/compute/kernels/scalar_arithmetic.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -240,23 +240,12 @@ struct SubtractCheckedDate32 {
 }
};

template <bool is_32bit, int64_t multiple>
template <int64_t multiple>
struct AddTimeDuration {
 template <typename T, typename Arg0, typename Arg1>
 static enable_if_t<is_32bit, T> Call(KernelContext*, Arg0 left, Arg1 right,
 Status* st) {
 T result = arrow::internal::SafeSignedAdd(left, static_cast<T>(right));
 if (result < 0 || multiple <= result) {
 *st = Status::Invalid(result, " is not within the acceptable range of ", "[0, ",
 multiple, ") s");
 }
 return result;
 }

 template <typename T, typename Arg0, typename Arg1>
 static enable_if_t<!is_32bit, T> Call(KernelContext*, Arg0 left, Arg1 right,
 Status* st) {
 T result = arrow::internal::SafeSignedAdd(left, right);
 static T Call(KernelContext*, Arg0 left, Arg1 right, Status* st) {
 T result =
 arrow::internal::SafeSignedAdd(static_cast<T>(left), static_cast<T>(right));
 if (result < 0 || multiple <= result) {
 *st = Status::Invalid(result, " is not within the acceptable range of ", "[0, ",
 multiple, ") s");
Expand All@@ -265,27 +254,13 @@ struct AddTimeDuration {
 }
};

template <bool is_32bit, int64_t multiple>
template <int64_t multiple>
struct AddTimeDurationChecked {
 template <typename T, typename Arg0, typename Arg1>
 static enable_if_t<is_32bit, T> Call(KernelContext*, Arg0 left, Arg1 right,
 Status* st) {
 T result = 0;
 if (ARROW_PREDICT_FALSE(AddWithOverflow(left, static_cast<T>(right), &result))) {
 *st = Status::Invalid("overflow");
 }
 if (result < 0 || multiple <= result) {
 *st = Status::Invalid(result, " is not within the acceptable range of ", "[0, ",
 multiple, ") s");
 }
 return result;
 }

 template <typename T, typename Arg0, typename Arg1>
 static enable_if_t<!is_32bit, T> Call(KernelContext*, Arg0 left, Arg1 right,
 Status* st) {
 static T Call(KernelContext*, Arg0 left, Arg1 right, Status* st) {
 T result = 0;
 if (ARROW_PREDICT_FALSE(AddWithOverflow(left, static_cast<T>(right), &result))) {
 if (ARROW_PREDICT_FALSE(
 AddWithOverflow(static_cast<T>(left), static_cast<T>(right), &result))) {
 *st = Status::Invalid("overflow");
 }
 if (result < 0 || multiple <= result) {
Expand All@@ -296,50 +271,23 @@ struct AddTimeDurationChecked {
 }
};

template <bool is_32bit, int64_t multiple>
template <int64_t multiple>
struct SubtractTimeDuration {
 template <typename T, typename Arg0, typename Arg1>
 static enable_if_t<is_32bit, T> Call(KernelContext*, Arg0 left, Arg1 right,
 Status* st) {
 static T Call(KernelContext*, Arg0 left, Arg1 right, Status* st) {
 T result = arrow::internal::SafeSignedSubtract(left, static_cast<T>(right));
 if (result < 0 || multiple <= result) {
 *st = Status::Invalid(result, " is not within the acceptable range of ", "[0, ",
 multiple, ") s");
 }
 return result;
 }

 template <typename T, typename Arg0, typename Arg1>
 static enable_if_t<!is_32bit, T> Call(KernelContext*, Arg0 left, Arg1 right,
 Status* st) {
 T result = arrow::internal::SafeSignedSubtract(left, right);
 if (result < 0 || multiple <= result) {
 *st = Status::Invalid(result, " is not within the acceptable range of ", "[0, ",
 multiple, ") s");
 }
 return result;
 }
};

template <bool is_32bit, int64_t multiple>
template <int64_t multiple>
struct SubtractTimeDurationChecked {
 template <typename T, typename Arg0, typename Arg1>
 static enable_if_t<is_32bit, T> Call(KernelContext*, Arg0 left, Arg1 right,
 Status* st) {
 T result = 0;
 if (ARROW_PREDICT_FALSE(SubtractWithOverflow(left, static_cast<T>(right), &result))) {
 *st = Status::Invalid("overflow");
 }
 if (result < 0 || multiple <= result) {
 *st = Status::Invalid(result, " is not within the acceptable range of ", "[0, ",
 multiple, ") s");
 }
 return result;
 }

 template <typename T, typename Arg0, typename Arg1>
 static enable_if_t<!is_32bit, T> Call(KernelContext*, Arg0 left, Arg1 right,
 Status* st) {
 static T Call(KernelContext*, Arg0 left, Arg1 right, Status* st) {
 T result = 0;
 if (ARROW_PREDICT_FALSE(SubtractWithOverflow(left, static_cast<T>(right), &result))) {
 *st = Status::Invalid("overflow");
Expand DownExpand Up@@ -2269,34 +2217,58 @@ std::shared_ptr<ScalarFunction> MakeArithmeticFunctionFloatingPointNotNull(
 return func;
}

template <template <bool, int64_t> class Op>
void AddArithmeticFunctionTimeDurations(std::shared_ptr<ScalarFunction> func) {
template <template <int64_t> class Op>
void AddArithmeticFunctionTimeDuration(std::shared_ptr<ScalarFunction> func) {
 // Add Op(time32, duration) -> time32
 TimeUnit::type unit = TimeUnit::SECOND;
 auto exec_1 = ScalarBinary<Time32Type, Time32Type, DurationType, Op<true, 86400>>::Exec;
 auto exec_1 = ScalarBinary<Time32Type, Time32Type, DurationType, Op<86400>>::Exec;
 DCHECK_OK(func->AddKernel({time32(unit), duration(unit)}, OutputType(FirstType),
 std::move(exec_1)));

 unit = TimeUnit::MILLI;
 auto exec_2 =
 ScalarBinary<Time32Type, Time32Type, DurationType, Op<true, 86400000>>::Exec;
 auto exec_2 = ScalarBinary<Time32Type, Time32Type, DurationType, Op<86400000>>::Exec;
 DCHECK_OK(func->AddKernel({time32(unit), duration(unit)}, OutputType(FirstType),
 std::move(exec_2)));

 // Add Op(time64, duration) -> time64
 unit = TimeUnit::MICRO;
 auto exec_3 =
 ScalarBinary<Time64Type, Time64Type, DurationType, Op<false, 86400000000>>::Exec;
 auto exec_3 = ScalarBinary<Time64Type, Time64Type, DurationType, Op<86400000000>>::Exec;
 DCHECK_OK(func->AddKernel({time64(unit), duration(unit)}, OutputType(FirstType),
 std::move(exec_3)));

 unit = TimeUnit::NANO;
 auto exec_4 =
 ScalarBinary<Time64Type, Time64Type, DurationType, Op<false, 86400000000000>>::Exec;
 ScalarBinary<Time64Type, Time64Type, DurationType, Op<86400000000000>>::Exec;
 DCHECK_OK(func->AddKernel({time64(unit), duration(unit)}, OutputType(FirstType),
 std::move(exec_4)));
}

template <template <int64_t> class Op>
void AddArithmeticFunctionDurationTime(std::shared_ptr<ScalarFunction> func) {
 // Add Op(duration, time32) -> time32
 TimeUnit::type unit = TimeUnit::SECOND;
 auto exec_1 = ScalarBinary<Time32Type, DurationType, Time32Type, Op<86400>>::Exec;
 DCHECK_OK(func->AddKernel({duration(unit), time32(unit)}, OutputType(LastType),
 std::move(exec_1)));

 unit = TimeUnit::MILLI;
 auto exec_2 = ScalarBinary<Time32Type, DurationType, Time32Type, Op<86400000>>::Exec;
 DCHECK_OK(func->AddKernel({duration(unit), time32(unit)}, OutputType(LastType),
 std::move(exec_2)));

 // Add Op(duration, time64) -> time64
 unit = TimeUnit::MICRO;
 auto exec_3 = ScalarBinary<Time64Type, DurationType, Time64Type, Op<86400000000>>::Exec;
 DCHECK_OK(func->AddKernel({duration(unit), time64(unit)}, OutputType(LastType),
 std::move(exec_3)));

 unit = TimeUnit::NANO;
 auto exec_4 =
 ScalarBinary<Time64Type, DurationType, Time64Type, Op<86400000000000>>::Exec;
 DCHECK_OK(func->AddKernel({duration(unit), time64(unit)}, OutputType(LastType),
 std::move(exec_4)));
}

const FunctionDoc absolute_value_doc{
 "Calculate the absolute value of the argument element-wise",
 ("Results will wrap around on integer overflow.\n"
Expand DownExpand Up@@ -2638,8 +2610,8 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
 for (auto unit : TimeUnit::values()) {
 InputType in_type(match::TimestampTypeUnit(unit));
 auto exec = ScalarBinary<Int64Type, Int64Type, Int64Type, Add>::Exec;
 DCHECK_OK(add->AddKernel({in_type, duration(unit)}, OutputType(FirstType),
 std::move(exec)));
 DCHECK_OK(add->AddKernel({in_type, duration(unit)}, OutputType(FirstType), exec));
DCHECK_OK(add->AddKernel({duration(unit), in_type}, OutputType(LastType), exec));
 }

 // Add add(duration, duration) -> duration
Expand All@@ -2649,7 +2621,8 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
 DCHECK_OK(add->AddKernel({in_type, in_type}, duration(unit), std::move(exec)));
 }

 AddArithmeticFunctionTimeDurations<AddTimeDuration>(add);
 AddArithmeticFunctionTimeDuration<AddTimeDuration>(add);
 AddArithmeticFunctionDurationTime<AddTimeDuration>(add);

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

Expand All@@ -2662,8 +2635,10 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
 for (auto unit : TimeUnit::values()) {
 InputType in_type(match::TimestampTypeUnit(unit));
 auto exec = ScalarBinary<Int64Type, Int64Type, Int64Type, AddChecked>::Exec;
 DCHECK_OK(add_checked->AddKernel({in_type, duration(unit)}, OutputType(FirstType),
 std::move(exec)));
 DCHECK_OK(
 add_checked->AddKernel({in_type, duration(unit)}, OutputType(FirstType), exec));
 DCHECK_OK(
 add_checked->AddKernel({duration(unit), in_type}, OutputType(LastType), exec));
 }

 // Add add(duration, duration) -> duration
Expand All@@ -2674,7 +2649,8 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
 add_checked->AddKernel({in_type, in_type}, duration(unit), std::move(exec)));
 }

 AddArithmeticFunctionTimeDurations<AddTimeDurationChecked>(add_checked);
 AddArithmeticFunctionTimeDuration<AddTimeDurationChecked>(add_checked);
 AddArithmeticFunctionDurationTime<AddTimeDurationChecked>(add_checked);

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

Expand DownExpand Up@@ -2732,7 +2708,7 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
 DCHECK_OK(subtract->AddKernel({in_type_date_64, in_type_date_64},
 duration(TimeUnit::MILLI), std::move(exec_date_64)));

AddArithmeticFunctionTimeDurations<SubtractTimeDuration>(subtract);
AddArithmeticFunctionTimeDuration<SubtractTimeDuration>(subtract);

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

Expand DownExpand Up@@ -2798,7 +2774,7 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
 subtract_checked->AddKernel({in_type, in_type}, duration(unit), std::move(exec)));
 }

AddArithmeticFunctionTimeDurations<SubtractTimeDurationChecked>(subtract_checked);
AddArithmeticFunctionTimeDuration<SubtractTimeDurationChecked>(subtract_checked);

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

Expand All@@ -2808,12 +2784,9 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {

 // 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)));
 auto exec = ArithmeticExecFromOp<ScalarBinaryEqualTypes, Multiply>(Type::DURATION);
 DCHECK_OK(multiply->AddKernel({duration(unit), int64()}, duration(unit), exec));
 DCHECK_OK(multiply->AddKernel({int64(), duration(unit)}, duration(unit), exec));
 }

 DCHECK_OK(registry->AddFunction(std::move(multiply)));
Expand All@@ -2825,14 +2798,12 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {

 // 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 =
 auto exec =
 ArithmeticExecFromOp<ScalarBinaryEqualTypes, MultiplyChecked>(Type::DURATION);
 DCHECK_OK(multiply_checked->AddKernel({int64(), duration(unit)}, duration(unit),
 std::move(exec2)));
 DCHECK_OK(
 multiply_checked->AddKernel({duration(unit), int64()}, duration(unit), exec));
 DCHECK_OK(
 multiply_checked->AddKernel({int64(), duration(unit)}, duration(unit), exec));
 }

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

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

Skip to content
ARROW-15919: [C++] Add function not commutative with timestamps & duration maths#12612

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

from

 Closed


ARROW-15919: [C++] Add function not commutative with timestamps & duration maths
#12612
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
0e7faba

Temporal add/add_checked should be commutative.


rok Mar 11, 2022
2c13914

Review feedback


rok Mar 16, 2022
0d424da

Review feedback


rok Mar 17, 2022
acabb81

Review feedback


rok Mar 17, 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


4 changes: 4 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@@ -182,6 +182,8 @@ TEST(TestDispatchBest, CommonTemporalResolution) {
 ASSERT_EQ(TimeUnit::MILLI, CommonTemporalResolution(args.data(), args.size()));
 args = {duration(TimeUnit::SECOND), time32(TimeUnit::SECOND)};
 ASSERT_EQ(TimeUnit::SECOND, CommonTemporalResolution(args.data(), args.size()));
 args = {duration(TimeUnit::SECOND), time64(TimeUnit::NANO)};
 ASSERT_EQ(TimeUnit::NANO, CommonTemporalResolution(args.data(), args.size()));
 args = {time64(TimeUnit::MICRO), duration(TimeUnit::NANO)};
 ASSERT_EQ(TimeUnit::NANO, CommonTemporalResolution(args.data(), args.size()));
 args = {timestamp(TimeUnit::SECOND, tz), timestamp(TimeUnit::MICRO)};
Expand All@@ -204,6 +206,8 @@ TEST(TestDispatchBest, CommonTemporalResolution) {
 ASSERT_EQ(TimeUnit::NANO, CommonTemporalResolution(args.data(), args.size()));
 args = {duration(TimeUnit::SECOND), int64()};
 ASSERT_EQ(TimeUnit::SECOND, CommonTemporalResolution(args.data(), args.size()));
 args = {duration(TimeUnit::MILLI), timestamp(TimeUnit::SECOND, tz)};
 ASSERT_EQ(TimeUnit::MILLI, CommonTemporalResolution(args.data(), args.size()));
}

TEST(TestDispatchBest, ReplaceTemporalTypes) {
Expand Down

157 changes: 64 additions & 93 deletions
cpp/src/arrow/compute/kernels/scalar_arithmetic.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -240,23 +240,12 @@ struct SubtractCheckedDate32 {
 }
};

template <bool is_32bit, int64_t multiple>
template <int64_t multiple>
struct AddTimeDuration {
 template <typename T, typename Arg0, typename Arg1>
 static enable_if_t<is_32bit, T> Call(KernelContext*, Arg0 left, Arg1 right,
 Status* st) {
 T result = arrow::internal::SafeSignedAdd(left, static_cast<T>(right));
 if (result < 0 || multiple <= result) {
 *st = Status::Invalid(result, " is not within the acceptable range of ", "[0, ",
 multiple, ") s");
 }
 return result;
 }

 template <typename T, typename Arg0, typename Arg1>
 static enable_if_t<!is_32bit, T> Call(KernelContext*, Arg0 left, Arg1 right,
 Status* st) {
 T result = arrow::internal::SafeSignedAdd(left, right);
 static T Call(KernelContext*, Arg0 left, Arg1 right, Status* st) {
 T result =
 arrow::internal::SafeSignedAdd(static_cast<T>(left), static_cast<T>(right));
 if (result < 0 || multiple <= result) {
 *st = Status::Invalid(result, " is not within the acceptable range of ", "[0, ",
 multiple, ") s");
Expand All@@ -265,27 +254,13 @@ struct AddTimeDuration {
 }
};

template <bool is_32bit, int64_t multiple>
template <int64_t multiple>
struct AddTimeDurationChecked {
 template <typename T, typename Arg0, typename Arg1>
 static enable_if_t<is_32bit, T> Call(KernelContext*, Arg0 left, Arg1 right,
 Status* st) {
 T result = 0;
 if (ARROW_PREDICT_FALSE(AddWithOverflow(left, static_cast<T>(right), &result))) {
 *st = Status::Invalid("overflow");
 }
 if (result < 0 || multiple <= result) {
 *st = Status::Invalid(result, " is not within the acceptable range of ", "[0, ",
 multiple, ") s");
 }
 return result;
 }

 template <typename T, typename Arg0, typename Arg1>
 static enable_if_t<!is_32bit, T> Call(KernelContext*, Arg0 left, Arg1 right,
 Status* st) {
 static T Call(KernelContext*, Arg0 left, Arg1 right, Status* st) {
 T result = 0;
 if (ARROW_PREDICT_FALSE(AddWithOverflow(left, static_cast<T>(right), &result))) {
 if (ARROW_PREDICT_FALSE(
 AddWithOverflow(static_cast<T>(left), static_cast<T>(right), &result))) {
 *st = Status::Invalid("overflow");
 }
 if (result < 0 || multiple <= result) {
Expand All@@ -296,50 +271,23 @@ struct AddTimeDurationChecked {
 }
};

template <bool is_32bit, int64_t multiple>
template <int64_t multiple>
struct SubtractTimeDuration {
 template <typename T, typename Arg0, typename Arg1>
 static enable_if_t<is_32bit, T> Call(KernelContext*, Arg0 left, Arg1 right,
 Status* st) {
 static T Call(KernelContext*, Arg0 left, Arg1 right, Status* st) {
 T result = arrow::internal::SafeSignedSubtract(left, static_cast<T>(right));
 if (result < 0 || multiple <= result) {
 *st = Status::Invalid(result, " is not within the acceptable range of ", "[0, ",
 multiple, ") s");
 }
 return result;
 }

 template <typename T, typename Arg0, typename Arg1>
 static enable_if_t<!is_32bit, T> Call(KernelContext*, Arg0 left, Arg1 right,
 Status* st) {
 T result = arrow::internal::SafeSignedSubtract(left, right);
 if (result < 0 || multiple <= result) {
 *st = Status::Invalid(result, " is not within the acceptable range of ", "[0, ",
 multiple, ") s");
 }
 return result;
 }
};

template <bool is_32bit, int64_t multiple>
template <int64_t multiple>
struct SubtractTimeDurationChecked {
 template <typename T, typename Arg0, typename Arg1>
 static enable_if_t<is_32bit, T> Call(KernelContext*, Arg0 left, Arg1 right,
 Status* st) {
 T result = 0;
 if (ARROW_PREDICT_FALSE(SubtractWithOverflow(left, static_cast<T>(right), &result))) {
 *st = Status::Invalid("overflow");
 }
 if (result < 0 || multiple <= result) {
 *st = Status::Invalid(result, " is not within the acceptable range of ", "[0, ",
 multiple, ") s");
 }
 return result;
 }

 template <typename T, typename Arg0, typename Arg1>
 static enable_if_t<!is_32bit, T> Call(KernelContext*, Arg0 left, Arg1 right,
 Status* st) {
 static T Call(KernelContext*, Arg0 left, Arg1 right, Status* st) {
 T result = 0;
 if (ARROW_PREDICT_FALSE(SubtractWithOverflow(left, static_cast<T>(right), &result))) {
 *st = Status::Invalid("overflow");
Expand DownExpand Up@@ -2269,34 +2217,58 @@ std::shared_ptr<ScalarFunction> MakeArithmeticFunctionFloatingPointNotNull(
 return func;
}

template <template <bool, int64_t> class Op>
void AddArithmeticFunctionTimeDurations(std::shared_ptr<ScalarFunction> func) {
template <template <int64_t> class Op>
void AddArithmeticFunctionTimeDuration(std::shared_ptr<ScalarFunction> func) {
 // Add Op(time32, duration) -> time32
 TimeUnit::type unit = TimeUnit::SECOND;
 auto exec_1 = ScalarBinary<Time32Type, Time32Type, DurationType, Op<true, 86400>>::Exec;
 auto exec_1 = ScalarBinary<Time32Type, Time32Type, DurationType, Op<86400>>::Exec;
 DCHECK_OK(func->AddKernel({time32(unit), duration(unit)}, OutputType(FirstType),
 std::move(exec_1)));

 unit = TimeUnit::MILLI;
 auto exec_2 =
 ScalarBinary<Time32Type, Time32Type, DurationType, Op<true, 86400000>>::Exec;
 auto exec_2 = ScalarBinary<Time32Type, Time32Type, DurationType, Op<86400000>>::Exec;
 DCHECK_OK(func->AddKernel({time32(unit), duration(unit)}, OutputType(FirstType),
 std::move(exec_2)));

 // Add Op(time64, duration) -> time64
 unit = TimeUnit::MICRO;
 auto exec_3 =
 ScalarBinary<Time64Type, Time64Type, DurationType, Op<false, 86400000000>>::Exec;
 auto exec_3 = ScalarBinary<Time64Type, Time64Type, DurationType, Op<86400000000>>::Exec;
 DCHECK_OK(func->AddKernel({time64(unit), duration(unit)}, OutputType(FirstType),
 std::move(exec_3)));

 unit = TimeUnit::NANO;
 auto exec_4 =
 ScalarBinary<Time64Type, Time64Type, DurationType, Op<false, 86400000000000>>::Exec;
 ScalarBinary<Time64Type, Time64Type, DurationType, Op<86400000000000>>::Exec;
 DCHECK_OK(func->AddKernel({time64(unit), duration(unit)}, OutputType(FirstType),
 std::move(exec_4)));
}

template <template <int64_t> class Op>
void AddArithmeticFunctionDurationTime(std::shared_ptr<ScalarFunction> func) {
 // Add Op(duration, time32) -> time32
 TimeUnit::type unit = TimeUnit::SECOND;
 auto exec_1 = ScalarBinary<Time32Type, DurationType, Time32Type, Op<86400>>::Exec;
 DCHECK_OK(func->AddKernel({duration(unit), time32(unit)}, OutputType(LastType),
 std::move(exec_1)));

 unit = TimeUnit::MILLI;
 auto exec_2 = ScalarBinary<Time32Type, DurationType, Time32Type, Op<86400000>>::Exec;
 DCHECK_OK(func->AddKernel({duration(unit), time32(unit)}, OutputType(LastType),
 std::move(exec_2)));

 // Add Op(duration, time64) -> time64
 unit = TimeUnit::MICRO;
 auto exec_3 = ScalarBinary<Time64Type, DurationType, Time64Type, Op<86400000000>>::Exec;
 DCHECK_OK(func->AddKernel({duration(unit), time64(unit)}, OutputType(LastType),
 std::move(exec_3)));

 unit = TimeUnit::NANO;
 auto exec_4 =
 ScalarBinary<Time64Type, DurationType, Time64Type, Op<86400000000000>>::Exec;
 DCHECK_OK(func->AddKernel({duration(unit), time64(unit)}, OutputType(LastType),
 std::move(exec_4)));
}

const FunctionDoc absolute_value_doc{
 "Calculate the absolute value of the argument element-wise",
 ("Results will wrap around on integer overflow.\n"
Expand DownExpand Up@@ -2638,8 +2610,8 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
 for (auto unit : TimeUnit::values()) {
 InputType in_type(match::TimestampTypeUnit(unit));
 auto exec = ScalarBinary<Int64Type, Int64Type, Int64Type, Add>::Exec;
 DCHECK_OK(add->AddKernel({in_type, duration(unit)}, OutputType(FirstType),
 std::move(exec)));
 DCHECK_OK(add->AddKernel({in_type, duration(unit)}, OutputType(FirstType), exec));
DCHECK_OK(add->AddKernel({duration(unit), in_type}, OutputType(LastType), exec));
 }

 // Add add(duration, duration) -> duration
Expand All@@ -2649,7 +2621,8 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
 DCHECK_OK(add->AddKernel({in_type, in_type}, duration(unit), std::move(exec)));
 }

 AddArithmeticFunctionTimeDurations<AddTimeDuration>(add);
 AddArithmeticFunctionTimeDuration<AddTimeDuration>(add);
 AddArithmeticFunctionDurationTime<AddTimeDuration>(add);

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

Expand All@@ -2662,8 +2635,10 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
 for (auto unit : TimeUnit::values()) {
 InputType in_type(match::TimestampTypeUnit(unit));
 auto exec = ScalarBinary<Int64Type, Int64Type, Int64Type, AddChecked>::Exec;
 DCHECK_OK(add_checked->AddKernel({in_type, duration(unit)}, OutputType(FirstType),
 std::move(exec)));
 DCHECK_OK(
 add_checked->AddKernel({in_type, duration(unit)}, OutputType(FirstType), exec));
 DCHECK_OK(
 add_checked->AddKernel({duration(unit), in_type}, OutputType(LastType), exec));
 }

 // Add add(duration, duration) -> duration
Expand All@@ -2674,7 +2649,8 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
 add_checked->AddKernel({in_type, in_type}, duration(unit), std::move(exec)));
 }

 AddArithmeticFunctionTimeDurations<AddTimeDurationChecked>(add_checked);
 AddArithmeticFunctionTimeDuration<AddTimeDurationChecked>(add_checked);
 AddArithmeticFunctionDurationTime<AddTimeDurationChecked>(add_checked);

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

Expand DownExpand Up@@ -2732,7 +2708,7 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
 DCHECK_OK(subtract->AddKernel({in_type_date_64, in_type_date_64},
 duration(TimeUnit::MILLI), std::move(exec_date_64)));

AddArithmeticFunctionTimeDurations<SubtractTimeDuration>(subtract);
AddArithmeticFunctionTimeDuration<SubtractTimeDuration>(subtract);

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

Expand DownExpand Up@@ -2798,7 +2774,7 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
 subtract_checked->AddKernel({in_type, in_type}, duration(unit), std::move(exec)));
 }

AddArithmeticFunctionTimeDurations<SubtractTimeDurationChecked>(subtract_checked);
AddArithmeticFunctionTimeDuration<SubtractTimeDurationChecked>(subtract_checked);

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

Expand All@@ -2808,12 +2784,9 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {

 // 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)));
 auto exec = ArithmeticExecFromOp<ScalarBinaryEqualTypes, Multiply>(Type::DURATION);
 DCHECK_OK(multiply->AddKernel({duration(unit), int64()}, duration(unit), exec));
 DCHECK_OK(multiply->AddKernel({int64(), duration(unit)}, duration(unit), exec));
 }

 DCHECK_OK(registry->AddFunction(std::move(multiply)));
Expand All@@ -2825,14 +2798,12 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {

 // 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 =
 auto exec =
 ArithmeticExecFromOp<ScalarBinaryEqualTypes, MultiplyChecked>(Type::DURATION);
 DCHECK_OK(multiply_checked->AddKernel({int64(), duration(unit)}, duration(unit),
 std::move(exec2)));
 DCHECK_OK(
 multiply_checked->AddKernel({duration(unit), int64()}, duration(unit), exec));
 DCHECK_OK(
 multiply_checked->AddKernel({int64(), duration(unit)}, duration(unit), exec));
 }

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

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

Skip to content
ARROW-15919: [C++] Add function not commutative with timestamps & duration maths#12612

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

from

 Closed


ARROW-15919: [C++] Add function not commutative with timestamps & duration maths
#12612
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
0e7faba

Temporal add/add_checked should be commutative.


rok Mar 11, 2022
2c13914

Review feedback


rok Mar 16, 2022
0d424da

Review feedback


rok Mar 17, 2022
acabb81

Review feedback


rok Mar 17, 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


4 changes: 4 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@@ -182,6 +182,8 @@ TEST(TestDispatchBest, CommonTemporalResolution) {
 ASSERT_EQ(TimeUnit::MILLI, CommonTemporalResolution(args.data(), args.size()));
 args = {duration(TimeUnit::SECOND), time32(TimeUnit::SECOND)};
 ASSERT_EQ(TimeUnit::SECOND, CommonTemporalResolution(args.data(), args.size()));
 args = {duration(TimeUnit::SECOND), time64(TimeUnit::NANO)};
 ASSERT_EQ(TimeUnit::NANO, CommonTemporalResolution(args.data(), args.size()));
 args = {time64(TimeUnit::MICRO), duration(TimeUnit::NANO)};
 ASSERT_EQ(TimeUnit::NANO, CommonTemporalResolution(args.data(), args.size()));
 args = {timestamp(TimeUnit::SECOND, tz), timestamp(TimeUnit::MICRO)};
Expand All@@ -204,6 +206,8 @@ TEST(TestDispatchBest, CommonTemporalResolution) {
 ASSERT_EQ(TimeUnit::NANO, CommonTemporalResolution(args.data(), args.size()));
 args = {duration(TimeUnit::SECOND), int64()};
 ASSERT_EQ(TimeUnit::SECOND, CommonTemporalResolution(args.data(), args.size()));
 args = {duration(TimeUnit::MILLI), timestamp(TimeUnit::SECOND, tz)};
 ASSERT_EQ(TimeUnit::MILLI, CommonTemporalResolution(args.data(), args.size()));
}

TEST(TestDispatchBest, ReplaceTemporalTypes) {
Expand Down

157 changes: 64 additions & 93 deletions
cpp/src/arrow/compute/kernels/scalar_arithmetic.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -240,23 +240,12 @@ struct SubtractCheckedDate32 {
 }
};

template <bool is_32bit, int64_t multiple>
template <int64_t multiple>
struct AddTimeDuration {
 template <typename T, typename Arg0, typename Arg1>
 static enable_if_t<is_32bit, T> Call(KernelContext*, Arg0 left, Arg1 right,
 Status* st) {
 T result = arrow::internal::SafeSignedAdd(left, static_cast<T>(right));
 if (result < 0 || multiple <= result) {
 *st = Status::Invalid(result, " is not within the acceptable range of ", "[0, ",
 multiple, ") s");
 }
 return result;
 }

 template <typename T, typename Arg0, typename Arg1>
 static enable_if_t<!is_32bit, T> Call(KernelContext*, Arg0 left, Arg1 right,
 Status* st) {
 T result = arrow::internal::SafeSignedAdd(left, right);
 static T Call(KernelContext*, Arg0 left, Arg1 right, Status* st) {
 T result =
 arrow::internal::SafeSignedAdd(static_cast<T>(left), static_cast<T>(right));
 if (result < 0 || multiple <= result) {
 *st = Status::Invalid(result, " is not within the acceptable range of ", "[0, ",
 multiple, ") s");
Expand All@@ -265,27 +254,13 @@ struct AddTimeDuration {
 }
};

template <bool is_32bit, int64_t multiple>
template <int64_t multiple>
struct AddTimeDurationChecked {
 template <typename T, typename Arg0, typename Arg1>
 static enable_if_t<is_32bit, T> Call(KernelContext*, Arg0 left, Arg1 right,
 Status* st) {
 T result = 0;
 if (ARROW_PREDICT_FALSE(AddWithOverflow(left, static_cast<T>(right), &result))) {
 *st = Status::Invalid("overflow");
 }
 if (result < 0 || multiple <= result) {
 *st = Status::Invalid(result, " is not within the acceptable range of ", "[0, ",
 multiple, ") s");
 }
 return result;
 }

 template <typename T, typename Arg0, typename Arg1>
 static enable_if_t<!is_32bit, T> Call(KernelContext*, Arg0 left, Arg1 right,
 Status* st) {
 static T Call(KernelContext*, Arg0 left, Arg1 right, Status* st) {
 T result = 0;
 if (ARROW_PREDICT_FALSE(AddWithOverflow(left, static_cast<T>(right), &result))) {
 if (ARROW_PREDICT_FALSE(
 AddWithOverflow(static_cast<T>(left), static_cast<T>(right), &result))) {
 *st = Status::Invalid("overflow");
 }
 if (result < 0 || multiple <= result) {
Expand All@@ -296,50 +271,23 @@ struct AddTimeDurationChecked {
 }
};

template <bool is_32bit, int64_t multiple>
template <int64_t multiple>
struct SubtractTimeDuration {
 template <typename T, typename Arg0, typename Arg1>
 static enable_if_t<is_32bit, T> Call(KernelContext*, Arg0 left, Arg1 right,
 Status* st) {
 static T Call(KernelContext*, Arg0 left, Arg1 right, Status* st) {
 T result = arrow::internal::SafeSignedSubtract(left, static_cast<T>(right));
 if (result < 0 || multiple <= result) {
 *st = Status::Invalid(result, " is not within the acceptable range of ", "[0, ",
 multiple, ") s");
 }
 return result;
 }

 template <typename T, typename Arg0, typename Arg1>
 static enable_if_t<!is_32bit, T> Call(KernelContext*, Arg0 left, Arg1 right,
 Status* st) {
 T result = arrow::internal::SafeSignedSubtract(left, right);
 if (result < 0 || multiple <= result) {
 *st = Status::Invalid(result, " is not within the acceptable range of ", "[0, ",
 multiple, ") s");
 }
 return result;
 }
};

template <bool is_32bit, int64_t multiple>
template <int64_t multiple>
struct SubtractTimeDurationChecked {
 template <typename T, typename Arg0, typename Arg1>
 static enable_if_t<is_32bit, T> Call(KernelContext*, Arg0 left, Arg1 right,
 Status* st) {
 T result = 0;
 if (ARROW_PREDICT_FALSE(SubtractWithOverflow(left, static_cast<T>(right), &result))) {
 *st = Status::Invalid("overflow");
 }
 if (result < 0 || multiple <= result) {
 *st = Status::Invalid(result, " is not within the acceptable range of ", "[0, ",
 multiple, ") s");
 }
 return result;
 }

 template <typename T, typename Arg0, typename Arg1>
 static enable_if_t<!is_32bit, T> Call(KernelContext*, Arg0 left, Arg1 right,
 Status* st) {
 static T Call(KernelContext*, Arg0 left, Arg1 right, Status* st) {
 T result = 0;
 if (ARROW_PREDICT_FALSE(SubtractWithOverflow(left, static_cast<T>(right), &result))) {
 *st = Status::Invalid("overflow");
Expand DownExpand Up@@ -2269,34 +2217,58 @@ std::shared_ptr<ScalarFunction> MakeArithmeticFunctionFloatingPointNotNull(
 return func;
}

template <template <bool, int64_t> class Op>
void AddArithmeticFunctionTimeDurations(std::shared_ptr<ScalarFunction> func) {
template <template <int64_t> class Op>
void AddArithmeticFunctionTimeDuration(std::shared_ptr<ScalarFunction> func) {
 // Add Op(time32, duration) -> time32
 TimeUnit::type unit = TimeUnit::SECOND;
 auto exec_1 = ScalarBinary<Time32Type, Time32Type, DurationType, Op<true, 86400>>::Exec;
 auto exec_1 = ScalarBinary<Time32Type, Time32Type, DurationType, Op<86400>>::Exec;
 DCHECK_OK(func->AddKernel({time32(unit), duration(unit)}, OutputType(FirstType),
 std::move(exec_1)));

 unit = TimeUnit::MILLI;
 auto exec_2 =
 ScalarBinary<Time32Type, Time32Type, DurationType, Op<true, 86400000>>::Exec;
 auto exec_2 = ScalarBinary<Time32Type, Time32Type, DurationType, Op<86400000>>::Exec;
 DCHECK_OK(func->AddKernel({time32(unit), duration(unit)}, OutputType(FirstType),
 std::move(exec_2)));

 // Add Op(time64, duration) -> time64
 unit = TimeUnit::MICRO;
 auto exec_3 =
 ScalarBinary<Time64Type, Time64Type, DurationType, Op<false, 86400000000>>::Exec;
 auto exec_3 = ScalarBinary<Time64Type, Time64Type, DurationType, Op<86400000000>>::Exec;
 DCHECK_OK(func->AddKernel({time64(unit), duration(unit)}, OutputType(FirstType),
 std::move(exec_3)));

 unit = TimeUnit::NANO;
 auto exec_4 =
 ScalarBinary<Time64Type, Time64Type, DurationType, Op<false, 86400000000000>>::Exec;
 ScalarBinary<Time64Type, Time64Type, DurationType, Op<86400000000000>>::Exec;
 DCHECK_OK(func->AddKernel({time64(unit), duration(unit)}, OutputType(FirstType),
 std::move(exec_4)));
}

template <template <int64_t> class Op>
void AddArithmeticFunctionDurationTime(std::shared_ptr<ScalarFunction> func) {
 // Add Op(duration, time32) -> time32
 TimeUnit::type unit = TimeUnit::SECOND;
 auto exec_1 = ScalarBinary<Time32Type, DurationType, Time32Type, Op<86400>>::Exec;
 DCHECK_OK(func->AddKernel({duration(unit), time32(unit)}, OutputType(LastType),
 std::move(exec_1)));

 unit = TimeUnit::MILLI;
 auto exec_2 = ScalarBinary<Time32Type, DurationType, Time32Type, Op<86400000>>::Exec;
 DCHECK_OK(func->AddKernel({duration(unit), time32(unit)}, OutputType(LastType),
 std::move(exec_2)));

 // Add Op(duration, time64) -> time64
 unit = TimeUnit::MICRO;
 auto exec_3 = ScalarBinary<Time64Type, DurationType, Time64Type, Op<86400000000>>::Exec;
 DCHECK_OK(func->AddKernel({duration(unit), time64(unit)}, OutputType(LastType),
 std::move(exec_3)));

 unit = TimeUnit::NANO;
 auto exec_4 =
 ScalarBinary<Time64Type, DurationType, Time64Type, Op<86400000000000>>::Exec;
 DCHECK_OK(func->AddKernel({duration(unit), time64(unit)}, OutputType(LastType),
 std::move(exec_4)));
}

const FunctionDoc absolute_value_doc{
 "Calculate the absolute value of the argument element-wise",
 ("Results will wrap around on integer overflow.\n"
Expand DownExpand Up@@ -2638,8 +2610,8 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
 for (auto unit : TimeUnit::values()) {
 InputType in_type(match::TimestampTypeUnit(unit));
 auto exec = ScalarBinary<Int64Type, Int64Type, Int64Type, Add>::Exec;
 DCHECK_OK(add->AddKernel({in_type, duration(unit)}, OutputType(FirstType),
 std::move(exec)));
 DCHECK_OK(add->AddKernel({in_type, duration(unit)}, OutputType(FirstType), exec));
DCHECK_OK(add->AddKernel({duration(unit), in_type}, OutputType(LastType), exec));
 }

 // Add add(duration, duration) -> duration
Expand All@@ -2649,7 +2621,8 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
 DCHECK_OK(add->AddKernel({in_type, in_type}, duration(unit), std::move(exec)));
 }

 AddArithmeticFunctionTimeDurations<AddTimeDuration>(add);
 AddArithmeticFunctionTimeDuration<AddTimeDuration>(add);
 AddArithmeticFunctionDurationTime<AddTimeDuration>(add);

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

Expand All@@ -2662,8 +2635,10 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
 for (auto unit : TimeUnit::values()) {
 InputType in_type(match::TimestampTypeUnit(unit));
 auto exec = ScalarBinary<Int64Type, Int64Type, Int64Type, AddChecked>::Exec;
 DCHECK_OK(add_checked->AddKernel({in_type, duration(unit)}, OutputType(FirstType),
 std::move(exec)));
 DCHECK_OK(
 add_checked->AddKernel({in_type, duration(unit)}, OutputType(FirstType), exec));
 DCHECK_OK(
 add_checked->AddKernel({duration(unit), in_type}, OutputType(LastType), exec));
 }

 // Add add(duration, duration) -> duration
Expand All@@ -2674,7 +2649,8 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
 add_checked->AddKernel({in_type, in_type}, duration(unit), std::move(exec)));
 }

 AddArithmeticFunctionTimeDurations<AddTimeDurationChecked>(add_checked);
 AddArithmeticFunctionTimeDuration<AddTimeDurationChecked>(add_checked);
 AddArithmeticFunctionDurationTime<AddTimeDurationChecked>(add_checked);

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

Expand DownExpand Up@@ -2732,7 +2708,7 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
 DCHECK_OK(subtract->AddKernel({in_type_date_64, in_type_date_64},
 duration(TimeUnit::MILLI), std::move(exec_date_64)));

AddArithmeticFunctionTimeDurations<SubtractTimeDuration>(subtract);
AddArithmeticFunctionTimeDuration<SubtractTimeDuration>(subtract);

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

Expand DownExpand Up@@ -2798,7 +2774,7 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
 subtract_checked->AddKernel({in_type, in_type}, duration(unit), std::move(exec)));
 }

AddArithmeticFunctionTimeDurations<SubtractTimeDurationChecked>(subtract_checked);
AddArithmeticFunctionTimeDuration<SubtractTimeDurationChecked>(subtract_checked);

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

Expand All@@ -2808,12 +2784,9 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {

 // 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)));
 auto exec = ArithmeticExecFromOp<ScalarBinaryEqualTypes, Multiply>(Type::DURATION);
 DCHECK_OK(multiply->AddKernel({duration(unit), int64()}, duration(unit), exec));
 DCHECK_OK(multiply->AddKernel({int64(), duration(unit)}, duration(unit), exec));
 }

 DCHECK_OK(registry->AddFunction(std::move(multiply)));
Expand All@@ -2825,14 +2798,12 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {

 // 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 =
 auto exec =
 ArithmeticExecFromOp<ScalarBinaryEqualTypes, MultiplyChecked>(Type::DURATION);
 DCHECK_OK(multiply_checked->AddKernel({int64(), duration(unit)}, duration(unit),
 std::move(exec2)));
 DCHECK_OK(
 multiply_checked->AddKernel({duration(unit), int64()}, duration(unit), exec));
 DCHECK_OK(
 multiply_checked->AddKernel({int64(), duration(unit)}, duration(unit), exec));
 }

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

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

Skip to content
ARROW-15919: [C++] Add function not commutative with timestamps & duration maths#12612

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

from

 Closed


ARROW-15919: [C++] Add function not commutative with timestamps & duration maths
#12612
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
0e7faba

Temporal add/add_checked should be commutative.


rok Mar 11, 2022
2c13914

Review feedback


rok Mar 16, 2022
0d424da

Review feedback


rok Mar 17, 2022
acabb81

Review feedback


rok Mar 17, 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


4 changes: 4 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@@ -182,6 +182,8 @@ TEST(TestDispatchBest, CommonTemporalResolution) {
 ASSERT_EQ(TimeUnit::MILLI, CommonTemporalResolution(args.data(), args.size()));
 args = {duration(TimeUnit::SECOND), time32(TimeUnit::SECOND)};
 ASSERT_EQ(TimeUnit::SECOND, CommonTemporalResolution(args.data(), args.size()));
 args = {duration(TimeUnit::SECOND), time64(TimeUnit::NANO)};
 ASSERT_EQ(TimeUnit::NANO, CommonTemporalResolution(args.data(), args.size()));
 args = {time64(TimeUnit::MICRO), duration(TimeUnit::NANO)};
 ASSERT_EQ(TimeUnit::NANO, CommonTemporalResolution(args.data(), args.size()));
 args = {timestamp(TimeUnit::SECOND, tz), timestamp(TimeUnit::MICRO)};
Expand All@@ -204,6 +206,8 @@ TEST(TestDispatchBest, CommonTemporalResolution) {
 ASSERT_EQ(TimeUnit::NANO, CommonTemporalResolution(args.data(), args.size()));
 args = {duration(TimeUnit::SECOND), int64()};
 ASSERT_EQ(TimeUnit::SECOND, CommonTemporalResolution(args.data(), args.size()));
 args = {duration(TimeUnit::MILLI), timestamp(TimeUnit::SECOND, tz)};
 ASSERT_EQ(TimeUnit::MILLI, CommonTemporalResolution(args.data(), args.size()));
}

TEST(TestDispatchBest, ReplaceTemporalTypes) {
Expand Down

157 changes: 64 additions & 93 deletions
cpp/src/arrow/compute/kernels/scalar_arithmetic.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -240,23 +240,12 @@ struct SubtractCheckedDate32 {
 }
};

template <bool is_32bit, int64_t multiple>
template <int64_t multiple>
struct AddTimeDuration {
 template <typename T, typename Arg0, typename Arg1>
 static enable_if_t<is_32bit, T> Call(KernelContext*, Arg0 left, Arg1 right,
 Status* st) {
 T result = arrow::internal::SafeSignedAdd(left, static_cast<T>(right));
 if (result < 0 || multiple <= result) {
 *st = Status::Invalid(result, " is not within the acceptable range of ", "[0, ",
 multiple, ") s");
 }
 return result;
 }

 template <typename T, typename Arg0, typename Arg1>
 static enable_if_t<!is_32bit, T> Call(KernelContext*, Arg0 left, Arg1 right,
 Status* st) {
 T result = arrow::internal::SafeSignedAdd(left, right);
 static T Call(KernelContext*, Arg0 left, Arg1 right, Status* st) {
 T result =
 arrow::internal::SafeSignedAdd(static_cast<T>(left), static_cast<T>(right));
 if (result < 0 || multiple <= result) {
 *st = Status::Invalid(result, " is not within the acceptable range of ", "[0, ",
 multiple, ") s");
Expand All@@ -265,27 +254,13 @@ struct AddTimeDuration {
 }
};

template <bool is_32bit, int64_t multiple>
template <int64_t multiple>
struct AddTimeDurationChecked {
 template <typename T, typename Arg0, typename Arg1>
 static enable_if_t<is_32bit, T> Call(KernelContext*, Arg0 left, Arg1 right,
 Status* st) {
 T result = 0;
 if (ARROW_PREDICT_FALSE(AddWithOverflow(left, static_cast<T>(right), &result))) {
 *st = Status::Invalid("overflow");
 }
 if (result < 0 || multiple <= result) {
 *st = Status::Invalid(result, " is not within the acceptable range of ", "[0, ",
 multiple, ") s");
 }
 return result;
 }

 template <typename T, typename Arg0, typename Arg1>
 static enable_if_t<!is_32bit, T> Call(KernelContext*, Arg0 left, Arg1 right,
 Status* st) {
 static T Call(KernelContext*, Arg0 left, Arg1 right, Status* st) {
 T result = 0;
 if (ARROW_PREDICT_FALSE(AddWithOverflow(left, static_cast<T>(right), &result))) {
 if (ARROW_PREDICT_FALSE(
 AddWithOverflow(static_cast<T>(left), static_cast<T>(right), &result))) {
 *st = Status::Invalid("overflow");
 }
 if (result < 0 || multiple <= result) {
Expand All@@ -296,50 +271,23 @@ struct AddTimeDurationChecked {
 }
};

template <bool is_32bit, int64_t multiple>
template <int64_t multiple>
struct SubtractTimeDuration {
 template <typename T, typename Arg0, typename Arg1>
 static enable_if_t<is_32bit, T> Call(KernelContext*, Arg0 left, Arg1 right,
 Status* st) {
 static T Call(KernelContext*, Arg0 left, Arg1 right, Status* st) {
 T result = arrow::internal::SafeSignedSubtract(left, static_cast<T>(right));
 if (result < 0 || multiple <= result) {
 *st = Status::Invalid(result, " is not within the acceptable range of ", "[0, ",
 multiple, ") s");
 }
 return result;
 }

 template <typename T, typename Arg0, typename Arg1>
 static enable_if_t<!is_32bit, T> Call(KernelContext*, Arg0 left, Arg1 right,
 Status* st) {
 T result = arrow::internal::SafeSignedSubtract(left, right);
 if (result < 0 || multiple <= result) {
 *st = Status::Invalid(result, " is not within the acceptable range of ", "[0, ",
 multiple, ") s");
 }
 return result;
 }
};

template <bool is_32bit, int64_t multiple>
template <int64_t multiple>
struct SubtractTimeDurationChecked {
 template <typename T, typename Arg0, typename Arg1>
 static enable_if_t<is_32bit, T> Call(KernelContext*, Arg0 left, Arg1 right,
 Status* st) {
 T result = 0;
 if (ARROW_PREDICT_FALSE(SubtractWithOverflow(left, static_cast<T>(right), &result))) {
 *st = Status::Invalid("overflow");
 }
 if (result < 0 || multiple <= result) {
 *st = Status::Invalid(result, " is not within the acceptable range of ", "[0, ",
 multiple, ") s");
 }
 return result;
 }

 template <typename T, typename Arg0, typename Arg1>
 static enable_if_t<!is_32bit, T> Call(KernelContext*, Arg0 left, Arg1 right,
 Status* st) {
 static T Call(KernelContext*, Arg0 left, Arg1 right, Status* st) {
 T result = 0;
 if (ARROW_PREDICT_FALSE(SubtractWithOverflow(left, static_cast<T>(right), &result))) {
 *st = Status::Invalid("overflow");
Expand DownExpand Up@@ -2269,34 +2217,58 @@ std::shared_ptr<ScalarFunction> MakeArithmeticFunctionFloatingPointNotNull(
 return func;
}

template <template <bool, int64_t> class Op>
void AddArithmeticFunctionTimeDurations(std::shared_ptr<ScalarFunction> func) {
template <template <int64_t> class Op>
void AddArithmeticFunctionTimeDuration(std::shared_ptr<ScalarFunction> func) {
 // Add Op(time32, duration) -> time32
 TimeUnit::type unit = TimeUnit::SECOND;
 auto exec_1 = ScalarBinary<Time32Type, Time32Type, DurationType, Op<true, 86400>>::Exec;
 auto exec_1 = ScalarBinary<Time32Type, Time32Type, DurationType, Op<86400>>::Exec;
 DCHECK_OK(func->AddKernel({time32(unit), duration(unit)}, OutputType(FirstType),
 std::move(exec_1)));

 unit = TimeUnit::MILLI;
 auto exec_2 =
 ScalarBinary<Time32Type, Time32Type, DurationType, Op<true, 86400000>>::Exec;
 auto exec_2 = ScalarBinary<Time32Type, Time32Type, DurationType, Op<86400000>>::Exec;
 DCHECK_OK(func->AddKernel({time32(unit), duration(unit)}, OutputType(FirstType),
 std::move(exec_2)));

 // Add Op(time64, duration) -> time64
 unit = TimeUnit::MICRO;
 auto exec_3 =
 ScalarBinary<Time64Type, Time64Type, DurationType, Op<false, 86400000000>>::Exec;
 auto exec_3 = ScalarBinary<Time64Type, Time64Type, DurationType, Op<86400000000>>::Exec;
 DCHECK_OK(func->AddKernel({time64(unit), duration(unit)}, OutputType(FirstType),
 std::move(exec_3)));

 unit = TimeUnit::NANO;
 auto exec_4 =
 ScalarBinary<Time64Type, Time64Type, DurationType, Op<false, 86400000000000>>::Exec;
 ScalarBinary<Time64Type, Time64Type, DurationType, Op<86400000000000>>::Exec;
 DCHECK_OK(func->AddKernel({time64(unit), duration(unit)}, OutputType(FirstType),
 std::move(exec_4)));
}

template <template <int64_t> class Op>
void AddArithmeticFunctionDurationTime(std::shared_ptr<ScalarFunction> func) {
 // Add Op(duration, time32) -> time32
 TimeUnit::type unit = TimeUnit::SECOND;
 auto exec_1 = ScalarBinary<Time32Type, DurationType, Time32Type, Op<86400>>::Exec;
 DCHECK_OK(func->AddKernel({duration(unit), time32(unit)}, OutputType(LastType),
 std::move(exec_1)));

 unit = TimeUnit::MILLI;
 auto exec_2 = ScalarBinary<Time32Type, DurationType, Time32Type, Op<86400000>>::Exec;
 DCHECK_OK(func->AddKernel({duration(unit), time32(unit)}, OutputType(LastType),
 std::move(exec_2)));

 // Add Op(duration, time64) -> time64
 unit = TimeUnit::MICRO;
 auto exec_3 = ScalarBinary<Time64Type, DurationType, Time64Type, Op<86400000000>>::Exec;
 DCHECK_OK(func->AddKernel({duration(unit), time64(unit)}, OutputType(LastType),
 std::move(exec_3)));

 unit = TimeUnit::NANO;
 auto exec_4 =
 ScalarBinary<Time64Type, DurationType, Time64Type, Op<86400000000000>>::Exec;
 DCHECK_OK(func->AddKernel({duration(unit), time64(unit)}, OutputType(LastType),
 std::move(exec_4)));
}

const FunctionDoc absolute_value_doc{
 "Calculate the absolute value of the argument element-wise",
 ("Results will wrap around on integer overflow.\n"
Expand DownExpand Up@@ -2638,8 +2610,8 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
 for (auto unit : TimeUnit::values()) {
 InputType in_type(match::TimestampTypeUnit(unit));
 auto exec = ScalarBinary<Int64Type, Int64Type, Int64Type, Add>::Exec;
 DCHECK_OK(add->AddKernel({in_type, duration(unit)}, OutputType(FirstType),
 std::move(exec)));
 DCHECK_OK(add->AddKernel({in_type, duration(unit)}, OutputType(FirstType), exec));
DCHECK_OK(add->AddKernel({duration(unit), in_type}, OutputType(LastType), exec));
 }

 // Add add(duration, duration) -> duration
Expand All@@ -2649,7 +2621,8 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
 DCHECK_OK(add->AddKernel({in_type, in_type}, duration(unit), std::move(exec)));
 }

 AddArithmeticFunctionTimeDurations<AddTimeDuration>(add);
 AddArithmeticFunctionTimeDuration<AddTimeDuration>(add);
 AddArithmeticFunctionDurationTime<AddTimeDuration>(add);

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

Expand All@@ -2662,8 +2635,10 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
 for (auto unit : TimeUnit::values()) {
 InputType in_type(match::TimestampTypeUnit(unit));
 auto exec = ScalarBinary<Int64Type, Int64Type, Int64Type, AddChecked>::Exec;
 DCHECK_OK(add_checked->AddKernel({in_type, duration(unit)}, OutputType(FirstType),
 std::move(exec)));
 DCHECK_OK(
 add_checked->AddKernel({in_type, duration(unit)}, OutputType(FirstType), exec));
 DCHECK_OK(
 add_checked->AddKernel({duration(unit), in_type}, OutputType(LastType), exec));
 }

 // Add add(duration, duration) -> duration
Expand All@@ -2674,7 +2649,8 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
 add_checked->AddKernel({in_type, in_type}, duration(unit), std::move(exec)));
 }

 AddArithmeticFunctionTimeDurations<AddTimeDurationChecked>(add_checked);
 AddArithmeticFunctionTimeDuration<AddTimeDurationChecked>(add_checked);
 AddArithmeticFunctionDurationTime<AddTimeDurationChecked>(add_checked);

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

Expand DownExpand Up@@ -2732,7 +2708,7 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
 DCHECK_OK(subtract->AddKernel({in_type_date_64, in_type_date_64},
 duration(TimeUnit::MILLI), std::move(exec_date_64)));

AddArithmeticFunctionTimeDurations<SubtractTimeDuration>(subtract);
AddArithmeticFunctionTimeDuration<SubtractTimeDuration>(subtract);

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

Expand DownExpand Up@@ -2798,7 +2774,7 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
 subtract_checked->AddKernel({in_type, in_type}, duration(unit), std::move(exec)));
 }

AddArithmeticFunctionTimeDurations<SubtractTimeDurationChecked>(subtract_checked);
AddArithmeticFunctionTimeDuration<SubtractTimeDurationChecked>(subtract_checked);

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

Expand All@@ -2808,12 +2784,9 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {

 // 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)));
 auto exec = ArithmeticExecFromOp<ScalarBinaryEqualTypes, Multiply>(Type::DURATION);
 DCHECK_OK(multiply->AddKernel({duration(unit), int64()}, duration(unit), exec));
 DCHECK_OK(multiply->AddKernel({int64(), duration(unit)}, duration(unit), exec));
 }

 DCHECK_OK(registry->AddFunction(std::move(multiply)));
Expand All@@ -2825,14 +2798,12 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {

 // 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 =
 auto exec =
 ArithmeticExecFromOp<ScalarBinaryEqualTypes, MultiplyChecked>(Type::DURATION);
 DCHECK_OK(multiply_checked->AddKernel({int64(), duration(unit)}, duration(unit),
 std::move(exec2)));
 DCHECK_OK(
 multiply_checked->AddKernel({duration(unit), int64()}, duration(unit), exec));
 DCHECK_OK(
 multiply_checked->AddKernel({int64(), duration(unit)}, duration(unit), exec));
 }

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

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

Skip to content
ARROW-15919: [C++] Add function not commutative with timestamps & duration maths#12612

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

from

 Closed


ARROW-15919: [C++] Add function not commutative with timestamps & duration maths
#12612
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
0e7faba

Temporal add/add_checked should be commutative.


rok Mar 11, 2022
2c13914

Review feedback


rok Mar 16, 2022
0d424da

Review feedback


rok Mar 17, 2022
acabb81

Review feedback


rok Mar 17, 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


4 changes: 4 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@@ -182,6 +182,8 @@ TEST(TestDispatchBest, CommonTemporalResolution) {
 ASSERT_EQ(TimeUnit::MILLI, CommonTemporalResolution(args.data(), args.size()));
 args = {duration(TimeUnit::SECOND), time32(TimeUnit::SECOND)};
 ASSERT_EQ(TimeUnit::SECOND, CommonTemporalResolution(args.data(), args.size()));
 args = {duration(TimeUnit::SECOND), time64(TimeUnit::NANO)};
 ASSERT_EQ(TimeUnit::NANO, CommonTemporalResolution(args.data(), args.size()));
 args = {time64(TimeUnit::MICRO), duration(TimeUnit::NANO)};
 ASSERT_EQ(TimeUnit::NANO, CommonTemporalResolution(args.data(), args.size()));
 args = {timestamp(TimeUnit::SECOND, tz), timestamp(TimeUnit::MICRO)};
Expand All@@ -204,6 +206,8 @@ TEST(TestDispatchBest, CommonTemporalResolution) {
 ASSERT_EQ(TimeUnit::NANO, CommonTemporalResolution(args.data(), args.size()));
 args = {duration(TimeUnit::SECOND), int64()};
 ASSERT_EQ(TimeUnit::SECOND, CommonTemporalResolution(args.data(), args.size()));
 args = {duration(TimeUnit::MILLI), timestamp(TimeUnit::SECOND, tz)};
 ASSERT_EQ(TimeUnit::MILLI, CommonTemporalResolution(args.data(), args.size()));
}

TEST(TestDispatchBest, ReplaceTemporalTypes) {
Expand Down

157 changes: 64 additions & 93 deletions
cpp/src/arrow/compute/kernels/scalar_arithmetic.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -240,23 +240,12 @@ struct SubtractCheckedDate32 {
 }
};

template <bool is_32bit, int64_t multiple>
template <int64_t multiple>
struct AddTimeDuration {
 template <typename T, typename Arg0, typename Arg1>
 static enable_if_t<is_32bit, T> Call(KernelContext*, Arg0 left, Arg1 right,
 Status* st) {
 T result = arrow::internal::SafeSignedAdd(left, static_cast<T>(right));
 if (result < 0 || multiple <= result) {
 *st = Status::Invalid(result, " is not within the acceptable range of ", "[0, ",
 multiple, ") s");
 }
 return result;
 }

 template <typename T, typename Arg0, typename Arg1>
 static enable_if_t<!is_32bit, T> Call(KernelContext*, Arg0 left, Arg1 right,
 Status* st) {
 T result = arrow::internal::SafeSignedAdd(left, right);
 static T Call(KernelContext*, Arg0 left, Arg1 right, Status* st) {
 T result =
 arrow::internal::SafeSignedAdd(static_cast<T>(left), static_cast<T>(right));
 if (result < 0 || multiple <= result) {
 *st = Status::Invalid(result, " is not within the acceptable range of ", "[0, ",
 multiple, ") s");
Expand All@@ -265,27 +254,13 @@ struct AddTimeDuration {
 }
};

template <bool is_32bit, int64_t multiple>
template <int64_t multiple>
struct AddTimeDurationChecked {
 template <typename T, typename Arg0, typename Arg1>
 static enable_if_t<is_32bit, T> Call(KernelContext*, Arg0 left, Arg1 right,
 Status* st) {
 T result = 0;
 if (ARROW_PREDICT_FALSE(AddWithOverflow(left, static_cast<T>(right), &result))) {
 *st = Status::Invalid("overflow");
 }
 if (result < 0 || multiple <= result) {
 *st = Status::Invalid(result, " is not within the acceptable range of ", "[0, ",
 multiple, ") s");
 }
 return result;
 }

 template <typename T, typename Arg0, typename Arg1>
 static enable_if_t<!is_32bit, T> Call(KernelContext*, Arg0 left, Arg1 right,
 Status* st) {
 static T Call(KernelContext*, Arg0 left, Arg1 right, Status* st) {
 T result = 0;
 if (ARROW_PREDICT_FALSE(AddWithOverflow(left, static_cast<T>(right), &result))) {
 if (ARROW_PREDICT_FALSE(
 AddWithOverflow(static_cast<T>(left), static_cast<T>(right), &result))) {
 *st = Status::Invalid("overflow");
 }
 if (result < 0 || multiple <= result) {
Expand All@@ -296,50 +271,23 @@ struct AddTimeDurationChecked {
 }
};

template <bool is_32bit, int64_t multiple>
template <int64_t multiple>
struct SubtractTimeDuration {
 template <typename T, typename Arg0, typename Arg1>
 static enable_if_t<is_32bit, T> Call(KernelContext*, Arg0 left, Arg1 right,
 Status* st) {
 static T Call(KernelContext*, Arg0 left, Arg1 right, Status* st) {
 T result = arrow::internal::SafeSignedSubtract(left, static_cast<T>(right));
 if (result < 0 || multiple <= result) {
 *st = Status::Invalid(result, " is not within the acceptable range of ", "[0, ",
 multiple, ") s");
 }
 return result;
 }

 template <typename T, typename Arg0, typename Arg1>
 static enable_if_t<!is_32bit, T> Call(KernelContext*, Arg0 left, Arg1 right,
 Status* st) {
 T result = arrow::internal::SafeSignedSubtract(left, right);
 if (result < 0 || multiple <= result) {
 *st = Status::Invalid(result, " is not within the acceptable range of ", "[0, ",
 multiple, ") s");
 }
 return result;
 }
};

template <bool is_32bit, int64_t multiple>
template <int64_t multiple>
struct SubtractTimeDurationChecked {
 template <typename T, typename Arg0, typename Arg1>
 static enable_if_t<is_32bit, T> Call(KernelContext*, Arg0 left, Arg1 right,
 Status* st) {
 T result = 0;
 if (ARROW_PREDICT_FALSE(SubtractWithOverflow(left, static_cast<T>(right), &result))) {
 *st = Status::Invalid("overflow");
 }
 if (result < 0 || multiple <= result) {
 *st = Status::Invalid(result, " is not within the acceptable range of ", "[0, ",
 multiple, ") s");
 }
 return result;
 }

 template <typename T, typename Arg0, typename Arg1>
 static enable_if_t<!is_32bit, T> Call(KernelContext*, Arg0 left, Arg1 right,
 Status* st) {
 static T Call(KernelContext*, Arg0 left, Arg1 right, Status* st) {
 T result = 0;
 if (ARROW_PREDICT_FALSE(SubtractWithOverflow(left, static_cast<T>(right), &result))) {
 *st = Status::Invalid("overflow");
Expand DownExpand Up@@ -2269,34 +2217,58 @@ std::shared_ptr<ScalarFunction> MakeArithmeticFunctionFloatingPointNotNull(
 return func;
}

template <template <bool, int64_t> class Op>
void AddArithmeticFunctionTimeDurations(std::shared_ptr<ScalarFunction> func) {
template <template <int64_t> class Op>
void AddArithmeticFunctionTimeDuration(std::shared_ptr<ScalarFunction> func) {
 // Add Op(time32, duration) -> time32
 TimeUnit::type unit = TimeUnit::SECOND;
 auto exec_1 = ScalarBinary<Time32Type, Time32Type, DurationType, Op<true, 86400>>::Exec;
 auto exec_1 = ScalarBinary<Time32Type, Time32Type, DurationType, Op<86400>>::Exec;
 DCHECK_OK(func->AddKernel({time32(unit), duration(unit)}, OutputType(FirstType),
 std::move(exec_1)));

 unit = TimeUnit::MILLI;
 auto exec_2 =
 ScalarBinary<Time32Type, Time32Type, DurationType, Op<true, 86400000>>::Exec;
 auto exec_2 = ScalarBinary<Time32Type, Time32Type, DurationType, Op<86400000>>::Exec;
 DCHECK_OK(func->AddKernel({time32(unit), duration(unit)}, OutputType(FirstType),
 std::move(exec_2)));

 // Add Op(time64, duration) -> time64
 unit = TimeUnit::MICRO;
 auto exec_3 =
 ScalarBinary<Time64Type, Time64Type, DurationType, Op<false, 86400000000>>::Exec;
 auto exec_3 = ScalarBinary<Time64Type, Time64Type, DurationType, Op<86400000000>>::Exec;
 DCHECK_OK(func->AddKernel({time64(unit), duration(unit)}, OutputType(FirstType),
 std::move(exec_3)));

 unit = TimeUnit::NANO;
 auto exec_4 =
 ScalarBinary<Time64Type, Time64Type, DurationType, Op<false, 86400000000000>>::Exec;
 ScalarBinary<Time64Type, Time64Type, DurationType, Op<86400000000000>>::Exec;
 DCHECK_OK(func->AddKernel({time64(unit), duration(unit)}, OutputType(FirstType),
 std::move(exec_4)));
}

template <template <int64_t> class Op>
void AddArithmeticFunctionDurationTime(std::shared_ptr<ScalarFunction> func) {
 // Add Op(duration, time32) -> time32
 TimeUnit::type unit = TimeUnit::SECOND;
 auto exec_1 = ScalarBinary<Time32Type, DurationType, Time32Type, Op<86400>>::Exec;
 DCHECK_OK(func->AddKernel({duration(unit), time32(unit)}, OutputType(LastType),
 std::move(exec_1)));

 unit = TimeUnit::MILLI;
 auto exec_2 = ScalarBinary<Time32Type, DurationType, Time32Type, Op<86400000>>::Exec;
 DCHECK_OK(func->AddKernel({duration(unit), time32(unit)}, OutputType(LastType),
 std::move(exec_2)));

 // Add Op(duration, time64) -> time64
 unit = TimeUnit::MICRO;
 auto exec_3 = ScalarBinary<Time64Type, DurationType, Time64Type, Op<86400000000>>::Exec;
 DCHECK_OK(func->AddKernel({duration(unit), time64(unit)}, OutputType(LastType),
 std::move(exec_3)));

 unit = TimeUnit::NANO;
 auto exec_4 =
 ScalarBinary<Time64Type, DurationType, Time64Type, Op<86400000000000>>::Exec;
 DCHECK_OK(func->AddKernel({duration(unit), time64(unit)}, OutputType(LastType),
 std::move(exec_4)));
}

const FunctionDoc absolute_value_doc{
 "Calculate the absolute value of the argument element-wise",
 ("Results will wrap around on integer overflow.\n"
Expand DownExpand Up@@ -2638,8 +2610,8 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
 for (auto unit : TimeUnit::values()) {
 InputType in_type(match::TimestampTypeUnit(unit));
 auto exec = ScalarBinary<Int64Type, Int64Type, Int64Type, Add>::Exec;
 DCHECK_OK(add->AddKernel({in_type, duration(unit)}, OutputType(FirstType),
 std::move(exec)));
 DCHECK_OK(add->AddKernel({in_type, duration(unit)}, OutputType(FirstType), exec));
DCHECK_OK(add->AddKernel({duration(unit), in_type}, OutputType(LastType), exec));
 }

 // Add add(duration, duration) -> duration
Expand All@@ -2649,7 +2621,8 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
 DCHECK_OK(add->AddKernel({in_type, in_type}, duration(unit), std::move(exec)));
 }

 AddArithmeticFunctionTimeDurations<AddTimeDuration>(add);
 AddArithmeticFunctionTimeDuration<AddTimeDuration>(add);
 AddArithmeticFunctionDurationTime<AddTimeDuration>(add);

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

Expand All@@ -2662,8 +2635,10 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
 for (auto unit : TimeUnit::values()) {
 InputType in_type(match::TimestampTypeUnit(unit));
 auto exec = ScalarBinary<Int64Type, Int64Type, Int64Type, AddChecked>::Exec;
 DCHECK_OK(add_checked->AddKernel({in_type, duration(unit)}, OutputType(FirstType),
 std::move(exec)));
 DCHECK_OK(
 add_checked->AddKernel({in_type, duration(unit)}, OutputType(FirstType), exec));
 DCHECK_OK(
 add_checked->AddKernel({duration(unit), in_type}, OutputType(LastType), exec));
 }

 // Add add(duration, duration) -> duration
Expand All@@ -2674,7 +2649,8 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
 add_checked->AddKernel({in_type, in_type}, duration(unit), std::move(exec)));
 }

 AddArithmeticFunctionTimeDurations<AddTimeDurationChecked>(add_checked);
 AddArithmeticFunctionTimeDuration<AddTimeDurationChecked>(add_checked);
 AddArithmeticFunctionDurationTime<AddTimeDurationChecked>(add_checked);

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

Expand DownExpand Up@@ -2732,7 +2708,7 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
 DCHECK_OK(subtract->AddKernel({in_type_date_64, in_type_date_64},
 duration(TimeUnit::MILLI), std::move(exec_date_64)));

AddArithmeticFunctionTimeDurations<SubtractTimeDuration>(subtract);
AddArithmeticFunctionTimeDuration<SubtractTimeDuration>(subtract);

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

Expand DownExpand Up@@ -2798,7 +2774,7 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
 subtract_checked->AddKernel({in_type, in_type}, duration(unit), std::move(exec)));
 }

AddArithmeticFunctionTimeDurations<SubtractTimeDurationChecked>(subtract_checked);
AddArithmeticFunctionTimeDuration<SubtractTimeDurationChecked>(subtract_checked);

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

Expand All@@ -2808,12 +2784,9 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {

 // 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)));
 auto exec = ArithmeticExecFromOp<ScalarBinaryEqualTypes, Multiply>(Type::DURATION);
 DCHECK_OK(multiply->AddKernel({duration(unit), int64()}, duration(unit), exec));
 DCHECK_OK(multiply->AddKernel({int64(), duration(unit)}, duration(unit), exec));
 }

 DCHECK_OK(registry->AddFunction(std::move(multiply)));
Expand All@@ -2825,14 +2798,12 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {

 // 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 =
 auto exec =
 ArithmeticExecFromOp<ScalarBinaryEqualTypes, MultiplyChecked>(Type::DURATION);
 DCHECK_OK(multiply_checked->AddKernel({int64(), duration(unit)}, duration(unit),
 std::move(exec2)));
 DCHECK_OK(
 multiply_checked->AddKernel({duration(unit), int64()}, duration(unit), exec));
 DCHECK_OK(
 multiply_checked->AddKernel({int64(), duration(unit)}, duration(unit), exec));
 }

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

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

Skip to content
ARROW-15919: [C++] Add function not commutative with timestamps & duration maths#12612

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

from

 Closed


ARROW-15919: [C++] Add function not commutative with timestamps & duration maths
#12612
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
0e7faba

Temporal add/add_checked should be commutative.


rok Mar 11, 2022
2c13914

Review feedback


rok Mar 16, 2022
0d424da

Review feedback


rok Mar 17, 2022
acabb81

Review feedback


rok Mar 17, 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


4 changes: 4 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@@ -182,6 +182,8 @@ TEST(TestDispatchBest, CommonTemporalResolution) {
 ASSERT_EQ(TimeUnit::MILLI, CommonTemporalResolution(args.data(), args.size()));
 args = {duration(TimeUnit::SECOND), time32(TimeUnit::SECOND)};
 ASSERT_EQ(TimeUnit::SECOND, CommonTemporalResolution(args.data(), args.size()));
 args = {duration(TimeUnit::SECOND), time64(TimeUnit::NANO)};
 ASSERT_EQ(TimeUnit::NANO, CommonTemporalResolution(args.data(), args.size()));
 args = {time64(TimeUnit::MICRO), duration(TimeUnit::NANO)};
 ASSERT_EQ(TimeUnit::NANO, CommonTemporalResolution(args.data(), args.size()));
 args = {timestamp(TimeUnit::SECOND, tz), timestamp(TimeUnit::MICRO)};
Expand All@@ -204,6 +206,8 @@ TEST(TestDispatchBest, CommonTemporalResolution) {
 ASSERT_EQ(TimeUnit::NANO, CommonTemporalResolution(args.data(), args.size()));
 args = {duration(TimeUnit::SECOND), int64()};
 ASSERT_EQ(TimeUnit::SECOND, CommonTemporalResolution(args.data(), args.size()));
 args = {duration(TimeUnit::MILLI), timestamp(TimeUnit::SECOND, tz)};
 ASSERT_EQ(TimeUnit::MILLI, CommonTemporalResolution(args.data(), args.size()));
}

TEST(TestDispatchBest, ReplaceTemporalTypes) {
Expand Down

157 changes: 64 additions & 93 deletions
cpp/src/arrow/compute/kernels/scalar_arithmetic.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -240,23 +240,12 @@ struct SubtractCheckedDate32 {
 }
};

template <bool is_32bit, int64_t multiple>
template <int64_t multiple>
struct AddTimeDuration {
 template <typename T, typename Arg0, typename Arg1>
 static enable_if_t<is_32bit, T> Call(KernelContext*, Arg0 left, Arg1 right,
 Status* st) {
 T result = arrow::internal::SafeSignedAdd(left, static_cast<T>(right));
 if (result < 0 || multiple <= result) {
 *st = Status::Invalid(result, " is not within the acceptable range of ", "[0, ",
 multiple, ") s");
 }
 return result;
 }

 template <typename T, typename Arg0, typename Arg1>
 static enable_if_t<!is_32bit, T> Call(KernelContext*, Arg0 left, Arg1 right,
 Status* st) {
 T result = arrow::internal::SafeSignedAdd(left, right);
 static T Call(KernelContext*, Arg0 left, Arg1 right, Status* st) {
 T result =
 arrow::internal::SafeSignedAdd(static_cast<T>(left), static_cast<T>(right));
 if (result < 0 || multiple <= result) {
 *st = Status::Invalid(result, " is not within the acceptable range of ", "[0, ",
 multiple, ") s");
Expand All@@ -265,27 +254,13 @@ struct AddTimeDuration {
 }
};

template <bool is_32bit, int64_t multiple>
template <int64_t multiple>
struct AddTimeDurationChecked {
 template <typename T, typename Arg0, typename Arg1>
 static enable_if_t<is_32bit, T> Call(KernelContext*, Arg0 left, Arg1 right,
 Status* st) {
 T result = 0;
 if (ARROW_PREDICT_FALSE(AddWithOverflow(left, static_cast<T>(right), &result))) {
 *st = Status::Invalid("overflow");
 }
 if (result < 0 || multiple <= result) {
 *st = Status::Invalid(result, " is not within the acceptable range of ", "[0, ",
 multiple, ") s");
 }
 return result;
 }

 template <typename T, typename Arg0, typename Arg1>
 static enable_if_t<!is_32bit, T> Call(KernelContext*, Arg0 left, Arg1 right,
 Status* st) {
 static T Call(KernelContext*, Arg0 left, Arg1 right, Status* st) {
 T result = 0;
 if (ARROW_PREDICT_FALSE(AddWithOverflow(left, static_cast<T>(right), &result))) {
 if (ARROW_PREDICT_FALSE(
 AddWithOverflow(static_cast<T>(left), static_cast<T>(right), &result))) {
 *st = Status::Invalid("overflow");
 }
 if (result < 0 || multiple <= result) {
Expand All@@ -296,50 +271,23 @@ struct AddTimeDurationChecked {
 }
};

template <bool is_32bit, int64_t multiple>
template <int64_t multiple>
struct SubtractTimeDuration {
 template <typename T, typename Arg0, typename Arg1>
 static enable_if_t<is_32bit, T> Call(KernelContext*, Arg0 left, Arg1 right,
 Status* st) {
 static T Call(KernelContext*, Arg0 left, Arg1 right, Status* st) {
 T result = arrow::internal::SafeSignedSubtract(left, static_cast<T>(right));
 if (result < 0 || multiple <= result) {
 *st = Status::Invalid(result, " is not within the acceptable range of ", "[0, ",
 multiple, ") s");
 }
 return result;
 }

 template <typename T, typename Arg0, typename Arg1>
 static enable_if_t<!is_32bit, T> Call(KernelContext*, Arg0 left, Arg1 right,
 Status* st) {
 T result = arrow::internal::SafeSignedSubtract(left, right);
 if (result < 0 || multiple <= result) {
 *st = Status::Invalid(result, " is not within the acceptable range of ", "[0, ",
 multiple, ") s");
 }
 return result;
 }
};

template <bool is_32bit, int64_t multiple>
template <int64_t multiple>
struct SubtractTimeDurationChecked {
 template <typename T, typename Arg0, typename Arg1>
 static enable_if_t<is_32bit, T> Call(KernelContext*, Arg0 left, Arg1 right,
 Status* st) {
 T result = 0;
 if (ARROW_PREDICT_FALSE(SubtractWithOverflow(left, static_cast<T>(right), &result))) {
 *st = Status::Invalid("overflow");
 }
 if (result < 0 || multiple <= result) {
 *st = Status::Invalid(result, " is not within the acceptable range of ", "[0, ",
 multiple, ") s");
 }
 return result;
 }

 template <typename T, typename Arg0, typename Arg1>
 static enable_if_t<!is_32bit, T> Call(KernelContext*, Arg0 left, Arg1 right,
 Status* st) {
 static T Call(KernelContext*, Arg0 left, Arg1 right, Status* st) {
 T result = 0;
 if (ARROW_PREDICT_FALSE(SubtractWithOverflow(left, static_cast<T>(right), &result))) {
 *st = Status::Invalid("overflow");
Expand DownExpand Up@@ -2269,34 +2217,58 @@ std::shared_ptr<ScalarFunction> MakeArithmeticFunctionFloatingPointNotNull(
 return func;
}

template <template <bool, int64_t> class Op>
void AddArithmeticFunctionTimeDurations(std::shared_ptr<ScalarFunction> func) {
template <template <int64_t> class Op>
void AddArithmeticFunctionTimeDuration(std::shared_ptr<ScalarFunction> func) {
 // Add Op(time32, duration) -> time32
 TimeUnit::type unit = TimeUnit::SECOND;
 auto exec_1 = ScalarBinary<Time32Type, Time32Type, DurationType, Op<true, 86400>>::Exec;
 auto exec_1 = ScalarBinary<Time32Type, Time32Type, DurationType, Op<86400>>::Exec;
 DCHECK_OK(func->AddKernel({time32(unit), duration(unit)}, OutputType(FirstType),
 std::move(exec_1)));

 unit = TimeUnit::MILLI;
 auto exec_2 =
 ScalarBinary<Time32Type, Time32Type, DurationType, Op<true, 86400000>>::Exec;
 auto exec_2 = ScalarBinary<Time32Type, Time32Type, DurationType, Op<86400000>>::Exec;
 DCHECK_OK(func->AddKernel({time32(unit), duration(unit)}, OutputType(FirstType),
 std::move(exec_2)));

 // Add Op(time64, duration) -> time64
 unit = TimeUnit::MICRO;
 auto exec_3 =
 ScalarBinary<Time64Type, Time64Type, DurationType, Op<false, 86400000000>>::Exec;
 auto exec_3 = ScalarBinary<Time64Type, Time64Type, DurationType, Op<86400000000>>::Exec;
 DCHECK_OK(func->AddKernel({time64(unit), duration(unit)}, OutputType(FirstType),
 std::move(exec_3)));

 unit = TimeUnit::NANO;
 auto exec_4 =
 ScalarBinary<Time64Type, Time64Type, DurationType, Op<false, 86400000000000>>::Exec;
 ScalarBinary<Time64Type, Time64Type, DurationType, Op<86400000000000>>::Exec;
 DCHECK_OK(func->AddKernel({time64(unit), duration(unit)}, OutputType(FirstType),
 std::move(exec_4)));
}

template <template <int64_t> class Op>
void AddArithmeticFunctionDurationTime(std::shared_ptr<ScalarFunction> func) {
 // Add Op(duration, time32) -> time32
 TimeUnit::type unit = TimeUnit::SECOND;
 auto exec_1 = ScalarBinary<Time32Type, DurationType, Time32Type, Op<86400>>::Exec;
 DCHECK_OK(func->AddKernel({duration(unit), time32(unit)}, OutputType(LastType),
 std::move(exec_1)));

 unit = TimeUnit::MILLI;
 auto exec_2 = ScalarBinary<Time32Type, DurationType, Time32Type, Op<86400000>>::Exec;
 DCHECK_OK(func->AddKernel({duration(unit), time32(unit)}, OutputType(LastType),
 std::move(exec_2)));

 // Add Op(duration, time64) -> time64
 unit = TimeUnit::MICRO;
 auto exec_3 = ScalarBinary<Time64Type, DurationType, Time64Type, Op<86400000000>>::Exec;
 DCHECK_OK(func->AddKernel({duration(unit), time64(unit)}, OutputType(LastType),
 std::move(exec_3)));

 unit = TimeUnit::NANO;
 auto exec_4 =
 ScalarBinary<Time64Type, DurationType, Time64Type, Op<86400000000000>>::Exec;
 DCHECK_OK(func->AddKernel({duration(unit), time64(unit)}, OutputType(LastType),
 std::move(exec_4)));
}

const FunctionDoc absolute_value_doc{
 "Calculate the absolute value of the argument element-wise",
 ("Results will wrap around on integer overflow.\n"
Expand DownExpand Up@@ -2638,8 +2610,8 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
 for (auto unit : TimeUnit::values()) {
 InputType in_type(match::TimestampTypeUnit(unit));
 auto exec = ScalarBinary<Int64Type, Int64Type, Int64Type, Add>::Exec;
 DCHECK_OK(add->AddKernel({in_type, duration(unit)}, OutputType(FirstType),
 std::move(exec)));
 DCHECK_OK(add->AddKernel({in_type, duration(unit)}, OutputType(FirstType), exec));
DCHECK_OK(add->AddKernel({duration(unit), in_type}, OutputType(LastType), exec));
 }

 // Add add(duration, duration) -> duration
Expand All@@ -2649,7 +2621,8 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
 DCHECK_OK(add->AddKernel({in_type, in_type}, duration(unit), std::move(exec)));
 }

 AddArithmeticFunctionTimeDurations<AddTimeDuration>(add);
 AddArithmeticFunctionTimeDuration<AddTimeDuration>(add);
 AddArithmeticFunctionDurationTime<AddTimeDuration>(add);

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

Expand All@@ -2662,8 +2635,10 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
 for (auto unit : TimeUnit::values()) {
 InputType in_type(match::TimestampTypeUnit(unit));
 auto exec = ScalarBinary<Int64Type, Int64Type, Int64Type, AddChecked>::Exec;
 DCHECK_OK(add_checked->AddKernel({in_type, duration(unit)}, OutputType(FirstType),
 std::move(exec)));
 DCHECK_OK(
 add_checked->AddKernel({in_type, duration(unit)}, OutputType(FirstType), exec));
 DCHECK_OK(
 add_checked->AddKernel({duration(unit), in_type}, OutputType(LastType), exec));
 }

 // Add add(duration, duration) -> duration
Expand All@@ -2674,7 +2649,8 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
 add_checked->AddKernel({in_type, in_type}, duration(unit), std::move(exec)));
 }

 AddArithmeticFunctionTimeDurations<AddTimeDurationChecked>(add_checked);
 AddArithmeticFunctionTimeDuration<AddTimeDurationChecked>(add_checked);
 AddArithmeticFunctionDurationTime<AddTimeDurationChecked>(add_checked);

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

Expand DownExpand Up@@ -2732,7 +2708,7 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
 DCHECK_OK(subtract->AddKernel({in_type_date_64, in_type_date_64},
 duration(TimeUnit::MILLI), std::move(exec_date_64)));

AddArithmeticFunctionTimeDurations<SubtractTimeDuration>(subtract);
AddArithmeticFunctionTimeDuration<SubtractTimeDuration>(subtract);

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

Expand DownExpand Up@@ -2798,7 +2774,7 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
 subtract_checked->AddKernel({in_type, in_type}, duration(unit), std::move(exec)));
 }

AddArithmeticFunctionTimeDurations<SubtractTimeDurationChecked>(subtract_checked);
AddArithmeticFunctionTimeDuration<SubtractTimeDurationChecked>(subtract_checked);

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

Expand All@@ -2808,12 +2784,9 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {

 // 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)));
 auto exec = ArithmeticExecFromOp<ScalarBinaryEqualTypes, Multiply>(Type::DURATION);
 DCHECK_OK(multiply->AddKernel({duration(unit), int64()}, duration(unit), exec));
 DCHECK_OK(multiply->AddKernel({int64(), duration(unit)}, duration(unit), exec));
 }

 DCHECK_OK(registry->AddFunction(std::move(multiply)));
Expand All@@ -2825,14 +2798,12 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {

 // 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 =
 auto exec =
 ArithmeticExecFromOp<ScalarBinaryEqualTypes, MultiplyChecked>(Type::DURATION);
 DCHECK_OK(multiply_checked->AddKernel({int64(), duration(unit)}, duration(unit),
 std::move(exec2)));
 DCHECK_OK(
 multiply_checked->AddKernel({duration(unit), int64()}, duration(unit), exec));
 DCHECK_OK(
 multiply_checked->AddKernel({int64(), duration(unit)}, duration(unit), exec));
 }

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

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

Skip to content
ARROW-15919: [C++] Add function not commutative with timestamps & duration maths#12612

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

from

 Closed


ARROW-15919: [C++] Add function not commutative with timestamps & duration maths
#12612
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
0e7faba

Temporal add/add_checked should be commutative.


rok Mar 11, 2022
2c13914

Review feedback


rok Mar 16, 2022
0d424da

Review feedback


rok Mar 17, 2022
acabb81

Review feedback


rok Mar 17, 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


4 changes: 4 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@@ -182,6 +182,8 @@ TEST(TestDispatchBest, CommonTemporalResolution) {
 ASSERT_EQ(TimeUnit::MILLI, CommonTemporalResolution(args.data(), args.size()));
 args = {duration(TimeUnit::SECOND), time32(TimeUnit::SECOND)};
 ASSERT_EQ(TimeUnit::SECOND, CommonTemporalResolution(args.data(), args.size()));
 args = {duration(TimeUnit::SECOND), time64(TimeUnit::NANO)};
 ASSERT_EQ(TimeUnit::NANO, CommonTemporalResolution(args.data(), args.size()));
 args = {time64(TimeUnit::MICRO), duration(TimeUnit::NANO)};
 ASSERT_EQ(TimeUnit::NANO, CommonTemporalResolution(args.data(), args.size()));
 args = {timestamp(TimeUnit::SECOND, tz), timestamp(TimeUnit::MICRO)};
Expand All@@ -204,6 +206,8 @@ TEST(TestDispatchBest, CommonTemporalResolution) {
 ASSERT_EQ(TimeUnit::NANO, CommonTemporalResolution(args.data(), args.size()));
 args = {duration(TimeUnit::SECOND), int64()};
 ASSERT_EQ(TimeUnit::SECOND, CommonTemporalResolution(args.data(), args.size()));
 args = {duration(TimeUnit::MILLI), timestamp(TimeUnit::SECOND, tz)};
 ASSERT_EQ(TimeUnit::MILLI, CommonTemporalResolution(args.data(), args.size()));
}

TEST(TestDispatchBest, ReplaceTemporalTypes) {
Expand Down

157 changes: 64 additions & 93 deletions
cpp/src/arrow/compute/kernels/scalar_arithmetic.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -240,23 +240,12 @@ struct SubtractCheckedDate32 {
 }
};

template <bool is_32bit, int64_t multiple>
template <int64_t multiple>
struct AddTimeDuration {
 template <typename T, typename Arg0, typename Arg1>
 static enable_if_t<is_32bit, T> Call(KernelContext*, Arg0 left, Arg1 right,
 Status* st) {
 T result = arrow::internal::SafeSignedAdd(left, static_cast<T>(right));
 if (result < 0 || multiple <= result) {
 *st = Status::Invalid(result, " is not within the acceptable range of ", "[0, ",
 multiple, ") s");
 }
 return result;
 }

 template <typename T, typename Arg0, typename Arg1>
 static enable_if_t<!is_32bit, T> Call(KernelContext*, Arg0 left, Arg1 right,
 Status* st) {
 T result = arrow::internal::SafeSignedAdd(left, right);
 static T Call(KernelContext*, Arg0 left, Arg1 right, Status* st) {
 T result =
 arrow::internal::SafeSignedAdd(static_cast<T>(left), static_cast<T>(right));
 if (result < 0 || multiple <= result) {
 *st = Status::Invalid(result, " is not within the acceptable range of ", "[0, ",
 multiple, ") s");
Expand All@@ -265,27 +254,13 @@ struct AddTimeDuration {
 }
};

template <bool is_32bit, int64_t multiple>
template <int64_t multiple>
struct AddTimeDurationChecked {
 template <typename T, typename Arg0, typename Arg1>
 static enable_if_t<is_32bit, T> Call(KernelContext*, Arg0 left, Arg1 right,
 Status* st) {
 T result = 0;
 if (ARROW_PREDICT_FALSE(AddWithOverflow(left, static_cast<T>(right), &result))) {
 *st = Status::Invalid("overflow");
 }
 if (result < 0 || multiple <= result) {
 *st = Status::Invalid(result, " is not within the acceptable range of ", "[0, ",
 multiple, ") s");
 }
 return result;
 }

 template <typename T, typename Arg0, typename Arg1>
 static enable_if_t<!is_32bit, T> Call(KernelContext*, Arg0 left, Arg1 right,
 Status* st) {
 static T Call(KernelContext*, Arg0 left, Arg1 right, Status* st) {
 T result = 0;
 if (ARROW_PREDICT_FALSE(AddWithOverflow(left, static_cast<T>(right), &result))) {
 if (ARROW_PREDICT_FALSE(
 AddWithOverflow(static_cast<T>(left), static_cast<T>(right), &result))) {
 *st = Status::Invalid("overflow");
 }
 if (result < 0 || multiple <= result) {
Expand All@@ -296,50 +271,23 @@ struct AddTimeDurationChecked {
 }
};

template <bool is_32bit, int64_t multiple>
template <int64_t multiple>
struct SubtractTimeDuration {
 template <typename T, typename Arg0, typename Arg1>
 static enable_if_t<is_32bit, T> Call(KernelContext*, Arg0 left, Arg1 right,
 Status* st) {
 static T Call(KernelContext*, Arg0 left, Arg1 right, Status* st) {
 T result = arrow::internal::SafeSignedSubtract(left, static_cast<T>(right));
 if (result < 0 || multiple <= result) {
 *st = Status::Invalid(result, " is not within the acceptable range of ", "[0, ",
 multiple, ") s");
 }
 return result;
 }

 template <typename T, typename Arg0, typename Arg1>
 static enable_if_t<!is_32bit, T> Call(KernelContext*, Arg0 left, Arg1 right,
 Status* st) {
 T result = arrow::internal::SafeSignedSubtract(left, right);
 if (result < 0 || multiple <= result) {
 *st = Status::Invalid(result, " is not within the acceptable range of ", "[0, ",
 multiple, ") s");
 }
 return result;
 }
};

template <bool is_32bit, int64_t multiple>
template <int64_t multiple>
struct SubtractTimeDurationChecked {
 template <typename T, typename Arg0, typename Arg1>
 static enable_if_t<is_32bit, T> Call(KernelContext*, Arg0 left, Arg1 right,
 Status* st) {
 T result = 0;
 if (ARROW_PREDICT_FALSE(SubtractWithOverflow(left, static_cast<T>(right), &result))) {
 *st = Status::Invalid("overflow");
 }
 if (result < 0 || multiple <= result) {
 *st = Status::Invalid(result, " is not within the acceptable range of ", "[0, ",
 multiple, ") s");
 }
 return result;
 }

 template <typename T, typename Arg0, typename Arg1>
 static enable_if_t<!is_32bit, T> Call(KernelContext*, Arg0 left, Arg1 right,
 Status* st) {
 static T Call(KernelContext*, Arg0 left, Arg1 right, Status* st) {
 T result = 0;
 if (ARROW_PREDICT_FALSE(SubtractWithOverflow(left, static_cast<T>(right), &result))) {
 *st = Status::Invalid("overflow");
Expand DownExpand Up@@ -2269,34 +2217,58 @@ std::shared_ptr<ScalarFunction> MakeArithmeticFunctionFloatingPointNotNull(
 return func;
}

template <template <bool, int64_t> class Op>
void AddArithmeticFunctionTimeDurations(std::shared_ptr<ScalarFunction> func) {
template <template <int64_t> class Op>
void AddArithmeticFunctionTimeDuration(std::shared_ptr<ScalarFunction> func) {
 // Add Op(time32, duration) -> time32
 TimeUnit::type unit = TimeUnit::SECOND;
 auto exec_1 = ScalarBinary<Time32Type, Time32Type, DurationType, Op<true, 86400>>::Exec;
 auto exec_1 = ScalarBinary<Time32Type, Time32Type, DurationType, Op<86400>>::Exec;
 DCHECK_OK(func->AddKernel({time32(unit), duration(unit)}, OutputType(FirstType),
 std::move(exec_1)));

 unit = TimeUnit::MILLI;
 auto exec_2 =
 ScalarBinary<Time32Type, Time32Type, DurationType, Op<true, 86400000>>::Exec;
 auto exec_2 = ScalarBinary<Time32Type, Time32Type, DurationType, Op<86400000>>::Exec;
 DCHECK_OK(func->AddKernel({time32(unit), duration(unit)}, OutputType(FirstType),
 std::move(exec_2)));

 // Add Op(time64, duration) -> time64
 unit = TimeUnit::MICRO;
 auto exec_3 =
 ScalarBinary<Time64Type, Time64Type, DurationType, Op<false, 86400000000>>::Exec;
 auto exec_3 = ScalarBinary<Time64Type, Time64Type, DurationType, Op<86400000000>>::Exec;
 DCHECK_OK(func->AddKernel({time64(unit), duration(unit)}, OutputType(FirstType),
 std::move(exec_3)));

 unit = TimeUnit::NANO;
 auto exec_4 =
 ScalarBinary<Time64Type, Time64Type, DurationType, Op<false, 86400000000000>>::Exec;
 ScalarBinary<Time64Type, Time64Type, DurationType, Op<86400000000000>>::Exec;
 DCHECK_OK(func->AddKernel({time64(unit), duration(unit)}, OutputType(FirstType),
 std::move(exec_4)));
}

template <template <int64_t> class Op>
void AddArithmeticFunctionDurationTime(std::shared_ptr<ScalarFunction> func) {
 // Add Op(duration, time32) -> time32
 TimeUnit::type unit = TimeUnit::SECOND;
 auto exec_1 = ScalarBinary<Time32Type, DurationType, Time32Type, Op<86400>>::Exec;
 DCHECK_OK(func->AddKernel({duration(unit), time32(unit)}, OutputType(LastType),
 std::move(exec_1)));

 unit = TimeUnit::MILLI;
 auto exec_2 = ScalarBinary<Time32Type, DurationType, Time32Type, Op<86400000>>::Exec;
 DCHECK_OK(func->AddKernel({duration(unit), time32(unit)}, OutputType(LastType),
 std::move(exec_2)));

 // Add Op(duration, time64) -> time64
 unit = TimeUnit::MICRO;
 auto exec_3 = ScalarBinary<Time64Type, DurationType, Time64Type, Op<86400000000>>::Exec;
 DCHECK_OK(func->AddKernel({duration(unit), time64(unit)}, OutputType(LastType),
 std::move(exec_3)));

 unit = TimeUnit::NANO;
 auto exec_4 =
 ScalarBinary<Time64Type, DurationType, Time64Type, Op<86400000000000>>::Exec;
 DCHECK_OK(func->AddKernel({duration(unit), time64(unit)}, OutputType(LastType),
 std::move(exec_4)));
}

const FunctionDoc absolute_value_doc{
 "Calculate the absolute value of the argument element-wise",
 ("Results will wrap around on integer overflow.\n"
Expand DownExpand Up@@ -2638,8 +2610,8 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
 for (auto unit : TimeUnit::values()) {
 InputType in_type(match::TimestampTypeUnit(unit));
 auto exec = ScalarBinary<Int64Type, Int64Type, Int64Type, Add>::Exec;
 DCHECK_OK(add->AddKernel({in_type, duration(unit)}, OutputType(FirstType),
 std::move(exec)));
 DCHECK_OK(add->AddKernel({in_type, duration(unit)}, OutputType(FirstType), exec));
DCHECK_OK(add->AddKernel({duration(unit), in_type}, OutputType(LastType), exec));
 }

 // Add add(duration, duration) -> duration
Expand All@@ -2649,7 +2621,8 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
 DCHECK_OK(add->AddKernel({in_type, in_type}, duration(unit), std::move(exec)));
 }

 AddArithmeticFunctionTimeDurations<AddTimeDuration>(add);
 AddArithmeticFunctionTimeDuration<AddTimeDuration>(add);
 AddArithmeticFunctionDurationTime<AddTimeDuration>(add);

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

Expand All@@ -2662,8 +2635,10 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
 for (auto unit : TimeUnit::values()) {
 InputType in_type(match::TimestampTypeUnit(unit));
 auto exec = ScalarBinary<Int64Type, Int64Type, Int64Type, AddChecked>::Exec;
 DCHECK_OK(add_checked->AddKernel({in_type, duration(unit)}, OutputType(FirstType),
 std::move(exec)));
 DCHECK_OK(
 add_checked->AddKernel({in_type, duration(unit)}, OutputType(FirstType), exec));
 DCHECK_OK(
 add_checked->AddKernel({duration(unit), in_type}, OutputType(LastType), exec));
 }

 // Add add(duration, duration) -> duration
Expand All@@ -2674,7 +2649,8 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
 add_checked->AddKernel({in_type, in_type}, duration(unit), std::move(exec)));
 }

 AddArithmeticFunctionTimeDurations<AddTimeDurationChecked>(add_checked);
 AddArithmeticFunctionTimeDuration<AddTimeDurationChecked>(add_checked);
 AddArithmeticFunctionDurationTime<AddTimeDurationChecked>(add_checked);

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

Expand DownExpand Up@@ -2732,7 +2708,7 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
 DCHECK_OK(subtract->AddKernel({in_type_date_64, in_type_date_64},
 duration(TimeUnit::MILLI), std::move(exec_date_64)));

AddArithmeticFunctionTimeDurations<SubtractTimeDuration>(subtract);
AddArithmeticFunctionTimeDuration<SubtractTimeDuration>(subtract);

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

Expand DownExpand Up@@ -2798,7 +2774,7 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
 subtract_checked->AddKernel({in_type, in_type}, duration(unit), std::move(exec)));
 }

AddArithmeticFunctionTimeDurations<SubtractTimeDurationChecked>(subtract_checked);
AddArithmeticFunctionTimeDuration<SubtractTimeDurationChecked>(subtract_checked);

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

Expand All@@ -2808,12 +2784,9 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {

 // 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)));
 auto exec = ArithmeticExecFromOp<ScalarBinaryEqualTypes, Multiply>(Type::DURATION);
 DCHECK_OK(multiply->AddKernel({duration(unit), int64()}, duration(unit), exec));
 DCHECK_OK(multiply->AddKernel({int64(), duration(unit)}, duration(unit), exec));
 }

 DCHECK_OK(registry->AddFunction(std::move(multiply)));
Expand All@@ -2825,14 +2798,12 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {

 // 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 =
 auto exec =
 ArithmeticExecFromOp<ScalarBinaryEqualTypes, MultiplyChecked>(Type::DURATION);
 DCHECK_OK(multiply_checked->AddKernel({int64(), duration(unit)}, duration(unit),
 std::move(exec2)));
 DCHECK_OK(
 multiply_checked->AddKernel({duration(unit), int64()}, duration(unit), exec));
 DCHECK_OK(
 multiply_checked->AddKernel({int64(), duration(unit)}, duration(unit), exec));
 }

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