Skip to content

ARROW-14093: [C++] subtract(date, date) -> duration kernel#12124

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

ARROW-14093: [C++] subtract(date, date) -> duration kernel #12124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4c48850
subtract(date, date)->duration
rok Jan 11, 2022
eae5350
Review feedback.
rok Jan 12, 2022
83ebaf1
Add ReplaceTemporalTypes
rok Jan 19, 2022
5b77577
Rebase for ARROW-14092
rok Jan 26, 2022
f022b5e
Review feedback
rok Jan 31, 2022
66e1955
Review feedback
rok Feb 2, 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
84 changes: 82 additions & 2 deletions cpp/src/arrow/compute/kernels/scalar_arithmetic.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -214,6 +214,31 @@ struct SubtractChecked {
}
};

struct SubtractDate32 {
static constexpr int64_t kSecondsInDay = 86400;

template <typename T, typename Arg0, typename Arg1>
static constexpr T Call(KernelContext*, Arg0 left, Arg1 right, Status*) {
return arrow::internal::SafeSignedSubtract(left, right) * kSecondsInDay;
}
};

struct SubtractCheckedDate32 {
static constexpr int64_t kSecondsInDay = 86400;

template <typename T, typename Arg0, typename Arg1>
static T Call(KernelContext*, Arg0 left, Arg1 right, Status* st) {
T result = 0;
if (ARROW_PREDICT_FALSE(SubtractWithOverflow(left, right, &result))) {
*st = Status::Invalid("overflow");
}
if (ARROW_PREDICT_FALSE(MultiplyWithOverflow(result, kSecondsInDay, &result))) {
*st = Status::Invalid("overflow");
}
return result;
}
};

struct Multiply {
static_assert(std::is_same<decltype(int8_t() * int8_t()), int32_t>::value, "");
static_assert(std::is_same<decltype(uint8_t() * uint8_t()), int32_t>::value, "");
Expand DownExpand Up@@ -1611,6 +1636,23 @@ Result<ValueDescr> ResolveDecimalDivisionOutput(KernelContext*,
});
}

Result<ValueDescr> ResolveTemporalOutput(KernelContext*,
const std::vector<ValueDescr>& args) {
DCHECK_EQ(args[0].type->id(), args[1].type->id());
auto left_type = checked_cast<const TimestampType*>(args[0].type.get());
auto right_type = checked_cast<const TimestampType*>(args[1].type.get());
DCHECK_EQ(left_type->unit(), left_type->unit());

if ((left_type->timezone() == "" || right_type->timezone() == "") &&
left_type->timezone() != right_type->timezone()) {
return Status::Invalid("Subtraction of zoned and non-zoned times is ambiguous. (",
left_type->timezone(), right_type->timezone(), ").");
}

auto type = duration(right_type->unit());
return ValueDescr(std::move(type), GetBroadcastShape(args));
}

template <typename Op>
void AddDecimalUnaryKernels(ScalarFunction* func) {
OutputType out_type(FirstType);
Expand DownExpand Up@@ -2426,7 +2468,9 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
for (auto unit : TimeUnit::values()) {
InputType in_type(match::TimestampTypeUnit(unit));
auto exec = ArithmeticExecFromOp<ScalarBinaryEqualTypes, Subtract>(Type::TIMESTAMP);
DCHECK_OK(subtract->AddKernel({in_type, in_type}, duration(unit), std::move(exec)));
DCHECK_OK(subtract->AddKernel({in_type, in_type},
OutputType::Resolver(ResolveTemporalOutput),
std::move(exec)));
}

// Add subtract(timestamp, duration) -> timestamp
Expand All@@ -2437,14 +2481,36 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
std::move(exec)));
}

// Add subtract(date32, date32) -> duration(TimeUnit::SECOND)
InputType in_type_date_32(date32());
auto exec_date_32 = ScalarBinaryEqualTypes<Int64Type, Date32Type, SubtractDate32>::Exec;
DCHECK_OK(subtract->AddKernel({in_type_date_32, in_type_date_32},
duration(TimeUnit::SECOND), std::move(exec_date_32)));

// Add subtract(date64, date64) -> duration(TimeUnit::MILLI)
InputType in_type_date_64(date64());
auto exec_date_64 = ScalarBinaryEqualTypes<Int64Type, Date64Type, Subtract>::Exec;
DCHECK_OK(subtract->AddKernel({in_type_date_64, in_type_date_64},
duration(TimeUnit::MILLI), std::move(exec_date_64)));

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

// ----------------------------------------------------------------------
auto subtract_checked = MakeArithmeticFunctionNotNull<SubtractChecked>(
"subtract_checked", &sub_checked_doc);
AddDecimalBinaryKernels<SubtractChecked>("subtract_checked", subtract_checked.get());

// Add subtract(timestamp, duration) -> timestamp
// Add subtract_checked(timestamp, timestamp) -> duration
for (auto unit : TimeUnit::values()) {
InputType in_type(match::TimestampTypeUnit(unit));
Comment thread
lidavidm marked this conversation as resolved.
Outdated
auto exec =
ArithmeticExecFromOp<ScalarBinaryEqualTypes, SubtractChecked>(Type::TIMESTAMP);
DCHECK_OK(subtract_checked->AddKernel({in_type, in_type},
OutputType::Resolver(ResolveTemporalOutput),
std::move(exec)));
}

// Add subtract_checked(timestamp, duration) -> timestamp
for (auto unit : TimeUnit::values()) {
InputType in_type(match::TimestampTypeUnit(unit));
auto exec =
Expand All@@ -2453,6 +2519,20 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
OutputType(FirstType), std::move(exec)));
}

