Bugfix: Remove df-cli specific SQL statment options before executing with DataFusion #8426
Conversation
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
Closed
alamb
reviewed
Dec 5, 2023
| ) -> Result<AmazonS3Builder> { | ||
| let bucket_name = get_bucket_name(url)?; | ||
| let mut builder = AmazonS3Builder::from_env().with_bucket_name(bucket_name); | ||
|
|
||
| if let (Some(access_key_id), Some(secret_access_key)) = ( | ||
| cmd.options.get("access_key_id"), | ||
| cmd.options.get("secret_access_key"), | ||
| cmd.options.remove("access_key_id"), |
There was a problem hiding this comment.
This is a very subtle change -- maybe we can add a comment explaining why these options are removed
Likewise below
There was a problem hiding this comment.
Added some comments explaining why the keys are removed/plan made mutable within datafusion-cli.
I also updated one of the unit tests to invoke FileTypeWriterOptions::build to test for this issue in the future.
devinjdangelo
force-pushed
the
dfcli-remove-options
branch
from
28469dd to
0f71c99
Compare
7 tasks
alamb
approved these changes
Dec 6, 2023
| @@ -221,10 +221,12 @@ async fn exec_and_print( | |||
| | LogicalPlan::Analyze(_) | |||
| ); | |||
|
|
|||
| if let LogicalPlan::Ddl(DdlStatement::CreateExternalTable(cmd)) = &plan { | |||
| // Note that cmd is a mutable reference so that create_external_table function can remove all | |||
| ) -> Result<AmazonS3Builder> { | ||
| let bucket_name = get_bucket_name(url)?; | ||
| let mut builder = AmazonS3Builder::from_env().with_bucket_name(bucket_name); | ||
|
|
||
| if let (Some(access_key_id), Some(secret_access_key)) = ( | ||
| cmd.options.get("access_key_id"), | ||
| cmd.options.get("secret_access_key"), | ||
| cmd.options.remove("access_key_id"), |
appletreeisyellow
pushed a commit
to appletreeisyellow/datafusion
that referenced
this pull request
Dec 15, 2023
…with DataFusion (apache#8426) * remove df-cli specific options from create external table options * add test and comments * cargo fmt * merge main * cargo toml format
# for free
to join this conversation on GitHub.
Already have an account?
# 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.
Which issue does this PR close?
Closes #8421
Rationale for this change
See issue (PR in datafusion caused regression in datafusion-cli when using datafusion-cli specific SQL statement options)
What changes are included in this PR?
Any arbitrary SQL statement option parsed in datafusion-cli is removed if found before executing the plan.
Are these changes tested?
Yes, modified existing datafusion-cli unit test to make sure FileTypeWriterOptions::build will not throw an error when passing ObjectStore related datafusion-cli options.
Are there any user-facing changes?
No