-
Notifications
You must be signed in to change notification settings - Fork 1.2k
fix: write error for dbg output of out of range timestamps #10130
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
Open
Jefffrey
wants to merge
3
commits into
apache:main
Choose a base branch
from
Jefffrey:fix-timestamp-out-of-range-dbg
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+66
−13
Open
Changes from all commits
Commits
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1360,21 +1360,30 @@ impl<T: ArrowPrimitiveType> std::fmt::Debug for PrimitiveArray<T> { | |
| // if the time zone is valid, construct a DateTime<Tz> and format it as rfc3339 | ||
| Ok(tz) => match as_datetime_with_timezone::<T>(v, tz) { | ||
| Some(datetime) => write!(f, "{}", datetime.to_rfc3339()), | ||
| None => write!(f, "null"), | ||
| None => write!( | ||
| f, | ||
| "Cast error: Failed to convert {v} to timestamp for {data_type}" | ||
| ), | ||
| }, | ||
| // if the time zone is invalid, shows NaiveDateTime with an error message | ||
| Err(_) => match as_datetime::<T>(v) { | ||
| Some(datetime) => { | ||
| write!(f, "{datetime:?} (Unknown Time Zone '{tz_string}')") | ||
| } | ||
| None => write!(f, "null"), | ||
| None => write!( | ||
| f, | ||
| "Cast error: Failed to convert {v} to timestamp for {data_type}" | ||
| ), | ||
| }, | ||
| } | ||
| } | ||
| // for Timestamp without TimeZone | ||
| None => match as_datetime::<T>(v) { | ||
| Some(datetime) => write!(f, "{datetime:?}"), | ||
| None => write!(f, "null"), | ||
| None => write!( | ||
| f, | ||
| "Cast error: Failed to convert {v} to timestamp for {data_type}" | ||
| ), | ||
| }, | ||
| } | ||
| } | ||
|
|
@@ -2127,6 +2136,60 @@ mod tests { | |
| ); | ||
| } | ||
|
|
||
| #[test] | ||
| fn test_timestamp_fmt_debug_out_of_range() { | ||
| // Include a true null into dataset to ensure we don't write that as an error | ||
| let data = Int64Array::new( | ||
| vec![i64::MAX, i64::MIN, i64::MAX].into(), | ||
| Some(vec![true, true, false].into()), | ||
| ); | ||
|
|
||
| let arr = data.reinterpret_cast::<TimestampSecondType>(); | ||
| assert_eq!( | ||
| "PrimitiveArray<Timestamp(s)> | ||
| [ | ||
| Cast error: Failed to convert 9223372036854775807 to timestamp for Timestamp(s), | ||
| Cast error: Failed to convert -9223372036854775808 to timestamp for Timestamp(s), | ||
| null, | ||
| ]", | ||
| format!("{arr:?}") | ||
| ); | ||
|
|
||
| let arr = data.reinterpret_cast::<TimestampMillisecondType>(); | ||
| assert_eq!( | ||
| "PrimitiveArray<Timestamp(ms)> | ||
| [ | ||
| Cast error: Failed to convert 9223372036854775807 to timestamp for Timestamp(ms), | ||
| Cast error: Failed to convert -9223372036854775808 to timestamp for Timestamp(ms), | ||
| null, | ||
| ]", | ||
| format!("{arr:?}") | ||
| ); | ||
|
|
||
| let arr = data.reinterpret_cast::<TimestampMicrosecondType>(); | ||
| assert_eq!( | ||
| "PrimitiveArray<Timestamp(µs)> | ||
| [ | ||
| Cast error: Failed to convert 9223372036854775807 to timestamp for Timestamp(µs), | ||
| Cast error: Failed to convert -9223372036854775808 to timestamp for Timestamp(µs), | ||
| null, | ||
| ]", | ||
| format!("{arr:?}") | ||
| ); | ||
|
|
||
| // Nanoseconds always in range | ||
| let arr = data.reinterpret_cast::<TimestampNanosecondType>(); | ||
| assert_eq!( | ||
| "PrimitiveArray<Timestamp(ns)> | ||
| [ | ||
| 2262-04-11T23:47:16.854775807, | ||
| 1677-09-21T00:12:43.145224192, | ||
| null, | ||
| ]", | ||
| format!("{arr:?}") | ||
| ); | ||
| } | ||
|
|
||
| #[test] | ||
| fn test_timestamp_utc_fmt_debug() { | ||
| let arr: PrimitiveArray<TimestampMillisecondType> = | ||
|
|
@@ -2232,16 +2295,6 @@ mod tests { | |
| ) | ||
| } | ||
|
|
||
| #[test] | ||
| fn test_timestamp_micros_out_of_range() { | ||
|
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. consolidated this into newly added test |
||
| // replicate the issue from https://github.com/apache/arrow-datafusion/issues/3832 | ||
| let arr: PrimitiveArray<TimestampMicrosecondType> = vec![9065525203050843594].into(); | ||
| assert_eq!( | ||
| "PrimitiveArray<Timestamp(µs)>\n[\n null,\n]", | ||
| format!("{arr:?}") | ||
| ) | ||
| } | ||
|
|
||
| #[test] | ||
| fn test_primitive_array_builder() { | ||
| // Test building a primitive array with ArrayData builder and offset | ||
|
|
||
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.
same error message format as date & time branches above