Skip to content

Commit

Permalink
Merge branch 'main' into cdc-update-only
Browse files Browse the repository at this point in the history
  • Loading branch information
rtyler authored May 19, 2024
2 parents b2c997f + 1d2bf64 commit 83da4fe
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ resolver = "2"

[workspace.package]
authors = ["Qingping Hou <dave2008713@gmail.com>"]
rust-version = "1.72"
rust-version = "1.75"
keywords = ["deltalake", "delta", "datalake"]
readme = "README.md"
edition = "2021"
Expand Down
1 change: 0 additions & 1 deletion crates/aws/src/storage.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ use std::str::FromStr;
use std::sync::Arc;
use std::time::Duration;
use tokio::io::AsyncWrite;
use tracing::warn;
use url::Url;

use crate::errors::DynamoDbConfigError;
Expand Down
8 changes: 4 additions & 4 deletions crates/core/src/delta_datafusion/expr.rs
Original file line number Diff line number Diff line change
Expand Up @@ -372,8 +372,8 @@ impl<'a> fmt::Display for ScalarValueFormat<'a> {
Some(e) => write!(
f,
"'{}'::date",
DateTime::from_timestamp_millis((*e).into())
.ok_or(Error::default())?
DateTime::from_timestamp_millis(*e)
.ok_or(Error)?
.date_naive()
.format("%Y-%m-%d")
)?,
Expand All @@ -385,14 +385,14 @@ impl<'a> fmt::Display for ScalarValueFormat<'a> {
f,
"arrow_cast('{}', 'Timestamp(Microsecond, Some(\"UTC\"))')",
DateTime::from_timestamp_micros(*e)
.ok_or(Error::default())?
.ok_or(Error)?
.format("%Y-%m-%dT%H:%M:%S%.6f")
)?,
None => write!(
f,
"arrow_cast('{}', 'Timestamp(Microsecond, None)')",
DateTime::from_timestamp_micros(*e)
.ok_or(Error::default())?
.ok_or(Error)?
.format("%Y-%m-%dT%H:%M:%S%.6f")
)?,
},
Expand Down
2 changes: 1 addition & 1 deletion crates/core/src/operations/set_tbl_properties.rs
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ impl std::future::IntoFuture for SetTablePropertiesBuilder {
type IntoFuture = BoxFuture<'static, Self::Output>;

fn into_future(self) -> Self::IntoFuture {
let mut this = self;
let this = self;

Box::pin(async move {
let mut metadata = this.snapshot.metadata().clone();
Expand Down

0 comments on commit 83da4fe

Please sign in to comment.