Conversation
vustef
approved these changes
Feb 13, 2026
This commit consolidates the upstream merge with all necessary integration: Upstream Changes: - Reorganize storage code into new storage/ module structure - Move configuration files into storage/config/ subdirectory - Refactor module hierarchy for better organization - Improve error handling with header redaction control Fork Enhancements Preserved: - Vended credentials support in REST catalog - Credential refresh capability with TableIdent tracking - Custom storage credentials loader integration - Refreshable storage backend for dynamic credential updates Integration Work: - Updated all imports to match new module structure - Re-exported storage types and config constants through io::* API - Fixed module visibility (pub mod storage) - Ensured all downstream code references correct import paths - Simplified module exports to match upstream pattern (pub use storage::*) - Updated doc tests to reflect new import structure - Verified builds pass with all targets and features Testing: - All doc tests pass (92 passed, 4 ignored as expected) - Build succeeds with all-targets and all-features - Clippy passes with no warnings - Maintains full backward compatibility at the public API level Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
gbrgr
force-pushed
the
gb/merge-upstream-20260213
branch
from
6c276c0 to
37ac2c2
Compare
…2109) - Closes #. - Add a new module `storage` within `io` and put traits there Relying on the existing tests
This merge incorporates the revert of merge-upstream-20260213 on origin/main while keeping our branch with the upstream storage reorganization intact. The refreshable_storage.rs conflict was resolved by keeping our import of super::storage::opendal::OpenDalStorage which is needed for the credential refresh feature that depends on the storage reorganization.
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
5 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?
What changes are included in this PR?
Are these changes tested?