-
Notifications
You must be signed in to change notification settings - Fork 1.2k
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
support to_timestamp with optional chrono formats #8886
Merged
+1,115
−179
Merged
Changes from 5 commits
Commits
Show all changes
19 commits
Select commit
Hold shift + click to select a range
c5e230a
Support to_timestamp with chrono formatting #5398
Omega359 ef6723b
Merge remote-tracking branch 'origin/main' into 5398-timestamp_with_f…
Omega359 a48ab54
Updated user guide's to_timestamp to include chrono formatting inform…
Omega359 3123539
Minor comment update.
Omega359 573456d
Small documentation updates for to_timestamp functions.
Omega359 66bf2e3
Merge remote-tracking branch 'upstream/main' into 5398-timestamp_with…
Omega359 a78a85a
Cargo fmt and clippy improvements.
Omega359 c06adcb
Switched to assert and unwrap_err based on feedback
Omega359 d14bb0b
Fixed assert, code compiles and runs as expected now.
Omega359 a83b900
Fix fmt (again).
Omega359 0fb0dd2
Merge remote-tracking branch 'upstream/main' into 5398-timestamp_with…
Omega359 db071cc
Add additional to_timestamp tests covering usage with tables with and…
Omega359 40d932c
to_timestamp documentation fixes.
Omega359 77f08ff
- Changed internal_err! -> exec_err! for unsupported data type errors.
Omega359 1b637ae
Merge remote-tracking branch 'upstream/main' into 5398-timestamp_with…
Omega359 951809a
Resolved merge conflict, updated toStringXXX methods to reflect upstr…
Omega359 4fcecb3
Merge remote-tracking branch 'apache/main' into 5398-timestamp_with_f…
alamb 406fd77
prettier
alamb 3c01f75
Fix clippy
alamb 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 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,90 @@ | ||
// 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. | ||
|
||
use std::sync::Arc; | ||
|
||
use datafusion::arrow::array::StringArray; | ||
use datafusion::arrow::datatypes::{DataType, Field, Schema}; | ||
use datafusion::arrow::record_batch::RecordBatch; | ||
use datafusion::error::Result; | ||
use datafusion::prelude::*; | ||
|
||
/// This example demonstrates how to use the to_timestamp function in the DataFrame API as well as via sql. | ||
#[tokio::main] | ||
async fn main() -> Result<()> { | ||
// define a schema. | ||
let schema = Arc::new(Schema::new(vec![ | ||
Field::new("a", DataType::Utf8, false), | ||
Field::new("b", DataType::Utf8, false), | ||
])); | ||
|
||
// define data. | ||
let batch = RecordBatch::try_new( | ||
schema, | ||
vec![ | ||
Arc::new(StringArray::from(vec!["2020-09-08T13:42:29Z", "2020-09-08T13:42:29.190855-05:00", "2020-08-09 12:13:29", "2020-01-02"])), | ||
Arc::new(StringArray::from(vec!["2020-09-08T13:42:29Z", "2020-09-08T13:42:29.190855-05:00", "08-09-2020 13/42/29", "09-27-2020 13:42:29-05:30"])), | ||
], | ||
)?; | ||
|
||
// declare a new context. In spark API, this corresponds to a new spark SQLsession | ||
let ctx = SessionContext::new(); | ||
|
||
// declare a table in memory. In spark API, this corresponds to createDataFrame(...). | ||
ctx.register_batch("t", batch)?; | ||
let df = ctx.table("t").await?; | ||
|
||
// use to_timestamp function to convert col 'a' to timestamp type using the default parsing | ||
let df = df.with_column("a", to_timestamp(vec![col("a")]))?; | ||
// use to_timestamp_seconds function to convert col 'b' to timestamp(Seconds) type using a list of chrono formats to try | ||
let df = df.with_column("b", to_timestamp_seconds(vec![col("b"), lit("%+"), lit("%d-%m-%Y %H/%M/%S"), lit("%m-%d-%Y %H:%M:%S%#z")]))?; | ||
|
||
let df = df.select_columns(&["a", "b"])?; | ||
|
||
// print the results | ||
df.show().await?; | ||
|
||
// use sql to convert col 'a' to timestamp using the default parsing | ||
let df = ctx.sql("select to_timestamp(a) from t").await?; | ||
|
||
// print the results | ||
df.show().await?; | ||
|
||
// use sql to convert col 'b' to timestamp using a list of chrono formats to try | ||
let df = ctx.sql("select to_timestamp(b, '%+', '%d-%m-%Y %H/%M/%S', '%m-%d-%Y %H:%M:%S%#z') from t").await?; | ||
|
||
// print the results | ||
df.show().await?; | ||
|
||
// use sql to convert a static string to a timestamp using a list of chrono formats to try | ||
let df = ctx.sql("select to_timestamp('01-14-2023 01:01:30+05:30', '%+', '%d-%m-%Y %H/%M/%S', '%m-%d-%Y %H:%M:%S%#z')").await?; | ||
|
||
// print the results | ||
df.show().await?; | ||
|
||
// use sql to convert a static string to a timestamp using a non-matching chrono format to try | ||
let result = ctx.sql("select to_timestamp('01-14-2023 01/01/30', '%d-%m-%Y %H:%M:%S')").await?.collect().await; | ||
|
||
if result.is_err() { | ||
Omega359 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
println!("Received the expected error: {:?}", result.err().unwrap()); | ||
} | ||
else { | ||
panic!("timestamp parsing with no matching formats should fail") | ||
} | ||
|
||
Ok(()) | ||
} |
This file contains 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 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
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.
This is really nice 👌