// Add subtract_checked(date32, date32) -> duration(TimeUnit::SECOND)
auto exec_date_32_checked =
ScalarBinaryEqualTypes<Int64Type, Date32Type, SubtractCheckedDate32>::Exec;
DCHECK_OK(subtract_checked->AddKernel({in_type_date_32, in_type_date_32},
duration(TimeUnit::SECOND),
std::move(exec_date_32_checked)));

// Add subtract_checked(date64, date64) -> duration(TimeUnit::MILLI)
auto exec_date_64_checked =
ScalarBinaryEqualTypes<Int64Type, Date64Type, SubtractChecked>::Exec;
DCHECK_OK(subtract_checked->AddKernel({in_type_date_64, in_type_date_64},
duration(TimeUnit::MILLI),
std::move(exec_date_64_checked)));

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

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

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

from

 Closed


ARROW-14093: [C++] subtract(date, date) -> duration kernel
#12124
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
4c48850

subtract(date, date)->duration


rok Jan 11, 2022
eae5350

Review feedback.


rok Jan 12, 2022
83ebaf1

Add ReplaceTemporalTypes


rok Jan 19, 2022
5b77577

Rebase for ARROW-14092


rok Jan 26, 2022
f022b5e

Review feedback


rok Jan 31, 2022
66e1955

Review feedback


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


84 changes: 82 additions & 2 deletions
cpp/src/arrow/compute/kernels/scalar_arithmetic.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -214,6 +214,31 @@ struct SubtractChecked {
 }
};

struct SubtractDate32 {
 static constexpr int64_t kSecondsInDay = 86400;

 template <typename T, typename Arg0, typename Arg1>
 static constexpr T Call(KernelContext*, Arg0 left, Arg1 right, Status*) {
 return arrow::internal::SafeSignedSubtract(left, right) * kSecondsInDay;
 }
};

struct SubtractCheckedDate32 {
 static constexpr int64_t kSecondsInDay = 86400;

 template <typename T, typename Arg0, typename Arg1>
 static T Call(KernelContext*, Arg0 left, Arg1 right, Status* st) {
 T result = 0;
 if (ARROW_PREDICT_FALSE(SubtractWithOverflow(left, right, &result))) {
 *st = Status::Invalid("overflow");
 }
 if (ARROW_PREDICT_FALSE(MultiplyWithOverflow(result, kSecondsInDay, &result))) {
 *st = Status::Invalid("overflow");
 }
 return result;
 }
};

struct Multiply {
 static_assert(std::is_same<decltype(int8_t() * int8_t()), int32_t>::value, "");
 static_assert(std::is_same<decltype(uint8_t() * uint8_t()), int32_t>::value, "");
Expand DownExpand Up@@ -1611,6 +1636,23 @@ Result<ValueDescr> ResolveDecimalDivisionOutput(KernelContext*,
 });
}

Result<ValueDescr> ResolveTemporalOutput(KernelContext*,
 const std::vector<ValueDescr>& args) {
 DCHECK_EQ(args[0].type->id(), args[1].type->id());
 auto left_type = checked_cast<const TimestampType*>(args[0].type.get());
 auto right_type = checked_cast<const TimestampType*>(args[1].type.get());
 DCHECK_EQ(left_type->unit(), left_type->unit());

 if ((left_type->timezone() == "" || right_type->timezone() == "") &&
 left_type->timezone() != right_type->timezone()) {
 return Status::Invalid("Subtraction of zoned and non-zoned times is ambiguous. (",
 left_type->timezone(), right_type->timezone(), ").");
 }

 auto type = duration(right_type->unit());
 return ValueDescr(std::move(type), GetBroadcastShape(args));
}

template <typename Op>
void AddDecimalUnaryKernels(ScalarFunction* func) {
 OutputType out_type(FirstType);
Expand DownExpand Up@@ -2426,7 +2468,9 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
 for (auto unit : TimeUnit::values()) {
 InputType in_type(match::TimestampTypeUnit(unit));
 auto exec = ArithmeticExecFromOp<ScalarBinaryEqualTypes, Subtract>(Type::TIMESTAMP);
 DCHECK_OK(subtract->AddKernel({in_type, in_type}, duration(unit), std::move(exec)));
 DCHECK_OK(subtract->AddKernel({in_type, in_type},
 OutputType::Resolver(ResolveTemporalOutput),
 std::move(exec)));
 }

 // Add subtract(timestamp, duration) -> timestamp
Expand All@@ -2437,14 +2481,36 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
 std::move(exec)));
 }

 // Add subtract(date32, date32) -> duration(TimeUnit::SECOND)
 InputType in_type_date_32(date32());
 auto exec_date_32 = ScalarBinaryEqualTypes<Int64Type, Date32Type, SubtractDate32>::Exec;
 DCHECK_OK(subtract->AddKernel({in_type_date_32, in_type_date_32},
 duration(TimeUnit::SECOND), std::move(exec_date_32)));

 // Add subtract(date64, date64) -> duration(TimeUnit::MILLI)
 InputType in_type_date_64(date64());
 auto exec_date_64 = ScalarBinaryEqualTypes<Int64Type, Date64Type, Subtract>::Exec;
 DCHECK_OK(subtract->AddKernel({in_type_date_64, in_type_date_64},
 duration(TimeUnit::MILLI), std::move(exec_date_64)));

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

 // ----------------------------------------------------------------------
 auto subtract_checked = MakeArithmeticFunctionNotNull<SubtractChecked>(
 "subtract_checked", &sub_checked_doc);
 AddDecimalBinaryKernels<SubtractChecked>("subtract_checked", subtract_checked.get());

 // Add subtract(timestamp, duration) -> timestamp
 // Add subtract_checked(timestamp, timestamp) -> duration
 for (auto unit : TimeUnit::values()) {
 InputType in_type(match::TimestampTypeUnit(unit));
Comment thread
lidavidm marked this conversation as resolved.


Outdated

 auto exec =
 ArithmeticExecFromOp<ScalarBinaryEqualTypes, SubtractChecked>(Type::TIMESTAMP);
 DCHECK_OK(subtract_checked->AddKernel({in_type, in_type},
 OutputType::Resolver(ResolveTemporalOutput),
 std::move(exec)));
 }

 // Add subtract_checked(timestamp, duration) -> timestamp
 for (auto unit : TimeUnit::values()) {
 InputType in_type(match::TimestampTypeUnit(unit));
 auto exec =
Expand All@@ -2453,6 +2519,20 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
 OutputType(FirstType), std::move(exec)));
 }

 // Add subtract_checked(date32, date32) -> duration(TimeUnit::SECOND)
 auto exec_date_32_checked =
 ScalarBinaryEqualTypes<Int64Type, Date32Type, SubtractCheckedDate32>::Exec;
 DCHECK_OK(subtract_checked->AddKernel({in_type_date_32, in_type_date_32},
 duration(TimeUnit::SECOND),
 std::move(exec_date_32_checked)));

 // Add subtract_checked(date64, date64) -> duration(TimeUnit::MILLI)
 auto exec_date_64_checked =
 ScalarBinaryEqualTypes<Int64Type, Date64Type, SubtractChecked>::Exec;
 DCHECK_OK(subtract_checked->AddKernel({in_type_date_64, in_type_date_64},
 duration(TimeUnit::MILLI),
 std::move(exec_date_64_checked)));

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

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

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

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

