[SPARK-36680][SQL][FOLLOWUP] Files with options should be put into resolveDataSource function #47370
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
…solveDataSource function
szehon-ho
reviewed
Jul 16, 2024
| sparkSession, | ||
| paths = Seq(ident.last), | ||
| className = ident.head, | ||
| options = unresolved.options.asCaseSensitiveMap.asScala.toMap) |
There was a problem hiding this comment.
I think we can remove .asCaseSensitiveMap
There was a problem hiding this comment.
Thank you , I have removed this asCaseSensitiveMap .
|
cc @huaxingao @cloud-fan could you review this PR? This is my first PR in the Spark community. Thank you ：） |
cloud-fan
reviewed
Jul 17, 2024
| @@ -19,6 +19,8 @@ package org.apache.spark.sql.execution.datasources | |||
|
|
|||
| import java.util.Locale | |||
|
|
|||
| import scala.jdk.CollectionConverters.MapHasAsScala | |||
There was a problem hiding this comment.
I think it's more common to just import scala.jdk.CollectionConverters._
cloud-fan
reviewed
Jul 17, 2024
|
|
||
| test("SPARK-36680: Files hint options should be put into resolveDataSource function") { | ||
| val df1 = spark.range(100).toDF() | ||
| withTempPath(f => { |
There was a problem hiding this comment.
nit:
withTempPath { f =>
}
cloud-fan
reviewed
Jul 17, 2024
| """.stripMargin | ||
| ) | ||
| checkAnswer(df2, df1) | ||
| df2.queryExecution.analyzed foreach { |
There was a problem hiding this comment.
to make the test more explicit, I suggest to do
val relations = df2.queryExecution.analyzed.collect {
case LogicalRelation(fs: HadoopFsRelation, _, _, _) => fs
}
assert(relations.length == 1)
assert(relations.head.options == ...)
|
@cloud-fan Thank you very much, I modified the code according to your suggestion, can you take a look at it again? |
cloud-fan
approved these changes
Jul 18, 2024
|
thanks, merging to master! |
jingz-db
pushed a commit
to jingz-db/spark
that referenced
this pull request
Jul 22, 2024
…solveDataSource function ### What changes were proposed in this pull request? When reading csv, json and other files, pass the options parameter to the rules.resolveDataSource method to make the options parameter effective. This is a bug fix for [apache#46707](apache#46707) szehon-ho ### Why are the changes needed? For the following SQL, the options parameter passed in does not take effect. This is because the rules.resolveDataSource method does not pass the options parameter during the datasource construction process ``` SELECT * FROM csv.`/test/data.csv` WITH (`header` = true, 'delimiter' = '|') ``` ### Does this PR introduce _any_ user-facing change? No ### How was this patch tested? Unit test in SQLQuerySuite ### Was this patch authored or co-authored using generative AI tooling? No Closes apache#47370 from logze/hint-options. Authored-by: lizongze <lizongze@xiaomi.com> Signed-off-by: Wenchen Fan <wenchen@databricks.com>
attilapiros
pushed a commit
to attilapiros/spark
that referenced
this pull request
Oct 4, 2024
…solveDataSource function ### What changes were proposed in this pull request? When reading csv, json and other files, pass the options parameter to the rules.resolveDataSource method to make the options parameter effective. This is a bug fix for [apache#46707](apache#46707) szehon-ho ### Why are the changes needed? For the following SQL, the options parameter passed in does not take effect. This is because the rules.resolveDataSource method does not pass the options parameter during the datasource construction process ``` SELECT * FROM csv.`/test/data.csv` WITH (`header` = true, 'delimiter' = '|') ``` ### Does this PR introduce _any_ user-facing change? No ### How was this patch tested? Unit test in SQLQuerySuite ### Was this patch authored or co-authored using generative AI tooling? No Closes apache#47370 from logze/hint-options. Authored-by: lizongze <lizongze@xiaomi.com> Signed-off-by: Wenchen Fan <wenchen@databricks.com>
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.
What changes were proposed in this pull request?
When reading csv, json and other files, pass the options parameter to the rules.resolveDataSource method to make the options parameter effective.
This is a bug fix for #46707 @szehon-ho
Why are the changes needed?
For the following SQL, the options parameter passed in does not take effect. This is because the rules.resolveDataSource method does not pass the options parameter during the datasource construction process
Does this PR introduce any user-facing change?
No
How was this patch tested?
Unit test in SQLQuerySuite
Was this patch authored or co-authored using generative AI tooling?
No