[SPARK-41708][SQL][FOLLOWUP] Override toString method of FileIndex
#39610
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
LuciferYang
commented
Jan 16, 2023
| @@ -1086,20 +1086,20 @@ struct<plan:string> | |||
| +- 'UnresolvedRelation [explain_temp4], [], false | |||
|
|
|||
| == Analyzed Logical Plan == | |||
| InsertIntoHadoopFsRelationCommand Location [not included in comparison]/{warehouse_dir}/explain_temp5], Append, `spark_catalog`.`default`.`explain_temp5`, org.apache.spark.sql.execution.datasources.CatalogFileIndex, [key, val] | |||
| InsertIntoHadoopFsRelationCommand Location [not included in comparison]/{warehouse_dir}/explain_temp5, false, [val#x], Parquet, [path=Location [not included in comparison]/{warehouse_dir}/explain_temp5], Append, `spark_catalog`.`default`.`explain_temp5`, org.apache.spark.sql.execution.datasources.CatalogFileIndex(Location [not included in comparison]/{warehouse_dir}/explain_temp5), [key, val] | |||
There was a problem hiding this comment.
@cloud-fan Is this OK?
There was a problem hiding this comment.
also cc @dongjoon-hyun
cloud-fan
reviewed
Jan 16, 2023
sql/core/src/test/scala/org/apache/spark/sql/SQLQueryTestHelper.scala
Outdated
Show resolved
Hide resolved
cloud-fan
approved these changes
Jan 16, 2023
…r.scala Location -> file: Co-authored-by: Wenchen Fan <cloud0fan@gmail.com>
LuciferYang
commented
Jan 16, 2023
|
Merged to master. |
|
Thanks @dongjoon-hyun @cloud-fan |
HyukjinKwon
pushed a commit
that referenced
this pull request
Feb 8, 2023
### What changes were proposed in this pull request? This is a followup of #39610 . The non-greedy mode does not work well if the ending class name appears more than once, like `file://myPath/.../clsName/.../clsName`. We should still use greedy mode, but to match any chars that are not space or comma (comma is used to combine multiple paths in `FileIndex.toString`). ### Why are the changes needed? make the test framework more stable ### Does this PR introduce _any_ user-facing change? no ### How was this patch tested? N/A Closes #39924 from cloud-fan/minor. Authored-by: Wenchen Fan <wenchen@databricks.com> Signed-off-by: Hyukjin Kwon <gurwls223@apache.org>
HyukjinKwon
pushed a commit
that referenced
this pull request
Feb 8, 2023
### What changes were proposed in this pull request? This is a followup of #39610 . The non-greedy mode does not work well if the ending class name appears more than once, like `file://myPath/.../clsName/.../clsName`. We should still use greedy mode, but to match any chars that are not space or comma (comma is used to combine multiple paths in `FileIndex.toString`). ### Why are the changes needed? make the test framework more stable ### Does this PR introduce _any_ user-facing change? no ### How was this patch tested? N/A Closes #39924 from cloud-fan/minor. Authored-by: Wenchen Fan <wenchen@databricks.com> Signed-off-by: Hyukjin Kwon <gurwls223@apache.org> (cherry picked from commit 04550ed) Signed-off-by: Hyukjin Kwon <gurwls223@apache.org>
snmvaughan
pushed a commit
to snmvaughan/spark
that referenced
this pull request
Jun 20, 2023
### What changes were proposed in this pull request? This is a followup of apache#39610 . The non-greedy mode does not work well if the ending class name appears more than once, like `file://myPath/.../clsName/.../clsName`. We should still use greedy mode, but to match any chars that are not space or comma (comma is used to combine multiple paths in `FileIndex.toString`). ### Why are the changes needed? make the test framework more stable ### Does this PR introduce _any_ user-facing change? no ### How was this patch tested? N/A Closes apache#39924 from cloud-fan/minor. Authored-by: Wenchen Fan <wenchen@databricks.com> Signed-off-by: Hyukjin Kwon <gurwls223@apache.org> (cherry picked from commit 04550ed) Signed-off-by: Hyukjin Kwon <gurwls223@apache.org>
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?
The main change of this pr is to fix suggestions of #39598 (comment):
replaceAlltoSQLQueryTestHelper#replaceNotIncludedMsgto remove@hashCode#39598toStringmethod ofFileIndexto print className withrootPathsSQLQueryTestHelper#replaceNotIncludedMsgmethod forfile://xxx/clsName/path to replace one by one instead of replacing the longest matchWhy are the changes needed?
Fix suggestions of #39598 (comment)
Does this PR introduce any user-facing change?
No
How was this patch tested?
build/sbt "sql/testOnly org.apache.spark.sql.SQLQueryTestSuite" -Pscala-2.13, run successful