from

 Closed


ARROW-14093: [C++] subtract(date, date) -> duration kernel
#12124
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
4c48850

subtract(date, date)->duration


rok Jan 11, 2022
eae5350

Review feedback.


rok Jan 12, 2022
83ebaf1

Add ReplaceTemporalTypes


rok Jan 19, 2022
5b77577

Rebase for ARROW-14092


rok Jan 26, 2022
f022b5e

Review feedback


rok Jan 31, 2022
66e1955

Review feedback


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


84 changes: 82 additions & 2 deletions
cpp/src/arrow/compute/kernels/scalar_arithmetic.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -214,6 +214,31 @@ struct SubtractChecked {
 }
};

struct SubtractDate32 {
 static constexpr int64_t kSecondsInDay = 86400;

 template <typename T, typename Arg0, typename Arg1>
 static constexpr T Call(KernelContext*, Arg0 left, Arg1 right, Status*) {
 return arrow::internal::SafeSignedSubtract(left, right) * kSecondsInDay;
 }
};

struct SubtractCheckedDate32 {
 static constexpr int64_t kSecondsInDay = 86400;

 template <typename T, typename Arg0, typename Arg1>
 static T Call(KernelContext*, Arg0 left, Arg1 right, Status* st) {
 T result = 0;
 if (ARROW_PREDICT_FALSE(SubtractWithOverflow(left, right, &result))) {
 *st = Status::Invalid("overflow");
 }
 if (ARROW_PREDICT_FALSE(MultiplyWithOverflow(result, kSecondsInDay, &result))) {
 *st = Status::Invalid("overflow");
 }
 return result;
 }
};

struct Multiply {
 static_assert(std::is_same<decltype(int8_t() * int8_t()), int32_t>::value, "");
 static_assert(std::is_same<decltype(uint8_t() * uint8_t()), int32_t>::value, "");
Expand DownExpand Up@@ -1611,6 +1636,23 @@ Result<ValueDescr> ResolveDecimalDivisionOutput(KernelContext*,
 });
}

Result<ValueDescr> ResolveTemporalOutput(KernelContext*,
 const std::vector<ValueDescr>& args) {
 DCHECK_EQ(args[0].type->id(), args[1].type->id());
 auto left_type = checked_cast<const TimestampType*>(args[0].type.get());
 auto right_type = checked_cast<const TimestampType*>(args[1].type.get());
 DCHECK_EQ(left_type->unit(), left_type->unit());

 if ((left_type->timezone() == "" || right_type->timezone() == "") &&
 left_type->timezone() != right_type->timezone()) {
 return Status::Invalid("Subtraction of zoned and non-zoned times is ambiguous. (",
 left_type->timezone(), right_type->timezone(), ").");
 }

 auto type = duration(right_type->unit());
 return ValueDescr(std::move(type), GetBroadcastShape(args));
}

