Skip to content

Upgrade to arrow 59 and DataFusion 55 #146

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.

Sign up for GitHub

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
AdamGS wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Upgrade to arrow 59 and DataFusion 55 #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e16a538
Upgrade to arrow 59 and DataFusion 55
AdamGS Sep 15, 2026
c412c9e
Fix tests because the parquet writer changed its dict behavior
AdamGS Sep 15, 2026
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
2 changes: 1 addition & 1 deletion rust-toolchain.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@
# to compile this workspace and run CI jobs.

[toolchain]
channel = "1.90.0"
channel = "1.94.0"
components = ["rustfmt", "clippy"]
4 changes: 2 additions & 2 deletions spatialbench-arrow/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ keywords = ["spatial", "geospatial", "data-generation", "apache-arrow"]
categories = ["science::geo", "database", "data-structures"]

[dependencies]
arrow = { version = "58", default-features = false, features = ["prettyprint"] }
arrow = { version = "59", default-features = false, features = ["prettyprint"] }
spatialbench = { path = "../spatialbench", version = "0.3.0" }
geo = { workspace = true }
geozero = { workspace = true }

[dev-dependencies]
arrow-csv = "58"
arrow-csv = "59"
chrono = "0.4.39"
6 changes: 3 additions & 3 deletions spatialbench-cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ keywords = ["spatial", "geospatial", "benchmark", "cli", "data-generation"]
categories = ["science::geo", "database", "command-line-utilities", "development-tools"]

[dependencies]
arrow = "58"
parquet = "58"
arrow = "59"
parquet = "59"
clap = { version = "4.5.32", features = ["derive"] }
spatialbench = { path = "../spatialbench", version = "0.3.0"}
spatialbench-arrow = { path = "../spatialbench-arrow", version = "0.3.0" }
Expand All @@ -42,7 +42,7 @@ env_logger = "0.11.7"
serde = { version = "1.0.219", features = ["derive"] }
anyhow = "1.0.99"
serde_yaml = "0.9.33"
datafusion = "54.1"
datafusion = "55"
object_store = { version = "0.13.2", features = ["http", "aws"] }
url = "2.5.7"
bytes = "1.10.1"
Expand Down
3 changes: 2 additions & 1 deletion spatialbench-cli/src/zone/transform.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@

use anyhow::Result;
use arrow::datatypes::Schema;
use datafusion::{prelude::*, sql::TableReference};
use datafusion::common::TableReference;
use datafusion::prelude::*;
use log::{debug, info};

pub struct ZoneTransformer {
Expand Down
18 changes: 9 additions & 9 deletions spatialbench-cli/tests/cli_integration.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ async fn test_zone_parquet_no_overwrite() {
run_command();
let original_metadata =
fs::metadata(&expected_file).expect("Failed to get metadata of generated file");
assert_eq!(original_metadata.len(), 25400203);
assert_eq!(original_metadata.len(), 25342328);

// Run the spatialbench-cli command again with the same parameters and expect the
// file to not be overwritten
Expand Down Expand Up @@ -541,7 +541,7 @@ async fn test_write_parquet_row_group_size_default() {
},
RowGroups {
table: "trip",
row_group_bytes: vec![123493205, 123460055, 123449607, 123465483],
row_group_bytes: vec![123492787, 123459637, 123449189, 123465065],
},
RowGroups {
table: "driver",
Expand All @@ -553,7 +553,7 @@ async fn test_write_parquet_row_group_size_default() {
},
RowGroups {
table: "building",
row_group_bytes: vec![2492359],
row_group_bytes: vec![2491050],
},
],
);
Expand Down Expand Up @@ -584,7 +584,7 @@ async fn test_zone_write_parquet_row_group_size_default() {
output_dir.path(),
vec![RowGroups {
table: "zone/zone.1",
row_group_bytes: vec![86288517],
row_group_bytes: vec![86288569],
}],
);
}
Expand Down Expand Up @@ -616,9 +616,9 @@ async fn test_write_parquet_row_group_size_20mb() {
RowGroups {
table: "trip",
row_group_bytes: vec![
24356144, 24356407, 24345650, 24343404, 24348327, 24330535, 24353663, 24337733,
24340689, 24356034, 24332349, 24340694, 24343446, 24356122, 24356250, 24340986,
24345859, 24333134, 24343026, 24356402, 24346155,
24355726, 24355989, 24345232, 24342986, 24347909, 24330117, 24353245, 24337315,
24340271, 24355616, 24331931, 24340276, 24343028, 24355704, 24355832, 24340568,
24345441, 24332716, 24342608, 24355984, 24345737,
],
},
RowGroups {
Expand All @@ -631,7 +631,7 @@ async fn test_write_parquet_row_group_size_20mb() {
},
RowGroups {
table: "building",
row_group_bytes: vec![2492359],
row_group_bytes: vec![2491050],
},
],
);
Expand Down Expand Up @@ -664,7 +664,7 @@ async fn test_zone_write_parquet_row_group_size_20mb() {
output_dir.path(),
vec![RowGroups {
table: "zone/zone.1",
row_group_bytes: vec![15428592, 17250042, 19338201, 17046885, 17251978],
row_group_bytes: vec![15427740, 17249254, 19337347, 17046007, 17251120],
}],
);
}
Expand Down
Loading