You are viewing a plain text version of this content. The canonical link for it is here.
Posted to reviews@spark.apache.org by GitBox <gi...@apache.org> on 2021/10/21 14:50:25 UTC
[GitHub] [spark] cloud-fan opened a new pull request #34358: [SPARK-37087][SQL] Merge three relation resolutions into one
cloud-fan opened a new pull request #34358:
URL: https://github.com/apache/spark/pull/34358
<!--
Thanks for sending a pull request! Here are some tips for you:
1. If this is your first time, please read our contributor guidelines: https://spark.apache.org/contributing.html
2. Ensure you have added or run the appropriate tests for your PR: https://spark.apache.org/developer-tools.html
3. If the PR is unfinished, add '[WIP]' in your PR title, e.g., '[WIP][SPARK-XXXX] Your PR title ...'.
4. Be sure to keep the PR description updated to reflect all changes.
5. Please write your PR title to summarize what this PR proposes.
6. If possible, provide a concise example to reproduce the issue for a faster review.
7. If you want to add a new configuration, please read the guideline first for naming configurations in
'core/src/main/scala/org/apache/spark/internal/config/ConfigEntry.scala'.
8. If you want to add or modify an error type or message, please read the guideline first in
'core/src/main/resources/error/README.md'.
-->
### What changes were proposed in this pull request?
<!--
Please clarify what changes you are proposing. The purpose of this section is to outline the changes and how this PR fixes the issue.
If possible, please consider writing useful notes for better and faster reviews in your PR. See the examples below.
1. If you refactor some codes with changing classes, showing the class hierarchy will help reviewers.
2. If you fix some SQL features, you can provide some references of other DBMSes.
3. If there is design documentation, please add the link.
4. If there is a discussion in the mailing list, please add the link.
-->
Today, Spark has 3 analyzer rules to resolve relations: `ResolveTempViews`, `ResolveTables` and `ResolveRelations`. This leads to duplicated code, and also makes it harder to figure out the resolution logic, as you need to look at three rules and think about their interactions.
This PR merges these three rules into one.
### Why are the changes needed?
<!--
Please clarify why the changes are needed. For instance,
1. If you propose a new API, clarify the use case for a new API.
2. If you fix a bug, you can clarify why it is a bug.
-->
code simplification
### Does this PR introduce _any_ user-facing change?
<!--
Note that it means *any* user-facing change including all aspects such as the documentation fix.
If yes, please clarify the previous behavior and the change this PR proposes - provide the console output, description and/or an example to show the behavior difference if possible.
If possible, please also clarify if this is a user-facing change compared to the released Spark versions or within the unreleased branches such as master.
If no, write 'No'.
-->
no
### How was this patch tested?
<!--
If tests were added, say they were added here. Please make sure to add some test cases that check the changes thoroughly including negative and positive cases if possible.
If it was tested in a way different from regular unit tests, please clarify how you tested step by step, ideally copy and paste-able, so that other reviewers can test and check, and descendants can verify in the future.
If tests were not added, please describe why they were not added and/or why it was difficult to add.
If benchmark tests were added, please run the benchmarks in GitHub Actions for the consistent environment, and the instructions could accord to: https://spark.apache.org/developer-tools.html#github-workflow-benchmarks.
-->
existing tests
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] SparkQA commented on pull request #34358: [SPARK-37087][SQL] Merge three relation resolutions into one
Posted by GitBox <gi...@apache.org>.
SparkQA commented on pull request #34358:
URL: https://github.com/apache/spark/pull/34358#issuecomment-948740808
Kubernetes integration test starting
URL: https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder-K8s/48982/
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] SparkQA commented on pull request #34358: [SPARK-37087][SQL] Merge three relation resolution rules into one
Posted by GitBox <gi...@apache.org>.
SparkQA commented on pull request #34358:
URL: https://github.com/apache/spark/pull/34358#issuecomment-949453027
Kubernetes integration test starting
URL: https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder-K8s/49004/
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] SparkQA commented on pull request #34358: [SPARK-37087][SQL] Merge three relation resolution rules into one
Posted by GitBox <gi...@apache.org>.
SparkQA commented on pull request #34358:
URL: https://github.com/apache/spark/pull/34358#issuecomment-951590552
**[Test build #144616 has started](https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder/144616/testReport)** for PR 34358 at commit [`e4801d2`](https://github.com/apache/spark/commit/e4801d2e5487e5cfad196e89dca2896961f31c22).
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] AmplabJenkins commented on pull request #34358: [SPARK-37087][SQL] Merge three relation resolution rules into one
Posted by GitBox <gi...@apache.org>.
AmplabJenkins commented on pull request #34358:
URL: https://github.com/apache/spark/pull/34358#issuecomment-949651327
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins//job/SparkPullRequestBuilder/144533/
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] AmplabJenkins removed a comment on pull request #34358: [SPARK-37087][SQL] Merge three relation resolution rules into one
Posted by GitBox <gi...@apache.org>.
AmplabJenkins removed a comment on pull request #34358:
URL: https://github.com/apache/spark/pull/34358#issuecomment-949651327
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins//job/SparkPullRequestBuilder/144533/
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] AmplabJenkins commented on pull request #34358: [SPARK-37087][SQL] Merge three relation resolution rules into one
Posted by GitBox <gi...@apache.org>.
AmplabJenkins commented on pull request #34358:
URL: https://github.com/apache/spark/pull/34358#issuecomment-951839602
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins//job/SparkPullRequestBuilder/144616/
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] AmplabJenkins commented on pull request #34358: [SPARK-37087][SQL] Merge three relation resolutions into one
Posted by GitBox <gi...@apache.org>.
AmplabJenkins commented on pull request #34358:
URL: https://github.com/apache/spark/pull/34358#issuecomment-948793186
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] SparkQA commented on pull request #34358: [SPARK-37087][SQL] Merge three relation resolution rules into one
Posted by GitBox <gi...@apache.org>.
SparkQA commented on pull request #34358:
URL: https://github.com/apache/spark/pull/34358#issuecomment-949419631
**[Test build #144533 has started](https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder/144533/testReport)** for PR 34358 at commit [`83911af`](https://github.com/apache/spark/commit/83911af23620aa5d89d55ab2e2888d63577b9370).
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] cloud-fan commented on pull request #34358: [SPARK-37087][SQL] Merge three relation resolutions into one
Posted by GitBox <gi...@apache.org>.
cloud-fan commented on pull request #34358:
URL: https://github.com/apache/spark/pull/34358#issuecomment-948696725
cc @viirya @maropu @imback82 @allisonwang-db
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] AmplabJenkins removed a comment on pull request #34358: [SPARK-37087][SQL] Merge three relation resolutions into one
Posted by GitBox <gi...@apache.org>.
AmplabJenkins removed a comment on pull request #34358:
URL: https://github.com/apache/spark/pull/34358#issuecomment-948793184
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] SparkQA commented on pull request #34358: [SPARK-37087][SQL] Merge three relation resolution rules into one
Posted by GitBox <gi...@apache.org>.
SparkQA commented on pull request #34358:
URL: https://github.com/apache/spark/pull/34358#issuecomment-951617526
Kubernetes integration test starting
URL: https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder-K8s/49086/
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] SparkQA commented on pull request #34358: [SPARK-37087][SQL] Merge three relation resolution rules into one
Posted by GitBox <gi...@apache.org>.
SparkQA commented on pull request #34358:
URL: https://github.com/apache/spark/pull/34358#issuecomment-951648277
Kubernetes integration test status failure
URL: https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder-K8s/49086/
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] SparkQA removed a comment on pull request #34358: [SPARK-37087][SQL] Merge three relation resolution rules into one
Posted by GitBox <gi...@apache.org>.
SparkQA removed a comment on pull request #34358:
URL: https://github.com/apache/spark/pull/34358#issuecomment-949419631
**[Test build #144533 has started](https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder/144533/testReport)** for PR 34358 at commit [`83911af`](https://github.com/apache/spark/commit/83911af23620aa5d89d55ab2e2888d63577b9370).
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] SparkQA commented on pull request #34358: [SPARK-37087][SQL] Merge three relation resolutions into one
Posted by GitBox <gi...@apache.org>.
SparkQA commented on pull request #34358:
URL: https://github.com/apache/spark/pull/34358#issuecomment-948698897
**[Test build #144510 has started](https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder/144510/testReport)** for PR 34358 at commit [`80b4a9f`](https://github.com/apache/spark/commit/80b4a9f1c9dfb007527f34b40df692ff4fce8f72).
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] AmplabJenkins commented on pull request #34358: [SPARK-37087][SQL] Merge three relation resolution rules into one
Posted by GitBox <gi...@apache.org>.
AmplabJenkins commented on pull request #34358:
URL: https://github.com/apache/spark/pull/34358#issuecomment-951663711
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins//job/SparkPullRequestBuilder-K8s/49086/
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] AmplabJenkins commented on pull request #34358: [SPARK-37087][SQL] Merge three relation resolution rules into one
Posted by GitBox <gi...@apache.org>.
AmplabJenkins commented on pull request #34358:
URL: https://github.com/apache/spark/pull/34358#issuecomment-949508683
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins//job/SparkPullRequestBuilder-K8s/49004/
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] allisonwang-db commented on a change in pull request #34358: [SPARK-37087][SQL] Merge three relation resolution rules into one
Posted by GitBox <gi...@apache.org>.
allisonwang-db commented on a change in pull request #34358:
URL: https://github.com/apache/spark/pull/34358#discussion_r735987452
##########
File path: sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala
##########
@@ -1211,82 +1064,124 @@ class Analyzer(override val catalogManager: CatalogManager)
case table => table
}.getOrElse(u)
- case u @ UnresolvedView(identifier, cmd, _, relationTypeMismatchHint) =>
+ case u @ UnresolvedView(identifier, cmd, allowTemp, relationTypeMismatchHint) =>
lookupTableOrView(identifier).map {
+ case v: ResolvedView if v.isTemp && !allowTemp =>
+ val name = identifier.quoted
+ u.failAnalysis(s"$name is a temp view. '$cmd' expects a permanent view.")
case t: ResolvedTable =>
throw QueryCompilationErrors.expectViewNotTableError(
t, cmd, relationTypeMismatchHint, u)
- case view => view
+ case other => other
}.getOrElse(u)
- case u @ UnresolvedTableOrView(identifier, _, _) =>
- lookupTableOrView(identifier).getOrElse(u)
+ case u @ UnresolvedTableOrView(identifier, cmd, allowTempView) =>
+ lookupTableOrView(identifier).map {
+ case v: ResolvedView if v.isTemp && !allowTempView =>
+ throw QueryCompilationErrors.expectTableOrPermanentViewNotTempViewError(
+ identifier.quoted, cmd, u)
+ case other => other
+ }.getOrElse(u)
}
- private def lookupTableOrView(identifier: Seq[String]): Option[LogicalPlan] = {
- expandIdentifier(identifier) match {
- case SessionCatalogAndIdentifier(catalog, ident) =>
- CatalogV2Util.loadTable(catalog, ident).map {
- case v1Table: V1Table if v1Table.v1Table.tableType == CatalogTableType.VIEW =>
- ResolvedView(ident, isTemp = false)
- case table =>
- ResolvedTable.create(catalog.asTableCatalog, ident, table)
- }
+ private def lookupTempView(
+ identifier: Seq[String],
+ isStreaming: Boolean = false): Option[LogicalPlan] = {
+ // We are resolving a view and this name is not a temp view when that view was created. We
+ // return None earlier here.
+ if (isResolvingView && !isReferredTempViewName(identifier)) return None
+
+ val tmpView = identifier match {
+ case Seq(part1) => v1SessionCatalog.lookupTempView(part1)
+ case Seq(part1, part2) => v1SessionCatalog.lookupGlobalTempView(part1, part2)
case _ => None
}
+
+ if (isStreaming && tmpView.nonEmpty && !tmpView.get.isStreaming) {
+ throw QueryCompilationErrors.readNonStreamingTempViewError(identifier.quoted)
+ }
+ tmpView
}
- // Look up a relation from the session catalog with the following logic:
- // 1) If the resolved catalog is not session catalog, return None.
- // 2) If a relation is not found in the catalog, return None.
- // 3) If a v1 table is found, create a v1 relation. Otherwise, create a v2 relation.
- private def lookupRelation(
- identifier: Seq[String],
+ private def lookupTableOrView(identifier: Seq[String]): Option[LogicalPlan] = {
Review comment:
Maybe we can add a comment for this method `lookupTableOrView` saying that it is used for DDL commands (return either `ResolvedView` or `ResolvedTable`) while `lookupRelation` is used for DML/SELECT queries that return a concrete logical plan for the relation (if I understand it correctly).
##########
File path: sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala
##########
@@ -1184,24 +1039,22 @@ class Analyzer(override val catalogManager: CatalogManager)
case write: V2WriteCommand =>
write.table match {
case u: UnresolvedRelation if !u.isStreaming =>
- lookupRelation(u.multipartIdentifier, u.options, false)
- .map(EliminateSubqueryAliases(_))
- .map {
- case v: View => throw QueryCompilationErrors.writeIntoViewNotAllowedError(
- v.desc.identifier, write)
- case u: UnresolvedCatalogRelation =>
- throw QueryCompilationErrors.writeIntoV1TableNotAllowedError(
- u.tableMeta.identifier, write)
- case r: DataSourceV2Relation => write.withNewTable(r)
- case other => throw new IllegalStateException(
- "[BUG] unexpected plan returned by `lookupRelation`: " + other)
- }.getOrElse(write)
+ lookupRelation(u).map(unwrapRelationPlan).map {
+ case v: View => throw QueryCompilationErrors.writeIntoViewNotAllowedError(
Review comment:
Can this `View` be both temp view and permanent view?
##########
File path: sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala
##########
@@ -1162,12 +1010,19 @@ class Analyzer(override val catalogManager: CatalogManager)
case _ => plan
}
- def apply(plan: LogicalPlan): LogicalPlan = ResolveTempViews(plan).
- resolveOperatorsUpWithPruning(AlwaysProcess.fn, ruleId) {
+ private def unwrapRelationPlan(plan: LogicalPlan): LogicalPlan = {
+ EliminateSubqueryAliases(plan) match {
+ case v: View if v.isTempViewStoringAnalyzedPlan => v.child
Review comment:
Just curious why this is checking `isTempViewStoringAnalyzedPlan` instead of checking `isTempView`?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] SparkQA commented on pull request #34358: [SPARK-37087][SQL] Merge three relation resolution rules into one
Posted by GitBox <gi...@apache.org>.
SparkQA commented on pull request #34358:
URL: https://github.com/apache/spark/pull/34358#issuecomment-951837962
**[Test build #144616 has finished](https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder/144616/testReport)** for PR 34358 at commit [`e4801d2`](https://github.com/apache/spark/commit/e4801d2e5487e5cfad196e89dca2896961f31c22).
* This patch passes all tests.
* This patch merges cleanly.
* This patch adds no public classes.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] imback82 commented on a change in pull request #34358: [SPARK-37087][SQL] Merge three relation resolution rules into one
Posted by GitBox <gi...@apache.org>.
imback82 commented on a change in pull request #34358:
URL: https://github.com/apache/spark/pull/34358#discussion_r735157413
##########
File path: sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala
##########
@@ -1184,24 +1039,22 @@ class Analyzer(override val catalogManager: CatalogManager)
case write: V2WriteCommand =>
write.table match {
case u: UnresolvedRelation if !u.isStreaming =>
- lookupRelation(u.multipartIdentifier, u.options, false)
- .map(EliminateSubqueryAliases(_))
- .map {
- case v: View => throw QueryCompilationErrors.writeIntoViewNotAllowedError(
- v.desc.identifier, write)
- case u: UnresolvedCatalogRelation =>
- throw QueryCompilationErrors.writeIntoV1TableNotAllowedError(
- u.tableMeta.identifier, write)
- case r: DataSourceV2Relation => write.withNewTable(r)
- case other => throw new IllegalStateException(
- "[BUG] unexpected plan returned by `lookupRelation`: " + other)
- }.getOrElse(write)
+ lookupRelation(u).map(unwrapRelationPlan).map {
+ case v: View => throw QueryCompilationErrors.writeIntoViewNotAllowedError(
+ v.desc.identifier, write)
+ case r: DataSourceV2Relation => write.withNewTable(r)
+ case u: UnresolvedCatalogRelation =>
+ throw QueryCompilationErrors.writeIntoV1TableNotAllowedError(
+ u.tableMeta.identifier, write)
+ case other =>
+ throw QueryCompilationErrors.writeIntoTempViewNotAllowedError(
Review comment:
Would `other` be always a temp view now?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] cloud-fan commented on pull request #34358: [SPARK-37087][SQL] Merge three relation resolution rules into one
Posted by GitBox <gi...@apache.org>.
cloud-fan commented on pull request #34358:
URL: https://github.com/apache/spark/pull/34358#issuecomment-950552208
also cc @gengliangwang
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] viirya commented on a change in pull request #34358: [SPARK-37087][SQL] Merge three relation resolution rules into one
Posted by GitBox <gi...@apache.org>.
viirya commented on a change in pull request #34358:
URL: https://github.com/apache/spark/pull/34358#discussion_r735349464
##########
File path: sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala
##########
@@ -1211,82 +1064,124 @@ class Analyzer(override val catalogManager: CatalogManager)
case table => table
}.getOrElse(u)
- case u @ UnresolvedView(identifier, cmd, _, relationTypeMismatchHint) =>
+ case u @ UnresolvedView(identifier, cmd, allowTemp, relationTypeMismatchHint) =>
lookupTableOrView(identifier).map {
+ case v: ResolvedView if v.isTemp && !allowTemp =>
+ val name = identifier.quoted
+ u.failAnalysis(s"$name is a temp view. '$cmd' expects a permanent view.")
case t: ResolvedTable =>
throw QueryCompilationErrors.expectViewNotTableError(
t, cmd, relationTypeMismatchHint, u)
- case view => view
+ case other => other
}.getOrElse(u)
- case u @ UnresolvedTableOrView(identifier, _, _) =>
- lookupTableOrView(identifier).getOrElse(u)
+ case u @ UnresolvedTableOrView(identifier, cmd, allowTempView) =>
+ lookupTableOrView(identifier).map {
+ case v: ResolvedView if v.isTemp && !allowTempView =>
+ throw QueryCompilationErrors.expectTableOrPermanentViewNotTempViewError(
+ identifier.quoted, cmd, u)
+ case other => other
+ }.getOrElse(u)
}
- private def lookupTableOrView(identifier: Seq[String]): Option[LogicalPlan] = {
- expandIdentifier(identifier) match {
- case SessionCatalogAndIdentifier(catalog, ident) =>
- CatalogV2Util.loadTable(catalog, ident).map {
- case v1Table: V1Table if v1Table.v1Table.tableType == CatalogTableType.VIEW =>
- ResolvedView(ident, isTemp = false)
- case table =>
- ResolvedTable.create(catalog.asTableCatalog, ident, table)
- }
+ private def lookupTempView(
+ identifier: Seq[String],
+ isStreaming: Boolean = false): Option[LogicalPlan] = {
+ // We are resolving a view and this name is not a temp view when that view was created. We
+ // return None earlier here.
+ if (isResolvingView && !isReferredTempViewName(identifier)) return None
+
+ val tmpView = identifier match {
+ case Seq(part1) => v1SessionCatalog.lookupTempView(part1)
+ case Seq(part1, part2) => v1SessionCatalog.lookupGlobalTempView(part1, part2)
case _ => None
}
+
+ if (isStreaming && tmpView.nonEmpty && !tmpView.get.isStreaming) {
+ throw QueryCompilationErrors.readNonStreamingTempViewError(identifier.quoted)
+ }
+ tmpView
}
- // Look up a relation from the session catalog with the following logic:
- // 1) If the resolved catalog is not session catalog, return None.
- // 2) If a relation is not found in the catalog, return None.
- // 3) If a v1 table is found, create a v1 relation. Otherwise, create a v2 relation.
- private def lookupRelation(
- identifier: Seq[String],
+ private def lookupTableOrView(identifier: Seq[String]): Option[LogicalPlan] = {
Review comment:
As view is resolved first and then table, maybe `lookupViewOrTable`?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] cloud-fan closed pull request #34358: [SPARK-37087][SQL] Merge three relation resolution rules into one
Posted by GitBox <gi...@apache.org>.
cloud-fan closed pull request #34358:
URL: https://github.com/apache/spark/pull/34358
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] SparkQA commented on pull request #34358: [SPARK-37087][SQL] Merge three relation resolution rules into one
Posted by GitBox <gi...@apache.org>.
SparkQA commented on pull request #34358:
URL: https://github.com/apache/spark/pull/34358#issuecomment-949486240
Kubernetes integration test status failure
URL: https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder-K8s/49004/
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] cloud-fan commented on pull request #34358: [SPARK-37087][SQL] Merge three relation resolution rules into one
Posted by GitBox <gi...@apache.org>.
cloud-fan commented on pull request #34358:
URL: https://github.com/apache/spark/pull/34358#issuecomment-951592498
the last commit just adds comment, I'm merging to master, thanks for the review!
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] AmplabJenkins removed a comment on pull request #34358: [SPARK-37087][SQL] Merge three relation resolution rules into one
Posted by GitBox <gi...@apache.org>.
AmplabJenkins removed a comment on pull request #34358:
URL: https://github.com/apache/spark/pull/34358#issuecomment-949508683
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins//job/SparkPullRequestBuilder-K8s/49004/
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] SparkQA commented on pull request #34358: [SPARK-37087][SQL] Merge three relation resolution rules into one
Posted by GitBox <gi...@apache.org>.
SparkQA commented on pull request #34358:
URL: https://github.com/apache/spark/pull/34358#issuecomment-949649426
**[Test build #144533 has finished](https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder/144533/testReport)** for PR 34358 at commit [`83911af`](https://github.com/apache/spark/commit/83911af23620aa5d89d55ab2e2888d63577b9370).
* This patch passes all tests.
* This patch merges cleanly.
* This patch adds no public classes.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] cloud-fan commented on a change in pull request #34358: [SPARK-37087][SQL] Merge three relation resolution rules into one
Posted by GitBox <gi...@apache.org>.
cloud-fan commented on a change in pull request #34358:
URL: https://github.com/apache/spark/pull/34358#discussion_r735274431
##########
File path: sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala
##########
@@ -1184,24 +1039,22 @@ class Analyzer(override val catalogManager: CatalogManager)
case write: V2WriteCommand =>
write.table match {
case u: UnresolvedRelation if !u.isStreaming =>
- lookupRelation(u.multipartIdentifier, u.options, false)
- .map(EliminateSubqueryAliases(_))
- .map {
- case v: View => throw QueryCompilationErrors.writeIntoViewNotAllowedError(
- v.desc.identifier, write)
- case u: UnresolvedCatalogRelation =>
- throw QueryCompilationErrors.writeIntoV1TableNotAllowedError(
- u.tableMeta.identifier, write)
- case r: DataSourceV2Relation => write.withNewTable(r)
- case other => throw new IllegalStateException(
- "[BUG] unexpected plan returned by `lookupRelation`: " + other)
- }.getOrElse(write)
+ lookupRelation(u).map(unwrapRelationPlan).map {
+ case v: View => throw QueryCompilationErrors.writeIntoViewNotAllowedError(
+ v.desc.identifier, write)
+ case r: DataSourceV2Relation => write.withNewTable(r)
+ case u: UnresolvedCatalogRelation =>
+ throw QueryCompilationErrors.writeIntoV1TableNotAllowedError(
+ u.tableMeta.identifier, write)
+ case other =>
+ throw QueryCompilationErrors.writeIntoTempViewNotAllowedError(
Review comment:
Yes, as it's from `UnresolvedRelation`. We only resolve `UnresolvedRelation` to
1. SQL view, which we fail before
2. v2 table, which we handled before
3. v1 table, which we fail before
4. temp view
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] cloud-fan commented on a change in pull request #34358: [SPARK-37087][SQL] Merge three relation resolution rules into one
Posted by GitBox <gi...@apache.org>.
cloud-fan commented on a change in pull request #34358:
URL: https://github.com/apache/spark/pull/34358#discussion_r736162611
##########
File path: sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala
##########
@@ -1162,12 +1010,19 @@ class Analyzer(override val catalogManager: CatalogManager)
case _ => plan
}
- def apply(plan: LogicalPlan): LogicalPlan = ResolveTempViews(plan).
- resolveOperatorsUpWithPruning(AlwaysProcess.fn, ruleId) {
+ private def unwrapRelationPlan(plan: LogicalPlan): LogicalPlan = {
+ EliminateSubqueryAliases(plan) match {
+ case v: View if v.isTempViewStoringAnalyzedPlan => v.child
Review comment:
Because we only want to allow inserting into `spark.read.parquet....createTempView`, not SQL view like `CREATE TEMP VIEW v AS SELECT ...`
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] cloud-fan commented on a change in pull request #34358: [SPARK-37087][SQL] Merge three relation resolution rules into one
Posted by GitBox <gi...@apache.org>.
cloud-fan commented on a change in pull request #34358:
URL: https://github.com/apache/spark/pull/34358#discussion_r735406921
##########
File path: sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala
##########
@@ -1211,82 +1064,124 @@ class Analyzer(override val catalogManager: CatalogManager)
case table => table
}.getOrElse(u)
- case u @ UnresolvedView(identifier, cmd, _, relationTypeMismatchHint) =>
+ case u @ UnresolvedView(identifier, cmd, allowTemp, relationTypeMismatchHint) =>
lookupTableOrView(identifier).map {
+ case v: ResolvedView if v.isTemp && !allowTemp =>
+ val name = identifier.quoted
+ u.failAnalysis(s"$name is a temp view. '$cmd' expects a permanent view.")
case t: ResolvedTable =>
throw QueryCompilationErrors.expectViewNotTableError(
t, cmd, relationTypeMismatchHint, u)
- case view => view
+ case other => other
}.getOrElse(u)
- case u @ UnresolvedTableOrView(identifier, _, _) =>
- lookupTableOrView(identifier).getOrElse(u)
+ case u @ UnresolvedTableOrView(identifier, cmd, allowTempView) =>
+ lookupTableOrView(identifier).map {
+ case v: ResolvedView if v.isTemp && !allowTempView =>
+ throw QueryCompilationErrors.expectTableOrPermanentViewNotTempViewError(
+ identifier.quoted, cmd, u)
+ case other => other
+ }.getOrElse(u)
}
- private def lookupTableOrView(identifier: Seq[String]): Option[LogicalPlan] = {
- expandIdentifier(identifier) match {
- case SessionCatalogAndIdentifier(catalog, ident) =>
- CatalogV2Util.loadTable(catalog, ident).map {
- case v1Table: V1Table if v1Table.v1Table.tableType == CatalogTableType.VIEW =>
- ResolvedView(ident, isTemp = false)
- case table =>
- ResolvedTable.create(catalog.asTableCatalog, ident, table)
- }
+ private def lookupTempView(
+ identifier: Seq[String],
+ isStreaming: Boolean = false): Option[LogicalPlan] = {
+ // We are resolving a view and this name is not a temp view when that view was created. We
+ // return None earlier here.
+ if (isResolvingView && !isReferredTempViewName(identifier)) return None
+
+ val tmpView = identifier match {
+ case Seq(part1) => v1SessionCatalog.lookupTempView(part1)
+ case Seq(part1, part2) => v1SessionCatalog.lookupGlobalTempView(part1, part2)
case _ => None
}
+
+ if (isStreaming && tmpView.nonEmpty && !tmpView.get.isStreaming) {
+ throw QueryCompilationErrors.readNonStreamingTempViewError(identifier.quoted)
+ }
+ tmpView
}
- // Look up a relation from the session catalog with the following logic:
- // 1) If the resolved catalog is not session catalog, return None.
- // 2) If a relation is not found in the catalog, return None.
- // 3) If a v1 table is found, create a v1 relation. Otherwise, create a v2 relation.
- private def lookupRelation(
- identifier: Seq[String],
+ private def lookupTableOrView(identifier: Seq[String]): Option[LogicalPlan] = {
+ lookupTempView(identifier).map { _ =>
+ ResolvedView(identifier.asIdentifier, isTemp = true)
+ }.orElse {
+ expandIdentifier(identifier) match {
+ case CatalogAndIdentifier(catalog, ident) =>
+ CatalogV2Util.loadTable(catalog, ident).map {
+ case v1Table: V1Table if CatalogV2Util.isSessionCatalog(catalog) &&
+ v1Table.v1Table.tableType == CatalogTableType.VIEW =>
+ ResolvedView(ident, isTemp = false)
+ case table =>
+ ResolvedTable.create(catalog.asTableCatalog, ident, table)
+ }
+ case _ => None
+ }
+ }
+ }
+
+ private def createRelation(
+ catalog: CatalogPlugin,
+ ident: Identifier,
+ table: Option[Table],
options: CaseInsensitiveStringMap,
isStreaming: Boolean): Option[LogicalPlan] = {
- expandIdentifier(identifier) match {
- case SessionCatalogAndIdentifier(catalog, ident) =>
- lazy val loaded = CatalogV2Util.loadTable(catalog, ident).map {
- case v1Table: V1Table =>
- if (isStreaming) {
- if (v1Table.v1Table.tableType == CatalogTableType.VIEW) {
- throw QueryCompilationErrors.permanentViewNotSupportedByStreamingReadingAPIError(
- identifier.quoted)
- }
- SubqueryAlias(
- catalog.name +: ident.asMultipartIdentifier,
- UnresolvedCatalogRelation(v1Table.v1Table, options, isStreaming = true))
- } else {
- v1SessionCatalog.getRelation(v1Table.v1Table, options)
- }
- case table =>
- if (isStreaming) {
- val v1Fallback = table match {
- case withFallback: V2TableWithV1Fallback =>
- Some(UnresolvedCatalogRelation(withFallback.v1Table, isStreaming = true))
- case _ => None
- }
- SubqueryAlias(
- catalog.name +: ident.asMultipartIdentifier,
- StreamingRelationV2(None, table.name, table, options, table.schema.toAttributes,
- Some(catalog), Some(ident), v1Fallback))
- } else {
- SubqueryAlias(
- catalog.name +: ident.asMultipartIdentifier,
- DataSourceV2Relation.create(table, Some(catalog), Some(ident), options))
- }
+ table.map {
+ case v1Table: V1Table if CatalogV2Util.isSessionCatalog(catalog) =>
Review comment:
It's possible. Now this `ResolveRelations` rule resolves all the relations, not relations from only the v1 session catalog.
Previously it returned None because `ResolveRelations` does not want to deal with v2 catalogs and leave it to the rule `ResolveTables`.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] SparkQA commented on pull request #34358: [SPARK-37087][SQL] Merge three relation resolutions into one
Posted by GitBox <gi...@apache.org>.
SparkQA commented on pull request #34358:
URL: https://github.com/apache/spark/pull/34358#issuecomment-948779230
Kubernetes integration test status failure
URL: https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder-K8s/48982/
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] SparkQA removed a comment on pull request #34358: [SPARK-37087][SQL] Merge three relation resolution rules into one
Posted by GitBox <gi...@apache.org>.
SparkQA removed a comment on pull request #34358:
URL: https://github.com/apache/spark/pull/34358#issuecomment-951590552
**[Test build #144616 has started](https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder/144616/testReport)** for PR 34358 at commit [`e4801d2`](https://github.com/apache/spark/commit/e4801d2e5487e5cfad196e89dca2896961f31c22).
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] cloud-fan commented on a change in pull request #34358: [SPARK-37087][SQL] Merge three relation resolution rules into one
Posted by GitBox <gi...@apache.org>.
cloud-fan commented on a change in pull request #34358:
URL: https://github.com/apache/spark/pull/34358#discussion_r736163045
##########
File path: sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala
##########
@@ -1184,24 +1039,22 @@ class Analyzer(override val catalogManager: CatalogManager)
case write: V2WriteCommand =>
write.table match {
case u: UnresolvedRelation if !u.isStreaming =>
- lookupRelation(u.multipartIdentifier, u.options, false)
- .map(EliminateSubqueryAliases(_))
- .map {
- case v: View => throw QueryCompilationErrors.writeIntoViewNotAllowedError(
- v.desc.identifier, write)
- case u: UnresolvedCatalogRelation =>
- throw QueryCompilationErrors.writeIntoV1TableNotAllowedError(
- u.tableMeta.identifier, write)
- case r: DataSourceV2Relation => write.withNewTable(r)
- case other => throw new IllegalStateException(
- "[BUG] unexpected plan returned by `lookupRelation`: " + other)
- }.getOrElse(write)
+ lookupRelation(u).map(unwrapRelationPlan).map {
+ case v: View => throw QueryCompilationErrors.writeIntoViewNotAllowedError(
Review comment:
yes
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] AmplabJenkins removed a comment on pull request #34358: [SPARK-37087][SQL] Merge three relation resolution rules into one
Posted by GitBox <gi...@apache.org>.
AmplabJenkins removed a comment on pull request #34358:
URL: https://github.com/apache/spark/pull/34358#issuecomment-951663711
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins//job/SparkPullRequestBuilder-K8s/49086/
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] viirya commented on a change in pull request #34358: [SPARK-37087][SQL] Merge three relation resolution rules into one
Posted by GitBox <gi...@apache.org>.
viirya commented on a change in pull request #34358:
URL: https://github.com/apache/spark/pull/34358#discussion_r735352366
##########
File path: sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala
##########
@@ -1211,82 +1064,124 @@ class Analyzer(override val catalogManager: CatalogManager)
case table => table
}.getOrElse(u)
- case u @ UnresolvedView(identifier, cmd, _, relationTypeMismatchHint) =>
+ case u @ UnresolvedView(identifier, cmd, allowTemp, relationTypeMismatchHint) =>
lookupTableOrView(identifier).map {
+ case v: ResolvedView if v.isTemp && !allowTemp =>
+ val name = identifier.quoted
+ u.failAnalysis(s"$name is a temp view. '$cmd' expects a permanent view.")
case t: ResolvedTable =>
throw QueryCompilationErrors.expectViewNotTableError(
t, cmd, relationTypeMismatchHint, u)
- case view => view
+ case other => other
}.getOrElse(u)
- case u @ UnresolvedTableOrView(identifier, _, _) =>
- lookupTableOrView(identifier).getOrElse(u)
+ case u @ UnresolvedTableOrView(identifier, cmd, allowTempView) =>
+ lookupTableOrView(identifier).map {
+ case v: ResolvedView if v.isTemp && !allowTempView =>
+ throw QueryCompilationErrors.expectTableOrPermanentViewNotTempViewError(
+ identifier.quoted, cmd, u)
+ case other => other
+ }.getOrElse(u)
}
- private def lookupTableOrView(identifier: Seq[String]): Option[LogicalPlan] = {
- expandIdentifier(identifier) match {
- case SessionCatalogAndIdentifier(catalog, ident) =>
- CatalogV2Util.loadTable(catalog, ident).map {
- case v1Table: V1Table if v1Table.v1Table.tableType == CatalogTableType.VIEW =>
- ResolvedView(ident, isTemp = false)
- case table =>
- ResolvedTable.create(catalog.asTableCatalog, ident, table)
- }
+ private def lookupTempView(
+ identifier: Seq[String],
+ isStreaming: Boolean = false): Option[LogicalPlan] = {
+ // We are resolving a view and this name is not a temp view when that view was created. We
+ // return None earlier here.
+ if (isResolvingView && !isReferredTempViewName(identifier)) return None
+
+ val tmpView = identifier match {
+ case Seq(part1) => v1SessionCatalog.lookupTempView(part1)
+ case Seq(part1, part2) => v1SessionCatalog.lookupGlobalTempView(part1, part2)
case _ => None
}
+
+ if (isStreaming && tmpView.nonEmpty && !tmpView.get.isStreaming) {
+ throw QueryCompilationErrors.readNonStreamingTempViewError(identifier.quoted)
+ }
+ tmpView
}
- // Look up a relation from the session catalog with the following logic:
- // 1) If the resolved catalog is not session catalog, return None.
- // 2) If a relation is not found in the catalog, return None.
- // 3) If a v1 table is found, create a v1 relation. Otherwise, create a v2 relation.
- private def lookupRelation(
- identifier: Seq[String],
+ private def lookupTableOrView(identifier: Seq[String]): Option[LogicalPlan] = {
+ lookupTempView(identifier).map { _ =>
+ ResolvedView(identifier.asIdentifier, isTemp = true)
+ }.orElse {
+ expandIdentifier(identifier) match {
+ case CatalogAndIdentifier(catalog, ident) =>
+ CatalogV2Util.loadTable(catalog, ident).map {
+ case v1Table: V1Table if CatalogV2Util.isSessionCatalog(catalog) &&
+ v1Table.v1Table.tableType == CatalogTableType.VIEW =>
+ ResolvedView(ident, isTemp = false)
+ case table =>
+ ResolvedTable.create(catalog.asTableCatalog, ident, table)
+ }
+ case _ => None
+ }
+ }
+ }
+
+ private def createRelation(
+ catalog: CatalogPlugin,
+ ident: Identifier,
+ table: Option[Table],
options: CaseInsensitiveStringMap,
isStreaming: Boolean): Option[LogicalPlan] = {
- expandIdentifier(identifier) match {
- case SessionCatalogAndIdentifier(catalog, ident) =>
- lazy val loaded = CatalogV2Util.loadTable(catalog, ident).map {
- case v1Table: V1Table =>
- if (isStreaming) {
- if (v1Table.v1Table.tableType == CatalogTableType.VIEW) {
- throw QueryCompilationErrors.permanentViewNotSupportedByStreamingReadingAPIError(
- identifier.quoted)
- }
- SubqueryAlias(
- catalog.name +: ident.asMultipartIdentifier,
- UnresolvedCatalogRelation(v1Table.v1Table, options, isStreaming = true))
- } else {
- v1SessionCatalog.getRelation(v1Table.v1Table, options)
- }
- case table =>
- if (isStreaming) {
- val v1Fallback = table match {
- case withFallback: V2TableWithV1Fallback =>
- Some(UnresolvedCatalogRelation(withFallback.v1Table, isStreaming = true))
- case _ => None
- }
- SubqueryAlias(
- catalog.name +: ident.asMultipartIdentifier,
- StreamingRelationV2(None, table.name, table, options, table.schema.toAttributes,
- Some(catalog), Some(ident), v1Fallback))
- } else {
- SubqueryAlias(
- catalog.name +: ident.asMultipartIdentifier,
- DataSourceV2Relation.create(table, Some(catalog), Some(ident), options))
- }
+ table.map {
+ case v1Table: V1Table if CatalogV2Util.isSessionCatalog(catalog) =>
Review comment:
Is it possible `catalog` not a session catalog? Previously `lookupRelation` returns `None` for that. Now it is not handled?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] SparkQA commented on pull request #34358: [SPARK-37087][SQL] Merge three relation resolutions into one
Posted by GitBox <gi...@apache.org>.
SparkQA commented on pull request #34358:
URL: https://github.com/apache/spark/pull/34358#issuecomment-948792060
**[Test build #144510 has finished](https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder/144510/testReport)** for PR 34358 at commit [`80b4a9f`](https://github.com/apache/spark/commit/80b4a9f1c9dfb007527f34b40df692ff4fce8f72).
* This patch **fails Spark unit tests**.
* This patch merges cleanly.
* This patch adds no public classes.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] SparkQA removed a comment on pull request #34358: [SPARK-37087][SQL] Merge three relation resolutions into one
Posted by GitBox <gi...@apache.org>.
SparkQA removed a comment on pull request #34358:
URL: https://github.com/apache/spark/pull/34358#issuecomment-948698897
**[Test build #144510 has started](https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder/144510/testReport)** for PR 34358 at commit [`80b4a9f`](https://github.com/apache/spark/commit/80b4a9f1c9dfb007527f34b40df692ff4fce8f72).
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] cloud-fan commented on a change in pull request #34358: [SPARK-37087][SQL] Merge three relation resolution rules into one
Posted by GitBox <gi...@apache.org>.
cloud-fan commented on a change in pull request #34358:
URL: https://github.com/apache/spark/pull/34358#discussion_r735405048
##########
File path: sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala
##########
@@ -1211,82 +1064,124 @@ class Analyzer(override val catalogManager: CatalogManager)
case table => table
}.getOrElse(u)
- case u @ UnresolvedView(identifier, cmd, _, relationTypeMismatchHint) =>
+ case u @ UnresolvedView(identifier, cmd, allowTemp, relationTypeMismatchHint) =>
lookupTableOrView(identifier).map {
+ case v: ResolvedView if v.isTemp && !allowTemp =>
+ val name = identifier.quoted
+ u.failAnalysis(s"$name is a temp view. '$cmd' expects a permanent view.")
case t: ResolvedTable =>
throw QueryCompilationErrors.expectViewNotTableError(
t, cmd, relationTypeMismatchHint, u)
- case view => view
+ case other => other
}.getOrElse(u)
- case u @ UnresolvedTableOrView(identifier, _, _) =>
- lookupTableOrView(identifier).getOrElse(u)
+ case u @ UnresolvedTableOrView(identifier, cmd, allowTempView) =>
+ lookupTableOrView(identifier).map {
+ case v: ResolvedView if v.isTemp && !allowTempView =>
+ throw QueryCompilationErrors.expectTableOrPermanentViewNotTempViewError(
+ identifier.quoted, cmd, u)
+ case other => other
+ }.getOrElse(u)
}
- private def lookupTableOrView(identifier: Seq[String]): Option[LogicalPlan] = {
- expandIdentifier(identifier) match {
- case SessionCatalogAndIdentifier(catalog, ident) =>
- CatalogV2Util.loadTable(catalog, ident).map {
- case v1Table: V1Table if v1Table.v1Table.tableType == CatalogTableType.VIEW =>
- ResolvedView(ident, isTemp = false)
- case table =>
- ResolvedTable.create(catalog.asTableCatalog, ident, table)
- }
+ private def lookupTempView(
+ identifier: Seq[String],
+ isStreaming: Boolean = false): Option[LogicalPlan] = {
+ // We are resolving a view and this name is not a temp view when that view was created. We
+ // return None earlier here.
+ if (isResolvingView && !isReferredTempViewName(identifier)) return None
+
+ val tmpView = identifier match {
+ case Seq(part1) => v1SessionCatalog.lookupTempView(part1)
+ case Seq(part1, part2) => v1SessionCatalog.lookupGlobalTempView(part1, part2)
case _ => None
}
+
+ if (isStreaming && tmpView.nonEmpty && !tmpView.get.isStreaming) {
+ throw QueryCompilationErrors.readNonStreamingTempViewError(identifier.quoted)
+ }
+ tmpView
}
- // Look up a relation from the session catalog with the following logic:
- // 1) If the resolved catalog is not session catalog, return None.
- // 2) If a relation is not found in the catalog, return None.
- // 3) If a v1 table is found, create a v1 relation. Otherwise, create a v2 relation.
- private def lookupRelation(
- identifier: Seq[String],
+ private def lookupTableOrView(identifier: Seq[String]): Option[LogicalPlan] = {
Review comment:
It was called `lookupTableOrView` before too. BTW only temp view is resolved first, not permanent views.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org