[SPARK-49152][SQL][FOLLOWUP] DelegatingCatalogExtension should also use V1 commands #47995
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
Contributor
Author
cloud-fan
reviewed
Sep 5, 2024
|
|
||
| case RepairTable(ResolvedV1TableIdentifier(ident), addPartitions, dropPartitions) => | ||
| case RepairTable( | ||
| ResolvedTableIdentifierInSessionCatalog(ident), addPartitions, dropPartitions) => |
Contributor
There was a problem hiding this comment.
Suggested change
| ResolvedTableIdentifierInSessionCatalog(ident), addPartitions, dropPartitions) => | |
| ResolvedTableIdentifierInSessionCatalog(ident), addPartitions, dropPartitions) => |
cloud-fan
reviewed
Sep 5, 2024
| private def supportsV1Command(catalog: CatalogPlugin): Boolean = { | ||
| isSessionCatalog(catalog) && | ||
| SQLConf.get.getConf(SQLConf.V2_SESSION_CATALOG_IMPLEMENTATION).isEmpty | ||
| (isSessionCatalog(catalog) && |
Contributor
There was a problem hiding this comment.
I think isSessionCatalog(catalog) should always be checked.
cloud-fan
reviewed
Sep 5, 2024
sql/core/src/main/scala/org/apache/spark/sql/catalyst/analysis/ResolveSessionCatalog.scala
Show resolved
Hide resolved
cloud-fan
reviewed
Sep 5, 2024
sql/core/src/main/scala/org/apache/spark/sql/catalyst/analysis/ResolveSessionCatalog.scala
Show resolved
Hide resolved
cloud-fan
reviewed
Sep 5, 2024
sql/core/src/main/scala/org/apache/spark/sql/catalyst/analysis/ResolveSessionCatalog.scala
Show resolved
Hide resolved
cloud-fan
reviewed
Sep 5, 2024
sql/core/src/main/scala/org/apache/spark/sql/catalyst/analysis/ResolveSessionCatalog.scala
Show resolved
Hide resolved
cloud-fan
reviewed
Sep 5, 2024
sql/core/src/main/scala/org/apache/spark/sql/catalyst/analysis/ResolveSessionCatalog.scala
Show resolved
Hide resolved
cloud-fan
reviewed
Sep 5, 2024
sql/core/src/main/scala/org/apache/spark/sql/catalyst/analysis/ResolveSessionCatalog.scala
Outdated
Show resolved
Hide resolved
Contributor
yaooqinn
approved these changes
Sep 5, 2024
cloud-fan
reviewed
Sep 5, 2024
| val v2Catalog = catalog("spark_catalog").asTableCatalog | ||
| val table = v2Catalog.loadTable(Identifier.of(Array("default"), "tbl")) | ||
| assert(table.properties().get(TableCatalog.PROP_PROVIDER) == classOf[SimpleScanSource].getName) | ||
| val e = intercept[AnalysisException] { |
Contributor
There was a problem hiding this comment.
Contributor
|
thanks, merging to master/3.5! |
cloud-fan
added a commit
that referenced
this pull request
Sep 5, 2024
…se V1 commands ### What changes were proposed in this pull request? This is a followup of #47660 . If users override `spark_catalog` with `DelegatingCatalogExtension`, we should still use v1 commands as `DelegatingCatalogExtension` forwards requests to HMS and there are still behavior differences between v1 and v2 commands targeting HMS. This PR also forces to use v1 commands for certain commands that do not have a v2 version. ### Why are the changes needed? Avoid introducing behavior changes to Spark plugins that implements `DelegatingCatalogExtension` to override `spark_catalog`. ### Does this PR introduce _any_ user-facing change? No ### How was this patch tested? new test case ### Was this patch authored or co-authored using generative AI tooling? No Closes #47995 from amaliujia/fix_catalog_v2. Lead-authored-by: Wenchen Fan <[email protected]> Co-authored-by: Rui Wang <[email protected]> Co-authored-by: Wenchen Fan <[email protected]> Signed-off-by: Wenchen Fan <[email protected]> (cherry picked from commit f7cfeb5) Signed-off-by: Wenchen Fan <[email protected]>
| } | ||
| } | ||
|
|
||
| test("SPARK-49152: partition columns should be put at the end") { |
Member
There was a problem hiding this comment.
The test case name sounds a little mismatched. Is this a correct reproducer for DelegatingCatalogExtension issue, @amaliujia ?
Contributor
There was a problem hiding this comment.
This is the Spark behavior with the built-in catalog. A DelegatingCatalogExtension shouldn't change it.
Strictly speaking, this shouldn't be the only issue, as there might be other subtle differences between v1 and v2 CREATE TABLE command, or other commands.
Contributor
Author
There was a problem hiding this comment.
Yeah as @cloud-fan have mentioned, this verifies a specific case so we make sure the behavior is not changed. And there might be a list to verify though.
Member
There was a problem hiding this comment.
Got it. It makes sense. Thank you for the explanation.
cloud-fan
added a commit
that referenced
this pull request
Sep 9, 2024
…be changed by falling back to v1 command ### What changes were proposed in this pull request? This is a followup of #47772 . The behavior of SaveAsTable should not be changed by switching v1 to v2 command. This is similar to #47995. For the case of `DelegatingCatalogExtension` we need it goes to V1 commands to be consistent with previous behavior. ### Why are the changes needed? Behavior regression. ### Does this PR introduce _any_ user-facing change? No ### How was this patch tested? UT ### Was this patch authored or co-authored using generative AI tooling? No Closes #48019 from amaliujia/regress_v2. Lead-authored-by: Wenchen Fan <[email protected]> Co-authored-by: Rui Wang <[email protected]> Signed-off-by: Wenchen Fan <[email protected]>
cloud-fan
added a commit
that referenced
this pull request
Sep 9, 2024
…be changed by falling back to v1 command This is a followup of #47772 . The behavior of SaveAsTable should not be changed by switching v1 to v2 command. This is similar to #47995. For the case of `DelegatingCatalogExtension` we need it goes to V1 commands to be consistent with previous behavior. Behavior regression. No UT No Closes #48019 from amaliujia/regress_v2. Lead-authored-by: Wenchen Fan <[email protected]> Co-authored-by: Rui Wang <[email protected]> Signed-off-by: Wenchen Fan <[email protected]> (cherry picked from commit 37b39b4) Signed-off-by: Wenchen Fan <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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.
What changes were proposed in this pull request?
This is a followup of #47660 . If users override
spark_catalogwithDelegatingCatalogExtension, we should still use v1 commands asDelegatingCatalogExtensionforwards requests to HMS and there are still behavior differences between v1 and v2 commands targeting HMS.This PR also forces to use v1 commands for certain commands that do not have a v2 version.
Why are the changes needed?
Avoid introducing behavior changes to Spark plugins that implements
DelegatingCatalogExtensionto overridespark_catalog.Does this PR introduce any user-facing change?
No
How was this patch tested?
new test case
Was this patch authored or co-authored using generative AI tooling?
No