template <typename Op>
void AddDecimalUnaryKernels(ScalarFunction* func) {
 OutputType out_type(FirstType);
Expand DownExpand Up@@ -2426,7 +2468,9 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
 for (auto unit : TimeUnit::values()) {
 InputType in_type(match::TimestampTypeUnit(unit));
 auto exec = ArithmeticExecFromOp<ScalarBinaryEqualTypes, Subtract>(Type::TIMESTAMP);
 DCHECK_OK(subtract->AddKernel({in_type, in_type}, duration(unit), std::move(exec)));
 DCHECK_OK(subtract->AddKernel({in_type, in_type},
 OutputType::Resolver(ResolveTemporalOutput),
 std::move(exec)));
 }

 // Add subtract(timestamp, duration) -> timestamp
Expand All@@ -2437,14 +2481,36 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
 std::move(exec)));
 }

 // Add subtract(date32, date32) -> duration(TimeUnit::SECOND)
 InputType in_type_date_32(date32());
 auto exec_date_32 = ScalarBinaryEqualTypes<Int64Type, Date32Type, SubtractDate32>::Exec;
 DCHECK_OK(subtract->AddKernel({in_type_date_32, in_type_date_32},
 duration(TimeUnit::SECOND), std::move(exec_date_32)));

 // Add subtract(date64, date64) -> duration(TimeUnit::MILLI)
 InputType in_type_date_64(date64());
 auto exec_date_64 = ScalarBinaryEqualTypes<Int64Type, Date64Type, Subtract>::Exec;
 DCHECK_OK(subtract->AddKernel({in_type_date_64, in_type_date_64},
 duration(TimeUnit::MILLI), std::move(exec_date_64)));

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

 // ----------------------------------------------------------------------
 auto subtract_checked = MakeArithmeticFunctionNotNull<SubtractChecked>(
 "subtract_checked", &sub_checked_doc);
 AddDecimalBinaryKernels<SubtractChecked>("subtract_checked", subtract_checked.get());

 // Add subtract(timestamp, duration) -> timestamp
 // Add subtract_checked(timestamp, timestamp) -> duration
 for (auto unit : TimeUnit::values()) {
 InputType in_type(match::TimestampTypeUnit(unit));
Comment thread
lidavidm marked this conversation as resolved.


Outdated

 auto exec =
 ArithmeticExecFromOp<ScalarBinaryEqualTypes, SubtractChecked>(Type::TIMESTAMP);
 DCHECK_OK(subtract_checked->AddKernel({in_type, in_type},
 OutputType::Resolver(ResolveTemporalOutput),
 std::move(exec)));
 }

 // Add subtract_checked(timestamp, duration) -> timestamp
 for (auto unit : TimeUnit::values()) {
 InputType in_type(match::TimestampTypeUnit(unit));
 auto exec =
Expand All@@ -2453,6 +2519,20 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
 OutputType(FirstType), std::move(exec)));
 }

 // Add subtract_checked(date32, date32) -> duration(TimeUnit::SECOND)
 auto exec_date_32_checked =
 ScalarBinaryEqualTypes<Int64Type, Date32Type, SubtractCheckedDate32>::Exec;
 DCHECK_OK(subtract_checked->AddKernel({in_type_date_32, in_type_date_32},
 duration(TimeUnit::SECOND),
 std::move(exec_date_32_checked)));

 // Add subtract_checked(date64, date64) -> duration(TimeUnit::MILLI)
 auto exec_date_64_checked =
 ScalarBinaryEqualTypes<Int64Type, Date64Type, SubtractChecked>::Exec;
 DCHECK_OK(subtract_checked->AddKernel({in_type_date_64, in_type_date_64},
 duration(TimeUnit::MILLI),
 std::move(exec_date_64_checked)));

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

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

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

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

from

 Closed


ARROW-14093: [C++] subtract(date, date) -> duration kernel
#12124
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
4c48850

subtract(date, date)->duration


rok Jan 11, 2022
eae5350

Review feedback.


rok Jan 12, 2022
83ebaf1

Add ReplaceTemporalTypes


rok Jan 19, 2022
5b77577

Rebase for ARROW-14092


rok Jan 26, 2022
f022b5e

Review feedback


rok Jan 31, 2022
66e1955

Review feedback


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


84 changes: 82 additions & 2 deletions
cpp/src/arrow/compute/kernels/scalar_arithmetic.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -214,6 +214,31 @@ struct SubtractChecked {
 }
};

struct SubtractDate32 {
 static constexpr int64_t kSecondsInDay = 86400;

 template <typename T, typename Arg0, typename Arg1>
 static constexpr T Call(KernelContext*, Arg0 left, Arg1 right, Status*) {
 return arrow::internal::SafeSignedSubtract(left, right) * kSecondsInDay;
 }
};

struct SubtractCheckedDate32 {
 static constexpr int64_t kSecondsInDay = 86400;

 template <typename T, typename Arg0, typename Arg1>
 static T Call(KernelContext*, Arg0 left, Arg1 right, Status* st) {
 T result = 0;
 if (ARROW_PREDICT_FALSE(SubtractWithOverflow(left, right, &result))) {
 *st = Status::Invalid("overflow");
 }
 if (ARROW_PREDICT_FALSE(MultiplyWithOverflow(result, kSecondsInDay, &result))) {
 *st = Status::Invalid("overflow");
 }
 return result;
 }
};

struct Multiply {
 static_assert(std::is_same<decltype(int8_t() * int8_t()), int32_t>::value, "");
 static_assert(std::is_same<decltype(uint8_t() * uint8_t()), int32_t>::value, "");
Expand DownExpand Up@@ -1611,6 +1636,23 @@ Result<ValueDescr> ResolveDecimalDivisionOutput(KernelContext*,
 });
}

Result<ValueDescr> ResolveTemporalOutput(KernelContext*,
 const std::vector<ValueDescr>& args) {
 DCHECK_EQ(args[0].type->id(), args[1].type->id());
 auto left_type = checked_cast<const TimestampType*>(args[0].type.get());
 auto right_type = checked_cast<const TimestampType*>(args[1].type.get());
 DCHECK_EQ(left_type->unit(), left_type->unit());

 if ((left_type->timezone() == "" || right_type->timezone() == "") &&
 left_type->timezone() != right_type->timezone()) {
 return Status::Invalid("Subtraction of zoned and non-zoned times is ambiguous. (",
 left_type->timezone(), right_type->timezone(), ").");
 }

 auto type = duration(right_type->unit());
 return ValueDescr(std::move(type), GetBroadcastShape(args));
}

