fix: prevent cache collisions in ObjectStoreRegistry#5153
Merged
Conversation
ObjectStoreRegistry maintains a cache of ObjectStore objects. Previously, when caching an Azure blob store, the account name was not part of the cache key. This could result in collisions in the case where we tried to cache two Azure blob stores using the same container name, but different account names. Container names are not unique in Azure; only the combination of account name, container name is. The flow here is roughly that we determine what type of object store we're creating by looking at the first part of the URL (the scheme), and then use the associated object store Provider object to generate the appropriate store_prefix from the second part of the URL (the authority). We want to be able to do all this relatively quickly, without instantiating heavyweight objects, to support the cache key use-case. In the specific case of Azure, the account name may not even be in the URL at all. It can be passed as part of the storage options. Therefore, the function generating the object store prefix must also take the storage_options as a parameter. The final object store prefix we generate for Azure must include this account information, as well as the container information. This PR modifies WrappingObjectStore.wrap() to take the store prefix as an argument, rather than the storage options. In general, the storage options are highly specific to the type of the object store, which the wrapper generally doesn't know. It would not make sense to look for Azure-specific storage options when wrapping an s3 store, for example.
![chatgpt-codex-connector[bot]](https://avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
ℹ️ About Codex in GitHub
Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".
Codecov Report❌ Patch coverage is Additional details and impacted files@@ Coverage Diff @@
## main #5153 +/- ##
========================================
Coverage 81.85% 81.85%
========================================
Files 341 341
Lines 140548 140854 +306
Branches 140548 140854 +306
========================================
+ Hits 115046 115298 +252
- Misses 21694 21743 +49
- Partials 3808 3813 +5
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
wjones127
approved these changes
Nov 7, 2025
Contributor
wjones127
left a comment
wjones127
left a comment
There was a problem hiding this comment.
This looks good. I like the idea of Pushing the responsibility of creating a unique cache key on the provider rather than exposing the storage options to the wrapper store 👍
jackye1995
pushed a commit
to jackye1995/lance
that referenced
this pull request
Jan 21, 2026
ObjectStoreRegistry maintains a cache of ObjectStore objects. Previously, when caching an Azure blob store, the account name was not part of the cache key. This could result in collisions in the case where we tried to cache two Azure blob stores using the same container name, but different account names. Container names are not unique in Azure; only the combination of account name, container name is. The flow here is roughly that we determine what type of object store we're creating by looking at the first part of the URL (the scheme), and then use the associated object store Provider object to generate the appropriate store_prefix from the second part of the URL (the authority). We want to be able to do all this relatively quickly, without instantiating heavyweight objects, to support the cache key use-case. In the specific case of Azure, the account name may not even be in the URL at all. It can be passed as part of the storage options. Therefore, the function generating the object store prefix must also take the storage_options as a parameter. The final object store prefix we generate for Azure must include this account information, as well as the container information. This PR modifies WrappingObjectStore.wrap() to take the store prefix as an argument, rather than the storage options. In general, the storage options are highly specific to the type of the object store, which the wrapper generally doesn't know. It would not make sense to look for Azure-specific storage options when wrapping an s3 store, for example.
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
3 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.
ObjectStoreRegistry maintains a cache of ObjectStore objects. Previously, when caching an Azure blob store, the account name was not part of the cache key. This could result in collisions in the case where we tried to cache two Azure blob stores using the same container name, but different account names. Container names are not unique in Azure; only the combination of account name, container name is.
The flow here is roughly that we determine what type of object store we're creating by looking at the first part of the URL (the scheme), and then use the associated object store Provider object to generate the appropriate store_prefix from the second part of the URL (the authority). We want to be able to do all this relatively quickly, without instantiating heavyweight objects, to support the cache key use-case.
In the specific case of Azure, the account name may not even be in the URL at all. It can be passed as part of the storage options. Therefore, the function generating the object store prefix must also take the storage_options as a parameter. The final object store prefix we generate for Azure must include this account information, as well as the container information.
This PR modifies WrappingObjectStore.wrap() to take the store prefix as an argument, rather than the storage options. In general, the storage options are highly specific to the type of the object store, which the wrapper generally doesn't know. It would not make sense to look for Azure-specific storage options when wrapping an s3 store, for example.