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/03/03 16:05:29 UTC
[GitHub] [spark] cloud-fan opened a new pull request #31728: [SPARK-34609][SQL] Unify resolveExpressionBottomUp and resolveExpressionTopDown
cloud-fan opened a new pull request #31728:
URL: https://github.com/apache/spark/pull/31728
<!--
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'.
-->
### 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.
-->
It's a bit confusing to see `resolveExpressionBottomUp` and `resolveExpressionTopDown`, which provide similar functionalities but with different tree traverse order. It turns out that the real difference between these 2 methods is: which attributes should the columns be resolved to? `resolveExpressionTopDown` resolves columns using output attributes of the plan children, `resolveExpressionBottomUp` resolves columns using output attributes of the plan itself.
This PR unifies `resolveExpressionBottomUp` and `resolveExpressionTopDown` and put the common logic in a new method, and let `resolveExpressionBottomUp` and `resolveExpressionTopDown` just call the new method. This PR also renames `resolveExpressionBottomUp` and `resolveExpressionTopDown` to make the difference clear.
### 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 cleanup
### 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.
-->
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.
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 #31728: [SPARK-34609][SQL] Unify resolveExpressionBottomUp and resolveExpressionTopDown
Posted by GitBox <gi...@apache.org>.
SparkQA commented on pull request #31728:
URL: https://github.com/apache/spark/pull/31728#issuecomment-790464769
**[Test build #135745 has started](https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder/135745/testReport)** for PR 31728 at commit [`8332a43`](https://github.com/apache/spark/commit/8332a43c2d0e254a15a78cd4f9126da253c61457).
----------------------------------------------------------------
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.
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 #31728: [SPARK-34609][SQL] Unify resolveExpressionBottomUp and resolveExpressionTopDown
Posted by GitBox <gi...@apache.org>.
AmplabJenkins commented on pull request #31728:
URL: https://github.com/apache/spark/pull/31728#issuecomment-790676294
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins//job/SparkPullRequestBuilder/135749/
----------------------------------------------------------------
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.
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 #31728: [SPARK-34609][SQL] Unify resolveExpressionBottomUp and resolveExpressionTopDown
Posted by GitBox <gi...@apache.org>.
SparkQA commented on pull request #31728:
URL: https://github.com/apache/spark/pull/31728#issuecomment-789885950
Kubernetes integration test status failure
URL: https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder-K8s/40299/
----------------------------------------------------------------
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.
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 #31728: [SPARK-34609][SQL] Unify resolveExpressionBottomUp and resolveExpressionTopDown
Posted by GitBox <gi...@apache.org>.
SparkQA commented on pull request #31728:
URL: https://github.com/apache/spark/pull/31728#issuecomment-789853005
**[Test build #135717 has started](https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder/135717/testReport)** for PR 31728 at commit [`fef599b`](https://github.com/apache/spark/commit/fef599b437616d4912979371048ca7d01164ebef).
----------------------------------------------------------------
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.
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 #31728: [SPARK-34609][SQL] Unify resolveExpressionBottomUp and resolveExpressionTopDown
Posted by GitBox <gi...@apache.org>.
cloud-fan commented on a change in pull request #31728:
URL: https://github.com/apache/spark/pull/31728#discussion_r587216740
##########
File path: sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala
##########
@@ -1914,49 +1857,116 @@ class Analyzer(override val catalogManager: CatalogManager)
}
/**
- * Resolves the attribute, column value and extract value expressions(s) by traversing the
- * input expression in bottom-up manner. In order to resolve the nested complex type fields
- * correctly, this function makes use of `throws` parameter to control when to raise an
- * AnalysisException.
+ * Resolves `UnresolvedAttribute`, `GetColumnByOrdinal` and extract value expressions(s) by
+ * traversing the input expression in top-down manner. It must be top-down because we need to
+ * skip over unbound lambda function expression. The lambda expressions are resolved in a
+ * different place [[ResolveLambdaVariables]].
*
* Example :
- * SELECT a.b FROM t ORDER BY b[0].d
+ * SELECT transform(array(1, 2, 3), (x, i) -> x + i)"
*
- * In the above example, in b needs to be resolved before d can be resolved. Given we are
- * doing a bottom up traversal, it will first attempt to resolve d and fail as b has not
- * been resolved yet. If `throws` is false, this function will handle the exception by
- * returning the original attribute. In this case `d` will be resolved in subsequent passes
- * after `b` is resolved.
+ * In the case above, x and i are resolved as lambda variables in [[ResolveLambdaVariables]].
*/
- protected[sql] def resolveExpressionBottomUp(
+ private def resolveExpression(
expr: Expression,
- plan: LogicalPlan,
- throws: Boolean = false): Expression = {
- if (expr.resolved) return expr
+ resolveColumnByName: UnresolvedAttribute => Option[Expression],
+ resolveColumnByOrdinal: Int => Attribute,
+ trimAlias: Boolean,
+ throws: Boolean): Expression = {
// Resolve expression in one round.
- // If throws == false or the desired attribute doesn't exist
- // (like try to resolve `a.b` but `a` doesn't exist), fail and return the origin one.
- // Else, throw exception.
- try {
- expr transformUp {
- case GetColumnByOrdinal(ordinal, _) => plan.output(ordinal)
- case u @ UnresolvedAttribute(nameParts) =>
- val result =
- withPosition(u) {
- plan.resolve(nameParts, resolver)
- .orElse(resolveLiteralFunction(nameParts, u, plan))
- .getOrElse(u)
- }
+ def innerResolve(e: Expression, isTopLevel: Boolean): Expression = {
+ if (e.resolved) return e
+ e match {
+ case f: LambdaFunction if !f.bound => f
+ case GetColumnByOrdinal(ordinal, _) => resolveColumnByOrdinal(ordinal)
+ case u: UnresolvedAttribute =>
+ val resolved = withPosition(u) {
+ resolveColumnByName(u).getOrElse(u)
+ }
+ val result = resolved match {
+ // When trimAlias = true, we will trim unnecessary alias of `GetStructField` and
+ // we won't trim the alias of top-level `GetStructField`. Since we will call
+ // CleanupAliases later in Analyzer, trim non top-level unnecessary alias of
+ // `GetStructField` here is safe.
+ case Alias(s: GetStructField, _) if trimAlias && !isTopLevel => s
+ case others => others
+ }
logDebug(s"Resolving $u to $result")
result
case UnresolvedExtractValue(child, fieldName) if child.resolved =>
ExtractValue(child, fieldName, resolver)
+ case _ => e.mapChildren(innerResolve(_, isTopLevel = false))
}
+ }
+
+ try {
+ innerResolve(expr, isTopLevel = true)
} catch {
- case a: AnalysisException if !throws => expr
+ case _: AnalysisException if !throws => expr
}
}
+ /**
+ * Resolves `UnresolvedAttribute`, `GetColumnByOrdinal` and extract value expressions(s) by the
+ * input plan's output attributes. In order to resolve the nested complex type fields correctly,
+ * this function makes use of `throws` parameter to control when to raise an AnalysisException.
+ *
+ * Example :
+ * SELECT a.b FROM t ORDER BY b[0].d
+ *
+ * In the above example, in b needs to be resolved before d can be resolved. Given we are
+ * doing a bottom up traversal, it will first attempt to resolve d and fail as b has not
+ * been resolved yet. If `throws` is false, this function will handle the exception by
+ * returning the original attribute. In this case `d` will be resolved in subsequent passes
+ * after `b` is resolved.
+ */
+ def resolveExpressionByPlanOutput(
+ expr: Expression,
+ plan: LogicalPlan,
+ throws: Boolean = false): Expression = {
+ resolveExpression(
+ expr,
+ resolveColumnByName = u => {
+ plan.resolve(u.nameParts, resolver).orElse(resolveLiteralFunction(u.nameParts, u, plan))
+ },
+ resolveColumnByOrdinal = ordinal => {
+ assert(ordinal >= 0 && ordinal < plan.output.length)
+ plan.output(ordinal)
+ },
+ trimAlias = false,
+ throws = throws)
+ }
+
+ /**
+ * Resolves `UnresolvedAttribute`, `GetColumnByOrdinal` and extract value expressions(s) by the
+ * input plan's children output attributes.
+ *
+ * @param e The expression need to be resolved.
+ * @param q The LogicalPlan whose children are used to resolve expression's attribute.
+ * @param trimAlias When true, trim unnecessary alias of GetStructField`. Note that,
+ * we cannot trim the alias of top-level `GetStructField`, as we should
+ * resolve `UnresolvedAttribute` to a named expression. The caller side
+ * can trim the alias of top-level `GetStructField` if it's safe to do so.
+ * @return resolved Expression.
+ */
+ def resolveExpressionByPlanChildren(
Review comment:
`resolveExpressionsBottomUp` was `protected[sql]`, so I make this public in case we need it in other places (in Spark extensions)
----------------------------------------------------------------
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.
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 #31728: [SPARK-34609][SQL] Unify resolveExpressionBottomUp and resolveExpressionTopDown
Posted by GitBox <gi...@apache.org>.
AmplabJenkins commented on pull request #31728:
URL: https://github.com/apache/spark/pull/31728#issuecomment-790525334
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins//job/SparkPullRequestBuilder-K8s/40327/
----------------------------------------------------------------
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.
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 #31728: [SPARK-34609][SQL] Unify resolveExpressionBottomUp and resolveExpressionTopDown
Posted by GitBox <gi...@apache.org>.
SparkQA commented on pull request #31728:
URL: https://github.com/apache/spark/pull/31728#issuecomment-789931207
**[Test build #135717 has finished](https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder/135717/testReport)** for PR 31728 at commit [`fef599b`](https://github.com/apache/spark/commit/fef599b437616d4912979371048ca7d01164ebef).
* 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.
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 #31728: [SPARK-34609][SQL] Unify resolveExpressionBottomUp and resolveExpressionTopDown
Posted by GitBox <gi...@apache.org>.
cloud-fan commented on a change in pull request #31728:
URL: https://github.com/apache/spark/pull/31728#discussion_r587293852
##########
File path: sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala
##########
@@ -1914,49 +1857,126 @@ class Analyzer(override val catalogManager: CatalogManager)
}
/**
- * Resolves the attribute, column value and extract value expressions(s) by traversing the
- * input expression in bottom-up manner. In order to resolve the nested complex type fields
- * correctly, this function makes use of `throws` parameter to control when to raise an
- * AnalysisException.
+ * Resolves `UnresolvedAttribute`, `GetColumnByOrdinal` and extract value expressions(s) by
+ * traversing the input expression in top-down manner. It must be top-down because we need to
+ * skip over unbound lambda function expression. The lambda expressions are resolved in a
+ * different place [[ResolveLambdaVariables]].
*
* Example :
- * SELECT a.b FROM t ORDER BY b[0].d
+ * SELECT transform(array(1, 2, 3), (x, i) -> x + i)"
*
- * In the above example, in b needs to be resolved before d can be resolved. Given we are
- * doing a bottom up traversal, it will first attempt to resolve d and fail as b has not
- * been resolved yet. If `throws` is false, this function will handle the exception by
- * returning the original attribute. In this case `d` will be resolved in subsequent passes
- * after `b` is resolved.
+ * In the case above, x and i are resolved as lambda variables in [[ResolveLambdaVariables]].
*/
- protected[sql] def resolveExpressionBottomUp(
+ private def resolveExpression(
expr: Expression,
plan: LogicalPlan,
- throws: Boolean = false): Expression = {
- if (expr.resolved) return expr
+ resolveColumnByName: Seq[String] => Option[Expression],
+ resolveColumnByOrdinal: Int => Attribute,
+ trimAlias: Boolean,
+ throws: Boolean): Expression = {
// Resolve expression in one round.
- // If throws == false or the desired attribute doesn't exist
- // (like try to resolve `a.b` but `a` doesn't exist), fail and return the origin one.
- // Else, throw exception.
- try {
- expr transformUp {
- case GetColumnByOrdinal(ordinal, _) => plan.output(ordinal)
+ def innerResolve(e: Expression, isTopLevel: Boolean): Expression = {
+ if (e.resolved) return e
+ e match {
+ case f: LambdaFunction if !f.bound => f
+ case GetColumnByOrdinal(ordinal, _) => resolveColumnByOrdinal(ordinal)
case u @ UnresolvedAttribute(nameParts) =>
- val result =
- withPosition(u) {
- plan.resolve(nameParts, resolver)
- .orElse(resolveLiteralFunction(nameParts, u, plan))
- .getOrElse(u)
- }
+ val resolved = withPosition(u) {
+ resolveColumnByName(nameParts)
+ .orElse(resolveLiteralFunction(nameParts, u, plan))
+ .getOrElse(u)
+ }
+ val result = resolved match {
+ // When trimAlias = true, we will trim unnecessary alias of `GetStructField` and
+ // we won't trim the alias of top-level `GetStructField`. Since we will call
+ // CleanupAliases later in Analyzer, trim non top-level unnecessary alias of
+ // `GetStructField` here is safe.
+ case Alias(s: GetStructField, _) if trimAlias && !isTopLevel => s
+ case others => others
+ }
logDebug(s"Resolving $u to $result")
result
- case UnresolvedExtractValue(child, fieldName) if child.resolved =>
- ExtractValue(child, fieldName, resolver)
+ case u @ UnresolvedExtractValue(child, fieldName) =>
+ val newChild = innerResolve(child, isTopLevel = false)
+ if (newChild.resolved) {
+ ExtractValue(newChild, fieldName, resolver)
+ } else {
+ u.copy(child = newChild)
+ }
+ case _ => e.mapChildren(innerResolve(_, isTopLevel = false))
}
+ }
+
+ try {
+ innerResolve(expr, isTopLevel = true)
} catch {
- case a: AnalysisException if !throws => expr
+ case _: AnalysisException if !throws => expr
}
}
+ /**
+ * Resolves `UnresolvedAttribute`, `GetColumnByOrdinal` and extract value expressions(s) by the
+ * input plan's output attributes. In order to resolve the nested complex type fields correctly,
+ * this function makes use of `throws` parameter to control when to raise an AnalysisException.
+ *
+ * Example :
+ * SELECT a.b FROM t ORDER BY b[0].d
+ *
+ * In the above example, in b needs to be resolved before d can be resolved. Given we are
+ * doing a bottom up traversal, it will first attempt to resolve d and fail as b has not
+ * been resolved yet. If `throws` is false, this function will handle the exception by
+ * returning the original attribute. In this case `d` will be resolved in subsequent passes
+ * after `b` is resolved.
+ */
+ def resolveExpressionByPlanOutput(
+ expr: Expression,
+ plan: LogicalPlan,
+ throws: Boolean = false): Expression = {
+ resolveExpression(
+ expr,
+ plan,
+ resolveColumnByName = nameParts => {
+ plan.resolve(nameParts, resolver)
+ },
+ resolveColumnByOrdinal = ordinal => {
+ assert(ordinal >= 0 && ordinal < plan.output.length)
+ plan.output(ordinal)
+ },
+ trimAlias = false,
+ throws = throws)
+ }
+
+ /**
+ * Resolves `UnresolvedAttribute`, `GetColumnByOrdinal` and extract value expressions(s) by the
+ * input plan's children output attributes.
+ *
+ * @param e The expression need to be resolved.
+ * @param q The LogicalPlan whose children are used to resolve expression's attribute.
+ * @param trimAlias When true, trim unnecessary alias of GetStructField`. Note that,
+ * we cannot trim the alias of top-level `GetStructField`, as we should
+ * resolve `UnresolvedAttribute` to a named expression. The caller side
+ * can trim the alias of top-level `GetStructField` if it's safe to do so.
+ * @return resolved Expression.
+ */
+ def resolveExpressionByPlanChildren(
+ e: Expression,
+ q: LogicalPlan,
+ trimAlias: Boolean = false): Expression = {
+ resolveExpression(
+ e,
+ q,
+ resolveColumnByName = nameParts => {
+ q.resolveChildren(nameParts, resolver)
+ },
+ resolveColumnByOrdinal = ordinal => {
+ val candidates = q.children.flatMap(_.output)
+ assert(ordinal >= 0 && ordinal < candidates.length)
+ candidates.apply(ordinal)
+ },
Review comment:
No it doesn't, but I can't find a reason why we shouldn't have it. This doesn't hurt anyway.
The only difference should be where to resolve the columns: plan output vs plan children output. So that it's easy for developers to decide which one to call.
----------------------------------------------------------------
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.
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 #31728: [SPARK-34609][SQL] Unify resolveExpressionBottomUp and resolveExpressionTopDown
Posted by GitBox <gi...@apache.org>.
cloud-fan commented on a change in pull request #31728:
URL: https://github.com/apache/spark/pull/31728#discussion_r586546899
##########
File path: sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala
##########
@@ -1914,49 +1857,116 @@ class Analyzer(override val catalogManager: CatalogManager)
}
/**
- * Resolves the attribute, column value and extract value expressions(s) by traversing the
- * input expression in bottom-up manner. In order to resolve the nested complex type fields
- * correctly, this function makes use of `throws` parameter to control when to raise an
- * AnalysisException.
+ * Resolves `UnresolvedAttribute`, `GetColumnByOrdinal` and extract value expressions(s) by
+ * traversing the input expression in top-down manner. It must be top-down because we need to
+ * skip over unbound lambda function expression. The lambda expressions are resolved in a
+ * different place [[ResolveLambdaVariables]].
*
* Example :
- * SELECT a.b FROM t ORDER BY b[0].d
+ * SELECT transform(array(1, 2, 3), (x, i) -> x + i)"
*
- * In the above example, in b needs to be resolved before d can be resolved. Given we are
- * doing a bottom up traversal, it will first attempt to resolve d and fail as b has not
- * been resolved yet. If `throws` is false, this function will handle the exception by
- * returning the original attribute. In this case `d` will be resolved in subsequent passes
- * after `b` is resolved.
+ * In the case above, x and i are resolved as lambda variables in [[ResolveLambdaVariables]].
*/
- protected[sql] def resolveExpressionBottomUp(
+ private def resolveExpression(
expr: Expression,
- plan: LogicalPlan,
- throws: Boolean = false): Expression = {
- if (expr.resolved) return expr
+ resolveColumnByName: UnresolvedAttribute => Option[Expression],
+ resolveColumnByOrdinal: Int => Attribute,
+ trimAlias: Boolean,
+ throws: Boolean): Expression = {
// Resolve expression in one round.
- // If throws == false or the desired attribute doesn't exist
- // (like try to resolve `a.b` but `a` doesn't exist), fail and return the origin one.
- // Else, throw exception.
- try {
- expr transformUp {
- case GetColumnByOrdinal(ordinal, _) => plan.output(ordinal)
- case u @ UnresolvedAttribute(nameParts) =>
- val result =
- withPosition(u) {
- plan.resolve(nameParts, resolver)
- .orElse(resolveLiteralFunction(nameParts, u, plan))
- .getOrElse(u)
- }
+ def innerResolve(e: Expression, isTopLevel: Boolean): Expression = {
+ if (e.resolved) return e
+ e match {
+ case f: LambdaFunction if !f.bound => f
+ case GetColumnByOrdinal(ordinal, _) => resolveColumnByOrdinal(ordinal)
+ case u: UnresolvedAttribute =>
+ val resolved = withPosition(u) {
+ resolveColumnByName(u).getOrElse(u)
+ }
+ val result = resolved match {
+ // When trimAlias = true, we will trim unnecessary alias of `GetStructField` and
+ // we won't trim the alias of top-level `GetStructField`. Since we will call
+ // CleanupAliases later in Analyzer, trim non top-level unnecessary alias of
+ // `GetStructField` here is safe.
+ case Alias(s: GetStructField, _) if trimAlias && !isTopLevel => s
+ case others => others
+ }
logDebug(s"Resolving $u to $result")
result
case UnresolvedExtractValue(child, fieldName) if child.resolved =>
ExtractValue(child, fieldName, resolver)
+ case _ => e.mapChildren(innerResolve(_, isTopLevel = false))
}
+ }
+
+ try {
+ innerResolve(expr, isTopLevel = true)
} catch {
- case a: AnalysisException if !throws => expr
+ case _: AnalysisException if !throws => expr
}
}
+ /**
+ * Resolves `UnresolvedAttribute`, `GetColumnByOrdinal` and extract value expressions(s) by the
+ * input plan's output attributes. In order to resolve the nested complex type fields correctly,
+ * this function makes use of `throws` parameter to control when to raise an AnalysisException.
+ *
+ * Example :
+ * SELECT a.b FROM t ORDER BY b[0].d
+ *
+ * In the above example, in b needs to be resolved before d can be resolved. Given we are
+ * doing a bottom up traversal, it will first attempt to resolve d and fail as b has not
+ * been resolved yet. If `throws` is false, this function will handle the exception by
+ * returning the original attribute. In this case `d` will be resolved in subsequent passes
+ * after `b` is resolved.
+ */
+ def resolveExpressionByPlanOutput(
+ expr: Expression,
+ plan: LogicalPlan,
+ throws: Boolean = false): Expression = {
+ resolveExpression(
+ expr,
+ resolveColumnByName = u => {
+ plan.resolve(u.nameParts, resolver).orElse(resolveLiteralFunction(u.nameParts, u, plan))
+ },
+ resolveColumnByOrdinal = ordinal => {
+ assert(ordinal >= 0 && ordinal < plan.output.length)
+ plan.output(ordinal)
+ },
+ trimAlias = false,
+ throws = throws)
+ }
+
+ /**
+ * Resolves `UnresolvedAttribute`, `GetColumnByOrdinal` and extract value expressions(s) by the
+ * input plan's children output attributes.
+ *
+ * @param e The expression need to be resolved.
+ * @param q The LogicalPlan whose children are used to resolve expression's attribute.
+ * @param trimAlias When true, trim unnecessary alias of GetStructField`. Note that,
+ * we cannot trim the alias of top-level `GetStructField`, as we should
+ * resolve `UnresolvedAttribute` to a named expression. The caller side
+ * can trim the alias of top-level `GetStructField` if it's safe to do so.
+ * @return resolved Expression.
+ */
+ def resolveExpressionByPlanChildren(
Review comment:
The doc is mostly from the old `resolveExpressionTopDown`
----------------------------------------------------------------
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.
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 #31728: [SPARK-34609][SQL] Unify resolveExpressionBottomUp and resolveExpressionTopDown
Posted by GitBox <gi...@apache.org>.
viirya commented on a change in pull request #31728:
URL: https://github.com/apache/spark/pull/31728#discussion_r587253516
##########
File path: sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala
##########
@@ -1914,49 +1857,126 @@ class Analyzer(override val catalogManager: CatalogManager)
}
/**
- * Resolves the attribute, column value and extract value expressions(s) by traversing the
- * input expression in bottom-up manner. In order to resolve the nested complex type fields
- * correctly, this function makes use of `throws` parameter to control when to raise an
- * AnalysisException.
+ * Resolves `UnresolvedAttribute`, `GetColumnByOrdinal` and extract value expressions(s) by
+ * traversing the input expression in top-down manner. It must be top-down because we need to
+ * skip over unbound lambda function expression. The lambda expressions are resolved in a
+ * different place [[ResolveLambdaVariables]].
*
* Example :
- * SELECT a.b FROM t ORDER BY b[0].d
+ * SELECT transform(array(1, 2, 3), (x, i) -> x + i)"
*
- * In the above example, in b needs to be resolved before d can be resolved. Given we are
- * doing a bottom up traversal, it will first attempt to resolve d and fail as b has not
- * been resolved yet. If `throws` is false, this function will handle the exception by
- * returning the original attribute. In this case `d` will be resolved in subsequent passes
- * after `b` is resolved.
+ * In the case above, x and i are resolved as lambda variables in [[ResolveLambdaVariables]].
*/
- protected[sql] def resolveExpressionBottomUp(
+ private def resolveExpression(
expr: Expression,
plan: LogicalPlan,
- throws: Boolean = false): Expression = {
- if (expr.resolved) return expr
+ resolveColumnByName: Seq[String] => Option[Expression],
+ resolveColumnByOrdinal: Int => Attribute,
+ trimAlias: Boolean,
+ throws: Boolean): Expression = {
// Resolve expression in one round.
- // If throws == false or the desired attribute doesn't exist
- // (like try to resolve `a.b` but `a` doesn't exist), fail and return the origin one.
- // Else, throw exception.
- try {
- expr transformUp {
- case GetColumnByOrdinal(ordinal, _) => plan.output(ordinal)
+ def innerResolve(e: Expression, isTopLevel: Boolean): Expression = {
+ if (e.resolved) return e
+ e match {
+ case f: LambdaFunction if !f.bound => f
+ case GetColumnByOrdinal(ordinal, _) => resolveColumnByOrdinal(ordinal)
case u @ UnresolvedAttribute(nameParts) =>
- val result =
- withPosition(u) {
- plan.resolve(nameParts, resolver)
- .orElse(resolveLiteralFunction(nameParts, u, plan))
- .getOrElse(u)
- }
+ val resolved = withPosition(u) {
+ resolveColumnByName(nameParts)
+ .orElse(resolveLiteralFunction(nameParts, u, plan))
+ .getOrElse(u)
+ }
+ val result = resolved match {
+ // When trimAlias = true, we will trim unnecessary alias of `GetStructField` and
+ // we won't trim the alias of top-level `GetStructField`. Since we will call
+ // CleanupAliases later in Analyzer, trim non top-level unnecessary alias of
+ // `GetStructField` here is safe.
+ case Alias(s: GetStructField, _) if trimAlias && !isTopLevel => s
+ case others => others
+ }
logDebug(s"Resolving $u to $result")
result
- case UnresolvedExtractValue(child, fieldName) if child.resolved =>
- ExtractValue(child, fieldName, resolver)
+ case u @ UnresolvedExtractValue(child, fieldName) =>
+ val newChild = innerResolve(child, isTopLevel = false)
+ if (newChild.resolved) {
+ ExtractValue(newChild, fieldName, resolver)
+ } else {
+ u.copy(child = newChild)
+ }
+ case _ => e.mapChildren(innerResolve(_, isTopLevel = false))
}
+ }
+
+ try {
+ innerResolve(expr, isTopLevel = true)
} catch {
- case a: AnalysisException if !throws => expr
+ case _: AnalysisException if !throws => expr
}
}
+ /**
+ * Resolves `UnresolvedAttribute`, `GetColumnByOrdinal` and extract value expressions(s) by the
+ * input plan's output attributes. In order to resolve the nested complex type fields correctly,
+ * this function makes use of `throws` parameter to control when to raise an AnalysisException.
+ *
+ * Example :
+ * SELECT a.b FROM t ORDER BY b[0].d
+ *
+ * In the above example, in b needs to be resolved before d can be resolved. Given we are
Review comment:
`in b` -> `b`?
----------------------------------------------------------------
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.
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 #31728: [SPARK-34609][SQL] Unify resolveExpressionBottomUp and resolveExpressionTopDown
Posted by GitBox <gi...@apache.org>.
SparkQA removed a comment on pull request #31728:
URL: https://github.com/apache/spark/pull/31728#issuecomment-790464769
**[Test build #135745 has started](https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder/135745/testReport)** for PR 31728 at commit [`8332a43`](https://github.com/apache/spark/commit/8332a43c2d0e254a15a78cd4f9126da253c61457).
----------------------------------------------------------------
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.
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 #31728: [SPARK-34609][SQL] Unify resolveExpressionBottomUp and resolveExpressionTopDown
Posted by GitBox <gi...@apache.org>.
viirya commented on a change in pull request #31728:
URL: https://github.com/apache/spark/pull/31728#discussion_r587718257
##########
File path: sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala
##########
@@ -1914,49 +1857,126 @@ class Analyzer(override val catalogManager: CatalogManager)
}
/**
- * Resolves the attribute, column value and extract value expressions(s) by traversing the
- * input expression in bottom-up manner. In order to resolve the nested complex type fields
- * correctly, this function makes use of `throws` parameter to control when to raise an
- * AnalysisException.
+ * Resolves `UnresolvedAttribute`, `GetColumnByOrdinal` and extract value expressions(s) by
+ * traversing the input expression in top-down manner. It must be top-down because we need to
+ * skip over unbound lambda function expression. The lambda expressions are resolved in a
+ * different place [[ResolveLambdaVariables]].
*
* Example :
- * SELECT a.b FROM t ORDER BY b[0].d
+ * SELECT transform(array(1, 2, 3), (x, i) -> x + i)"
*
- * In the above example, in b needs to be resolved before d can be resolved. Given we are
- * doing a bottom up traversal, it will first attempt to resolve d and fail as b has not
- * been resolved yet. If `throws` is false, this function will handle the exception by
- * returning the original attribute. In this case `d` will be resolved in subsequent passes
- * after `b` is resolved.
+ * In the case above, x and i are resolved as lambda variables in [[ResolveLambdaVariables]].
*/
- protected[sql] def resolveExpressionBottomUp(
+ private def resolveExpression(
expr: Expression,
plan: LogicalPlan,
- throws: Boolean = false): Expression = {
- if (expr.resolved) return expr
+ resolveColumnByName: Seq[String] => Option[Expression],
+ resolveColumnByOrdinal: Int => Attribute,
+ trimAlias: Boolean,
+ throws: Boolean): Expression = {
// Resolve expression in one round.
- // If throws == false or the desired attribute doesn't exist
- // (like try to resolve `a.b` but `a` doesn't exist), fail and return the origin one.
- // Else, throw exception.
- try {
- expr transformUp {
- case GetColumnByOrdinal(ordinal, _) => plan.output(ordinal)
+ def innerResolve(e: Expression, isTopLevel: Boolean): Expression = {
+ if (e.resolved) return e
+ e match {
+ case f: LambdaFunction if !f.bound => f
+ case GetColumnByOrdinal(ordinal, _) => resolveColumnByOrdinal(ordinal)
case u @ UnresolvedAttribute(nameParts) =>
- val result =
- withPosition(u) {
- plan.resolve(nameParts, resolver)
- .orElse(resolveLiteralFunction(nameParts, u, plan))
- .getOrElse(u)
- }
+ val resolved = withPosition(u) {
+ resolveColumnByName(nameParts)
+ .orElse(resolveLiteralFunction(nameParts, u, plan))
+ .getOrElse(u)
+ }
+ val result = resolved match {
+ // When trimAlias = true, we will trim unnecessary alias of `GetStructField` and
+ // we won't trim the alias of top-level `GetStructField`. Since we will call
+ // CleanupAliases later in Analyzer, trim non top-level unnecessary alias of
+ // `GetStructField` here is safe.
+ case Alias(s: GetStructField, _) if trimAlias && !isTopLevel => s
+ case others => others
+ }
logDebug(s"Resolving $u to $result")
result
- case UnresolvedExtractValue(child, fieldName) if child.resolved =>
- ExtractValue(child, fieldName, resolver)
+ case u @ UnresolvedExtractValue(child, fieldName) =>
+ val newChild = innerResolve(child, isTopLevel = false)
+ if (newChild.resolved) {
+ ExtractValue(newChild, fieldName, resolver)
+ } else {
+ u.copy(child = newChild)
+ }
+ case _ => e.mapChildren(innerResolve(_, isTopLevel = false))
}
+ }
+
+ try {
+ innerResolve(expr, isTopLevel = true)
} catch {
- case a: AnalysisException if !throws => expr
+ case _: AnalysisException if !throws => expr
}
}
+ /**
+ * Resolves `UnresolvedAttribute`, `GetColumnByOrdinal` and extract value expressions(s) by the
+ * input plan's output attributes. In order to resolve the nested complex type fields correctly,
+ * this function makes use of `throws` parameter to control when to raise an AnalysisException.
+ *
+ * Example :
+ * SELECT a.b FROM t ORDER BY b[0].d
+ *
+ * In the above example, in b needs to be resolved before d can be resolved. Given we are
+ * doing a bottom up traversal, it will first attempt to resolve d and fail as b has not
+ * been resolved yet. If `throws` is false, this function will handle the exception by
+ * returning the original attribute. In this case `d` will be resolved in subsequent passes
+ * after `b` is resolved.
+ */
+ def resolveExpressionByPlanOutput(
+ expr: Expression,
+ plan: LogicalPlan,
+ throws: Boolean = false): Expression = {
+ resolveExpression(
+ expr,
+ plan,
+ resolveColumnByName = nameParts => {
+ plan.resolve(nameParts, resolver)
+ },
+ resolveColumnByOrdinal = ordinal => {
+ assert(ordinal >= 0 && ordinal < plan.output.length)
+ plan.output(ordinal)
+ },
+ trimAlias = false,
+ throws = throws)
+ }
+
+ /**
+ * Resolves `UnresolvedAttribute`, `GetColumnByOrdinal` and extract value expressions(s) by the
+ * input plan's children output attributes.
+ *
+ * @param e The expression need to be resolved.
+ * @param q The LogicalPlan whose children are used to resolve expression's attribute.
+ * @param trimAlias When true, trim unnecessary alias of GetStructField`. Note that,
+ * we cannot trim the alias of top-level `GetStructField`, as we should
+ * resolve `UnresolvedAttribute` to a named expression. The caller side
+ * can trim the alias of top-level `GetStructField` if it's safe to do so.
+ * @return resolved Expression.
+ */
+ def resolveExpressionByPlanChildren(
+ e: Expression,
+ q: LogicalPlan,
+ trimAlias: Boolean = false): Expression = {
+ resolveExpression(
+ e,
+ q,
+ resolveColumnByName = nameParts => {
+ q.resolveChildren(nameParts, resolver)
+ },
+ resolveColumnByOrdinal = ordinal => {
+ val candidates = q.children.flatMap(_.output)
+ assert(ordinal >= 0 && ordinal < candidates.length)
+ candidates.apply(ordinal)
+ },
Review comment:
Because here looks like we flatten all children outputs and let `GetColumnByOrdinal` resolve to ordinal in the flattened outputs. It doesn't like any other `GetColumnByOrdinal` usage so I have a question here. It works if the expr/query plan of `GetColumnByOrdinal` considers the ordinal correctly.
----------------------------------------------------------------
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.
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 #31728: [SPARK-34609][SQL] Unify resolveExpressionBottomUp and resolveExpressionTopDown
Posted by GitBox <gi...@apache.org>.
SparkQA commented on pull request #31728:
URL: https://github.com/apache/spark/pull/31728#issuecomment-790508071
**[Test build #135749 has started](https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder/135749/testReport)** for PR 31728 at commit [`7c2de54`](https://github.com/apache/spark/commit/7c2de54303d41c9400e8765116f53c7c863f978f).
----------------------------------------------------------------
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.
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 #31728: [SPARK-34609][SQL] Unify resolveExpressionBottomUp and resolveExpressionTopDown
Posted by GitBox <gi...@apache.org>.
AmplabJenkins removed a comment on pull request #31728:
URL: https://github.com/apache/spark/pull/31728#issuecomment-790405395
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins//job/SparkPullRequestBuilder-K8s/40321/
----------------------------------------------------------------
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.
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 #31728: [SPARK-34609][SQL] Unify resolveExpressionBottomUp and resolveExpressionTopDown
Posted by GitBox <gi...@apache.org>.
cloud-fan commented on pull request #31728:
URL: https://github.com/apache/spark/pull/31728#issuecomment-791175460
thanks for the review, merging to master!
----------------------------------------------------------------
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.
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 #31728: [SPARK-34609][SQL] Unify resolveExpressionBottomUp and resolveExpressionTopDown
Posted by GitBox <gi...@apache.org>.
cloud-fan commented on pull request #31728:
URL: https://github.com/apache/spark/pull/31728#issuecomment-789827386
cc @viirya @maropu @HyukjinKwon
----------------------------------------------------------------
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.
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 #31728: [SPARK-34609][SQL] Unify resolveExpressionBottomUp and resolveExpressionTopDown
Posted by GitBox <gi...@apache.org>.
AmplabJenkins removed a comment on pull request #31728:
URL: https://github.com/apache/spark/pull/31728#issuecomment-790525334
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins//job/SparkPullRequestBuilder-K8s/40327/
----------------------------------------------------------------
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.
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 #31728: [SPARK-34609][SQL] Unify resolveExpressionBottomUp and resolveExpressionTopDown
Posted by GitBox <gi...@apache.org>.
cloud-fan commented on a change in pull request #31728:
URL: https://github.com/apache/spark/pull/31728#discussion_r588049629
##########
File path: sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala
##########
@@ -1914,49 +1857,126 @@ class Analyzer(override val catalogManager: CatalogManager)
}
/**
- * Resolves the attribute, column value and extract value expressions(s) by traversing the
- * input expression in bottom-up manner. In order to resolve the nested complex type fields
- * correctly, this function makes use of `throws` parameter to control when to raise an
- * AnalysisException.
+ * Resolves `UnresolvedAttribute`, `GetColumnByOrdinal` and extract value expressions(s) by
+ * traversing the input expression in top-down manner. It must be top-down because we need to
+ * skip over unbound lambda function expression. The lambda expressions are resolved in a
+ * different place [[ResolveLambdaVariables]].
*
* Example :
- * SELECT a.b FROM t ORDER BY b[0].d
+ * SELECT transform(array(1, 2, 3), (x, i) -> x + i)"
*
- * In the above example, in b needs to be resolved before d can be resolved. Given we are
- * doing a bottom up traversal, it will first attempt to resolve d and fail as b has not
- * been resolved yet. If `throws` is false, this function will handle the exception by
- * returning the original attribute. In this case `d` will be resolved in subsequent passes
- * after `b` is resolved.
+ * In the case above, x and i are resolved as lambda variables in [[ResolveLambdaVariables]].
*/
- protected[sql] def resolveExpressionBottomUp(
+ private def resolveExpression(
expr: Expression,
plan: LogicalPlan,
- throws: Boolean = false): Expression = {
- if (expr.resolved) return expr
+ resolveColumnByName: Seq[String] => Option[Expression],
+ resolveColumnByOrdinal: Int => Attribute,
+ trimAlias: Boolean,
+ throws: Boolean): Expression = {
// Resolve expression in one round.
- // If throws == false or the desired attribute doesn't exist
- // (like try to resolve `a.b` but `a` doesn't exist), fail and return the origin one.
- // Else, throw exception.
- try {
- expr transformUp {
- case GetColumnByOrdinal(ordinal, _) => plan.output(ordinal)
+ def innerResolve(e: Expression, isTopLevel: Boolean): Expression = {
+ if (e.resolved) return e
+ e match {
+ case f: LambdaFunction if !f.bound => f
+ case GetColumnByOrdinal(ordinal, _) => resolveColumnByOrdinal(ordinal)
case u @ UnresolvedAttribute(nameParts) =>
- val result =
- withPosition(u) {
- plan.resolve(nameParts, resolver)
- .orElse(resolveLiteralFunction(nameParts, u, plan))
- .getOrElse(u)
- }
+ val resolved = withPosition(u) {
+ resolveColumnByName(nameParts)
+ .orElse(resolveLiteralFunction(nameParts, u, plan))
+ .getOrElse(u)
+ }
+ val result = resolved match {
+ // When trimAlias = true, we will trim unnecessary alias of `GetStructField` and
+ // we won't trim the alias of top-level `GetStructField`. Since we will call
+ // CleanupAliases later in Analyzer, trim non top-level unnecessary alias of
+ // `GetStructField` here is safe.
+ case Alias(s: GetStructField, _) if trimAlias && !isTopLevel => s
+ case others => others
+ }
logDebug(s"Resolving $u to $result")
result
- case UnresolvedExtractValue(child, fieldName) if child.resolved =>
- ExtractValue(child, fieldName, resolver)
+ case u @ UnresolvedExtractValue(child, fieldName) =>
+ val newChild = innerResolve(child, isTopLevel = false)
+ if (newChild.resolved) {
+ ExtractValue(newChild, fieldName, resolver)
+ } else {
+ u.copy(child = newChild)
+ }
+ case _ => e.mapChildren(innerResolve(_, isTopLevel = false))
}
+ }
+
+ try {
+ innerResolve(expr, isTopLevel = true)
} catch {
- case a: AnalysisException if !throws => expr
+ case _: AnalysisException if !throws => expr
}
}
+ /**
+ * Resolves `UnresolvedAttribute`, `GetColumnByOrdinal` and extract value expressions(s) by the
+ * input plan's output attributes. In order to resolve the nested complex type fields correctly,
+ * this function makes use of `throws` parameter to control when to raise an AnalysisException.
+ *
+ * Example :
+ * SELECT a.b FROM t ORDER BY b[0].d
+ *
+ * In the above example, in b needs to be resolved before d can be resolved. Given we are
+ * doing a bottom up traversal, it will first attempt to resolve d and fail as b has not
+ * been resolved yet. If `throws` is false, this function will handle the exception by
+ * returning the original attribute. In this case `d` will be resolved in subsequent passes
+ * after `b` is resolved.
+ */
+ def resolveExpressionByPlanOutput(
+ expr: Expression,
+ plan: LogicalPlan,
+ throws: Boolean = false): Expression = {
+ resolveExpression(
+ expr,
+ plan,
+ resolveColumnByName = nameParts => {
+ plan.resolve(nameParts, resolver)
+ },
+ resolveColumnByOrdinal = ordinal => {
+ assert(ordinal >= 0 && ordinal < plan.output.length)
+ plan.output(ordinal)
+ },
+ trimAlias = false,
+ throws = throws)
+ }
+
+ /**
+ * Resolves `UnresolvedAttribute`, `GetColumnByOrdinal` and extract value expressions(s) by the
+ * input plan's children output attributes.
+ *
+ * @param e The expression need to be resolved.
+ * @param q The LogicalPlan whose children are used to resolve expression's attribute.
+ * @param trimAlias When true, trim unnecessary alias of GetStructField`. Note that,
+ * we cannot trim the alias of top-level `GetStructField`, as we should
+ * resolve `UnresolvedAttribute` to a named expression. The caller side
+ * can trim the alias of top-level `GetStructField` if it's safe to do so.
+ * @return resolved Expression.
+ */
+ def resolveExpressionByPlanChildren(
+ e: Expression,
+ q: LogicalPlan,
+ trimAlias: Boolean = false): Expression = {
+ resolveExpression(
+ e,
+ q,
+ resolveColumnByName = nameParts => {
+ q.resolveChildren(nameParts, resolver)
+ },
+ resolveColumnByOrdinal = ordinal => {
+ val candidates = q.children.flatMap(_.output)
+ assert(ordinal >= 0 && ordinal < candidates.length)
+ candidates.apply(ordinal)
+ },
Review comment:
This is a good point. Since this logic is not really needed anywhere, maybe we can use a stricter definition first. We can say that it only works if the plan has one child and we look up the attribute from output attributes of that child.
I'll update this in the followup PR (I have some other related code cleanup in mind), to avoid waiting for the QA job.
----------------------------------------------------------------
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.
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 #31728: [SPARK-34609][SQL] Unify resolveExpressionBottomUp and resolveExpressionTopDown
Posted by GitBox <gi...@apache.org>.
cloud-fan commented on a change in pull request #31728:
URL: https://github.com/apache/spark/pull/31728#discussion_r587258728
##########
File path: sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala
##########
@@ -1914,49 +1857,126 @@ class Analyzer(override val catalogManager: CatalogManager)
}
/**
- * Resolves the attribute, column value and extract value expressions(s) by traversing the
- * input expression in bottom-up manner. In order to resolve the nested complex type fields
- * correctly, this function makes use of `throws` parameter to control when to raise an
- * AnalysisException.
+ * Resolves `UnresolvedAttribute`, `GetColumnByOrdinal` and extract value expressions(s) by
+ * traversing the input expression in top-down manner. It must be top-down because we need to
+ * skip over unbound lambda function expression. The lambda expressions are resolved in a
+ * different place [[ResolveLambdaVariables]].
*
* Example :
- * SELECT a.b FROM t ORDER BY b[0].d
+ * SELECT transform(array(1, 2, 3), (x, i) -> x + i)"
*
- * In the above example, in b needs to be resolved before d can be resolved. Given we are
- * doing a bottom up traversal, it will first attempt to resolve d and fail as b has not
- * been resolved yet. If `throws` is false, this function will handle the exception by
- * returning the original attribute. In this case `d` will be resolved in subsequent passes
- * after `b` is resolved.
+ * In the case above, x and i are resolved as lambda variables in [[ResolveLambdaVariables]].
*/
- protected[sql] def resolveExpressionBottomUp(
+ private def resolveExpression(
expr: Expression,
plan: LogicalPlan,
- throws: Boolean = false): Expression = {
- if (expr.resolved) return expr
+ resolveColumnByName: Seq[String] => Option[Expression],
+ resolveColumnByOrdinal: Int => Attribute,
+ trimAlias: Boolean,
+ throws: Boolean): Expression = {
// Resolve expression in one round.
- // If throws == false or the desired attribute doesn't exist
- // (like try to resolve `a.b` but `a` doesn't exist), fail and return the origin one.
- // Else, throw exception.
- try {
- expr transformUp {
- case GetColumnByOrdinal(ordinal, _) => plan.output(ordinal)
+ def innerResolve(e: Expression, isTopLevel: Boolean): Expression = {
+ if (e.resolved) return e
+ e match {
+ case f: LambdaFunction if !f.bound => f
+ case GetColumnByOrdinal(ordinal, _) => resolveColumnByOrdinal(ordinal)
case u @ UnresolvedAttribute(nameParts) =>
- val result =
- withPosition(u) {
- plan.resolve(nameParts, resolver)
- .orElse(resolveLiteralFunction(nameParts, u, plan))
- .getOrElse(u)
- }
+ val resolved = withPosition(u) {
+ resolveColumnByName(nameParts)
+ .orElse(resolveLiteralFunction(nameParts, u, plan))
+ .getOrElse(u)
+ }
+ val result = resolved match {
+ // When trimAlias = true, we will trim unnecessary alias of `GetStructField` and
+ // we won't trim the alias of top-level `GetStructField`. Since we will call
+ // CleanupAliases later in Analyzer, trim non top-level unnecessary alias of
+ // `GetStructField` here is safe.
+ case Alias(s: GetStructField, _) if trimAlias && !isTopLevel => s
+ case others => others
+ }
logDebug(s"Resolving $u to $result")
result
- case UnresolvedExtractValue(child, fieldName) if child.resolved =>
- ExtractValue(child, fieldName, resolver)
+ case u @ UnresolvedExtractValue(child, fieldName) =>
+ val newChild = innerResolve(child, isTopLevel = false)
+ if (newChild.resolved) {
+ ExtractValue(newChild, fieldName, resolver)
+ } else {
+ u.copy(child = newChild)
+ }
+ case _ => e.mapChildren(innerResolve(_, isTopLevel = false))
}
+ }
+
+ try {
+ innerResolve(expr, isTopLevel = true)
} catch {
- case a: AnalysisException if !throws => expr
+ case _: AnalysisException if !throws => expr
}
}
+ /**
+ * Resolves `UnresolvedAttribute`, `GetColumnByOrdinal` and extract value expressions(s) by the
+ * input plan's output attributes. In order to resolve the nested complex type fields correctly,
+ * this function makes use of `throws` parameter to control when to raise an AnalysisException.
+ *
+ * Example :
+ * SELECT a.b FROM t ORDER BY b[0].d
+ *
+ * In the above example, in b needs to be resolved before d can be resolved. Given we are
Review comment:
This is copied from the old code verbatimly. It's actually not accurate as `b[0].d` won't fail if `b` can't be resolved. It just returns the unresolved expression.
Let me rewrite this doc.
----------------------------------------------------------------
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.
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] maropu commented on a change in pull request #31728: [SPARK-34609][SQL] Unify resolveExpressionBottomUp and resolveExpressionTopDown
Posted by GitBox <gi...@apache.org>.
maropu commented on a change in pull request #31728:
URL: https://github.com/apache/spark/pull/31728#discussion_r587213670
##########
File path: sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala
##########
@@ -1928,33 +1925,51 @@ class Analyzer(override val catalogManager: CatalogManager)
* returning the original attribute. In this case `d` will be resolved in subsequent passes
* after `b` is resolved.
*/
- protected[sql] def resolveExpressionBottomUp(
+ def resolveExpressionByPlanOutput(
Review comment:
nit: `private`?
##########
File path: sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala
##########
@@ -1928,33 +1925,51 @@ class Analyzer(override val catalogManager: CatalogManager)
* returning the original attribute. In this case `d` will be resolved in subsequent passes
* after `b` is resolved.
*/
- protected[sql] def resolveExpressionBottomUp(
+ def resolveExpressionByPlanOutput(
expr: Expression,
plan: LogicalPlan,
throws: Boolean = false): Expression = {
- if (expr.resolved) return expr
- // Resolve expression in one round.
- // If throws == false or the desired attribute doesn't exist
- // (like try to resolve `a.b` but `a` doesn't exist), fail and return the origin one.
- // Else, throw exception.
- try {
- expr transformUp {
- case GetColumnByOrdinal(ordinal, _) => plan.output(ordinal)
- case u @ UnresolvedAttribute(nameParts) =>
- val result =
- withPosition(u) {
- plan.resolve(nameParts, resolver)
- .orElse(resolveLiteralFunction(nameParts, u, plan))
- .getOrElse(u)
- }
- logDebug(s"Resolving $u to $result")
- result
- case UnresolvedExtractValue(child, fieldName) if child.resolved =>
- ExtractValue(child, fieldName, resolver)
- }
- } catch {
- case a: AnalysisException if !throws => expr
- }
+ resolveExpression(
+ expr,
+ resolveColumnByName = u => {
+ plan.resolve(u.nameParts, resolver).orElse(resolveLiteralFunction(u.nameParts, u, plan))
Review comment:
Could we move the `orElse` part into `resolveExpression `? It seems it is the same between `resolveExpressionByPlanOutput` and `resolveExpressionByPlanChildren `.
##########
File path: sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala
##########
@@ -1914,49 +1857,116 @@ class Analyzer(override val catalogManager: CatalogManager)
}
/**
- * Resolves the attribute, column value and extract value expressions(s) by traversing the
- * input expression in bottom-up manner. In order to resolve the nested complex type fields
- * correctly, this function makes use of `throws` parameter to control when to raise an
- * AnalysisException.
+ * Resolves `UnresolvedAttribute`, `GetColumnByOrdinal` and extract value expressions(s) by
+ * traversing the input expression in top-down manner. It must be top-down because we need to
+ * skip over unbound lambda function expression. The lambda expressions are resolved in a
+ * different place [[ResolveLambdaVariables]].
*
* Example :
- * SELECT a.b FROM t ORDER BY b[0].d
+ * SELECT transform(array(1, 2, 3), (x, i) -> x + i)"
*
- * In the above example, in b needs to be resolved before d can be resolved. Given we are
- * doing a bottom up traversal, it will first attempt to resolve d and fail as b has not
- * been resolved yet. If `throws` is false, this function will handle the exception by
- * returning the original attribute. In this case `d` will be resolved in subsequent passes
- * after `b` is resolved.
+ * In the case above, x and i are resolved as lambda variables in [[ResolveLambdaVariables]].
*/
- protected[sql] def resolveExpressionBottomUp(
+ private def resolveExpression(
expr: Expression,
- plan: LogicalPlan,
- throws: Boolean = false): Expression = {
- if (expr.resolved) return expr
+ resolveColumnByName: UnresolvedAttribute => Option[Expression],
+ resolveColumnByOrdinal: Int => Attribute,
+ trimAlias: Boolean,
+ throws: Boolean): Expression = {
// Resolve expression in one round.
- // If throws == false or the desired attribute doesn't exist
- // (like try to resolve `a.b` but `a` doesn't exist), fail and return the origin one.
- // Else, throw exception.
- try {
- expr transformUp {
- case GetColumnByOrdinal(ordinal, _) => plan.output(ordinal)
- case u @ UnresolvedAttribute(nameParts) =>
- val result =
- withPosition(u) {
- plan.resolve(nameParts, resolver)
- .orElse(resolveLiteralFunction(nameParts, u, plan))
- .getOrElse(u)
- }
+ def innerResolve(e: Expression, isTopLevel: Boolean): Expression = {
+ if (e.resolved) return e
+ e match {
+ case f: LambdaFunction if !f.bound => f
+ case GetColumnByOrdinal(ordinal, _) => resolveColumnByOrdinal(ordinal)
+ case u: UnresolvedAttribute =>
+ val resolved = withPosition(u) {
+ resolveColumnByName(u).getOrElse(u)
+ }
+ val result = resolved match {
+ // When trimAlias = true, we will trim unnecessary alias of `GetStructField` and
+ // we won't trim the alias of top-level `GetStructField`. Since we will call
+ // CleanupAliases later in Analyzer, trim non top-level unnecessary alias of
+ // `GetStructField` here is safe.
+ case Alias(s: GetStructField, _) if trimAlias && !isTopLevel => s
+ case others => others
+ }
logDebug(s"Resolving $u to $result")
result
case UnresolvedExtractValue(child, fieldName) if child.resolved =>
ExtractValue(child, fieldName, resolver)
+ case _ => e.mapChildren(innerResolve(_, isTopLevel = false))
}
+ }
+
+ try {
+ innerResolve(expr, isTopLevel = true)
} catch {
- case a: AnalysisException if !throws => expr
+ case _: AnalysisException if !throws => expr
}
}
+ /**
+ * Resolves `UnresolvedAttribute`, `GetColumnByOrdinal` and extract value expressions(s) by the
+ * input plan's output attributes. In order to resolve the nested complex type fields correctly,
+ * this function makes use of `throws` parameter to control when to raise an AnalysisException.
+ *
+ * Example :
+ * SELECT a.b FROM t ORDER BY b[0].d
+ *
+ * In the above example, in b needs to be resolved before d can be resolved. Given we are
+ * doing a bottom up traversal, it will first attempt to resolve d and fail as b has not
+ * been resolved yet. If `throws` is false, this function will handle the exception by
+ * returning the original attribute. In this case `d` will be resolved in subsequent passes
+ * after `b` is resolved.
+ */
+ def resolveExpressionByPlanOutput(
+ expr: Expression,
+ plan: LogicalPlan,
+ throws: Boolean = false): Expression = {
+ resolveExpression(
+ expr,
+ resolveColumnByName = u => {
+ plan.resolve(u.nameParts, resolver).orElse(resolveLiteralFunction(u.nameParts, u, plan))
+ },
+ resolveColumnByOrdinal = ordinal => {
+ assert(ordinal >= 0 && ordinal < plan.output.length)
+ plan.output(ordinal)
+ },
+ trimAlias = false,
+ throws = throws)
+ }
+
+ /**
+ * Resolves `UnresolvedAttribute`, `GetColumnByOrdinal` and extract value expressions(s) by the
+ * input plan's children output attributes.
+ *
+ * @param e The expression need to be resolved.
+ * @param q The LogicalPlan whose children are used to resolve expression's attribute.
+ * @param trimAlias When true, trim unnecessary alias of GetStructField`. Note that,
+ * we cannot trim the alias of top-level `GetStructField`, as we should
+ * resolve `UnresolvedAttribute` to a named expression. The caller side
+ * can trim the alias of top-level `GetStructField` if it's safe to do so.
+ * @return resolved Expression.
+ */
+ def resolveExpressionByPlanChildren(
Review comment:
ditto: `private`?
----------------------------------------------------------------
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.
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 #31728: [SPARK-34609][SQL] Unify resolveExpressionBottomUp and resolveExpressionTopDown
Posted by GitBox <gi...@apache.org>.
SparkQA commented on pull request #31728:
URL: https://github.com/apache/spark/pull/31728#issuecomment-790674483
**[Test build #135749 has finished](https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder/135749/testReport)** for PR 31728 at commit [`7c2de54`](https://github.com/apache/spark/commit/7c2de54303d41c9400e8765116f53c7c863f978f).
* 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.
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 #31728: [SPARK-34609][SQL] Unify resolveExpressionBottomUp and resolveExpressionTopDown
Posted by GitBox <gi...@apache.org>.
SparkQA commented on pull request #31728:
URL: https://github.com/apache/spark/pull/31728#issuecomment-790534952
Kubernetes integration test starting
URL: https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder-K8s/40331/
----------------------------------------------------------------
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.
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 #31728: [SPARK-34609][SQL] Unify resolveExpressionBottomUp and resolveExpressionTopDown
Posted by GitBox <gi...@apache.org>.
SparkQA removed a comment on pull request #31728:
URL: https://github.com/apache/spark/pull/31728#issuecomment-790508071
**[Test build #135749 has started](https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder/135749/testReport)** for PR 31728 at commit [`7c2de54`](https://github.com/apache/spark/commit/7c2de54303d41c9400e8765116f53c7c863f978f).
----------------------------------------------------------------
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.
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 #31728: [SPARK-34609][SQL] Unify resolveExpressionBottomUp and resolveExpressionTopDown
Posted by GitBox <gi...@apache.org>.
AmplabJenkins commented on pull request #31728:
URL: https://github.com/apache/spark/pull/31728#issuecomment-790634532
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins//job/SparkPullRequestBuilder/135745/
----------------------------------------------------------------
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.
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 #31728: [SPARK-34609][SQL] Unify resolveExpressionBottomUp and resolveExpressionTopDown
Posted by GitBox <gi...@apache.org>.
AmplabJenkins commented on pull request #31728:
URL: https://github.com/apache/spark/pull/31728#issuecomment-790405395
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins//job/SparkPullRequestBuilder-K8s/40321/
----------------------------------------------------------------
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.
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 #31728: [SPARK-34609][SQL] Unify resolveExpressionBottomUp and resolveExpressionTopDown
Posted by GitBox <gi...@apache.org>.
SparkQA commented on pull request #31728:
URL: https://github.com/apache/spark/pull/31728#issuecomment-790550872
Kubernetes integration test status success
URL: https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder-K8s/40331/
----------------------------------------------------------------
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.
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 #31728: [SPARK-34609][SQL] Unify resolveExpressionBottomUp and resolveExpressionTopDown
Posted by GitBox <gi...@apache.org>.
AmplabJenkins commented on pull request #31728:
URL: https://github.com/apache/spark/pull/31728#issuecomment-790560063
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins//job/SparkPullRequestBuilder-K8s/40331/
----------------------------------------------------------------
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.
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 #31728: [SPARK-34609][SQL] Unify resolveExpressionBottomUp and resolveExpressionTopDown
Posted by GitBox <gi...@apache.org>.
cloud-fan commented on a change in pull request #31728:
URL: https://github.com/apache/spark/pull/31728#discussion_r587293852
##########
File path: sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala
##########
@@ -1914,49 +1857,126 @@ class Analyzer(override val catalogManager: CatalogManager)
}
/**
- * Resolves the attribute, column value and extract value expressions(s) by traversing the
- * input expression in bottom-up manner. In order to resolve the nested complex type fields
- * correctly, this function makes use of `throws` parameter to control when to raise an
- * AnalysisException.
+ * Resolves `UnresolvedAttribute`, `GetColumnByOrdinal` and extract value expressions(s) by
+ * traversing the input expression in top-down manner. It must be top-down because we need to
+ * skip over unbound lambda function expression. The lambda expressions are resolved in a
+ * different place [[ResolveLambdaVariables]].
*
* Example :
- * SELECT a.b FROM t ORDER BY b[0].d
+ * SELECT transform(array(1, 2, 3), (x, i) -> x + i)"
*
- * In the above example, in b needs to be resolved before d can be resolved. Given we are
- * doing a bottom up traversal, it will first attempt to resolve d and fail as b has not
- * been resolved yet. If `throws` is false, this function will handle the exception by
- * returning the original attribute. In this case `d` will be resolved in subsequent passes
- * after `b` is resolved.
+ * In the case above, x and i are resolved as lambda variables in [[ResolveLambdaVariables]].
*/
- protected[sql] def resolveExpressionBottomUp(
+ private def resolveExpression(
expr: Expression,
plan: LogicalPlan,
- throws: Boolean = false): Expression = {
- if (expr.resolved) return expr
+ resolveColumnByName: Seq[String] => Option[Expression],
+ resolveColumnByOrdinal: Int => Attribute,
+ trimAlias: Boolean,
+ throws: Boolean): Expression = {
// Resolve expression in one round.
- // If throws == false or the desired attribute doesn't exist
- // (like try to resolve `a.b` but `a` doesn't exist), fail and return the origin one.
- // Else, throw exception.
- try {
- expr transformUp {
- case GetColumnByOrdinal(ordinal, _) => plan.output(ordinal)
+ def innerResolve(e: Expression, isTopLevel: Boolean): Expression = {
+ if (e.resolved) return e
+ e match {
+ case f: LambdaFunction if !f.bound => f
+ case GetColumnByOrdinal(ordinal, _) => resolveColumnByOrdinal(ordinal)
case u @ UnresolvedAttribute(nameParts) =>
- val result =
- withPosition(u) {
- plan.resolve(nameParts, resolver)
- .orElse(resolveLiteralFunction(nameParts, u, plan))
- .getOrElse(u)
- }
+ val resolved = withPosition(u) {
+ resolveColumnByName(nameParts)
+ .orElse(resolveLiteralFunction(nameParts, u, plan))
+ .getOrElse(u)
+ }
+ val result = resolved match {
+ // When trimAlias = true, we will trim unnecessary alias of `GetStructField` and
+ // we won't trim the alias of top-level `GetStructField`. Since we will call
+ // CleanupAliases later in Analyzer, trim non top-level unnecessary alias of
+ // `GetStructField` here is safe.
+ case Alias(s: GetStructField, _) if trimAlias && !isTopLevel => s
+ case others => others
+ }
logDebug(s"Resolving $u to $result")
result
- case UnresolvedExtractValue(child, fieldName) if child.resolved =>
- ExtractValue(child, fieldName, resolver)
+ case u @ UnresolvedExtractValue(child, fieldName) =>
+ val newChild = innerResolve(child, isTopLevel = false)
+ if (newChild.resolved) {
+ ExtractValue(newChild, fieldName, resolver)
+ } else {
+ u.copy(child = newChild)
+ }
+ case _ => e.mapChildren(innerResolve(_, isTopLevel = false))
}
+ }
+
+ try {
+ innerResolve(expr, isTopLevel = true)
} catch {
- case a: AnalysisException if !throws => expr
+ case _: AnalysisException if !throws => expr
}
}
+ /**
+ * Resolves `UnresolvedAttribute`, `GetColumnByOrdinal` and extract value expressions(s) by the
+ * input plan's output attributes. In order to resolve the nested complex type fields correctly,
+ * this function makes use of `throws` parameter to control when to raise an AnalysisException.
+ *
+ * Example :
+ * SELECT a.b FROM t ORDER BY b[0].d
+ *
+ * In the above example, in b needs to be resolved before d can be resolved. Given we are
+ * doing a bottom up traversal, it will first attempt to resolve d and fail as b has not
+ * been resolved yet. If `throws` is false, this function will handle the exception by
+ * returning the original attribute. In this case `d` will be resolved in subsequent passes
+ * after `b` is resolved.
+ */
+ def resolveExpressionByPlanOutput(
+ expr: Expression,
+ plan: LogicalPlan,
+ throws: Boolean = false): Expression = {
+ resolveExpression(
+ expr,
+ plan,
+ resolveColumnByName = nameParts => {
+ plan.resolve(nameParts, resolver)
+ },
+ resolveColumnByOrdinal = ordinal => {
+ assert(ordinal >= 0 && ordinal < plan.output.length)
+ plan.output(ordinal)
+ },
+ trimAlias = false,
+ throws = throws)
+ }
+
+ /**
+ * Resolves `UnresolvedAttribute`, `GetColumnByOrdinal` and extract value expressions(s) by the
+ * input plan's children output attributes.
+ *
+ * @param e The expression need to be resolved.
+ * @param q The LogicalPlan whose children are used to resolve expression's attribute.
+ * @param trimAlias When true, trim unnecessary alias of GetStructField`. Note that,
+ * we cannot trim the alias of top-level `GetStructField`, as we should
+ * resolve `UnresolvedAttribute` to a named expression. The caller side
+ * can trim the alias of top-level `GetStructField` if it's safe to do so.
+ * @return resolved Expression.
+ */
+ def resolveExpressionByPlanChildren(
+ e: Expression,
+ q: LogicalPlan,
+ trimAlias: Boolean = false): Expression = {
+ resolveExpression(
+ e,
+ q,
+ resolveColumnByName = nameParts => {
+ q.resolveChildren(nameParts, resolver)
+ },
+ resolveColumnByOrdinal = ordinal => {
+ val candidates = q.children.flatMap(_.output)
+ assert(ordinal >= 0 && ordinal < candidates.length)
+ candidates.apply(ordinal)
+ },
Review comment:
No it doesn't, but I can't find a reason why we shouldn't have it.
The only difference should be where to resolve the columns: plan output vs plan children output. So that it's easy for developers to decide which one to call.
----------------------------------------------------------------
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.
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 #31728: [SPARK-34609][SQL] Unify resolveExpressionBottomUp and resolveExpressionTopDown
Posted by GitBox <gi...@apache.org>.
SparkQA commented on pull request #31728:
URL: https://github.com/apache/spark/pull/31728#issuecomment-790495883
Kubernetes integration test starting
URL: https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder-K8s/40327/
----------------------------------------------------------------
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.
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 #31728: [SPARK-34609][SQL] Unify resolveExpressionBottomUp and resolveExpressionTopDown
Posted by GitBox <gi...@apache.org>.
AmplabJenkins commented on pull request #31728:
URL: https://github.com/apache/spark/pull/31728#issuecomment-790597092
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins//job/SparkPullRequestBuilder/135743/
----------------------------------------------------------------
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.
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 #31728: [SPARK-34609][SQL] Unify resolveExpressionBottomUp and resolveExpressionTopDown
Posted by GitBox <gi...@apache.org>.
AmplabJenkins removed a comment on pull request #31728:
URL: https://github.com/apache/spark/pull/31728#issuecomment-789886118
----------------------------------------------------------------
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.
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 #31728: [SPARK-34609][SQL] Unify resolveExpressionBottomUp and resolveExpressionTopDown
Posted by GitBox <gi...@apache.org>.
AmplabJenkins commented on pull request #31728:
URL: https://github.com/apache/spark/pull/31728#issuecomment-789933219
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins//job/SparkPullRequestBuilder/135717/
----------------------------------------------------------------
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.
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 #31728: [SPARK-34609][SQL] Unify resolveExpressionBottomUp and resolveExpressionTopDown
Posted by GitBox <gi...@apache.org>.
AmplabJenkins removed a comment on pull request #31728:
URL: https://github.com/apache/spark/pull/31728#issuecomment-790560063
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins//job/SparkPullRequestBuilder-K8s/40331/
----------------------------------------------------------------
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.
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 #31728: [SPARK-34609][SQL] Unify resolveExpressionBottomUp and resolveExpressionTopDown
Posted by GitBox <gi...@apache.org>.
AmplabJenkins removed a comment on pull request #31728:
URL: https://github.com/apache/spark/pull/31728#issuecomment-790676294
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins//job/SparkPullRequestBuilder/135749/
----------------------------------------------------------------
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.
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 #31728: [SPARK-34609][SQL] Unify resolveExpressionBottomUp and resolveExpressionTopDown
Posted by GitBox <gi...@apache.org>.
SparkQA commented on pull request #31728:
URL: https://github.com/apache/spark/pull/31728#issuecomment-789878225
Kubernetes integration test starting
URL: https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder-K8s/40299/
----------------------------------------------------------------
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.
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 #31728: [SPARK-34609][SQL] Unify resolveExpressionBottomUp and resolveExpressionTopDown
Posted by GitBox <gi...@apache.org>.
SparkQA removed a comment on pull request #31728:
URL: https://github.com/apache/spark/pull/31728#issuecomment-790406566
**[Test build #135743 has started](https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder/135743/testReport)** for PR 31728 at commit [`8c1697c`](https://github.com/apache/spark/commit/8c1697c58fd76a5c66d928533956594867df6271).
----------------------------------------------------------------
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.
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 #31728: [SPARK-34609][SQL] Unify resolveExpressionBottomUp and resolveExpressionTopDown
Posted by GitBox <gi...@apache.org>.
cloud-fan commented on a change in pull request #31728:
URL: https://github.com/apache/spark/pull/31728#discussion_r586546590
##########
File path: sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala
##########
@@ -1914,49 +1857,116 @@ class Analyzer(override val catalogManager: CatalogManager)
}
/**
- * Resolves the attribute, column value and extract value expressions(s) by traversing the
- * input expression in bottom-up manner. In order to resolve the nested complex type fields
- * correctly, this function makes use of `throws` parameter to control when to raise an
- * AnalysisException.
+ * Resolves `UnresolvedAttribute`, `GetColumnByOrdinal` and extract value expressions(s) by
+ * traversing the input expression in top-down manner. It must be top-down because we need to
+ * skip over unbound lambda function expression. The lambda expressions are resolved in a
+ * different place [[ResolveLambdaVariables]].
*
* Example :
- * SELECT a.b FROM t ORDER BY b[0].d
+ * SELECT transform(array(1, 2, 3), (x, i) -> x + i)"
*
- * In the above example, in b needs to be resolved before d can be resolved. Given we are
- * doing a bottom up traversal, it will first attempt to resolve d and fail as b has not
- * been resolved yet. If `throws` is false, this function will handle the exception by
- * returning the original attribute. In this case `d` will be resolved in subsequent passes
- * after `b` is resolved.
+ * In the case above, x and i are resolved as lambda variables in [[ResolveLambdaVariables]].
*/
- protected[sql] def resolveExpressionBottomUp(
+ private def resolveExpression(
expr: Expression,
- plan: LogicalPlan,
- throws: Boolean = false): Expression = {
- if (expr.resolved) return expr
+ resolveColumnByName: UnresolvedAttribute => Option[Expression],
+ resolveColumnByOrdinal: Int => Attribute,
+ trimAlias: Boolean,
+ throws: Boolean): Expression = {
// Resolve expression in one round.
- // If throws == false or the desired attribute doesn't exist
- // (like try to resolve `a.b` but `a` doesn't exist), fail and return the origin one.
- // Else, throw exception.
- try {
- expr transformUp {
- case GetColumnByOrdinal(ordinal, _) => plan.output(ordinal)
- case u @ UnresolvedAttribute(nameParts) =>
- val result =
- withPosition(u) {
- plan.resolve(nameParts, resolver)
- .orElse(resolveLiteralFunction(nameParts, u, plan))
- .getOrElse(u)
- }
+ def innerResolve(e: Expression, isTopLevel: Boolean): Expression = {
+ if (e.resolved) return e
+ e match {
+ case f: LambdaFunction if !f.bound => f
+ case GetColumnByOrdinal(ordinal, _) => resolveColumnByOrdinal(ordinal)
+ case u: UnresolvedAttribute =>
+ val resolved = withPosition(u) {
+ resolveColumnByName(u).getOrElse(u)
+ }
+ val result = resolved match {
+ // When trimAlias = true, we will trim unnecessary alias of `GetStructField` and
+ // we won't trim the alias of top-level `GetStructField`. Since we will call
+ // CleanupAliases later in Analyzer, trim non top-level unnecessary alias of
+ // `GetStructField` here is safe.
+ case Alias(s: GetStructField, _) if trimAlias && !isTopLevel => s
+ case others => others
+ }
logDebug(s"Resolving $u to $result")
result
case UnresolvedExtractValue(child, fieldName) if child.resolved =>
ExtractValue(child, fieldName, resolver)
+ case _ => e.mapChildren(innerResolve(_, isTopLevel = false))
}
+ }
+
+ try {
+ innerResolve(expr, isTopLevel = true)
} catch {
- case a: AnalysisException if !throws => expr
+ case _: AnalysisException if !throws => expr
}
}
+ /**
+ * Resolves `UnresolvedAttribute`, `GetColumnByOrdinal` and extract value expressions(s) by the
+ * input plan's output attributes. In order to resolve the nested complex type fields correctly,
+ * this function makes use of `throws` parameter to control when to raise an AnalysisException.
+ *
+ * Example :
+ * SELECT a.b FROM t ORDER BY b[0].d
+ *
+ * In the above example, in b needs to be resolved before d can be resolved. Given we are
+ * doing a bottom up traversal, it will first attempt to resolve d and fail as b has not
+ * been resolved yet. If `throws` is false, this function will handle the exception by
+ * returning the original attribute. In this case `d` will be resolved in subsequent passes
+ * after `b` is resolved.
Review comment:
The doc is mostly from the old `resolveExpressionBottomUp`
----------------------------------------------------------------
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.
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 #31728: [SPARK-34609][SQL] Unify resolveExpressionBottomUp and resolveExpressionTopDown
Posted by GitBox <gi...@apache.org>.
viirya commented on a change in pull request #31728:
URL: https://github.com/apache/spark/pull/31728#discussion_r587258003
##########
File path: sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala
##########
@@ -1914,49 +1857,126 @@ class Analyzer(override val catalogManager: CatalogManager)
}
/**
- * Resolves the attribute, column value and extract value expressions(s) by traversing the
- * input expression in bottom-up manner. In order to resolve the nested complex type fields
- * correctly, this function makes use of `throws` parameter to control when to raise an
- * AnalysisException.
+ * Resolves `UnresolvedAttribute`, `GetColumnByOrdinal` and extract value expressions(s) by
+ * traversing the input expression in top-down manner. It must be top-down because we need to
+ * skip over unbound lambda function expression. The lambda expressions are resolved in a
+ * different place [[ResolveLambdaVariables]].
*
* Example :
- * SELECT a.b FROM t ORDER BY b[0].d
+ * SELECT transform(array(1, 2, 3), (x, i) -> x + i)"
*
- * In the above example, in b needs to be resolved before d can be resolved. Given we are
- * doing a bottom up traversal, it will first attempt to resolve d and fail as b has not
- * been resolved yet. If `throws` is false, this function will handle the exception by
- * returning the original attribute. In this case `d` will be resolved in subsequent passes
- * after `b` is resolved.
+ * In the case above, x and i are resolved as lambda variables in [[ResolveLambdaVariables]].
*/
- protected[sql] def resolveExpressionBottomUp(
+ private def resolveExpression(
expr: Expression,
plan: LogicalPlan,
- throws: Boolean = false): Expression = {
- if (expr.resolved) return expr
+ resolveColumnByName: Seq[String] => Option[Expression],
+ resolveColumnByOrdinal: Int => Attribute,
+ trimAlias: Boolean,
+ throws: Boolean): Expression = {
// Resolve expression in one round.
- // If throws == false or the desired attribute doesn't exist
- // (like try to resolve `a.b` but `a` doesn't exist), fail and return the origin one.
- // Else, throw exception.
- try {
- expr transformUp {
- case GetColumnByOrdinal(ordinal, _) => plan.output(ordinal)
+ def innerResolve(e: Expression, isTopLevel: Boolean): Expression = {
+ if (e.resolved) return e
+ e match {
+ case f: LambdaFunction if !f.bound => f
+ case GetColumnByOrdinal(ordinal, _) => resolveColumnByOrdinal(ordinal)
case u @ UnresolvedAttribute(nameParts) =>
- val result =
- withPosition(u) {
- plan.resolve(nameParts, resolver)
- .orElse(resolveLiteralFunction(nameParts, u, plan))
- .getOrElse(u)
- }
+ val resolved = withPosition(u) {
+ resolveColumnByName(nameParts)
+ .orElse(resolveLiteralFunction(nameParts, u, plan))
+ .getOrElse(u)
+ }
+ val result = resolved match {
+ // When trimAlias = true, we will trim unnecessary alias of `GetStructField` and
+ // we won't trim the alias of top-level `GetStructField`. Since we will call
+ // CleanupAliases later in Analyzer, trim non top-level unnecessary alias of
+ // `GetStructField` here is safe.
+ case Alias(s: GetStructField, _) if trimAlias && !isTopLevel => s
+ case others => others
+ }
logDebug(s"Resolving $u to $result")
result
- case UnresolvedExtractValue(child, fieldName) if child.resolved =>
- ExtractValue(child, fieldName, resolver)
+ case u @ UnresolvedExtractValue(child, fieldName) =>
+ val newChild = innerResolve(child, isTopLevel = false)
+ if (newChild.resolved) {
+ ExtractValue(newChild, fieldName, resolver)
+ } else {
+ u.copy(child = newChild)
+ }
+ case _ => e.mapChildren(innerResolve(_, isTopLevel = false))
}
+ }
+
+ try {
+ innerResolve(expr, isTopLevel = true)
} catch {
- case a: AnalysisException if !throws => expr
+ case _: AnalysisException if !throws => expr
}
}
+ /**
+ * Resolves `UnresolvedAttribute`, `GetColumnByOrdinal` and extract value expressions(s) by the
+ * input plan's output attributes. In order to resolve the nested complex type fields correctly,
+ * this function makes use of `throws` parameter to control when to raise an AnalysisException.
+ *
+ * Example :
+ * SELECT a.b FROM t ORDER BY b[0].d
+ *
+ * In the above example, in b needs to be resolved before d can be resolved. Given we are
+ * doing a bottom up traversal, it will first attempt to resolve d and fail as b has not
+ * been resolved yet. If `throws` is false, this function will handle the exception by
+ * returning the original attribute. In this case `d` will be resolved in subsequent passes
+ * after `b` is resolved.
+ */
+ def resolveExpressionByPlanOutput(
+ expr: Expression,
+ plan: LogicalPlan,
+ throws: Boolean = false): Expression = {
+ resolveExpression(
+ expr,
+ plan,
+ resolveColumnByName = nameParts => {
+ plan.resolve(nameParts, resolver)
+ },
+ resolveColumnByOrdinal = ordinal => {
+ assert(ordinal >= 0 && ordinal < plan.output.length)
+ plan.output(ordinal)
+ },
+ trimAlias = false,
+ throws = throws)
+ }
+
+ /**
+ * Resolves `UnresolvedAttribute`, `GetColumnByOrdinal` and extract value expressions(s) by the
+ * input plan's children output attributes.
+ *
+ * @param e The expression need to be resolved.
+ * @param q The LogicalPlan whose children are used to resolve expression's attribute.
+ * @param trimAlias When true, trim unnecessary alias of GetStructField`. Note that,
+ * we cannot trim the alias of top-level `GetStructField`, as we should
+ * resolve `UnresolvedAttribute` to a named expression. The caller side
+ * can trim the alias of top-level `GetStructField` if it's safe to do so.
+ * @return resolved Expression.
+ */
+ def resolveExpressionByPlanChildren(
+ e: Expression,
+ q: LogicalPlan,
+ trimAlias: Boolean = false): Expression = {
+ resolveExpression(
+ e,
+ q,
+ resolveColumnByName = nameParts => {
+ q.resolveChildren(nameParts, resolver)
+ },
+ resolveColumnByOrdinal = ordinal => {
+ val candidates = q.children.flatMap(_.output)
+ assert(ordinal >= 0 && ordinal < candidates.length)
+ candidates.apply(ordinal)
+ },
Review comment:
Does `resolveExpressionTopDown` have this logic originally? Seems I cannot find it.
----------------------------------------------------------------
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.
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 #31728: [SPARK-34609][SQL] Unify resolveExpressionBottomUp and resolveExpressionTopDown
Posted by GitBox <gi...@apache.org>.
cloud-fan closed pull request #31728:
URL: https://github.com/apache/spark/pull/31728
----------------------------------------------------------------
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.
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 #31728: [SPARK-34609][SQL] Unify resolveExpressionBottomUp and resolveExpressionTopDown
Posted by GitBox <gi...@apache.org>.
SparkQA commented on pull request #31728:
URL: https://github.com/apache/spark/pull/31728#issuecomment-790519913
Kubernetes integration test status failure
URL: https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder-K8s/40327/
----------------------------------------------------------------
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.
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 #31728: [SPARK-34609][SQL] Unify resolveExpressionBottomUp and resolveExpressionTopDown
Posted by GitBox <gi...@apache.org>.
AmplabJenkins removed a comment on pull request #31728:
URL: https://github.com/apache/spark/pull/31728#issuecomment-790634532
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins//job/SparkPullRequestBuilder/135745/
----------------------------------------------------------------
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.
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 #31728: [SPARK-34609][SQL] Unify resolveExpressionBottomUp and resolveExpressionTopDown
Posted by GitBox <gi...@apache.org>.
SparkQA removed a comment on pull request #31728:
URL: https://github.com/apache/spark/pull/31728#issuecomment-789853005
**[Test build #135717 has started](https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder/135717/testReport)** for PR 31728 at commit [`fef599b`](https://github.com/apache/spark/commit/fef599b437616d4912979371048ca7d01164ebef).
----------------------------------------------------------------
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.
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 #31728: [SPARK-34609][SQL] Unify resolveExpressionBottomUp and resolveExpressionTopDown
Posted by GitBox <gi...@apache.org>.
AmplabJenkins commented on pull request #31728:
URL: https://github.com/apache/spark/pull/31728#issuecomment-789886118
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins//job/SparkPullRequestBuilder-K8s/40299/
----------------------------------------------------------------
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.
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 #31728: [SPARK-34609][SQL] Unify resolveExpressionBottomUp and resolveExpressionTopDown
Posted by GitBox <gi...@apache.org>.
SparkQA commented on pull request #31728:
URL: https://github.com/apache/spark/pull/31728#issuecomment-790406566
**[Test build #135743 has started](https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder/135743/testReport)** for PR 31728 at commit [`8c1697c`](https://github.com/apache/spark/commit/8c1697c58fd76a5c66d928533956594867df6271).
----------------------------------------------------------------
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.
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 #31728: [SPARK-34609][SQL] Unify resolveExpressionBottomUp and resolveExpressionTopDown
Posted by GitBox <gi...@apache.org>.
SparkQA commented on pull request #31728:
URL: https://github.com/apache/spark/pull/31728#issuecomment-790626055
**[Test build #135745 has finished](https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder/135745/testReport)** for PR 31728 at commit [`8332a43`](https://github.com/apache/spark/commit/8332a43c2d0e254a15a78cd4f9126da253c61457).
* 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.
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 #31728: [SPARK-34609][SQL] Unify resolveExpressionBottomUp and resolveExpressionTopDown
Posted by GitBox <gi...@apache.org>.
AmplabJenkins removed a comment on pull request #31728:
URL: https://github.com/apache/spark/pull/31728#issuecomment-790597092
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins//job/SparkPullRequestBuilder/135743/
----------------------------------------------------------------
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.
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 #31728: [SPARK-34609][SQL] Unify resolveExpressionBottomUp and resolveExpressionTopDown
Posted by GitBox <gi...@apache.org>.
SparkQA commented on pull request #31728:
URL: https://github.com/apache/spark/pull/31728#issuecomment-790578285
**[Test build #135743 has finished](https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder/135743/testReport)** for PR 31728 at commit [`8c1697c`](https://github.com/apache/spark/commit/8c1697c58fd76a5c66d928533956594867df6271).
* 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.
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