template <typename Op>
void AddDecimalUnaryKernels(ScalarFunction* func) {
 OutputType out_type(FirstType);
Expand DownExpand Up@@ -2426,7 +2468,9 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
 for (auto unit : TimeUnit::values()) {
 InputType in_type(match::TimestampTypeUnit(unit));
 auto exec = ArithmeticExecFromOp<ScalarBinaryEqualTypes, Subtract>(Type::TIMESTAMP);
 DCHECK_OK(subtract->AddKernel({in_type, in_type}, duration(unit), std::move(exec)));
 DCHECK_OK(subtract->AddKernel({in_type, in_type},
 OutputType::Resolver(ResolveTemporalOutput),
 std::move(exec)));
 }

 // Add subtract(timestamp, duration) -> timestamp
Expand All@@ -2437,14 +2481,36 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
 std::move(exec)));
 }

 // Add subtract(date32, date32) -> duration(TimeUnit::SECOND)
 InputType in_type_date_32(date32());
 auto exec_date_32 = ScalarBinaryEqualTypes<Int64Type, Date32Type, SubtractDate32>::Exec;
 DCHECK_OK(subtract->AddKernel({in_type_date_32, in_type_date_32},
 duration(TimeUnit::SECOND), std::move(exec_date_32)));

 // Add subtract(date64, date64) -> duration(TimeUnit::MILLI)
 InputType in_type_date_64(date64());
 auto exec_date_64 = ScalarBinaryEqualTypes<Int64Type, Date64Type, Subtract>::Exec;
 DCHECK_OK(subtract->AddKernel({in_type_date_64, in_type_date_64},
 duration(TimeUnit::MILLI), std::move(exec_date_64)));

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

 // ----------------------------------------------------------------------
 auto subtract_checked = MakeArithmeticFunctionNotNull<SubtractChecked>(
 "subtract_checked", &sub_checked_doc);
 AddDecimalBinaryKernels<SubtractChecked>("subtract_checked", subtract_checked.get());

 // Add subtract(timestamp, duration) -> timestamp
 // Add subtract_checked(timestamp, timestamp) -> duration
 for (auto unit : TimeUnit::values()) {
 InputType in_type(match::TimestampTypeUnit(unit));
Comment thread
lidavidm marked this conversation as resolved.


Outdated

 auto exec =
 ArithmeticExecFromOp<ScalarBinaryEqualTypes, SubtractChecked>(Type::TIMESTAMP);
 DCHECK_OK(subtract_checked->AddKernel({in_type, in_type},
 OutputType::Resolver(ResolveTemporalOutput),
 std::move(exec)));
 }

 // Add subtract_checked(timestamp, duration) -> timestamp
 for (auto unit : TimeUnit::values()) {
 InputType in_type(match::TimestampTypeUnit(unit));
 auto exec =
Expand All@@ -2453,6 +2519,20 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
 OutputType(FirstType), std::move(exec)));
 }

 // Add subtract_checked(date32, date32) -> duration(TimeUnit::SECOND)
 auto exec_date_32_checked =
 ScalarBinaryEqualTypes<Int64Type, Date32Type, SubtractCheckedDate32>::Exec;
 DCHECK_OK(subtract_checked->AddKernel({in_type_date_32, in_type_date_32},
 duration(TimeUnit::SECOND),
 std::move(exec_date_32_checked)));

 // Add subtract_checked(date64, date64) -> duration(TimeUnit::MILLI)
 auto exec_date_64_checked =
 ScalarBinaryEqualTypes<Int64Type, Date64Type, SubtractChecked>::Exec;
 DCHECK_OK(subtract_checked->AddKernel({in_type_date_64, in_type_date_64},
 duration(TimeUnit::MILLI),
 std::move(exec_date_64_checked)));

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

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

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

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

from

 Closed


ARROW-14093: [C++] subtract(date, date) -> duration kernel
#12124
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
4c48850

subtract(date, date)->duration


rok Jan 11, 2022
eae5350

Review feedback.


rok Jan 12, 2022
83ebaf1

Add ReplaceTemporalTypes


rok Jan 19, 2022
5b77577

Rebase for ARROW-14092


rok Jan 26, 2022
f022b5e

Review feedback


rok Jan 31, 2022
66e1955

Review feedback


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


84 changes: 82 additions & 2 deletions
cpp/src/arrow/compute/kernels/scalar_arithmetic.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -214,6 +214,31 @@ struct SubtractChecked {
 }
};

struct SubtractDate32 {
 static constexpr int64_t kSecondsInDay = 86400;

 template <typename T, typename Arg0, typename Arg1>
 static constexpr T Call(KernelContext*, Arg0 left, Arg1 right, Status*) {
 return arrow::internal::SafeSignedSubtract(left, right) * kSecondsInDay;
 }
};

struct SubtractCheckedDate32 {
 static constexpr int64_t kSecondsInDay = 86400;

 template <typename T, typename Arg0, typename Arg1>
 static T Call(KernelContext*, Arg0 left, Arg1 right, Status* st) {
 T result = 0;
 if (ARROW_PREDICT_FALSE(SubtractWithOverflow(left, right, &result))) {
 *st = Status::Invalid("overflow");
 }
 if (ARROW_PREDICT_FALSE(MultiplyWithOverflow(result, kSecondsInDay, &result))) {
 *st = Status::Invalid("overflow");
 }
 return result;
 }
};

struct Multiply {
 static_assert(std::is_same<decltype(int8_t() * int8_t()), int32_t>::value, "");
 static_assert(std::is_same<decltype(uint8_t() * uint8_t()), int32_t>::value, "");
Expand DownExpand Up@@ -1611,6 +1636,23 @@ Result<ValueDescr> ResolveDecimalDivisionOutput(KernelContext*,
 });
}

Result<ValueDescr> ResolveTemporalOutput(KernelContext*,
 const std::vector<ValueDescr>& args) {
 DCHECK_EQ(args[0].type->id(), args[1].type->id());
 auto left_type = checked_cast<const TimestampType*>(args[0].type.get());
 auto right_type = checked_cast<const TimestampType*>(args[1].type.get());
 DCHECK_EQ(left_type->unit(), left_type->unit());

 if ((left_type->timezone() == "" || right_type->timezone() == "") &&
 left_type->timezone() != right_type->timezone()) {
 return Status::Invalid("Subtraction of zoned and non-zoned times is ambiguous. (",
 left_type->timezone(), right_type->timezone(), ").");
 }

 auto type = duration(right_type->unit());
 return ValueDescr(std::move(type), GetBroadcastShape(args));
}

