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
14 changes: 8 additions & 6 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ liblzma = { version = "0.4.6", features = ["static"] }
log = "^0.4"
memchr = "2.8.0"
num-traits = { version = "0.2" }
object_store = { version = "0.13.1", default-features = false }
object_store = { version = "0.13.2", default-features = false }
parking_lot = "0.12"
parquet = { version = "58.1.0", default-features = false, features = [
"arrow",
Expand Down
2 changes: 1 addition & 1 deletion datafusion/core/src/datasource/physical_plan/parquet.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1704,7 +1704,7 @@ mod tests {
let state = session_ctx.state();
let location = Path::from_filesystem_path(".")
.unwrap()
.child("invalid.parquet");
.join("invalid.parquet");
Copy link
Copy Markdown
Contributor

@alamb alamb Apr 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


let partitioned_file = PartitionedFile::new_from_meta(ObjectMeta {
location,
Expand Down
2 changes: 1 addition & 1 deletion datafusion/core/tests/sql/path_partition.rs
Original file line number Diff line number Diff line change
Expand Up @@ -774,7 +774,7 @@ impl ObjectStore for MirroringObjectStore {
};

if parts.next().is_some() {
common_prefixes.insert(prefix.child(common_prefix));
common_prefixes.insert(prefix.clone().join(common_prefix));
} else {
let object = ObjectMeta {
location: k.clone(),
Expand Down
2 changes: 1 addition & 1 deletion datafusion/datasource/src/url.rs
Original file line number Diff line number Diff line change
Expand Up @@ -536,7 +536,7 @@ mod tests {
let root = root.to_string_lossy();

let url = ListingTableUrl::parse(root).unwrap();
let child = url.prefix.child("partition").child("file");
let child = url.prefix.clone().join("partition").join("file");

let prefix: Vec<_> = url.strip_prefix(&child).unwrap().collect();
assert_eq!(prefix, vec!["partition", "file"]);
Expand Down
7 changes: 4 additions & 3 deletions datafusion/datasource/src/write/demux.rs
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,8 @@ fn generate_file_path(
if !single_file_output {
base_output_path
.prefix()
.child(format!("{write_id}_{part_idx}.{file_extension}"))
.clone()
.join(format!("{write_id}_{part_idx}.{file_extension}"))
} else {
base_output_path.prefix().to_owned()
}
Expand Down Expand Up @@ -588,8 +589,8 @@ fn compute_hive_style_file_path(
) -> Path {
let mut file_path = base_output_path.prefix().clone();
for j in 0..part_key.len() {
file_path = file_path.child(format!("{}={}", partition_by[j].0, part_key[j]));
file_path = file_path.join(format!("{}={}", partition_by[j].0, part_key[j]));
}

file_path.child(format!("{write_id}.{file_extension}"))
file_path.join(format!("{write_id}.{file_extension}"))
}
Loading