Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 3 additions & 6 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,9 @@ uuid = { version = "0.8", features = ["serde", "v4"] }
url = "2.3"

# datafusion feature is required for writer version 2
#deltalake-core = { version = "0.23.0", features = ["json", "datafusion"]}
#deltalake-aws = { version = "0.6.0", optional = true }
#deltalake-azure = { version = "0.6.0", optional = true }
deltalake-core = { git = "https://github.com/buoyant-data/delta-rs", branch = "default-engine-rustls", features = ["json", "datafusion"] }
deltalake-aws = { git = "https://github.com/buoyant-data/delta-rs", branch = "default-engine-rustls", optional = true }
deltalake-azure= { git = "https://github.com/buoyant-data/delta-rs", branch = "default-engine-rustls", optional = true }
deltalake-core = { version = "0.25.0", features = ["json", "datafusion"]}
deltalake-aws = { version = "0.8.0", optional = true }
deltalake-azure = { version = "0.8.0", optional = true }

# s3 feature enabled, helps for locking interactions with DLQ
dynamodb_lock = { version = "0.6.0", optional = true }
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM rust:1.81 AS builder
FROM rust:1.86 AS builder

RUN mkdir /build
WORKDIR /build
Expand Down
3 changes: 1 addition & 2 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -979,8 +979,7 @@ impl IngestProcessor {
epoch_id,
},
)
.await
.map_err(DeltaTableError::from);
.await;
match commit {
Ok(v) => {
/*if v != version {
Expand Down
5 changes: 2 additions & 3 deletions src/offsets.rs
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ pub(crate) async fn write_offsets_to_delta(
} else {
let partitions = conflict_offsets
.iter()
.map(|p| p.0.split('-').last().unwrap_or("N/A"))
.map(|p| p.0.split('-').next_back().unwrap_or("N/A"))
.collect::<Vec<&str>>()
.join(",");

Expand Down Expand Up @@ -127,8 +127,7 @@ async fn commit_partition_offsets(
epoch_id,
},
)
.await
.map_err(DeltaTableError::from);
.await;
match commit {
Ok(v) => {
info!(
Expand Down
3 changes: 1 addition & 2 deletions src/writer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -594,8 +594,7 @@ impl DataWriter {
predicate: None,
},
)
.await
.map_err(DeltaTableError::from)?;
.await?;
Ok(commit.version)
}
}
Expand Down
2 changes: 1 addition & 1 deletion tests/helpers/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ pub fn wait_until_file_created(path: &FilePath) {
let poll_time = now - start_time;
std::thread::sleep(Duration::from_secs(1));

if poll_time > chrono::Duration::seconds(180) {
if poll_time > chrono::Duration::seconds(300) {
panic!("File was not created before timeout");
}
}
Expand Down
Loading