template <typename Op>
void AddDecimalUnaryKernels(ScalarFunction* func) {
 OutputType out_type(FirstType);
Expand DownExpand Up@@ -2426,7 +2468,9 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
 for (auto unit : TimeUnit::values()) {
 InputType in_type(match::TimestampTypeUnit(unit));
 auto exec = ArithmeticExecFromOp<ScalarBinaryEqualTypes, Subtract>(Type::TIMESTAMP);
 DCHECK_OK(subtract->AddKernel({in_type, in_type}, duration(unit), std::move(exec)));
 DCHECK_OK(subtract->AddKernel({in_type, in_type},
 OutputType::Resolver(ResolveTemporalOutput),
 std::move(exec)));
 }

 // Add subtract(timestamp, duration) -> timestamp
Expand All@@ -2437,14 +2481,36 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
 std::move(exec)));
 }

 // Add subtract(date32, date32) -> duration(TimeUnit::SECOND)
 InputType in_type_date_32(date32());
 auto exec_date_32 = ScalarBinaryEqualTypes<Int64Type, Date32Type, SubtractDate32>::Exec;
 DCHECK_OK(subtract->AddKernel({in_type_date_32, in_type_date_32},
 duration(TimeUnit::SECOND), std::move(exec_date_32)));

 // Add subtract(date64, date64) -> duration(TimeUnit::MILLI)
 InputType in_type_date_64(date64());
 auto exec_date_64 = ScalarBinaryEqualTypes<Int64Type, Date64Type, Subtract>::Exec;
 DCHECK_OK(subtract->AddKernel({in_type_date_64, in_type_date_64},
 duration(TimeUnit::MILLI), std::move(exec_date_64)));

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

 // ----------------------------------------------------------------------
 auto subtract_checked = MakeArithmeticFunctionNotNull<SubtractChecked>(
 "subtract_checked", &sub_checked_doc);
 AddDecimalBinaryKernels<SubtractChecked>("subtract_checked", subtract_checked.get());

 // Add subtract(timestamp, duration) -> timestamp
 // Add subtract_checked(timestamp, timestamp) -> duration
 for (auto unit : TimeUnit::values()) {
 InputType in_type(match::TimestampTypeUnit(unit));
Comment thread
lidavidm marked this conversation as resolved.


Outdated

 auto exec =
 ArithmeticExecFromOp<ScalarBinaryEqualTypes, SubtractChecked>(Type::TIMESTAMP);
 DCHECK_OK(subtract_checked->AddKernel({in_type, in_type},
 OutputType::Resolver(ResolveTemporalOutput),
 std::move(exec)));
 }

 // Add subtract_checked(timestamp, duration) -> timestamp
 for (auto unit : TimeUnit::values()) {
 InputType in_type(match::TimestampTypeUnit(unit));
 auto exec =
Expand All@@ -2453,6 +2519,20 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
 OutputType(FirstType), std::move(exec)));
 }

 // Add subtract_checked(date32, date32) -> duration(TimeUnit::SECOND)
 auto exec_date_32_checked =
 ScalarBinaryEqualTypes<Int64Type, Date32Type, SubtractCheckedDate32>::Exec;
 DCHECK_OK(subtract_checked->AddKernel({in_type_date_32, in_type_date_32},
 duration(TimeUnit::SECOND),
 std::move(exec_date_32_checked)));

 // Add subtract_checked(date64, date64) -> duration(TimeUnit::MILLI)
 auto exec_date_64_checked =
 ScalarBinaryEqualTypes<Int64Type, Date64Type, SubtractChecked>::Exec;
 DCHECK_OK(subtract_checked->AddKernel({in_type_date_64, in_type_date_64},
 duration(TimeUnit::MILLI),
 std::move(exec_date_64_checked)));

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

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

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

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

from

 Closed


ARROW-14093: [C++] subtract(date, date) -> duration kernel
#12124
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
4c48850

subtract(date, date)->duration


rok Jan 11, 2022
eae5350

Review feedback.


rok Jan 12, 2022
83ebaf1

Add ReplaceTemporalTypes


rok Jan 19, 2022
5b77577

Rebase for ARROW-14092


rok Jan 26, 2022
f022b5e

Review feedback


rok Jan 31, 2022
66e1955

Review feedback


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


84 changes: 82 additions & 2 deletions
cpp/src/arrow/compute/kernels/scalar_arithmetic.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -214,6 +214,31 @@ struct SubtractChecked {
 }
};

struct SubtractDate32 {
 static constexpr int64_t kSecondsInDay = 86400;

 template <typename T, typename Arg0, typename Arg1>
 static constexpr T Call(KernelContext*, Arg0 left, Arg1 right, Status*) {
 return arrow::internal::SafeSignedSubtract(left, right) * kSecondsInDay;
 }
};

struct SubtractCheckedDate32 {
 static constexpr int64_t kSecondsInDay = 86400;

 template <typename T, typename Arg0, typename Arg1>
 static T Call(KernelContext*, Arg0 left, Arg1 right, Status* st) {
 T result = 0;
 if (ARROW_PREDICT_FALSE(SubtractWithOverflow(left, right, &result))) {
 *st = Status::Invalid("overflow");
 }
 if (ARROW_PREDICT_FALSE(MultiplyWithOverflow(result, kSecondsInDay, &result))) {
 *st = Status::Invalid("overflow");
 }
 return result;
 }
};

