-
Notifications
You must be signed in to change notification settings - Fork 4k
GH-30036: [C++] Timezone-aware kernels should handle offset strings (e.g. "+04:30") #12865
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.
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
Merged
Merged
Changes from 22 commits
Commits
Show all changes
23 commits
Select commit
Hold shift + click to select a range
22126de
Adding OffsetZone
rok 531b415
Review feedback
rok af7a51d
Update cpp/src/arrow/util/date_internal.h
rok 182ec5d
switch to std::variant
rok 4d669fb
pass OffsetZone by value
rok 8ce600c
Update cpp/src/arrow/compute/kernels/temporal_internal.h
rok 6fc8473
review feedback
rok 02149cc
comment
rok 74755fb
add error checking and reference to docs
rok 13f8ecc
factor out system time from formatter
rok 5f95fab
Review feedback
rok 7c60b11
review feedback
rok df5ad90
lint
rok 2e949dc
Review feedback
rok 0e8f0c9
Update cpp/src/arrow/compute/kernels/temporal_internal.h
rok 6c37faa
Review feedback
rok ae90099
Review feedback
rok 9a28581
Add test cases, fallthrough
rok d90a952
Add comment
rok 56a3fb8
cmake change
rok cf5875e
lint
rok 5a9ff1c
cleanup
rok 936d020
Add minimal python test
rok File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| // Licensed to the Apache Software Foundation (ASF) under one | ||
| // or more contributor license agreements. See the NOTICE file | ||
| // distributed with this work for additional information | ||
| // regarding copyright ownership. The ASF licenses this file | ||
| // to you under the Apache License, Version 2.0 (the | ||
| // "License"); you may not use this file except in compliance | ||
| // with the License. You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, | ||
| // software distributed under the License is distributed on an | ||
| // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| // KIND, either express or implied. See the License for the | ||
| // specific language governing permissions and limitations | ||
| // under the License. | ||
|
|
||
| #include "arrow/compute/kernels/temporal_internal.h" | ||
|
|
||
| namespace arrow::compute::internal { | ||
|
|
||
| Result<ArrowTimeZone> LocateZone(const std::string_view timezone) { | ||
| if (timezone[0] == '+' || timezone[0] == '-') { | ||
| // Valid offset strings have to have 4 digits and a sign prefix. | ||
| // Valid examples: +01:23 and -0123. | ||
| // Invalid examples: 1:23, 123, 0123, 01:23, +25:00, -12:34:45, +090000. | ||
| auto offset = std::string(timezone.substr(1)); | ||
| std::chrono::minutes zone_offset; | ||
| switch (timezone.length()) { | ||
| case 6: | ||
| if (arrow::internal::detail::ParseHH_MM(offset.c_str(), &zone_offset)) { | ||
| break; | ||
| } | ||
| [[fallthrough]]; | ||
| case 5: | ||
| if (arrow::internal::detail::ParseHHMM(offset.c_str(), &zone_offset)) { | ||
| break; | ||
| } | ||
| [[fallthrough]]; | ||
| default: | ||
| return Status::Invalid("Cannot locate or parse timezone '", timezone, "'"); | ||
| } | ||
| zone_offset = timezone[0] == '-' ? -zone_offset : zone_offset; | ||
| return OffsetZone(zone_offset); | ||
| } | ||
|
|
||
| try { | ||
| return locate_zone(timezone); | ||
| } catch (const std::runtime_error& ex) { | ||
| return Status::Invalid("Cannot locate or parse timezone '", timezone, | ||
| "': ", ex.what()); | ||
| } | ||
| } | ||
|
|
||
| } // namespace arrow::compute::internal | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should probably update this to operate on string_view but that can be done later
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Opened #47732