Don't pick up S3 config file/env props automatically #763
Conversation
This file contains 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
lizardoluis
approved these changes
Dec 16, 2024
| pub fn s3_opts_to_file_io_props( | ||
| key: AmazonS3ConfigKey, | ||
| val: &str, | ||
| props: &mut HashMap<String, String>, |
There was a problem hiding this comment.
You can declare this HashMap inside the function and just return it. It makes the signature and caller simpler.
And AFAIK, with rust, there is neither a copy nor a heap allocation involved when returning large structures
There was a problem hiding this comment.
s3_opts_to_file_io_props processes a single key at a time, so I can't really return the entire map from it (i.e. it needs to "hydrate" an existing one).
There was a problem hiding this comment.
Ahh, ok. I didn't see the loop in the caller
object_store_factory/src/utils.rs
Outdated
| props.insert(S3_ALLOW_ANONYMOUS.to_string(), val.clone()); | ||
| props.insert(S3_DISABLE_EC2_METADATA.to_string(), val.clone()); | ||
| continue; | ||
| match AmazonS3ConfigKey::from_str(key) { |
There was a problem hiding this comment.
Lets move this function to lib.rs and delete this file.
…ons are passed in
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Do this by automatically setting the new
S3_DISABLE_CONFIG_LOADconfig var to true when any S3 options are passed in.Also bump iceberg to pick up some type conversion/stats parsing fixes.