fix: isolate object-store registration by backend and configuration - #5503
Open
sunchao wants to merge 1 commit into
Open
fix: isolate object-store registration by backend and configuration#5503sunchao wants to merge 1 commit into
sunchao wants to merge 1 commit into
Conversation
This was referenced Aug 27, 2026
Contributor
|
would be related to #5314 |
comphead
reviewed
Aug 29, 2026
| // Registration URLs use a reserved suffix to distinguish backend/configuration | ||
| // identities. Encryption must use the physical URI that Spark registered. Match | ||
| // the complete suffix, from the right, so custom Hadoop schemes are preserved. | ||
| fn physical_object_store_scheme(object_store_url: &ObjectStoreUrl) -> &str { |
Contributor
There was a problem hiding this comment.
I think we already have a similar method is_hdfs_scheme maybe its time to unify them
comphead
reviewed
Aug 29, 2026
| } | ||
|
|
||
| type ObjectStoreCache = RwLock<HashMap<(String, u64), Arc<dyn ObjectStore>>>; | ||
| type ObjectStoreCacheKey = (String, u64, bool); |
Contributor
There was a problem hiding this comment.
Please document what is (String, u64, bool) represents
comphead
reviewed
Aug 29, 2026
| } else { | ||
| let backend = if is_hdfs_scheme { "hdfs" } else { "native" }; | ||
| ObjectStoreUrl::parse(format!( | ||
| "{scheme}+comet-{config_hash:016x}-{backend}://{}", |
Contributor
There was a problem hiding this comment.
why would comet be a hardcoded part of url?
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Which issue does this PR close?
Closes #5502.
Rationale for this change
A configuration can route
s3through Hadoop while leavings3aon the native backend. Normalizing natives3atos3currently gives those different backends the same process-cache key. Separately, DataFusion's registry identifies stores by scheme and authority, so registering a second configuration can overwrite the first mapping.This extracts the object-store correctness change from #5453. It contains no new scan counters or producer-lifecycle changes and does not depend on that metrics PR.
What changes are included in this PR?
Include backend identity in the cache key and register each non-local backend/configuration under a deterministic internal URL. The first registration receives the same identity it would receive after another store, so planning order cannot affect routing. Native
s3ands3ashare canonicals3identity; Hadoop-selected schemes retain their physical spelling. Native local files keepfile://behavior.Reconstruct the physical URI before configuring encryption lookup, stripping only a complete internal identity suffix. This preserves existing
s3/s3akey normalization and custom Hadoop schemes. The change isolates object-store lookup, not file-metadata caches.How are these changes tested?
The focused tests use two distinct in-memory stores and verify actual returned bytes after registration in both orders. Cases cover a normalized S3 alias/backend collision, different native configurations, custom Hadoop routing, native S3 alias reuse, and native versus Hadoop-routed file URLs. Encryption-option tests compare ordinary and isolated physical URIs, including aliases, ports, custom schemes, and local files.
The full native crate compiled with the two disjoint extracted changes combined at their shared base. All 90 Parquet tests passed, including the six new isolation/encryption regressions, with a confirmed zero process exit status. The four companion producer-lifecycle tests also passed.
cargo fmt --all --checkandgit diff --checkpass. Default native features and JDK 21 were used; tests use deterministic in-memory stores rather than a live Hadoop/cloud deployment. Full Spark integration and this branch's hosted CI have not run locally.