struct Multiply {
 static_assert(std::is_same<decltype(int8_t() * int8_t()), int32_t>::value, "");
 static_assert(std::is_same<decltype(uint8_t() * uint8_t()), int32_t>::value, "");
Expand DownExpand Up@@ -1611,6 +1636,23 @@ Result<ValueDescr> ResolveDecimalDivisionOutput(KernelContext*,
 });
}

Result<ValueDescr> ResolveTemporalOutput(KernelContext*,
 const std::vector<ValueDescr>& args) {
 DCHECK_EQ(args[0].type->id(), args[1].type->id());
 auto left_type = checked_cast<const TimestampType*>(args[0].type.get());
 auto right_type = checked_cast<const TimestampType*>(args[1].type.get());
 DCHECK_EQ(left_type->unit(), left_type->unit());

 if ((left_type->timezone() == "" || right_type->timezone() == "") &&
 left_type->timezone() != right_type->timezone()) {
 return Status::Invalid("Subtraction of zoned and non-zoned times is ambiguous. (",
 left_type->timezone(), right_type->timezone(), ").");
 }

 auto type = duration(right_type->unit());
 return ValueDescr(std::move(type), GetBroadcastShape(args));
}

template <typename Op>
void AddDecimalUnaryKernels(ScalarFunction* func) {
 OutputType out_type(FirstType);
Expand DownExpand Up@@ -2426,7 +2468,9 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
 for (auto unit : TimeUnit::values()) {
 InputType in_type(match::TimestampTypeUnit(unit));
 auto exec = ArithmeticExecFromOp<ScalarBinaryEqualTypes, Subtract>(Type::TIMESTAMP);
 DCHECK_OK(subtract->AddKernel({in_type, in_type}, duration(unit), std::move(exec)));
 DCHECK_OK(subtract->AddKernel({in_type, in_type},
 OutputType::Resolver(ResolveTemporalOutput),
 std::move(exec)));
 }

 // Add subtract(timestamp, duration) -> timestamp
Expand All@@ -2437,14 +2481,36 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
 std::move(exec)));
 }

 // Add subtract(date32, date32) -> duration(TimeUnit::SECOND)
 InputType in_type_date_32(date32());
 auto exec_date_32 = ScalarBinaryEqualTypes<Int64Type, Date32Type, SubtractDate32>::Exec;
 DCHECK_OK(subtract->AddKernel({in_type_date_32, in_type_date_32},
 duration(TimeUnit::SECOND), std::move(exec_date_32)));

 // Add subtract(date64, date64) -> duration(TimeUnit::MILLI)
 InputType in_type_date_64(date64());
 auto exec_date_64 = ScalarBinaryEqualTypes<Int64Type, Date64Type, Subtract>::Exec;
 DCHECK_OK(subtract->AddKernel({in_type_date_64, in_type_date_64},
 duration(TimeUnit::MILLI), std::move(exec_date_64)));

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

 // ----------------------------------------------------------------------
 auto subtract_checked = MakeArithmeticFunctionNotNull<SubtractChecked>(
 "subtract_checked", &sub_checked_doc);
 AddDecimalBinaryKernels<SubtractChecked>("subtract_checked", subtract_checked.get());

 // Add subtract(timestamp, duration) -> timestamp
 // Add subtract_checked(timestamp, timestamp) -> duration
 for (auto unit : TimeUnit::values()) {
 InputType in_type(match::TimestampTypeUnit(unit));
Comment thread
lidavidm marked this conversation as resolved.


Outdated

 auto exec =
 ArithmeticExecFromOp<ScalarBinaryEqualTypes, SubtractChecked>(Type::TIMESTAMP);
 DCHECK_OK(subtract_checked->AddKernel({in_type, in_type},
 OutputType::Resolver(ResolveTemporalOutput),
 std::move(exec)));
 }

 // Add subtract_checked(timestamp, duration) -> timestamp
 for (auto unit : TimeUnit::values()) {
 InputType in_type(match::TimestampTypeUnit(unit));
 auto exec =
Expand All@@ -2453,6 +2519,20 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
 OutputType(FirstType), std::move(exec)));
 }

 // Add subtract_checked(date32, date32) -> duration(TimeUnit::SECOND)
 auto exec_date_32_checked =
 ScalarBinaryEqualTypes<Int64Type, Date32Type, SubtractCheckedDate32>::Exec;
 DCHECK_OK(subtract_checked->AddKernel({in_type_date_32, in_type_date_32},
 duration(TimeUnit::SECOND),
 std::move(exec_date_32_checked)));

 // Add subtract_checked(date64, date64) -> duration(TimeUnit::MILLI)
 auto exec_date_64_checked =
 ScalarBinaryEqualTypes<Int64Type, Date64Type, SubtractChecked>::Exec;
 DCHECK_OK(subtract_checked->AddKernel({in_type_date_64, in_type_date_64},
 duration(TimeUnit::MILLI),
 std::move(exec_date_64_checked)));

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

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

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

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

from

 Closed


ARROW-14093: [C++] subtract(date, date) -> duration kernel
#12124
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
4c48850

subtract(date, date)->duration


rok Jan 11, 2022
eae5350

Review feedback.


rok Jan 12, 2022
83ebaf1

Add ReplaceTemporalTypes


rok Jan 19, 2022
5b77577

Rebase for ARROW-14092


rok Jan 26, 2022
f022b5e

Review feedback


rok Jan 31, 2022
66e1955

Review feedback


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


84 changes: 82 additions & 2 deletions
cpp/src/arrow/compute/kernels/scalar_arithmetic.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -214,6 +214,31 @@ struct SubtractChecked {
 }
};

struct SubtractDate32 {
 static constexpr int64_t kSecondsInDay = 86400;

 template <typename T, typename Arg0, typename Arg1>
 static constexpr T Call(KernelContext*, Arg0 left, Arg1 right, Status*) {
 return arrow::internal::SafeSignedSubtract(left, right) * kSecondsInDay;
 }
};

