Skip to content

Commit

Permalink
chore: Update datafusion to 30, arrow to 45
Browse files Browse the repository at this point in the history
  • Loading branch information
scsmithr authored and rtyler committed Aug 31, 2023
1 parent a5b24e0 commit 787c13a
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 19 deletions.
31 changes: 16 additions & 15 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[workspace]
members = ["rust", "python"]
exclude = ["proofs", "delta-inspect"]
resolver = "2"

[profile.release-with-debug]
inherits = "release"
Expand All @@ -14,23 +15,23 @@ debug = "line-tables-only"

[workspace.dependencies]
# arrow
arrow = { version = "43" }
arrow-array = { version = "43" }
arrow-buffer = { version = "43" }
arrow-cast = { version = "43" }
arrow-ord = { version = "43" }
arrow-row = { version = "43" }
arrow-schema = { version = "43" }
arrow-select = { version = "43" }
parquet = { version = "43" }
arrow = { version = "45" }
arrow-array = { version = "45" }
arrow-buffer = { version = "45" }
arrow-cast = { version = "45" }
arrow-ord = { version = "45" }
arrow-row = { version = "45" }
arrow-schema = { version = "45" }
arrow-select = { version = "45" }
parquet = { version = "45" }

# datafusion
datafusion = { version = "28" }
datafusion-expr = { version = "28" }
datafusion-common = { version = "28" }
datafusion-proto = { version = "28" }
datafusion-sql = { version = "28" }
datafusion-physical-expr = { version = "28" }
datafusion = { version = "30" }
datafusion-expr = { version = "30" }
datafusion-common = { version = "30" }
datafusion-proto = { version = "30" }
datafusion-sql = { version = "30" }
datafusion-physical-expr = { version = "30" }

# serde
serde = { version = "1", features = ["derive"] }
Expand Down
2 changes: 1 addition & 1 deletion rust/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ reqwest-retry = { version = "0.2.2", optional = true }
# Datafusion
dashmap = { version = "5", optional = true }

sqlparser = { version = "0.35", optional = true }
sqlparser = { version = "0.36", optional = true }

# NOTE dependencies only for integration tests
fs_extra = { version = "1.2.0", optional = true }
Expand Down
4 changes: 2 additions & 2 deletions rust/src/operations/optimize.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1180,11 +1180,11 @@ pub(super) mod zorder {
.map(|i| (i * value_size) as i32)
.collect::<Vec<i32>>();

let out_arr = BinaryArray::new_unchecked(
let out_arr = BinaryArray::try_new(
OffsetBuffer::new(ScalarBuffer::from(offsets)),
Buffer::from_vec(out),
None,
);
)?;

Ok(Arc::new(out_arr))
}
Expand Down
2 changes: 1 addition & 1 deletion rust/tests/command_restore.rs
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ async fn test_restore_with_error_params() -> Result<(), Box<dyn Error>> {
let history = table.history(Some(10)).await?;
let timestamp = history.get(1).unwrap().timestamp.unwrap();
let naive = NaiveDateTime::from_timestamp_millis(timestamp).unwrap();
let datetime: DateTime<Utc> = DateTime::from_utc(naive, Utc);
let datetime: DateTime<Utc> = Utc.from_utc_datetime(&naive);

// datetime and version both set
let result = DeltaOps(table)
Expand Down

0 comments on commit 787c13a

Please sign in to comment.