struct SubtractCheckedDate32 {
 static constexpr int64_t kSecondsInDay = 86400;

 template <typename T, typename Arg0, typename Arg1>
 static T Call(KernelContext*, Arg0 left, Arg1 right, Status* st) {
 T result = 0;
 if (ARROW_PREDICT_FALSE(SubtractWithOverflow(left, right, &result))) {
 *st = Status::Invalid("overflow");
 }
 if (ARROW_PREDICT_FALSE(MultiplyWithOverflow(result, kSecondsInDay, &result))) {
 *st = Status::Invalid("overflow");
 }
 return result;
 }
};

struct Multiply {
 static_assert(std::is_same<decltype(int8_t() * int8_t()), int32_t>::value, "");
 static_assert(std::is_same<decltype(uint8_t() * uint8_t()), int32_t>::value, "");
Expand DownExpand Up@@ -1611,6 +1636,23 @@ Result<ValueDescr> ResolveDecimalDivisionOutput(KernelContext*,
 });
}

Result<ValueDescr> ResolveTemporalOutput(KernelContext*,
 const std::vector<ValueDescr>& args) {
 DCHECK_EQ(args[0].type->id(), args[1].type->id());
 auto left_type = checked_cast<const TimestampType*>(args[0].type.get());
 auto right_type = checked_cast<const TimestampType*>(args[1].type.get());
 DCHECK_EQ(left_type->unit(), left_type->unit());

 if ((left_type->timezone() == "" || right_type->timezone() == "") &&
 left_type->timezone() != right_type->timezone()) {
 return Status::Invalid("Subtraction of zoned and non-zoned times is ambiguous. (",
 left_type->timezone(), right_type->timezone(), ").");
 }

 auto type = duration(right_type->unit());
 return ValueDescr(std::move(type), GetBroadcastShape(args));
}

template <typename Op>
void AddDecimalUnaryKernels(ScalarFunction* func) {
 OutputType out_type(FirstType);
Expand DownExpand Up@@ -2426,7 +2468,9 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
 for (auto unit : TimeUnit::values()) {
 InputType in_type(match::TimestampTypeUnit(unit));
 auto exec = ArithmeticExecFromOp<ScalarBinaryEqualTypes, Subtract>(Type::TIMESTAMP);
 DCHECK_OK(subtract->AddKernel({in_type, in_type}, duration(unit), std::move(exec)));
 DCHECK_OK(subtract->AddKernel({in_type, in_type},
 OutputType::Resolver(ResolveTemporalOutput),
 std::move(exec)));
 }

 // Add subtract(timestamp, duration) -> timestamp
Expand All@@ -2437,14 +2481,36 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
 std::move(exec)));
 }

 // Add subtract(date32, date32) -> duration(TimeUnit::SECOND)
 InputType in_type_date_32(date32());
 auto exec_date_32 = ScalarBinaryEqualTypes<Int64Type, Date32Type, SubtractDate32>::Exec;
 DCHECK_OK(subtract->AddKernel({in_type_date_32, in_type_date_32},
 duration(TimeUnit::SECOND), std::move(exec_date_32)));

 // Add subtract(date64, date64) -> duration(TimeUnit::MILLI)
 InputType in_type_date_64(date64());
 auto exec_date_64 = ScalarBinaryEqualTypes<Int64Type, Date64Type, Subtract>::Exec;
 DCHECK_OK(subtract->AddKernel({in_type_date_64, in_type_date_64},
 duration(TimeUnit::MILLI), std::move(exec_date_64)));

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

 // ----------------------------------------------------------------------
 auto subtract_checked = MakeArithmeticFunctionNotNull<SubtractChecked>(
 "subtract_checked", &sub_checked_doc);
 AddDecimalBinaryKernels<SubtractChecked>("subtract_checked", subtract_checked.get());

 // Add subtract(timestamp, duration) -> timestamp
 // Add subtract_checked(timestamp, timestamp) -> duration
 for (auto unit : TimeUnit::values()) {
 InputType in_type(match::TimestampTypeUnit(unit));
Comment thread
lidavidm marked this conversation as resolved.


Outdated

 auto exec =
 ArithmeticExecFromOp<ScalarBinaryEqualTypes, SubtractChecked>(Type::TIMESTAMP);
 DCHECK_OK(subtract_checked->AddKernel({in_type, in_type},
 OutputType::Resolver(ResolveTemporalOutput),
 std::move(exec)));
 }

 // Add subtract_checked(timestamp, duration) -> timestamp
 for (auto unit : TimeUnit::values()) {
 InputType in_type(match::TimestampTypeUnit(unit));
 auto exec =
Expand All@@ -2453,6 +2519,20 @@ void RegisterScalarArithmetic(FunctionRegistry* registry) {
 OutputType(FirstType), std::move(exec)));
 }

 // Add subtract_checked(date32, date32) -> duration(TimeUnit::SECOND)
 auto exec_date_32_checked =
 ScalarBinaryEqualTypes<Int64Type, Date32Type, SubtractCheckedDate32>::Exec;
 DCHECK_OK(subtract_checked->AddKernel({in_type_date_32, in_type_date_32},
 duration(TimeUnit::SECOND),
 std::move(exec_date_32_checked)));

 // Add subtract_checked(date64, date64) -> duration(TimeUnit::MILLI)
 auto exec_date_64_checked =
 ScalarBinaryEqualTypes<Int64Type, Date64Type, SubtractChecked>::Exec;
 DCHECK_OK(subtract_checked->AddKernel({in_type_date_64, in_type_date_64},
 duration(TimeUnit::MILLI),
 std::move(exec_date_64_checked)));

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

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