You are viewing a plain text version of this content. The canonical link for it is here.
Posted to reviews@spark.apache.org by "srielau (via GitHub)" <gi...@apache.org> on 2023/09/12 09:35:07 UTC
[GitHub] [spark] srielau opened a new pull request, #42888: [SPARK-45132][SQL] Fix IDENTIFIER for function invocation
srielau opened a new pull request, #42888:
URL: https://github.com/apache/spark/pull/42888
### What changes were proposed in this pull request?
Due to a quirk in the parser, in some cases, IDENTIFIER(<funcStr>)(<arg>) is not properly recognized as a function invocation.
The change is to remove the explicit IDENTIFIER-clause rule in the function invocation grammar and instead recognize
IDENTIFIER(<arg>) within visitFunctionCall.
### 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.
-->
Function invocation support for IDENTIFIER is incomplete otherwise
### Does this PR introduce _any_ user-facing change?
<!--
Note that it means *any* user-facing change including all aspects such as the documentation fix.
If yes, please clarify the previous behavior and the change this PR proposes - provide the console output, description and/or an example to show the behavior difference if possible.
If possible, please also clarify if this is a user-facing change compared to the released Spark versions or within the unreleased branches such as master.
If no, write 'No'.
-->
No
### How was this patch tested?
<!--
If tests were added, say they were added here. Please make sure to add some test cases that check the changes thoroughly including negative and positive cases if possible.
If it was tested in a way different from regular unit tests, please clarify how you tested step by step, ideally copy and paste-able, so that other reviewers can test and check, and descendants can verify in the future.
If tests were not added, please describe why they were not added and/or why it was difficult to add.
If benchmark tests were added, please run the benchmarks in GitHub Actions for the consistent environment, and the instructions could accord to: https://spark.apache.org/developer-tools.html#github-workflow-benchmarks.
-->
Added new testcases to identifier-clause.sql
### Was this patch authored or co-authored using generative AI tooling?
<!--
If generative AI tooling has been used in the process of authoring this patch, please include the
phrase: 'Generated-by: ' followed by the name of the tool and its version.
If no, write 'No'.
Please refer to the [ASF Generative Tooling Guidance](https://www.apache.org/legal/generative-tooling.html) for details.
-->
No
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-45132][SQL] Fix IDENTIFIER for function invocation [spark]
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on code in PR #42888:
URL: https://github.com/apache/spark/pull/42888#discussion_r1350581789
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/parser/AstBuilder.scala:
##########
@@ -2274,19 +2267,32 @@ class AstBuilder extends DataTypeAstBuilder with SQLConfHelper with Logging {
val filter = Option(ctx.where).map(expression(_))
val ignoreNulls =
Option(ctx.nullsOption).map(_.getType == SqlBaseParser.IGNORE).getOrElse(false)
- val funcCtx = ctx.functionName
- val func = withFuncIdentClause(
- funcCtx,
- ident => UnresolvedFunction(ident, arguments, isDistinct, filter, ignoreNulls)
- )
- // Check if the function is evaluated in a windowed context.
- ctx.windowSpec match {
- case spec: WindowRefContext =>
- UnresolvedWindowExpression(func, visitWindowRef(spec))
- case spec: WindowDefContext =>
- WindowExpression(func, visitWindowDef(spec))
- case _ => func
+ // Is this an IDENTIFIER clause instead of a function call?
+ if (name.toLowerCase(Locale.ROOT) == "identifier" && // IDENTIFIER (but not `IDENTIFIER`)
Review Comment:
in order to check this more explicitly, shall we update the parser rule a bit? `functionName LEFT_PAREN ...` -> `(IDENTIFIER_KW | functionName) LEFT_PAREN`
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-45132][SQL] Fix IDENTIFIER for function invocation [spark]
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on code in PR #42888:
URL: https://github.com/apache/spark/pull/42888#discussion_r1356379579
##########
sql/api/src/main/antlr4/org/apache/spark/sql/catalyst/parser/SqlBaseParser.g4:
##########
@@ -1196,6 +1195,7 @@ qualifiedNameList
functionName
: IDENTIFIER_KW LEFT_PAREN expression RIGHT_PAREN
+ | identFunc=IDENTIFIER_KW // IDENTIFIER itself is also a valid function name.
Review Comment:
```suggestion
| identFunc=IDENTIFIER_KW // IDENTIFIER itself is also a valid function name.
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-45132][SQL] Fix IDENTIFIER for function invocation [spark]
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on PR #42888:
URL: https://github.com/apache/spark/pull/42888#issuecomment-1759625160
The failed pyspark test is unrelated. Thanks, merging to master/3.5!
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-45132][SQL] Fix IDENTIFIER for function invocation [spark]
Posted by "srielau (via GitHub)" <gi...@apache.org>.
srielau commented on code in PR #42888:
URL: https://github.com/apache/spark/pull/42888#discussion_r1352802027
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/parser/AstBuilder.scala:
##########
@@ -2274,19 +2267,32 @@ class AstBuilder extends DataTypeAstBuilder with SQLConfHelper with Logging {
val filter = Option(ctx.where).map(expression(_))
val ignoreNulls =
Option(ctx.nullsOption).map(_.getType == SqlBaseParser.IGNORE).getOrElse(false)
- val funcCtx = ctx.functionName
- val func = withFuncIdentClause(
- funcCtx,
- ident => UnresolvedFunction(ident, arguments, isDistinct, filter, ignoreNulls)
- )
- // Check if the function is evaluated in a windowed context.
- ctx.windowSpec match {
- case spec: WindowRefContext =>
- UnresolvedWindowExpression(func, visitWindowRef(spec))
- case spec: WindowDefContext =>
- WindowExpression(func, visitWindowDef(spec))
- case _ => func
+ // Is this an IDENTIFIER clause instead of a function call?
+ if (name.toLowerCase(Locale.ROOT) == "identifier" && // IDENTIFIER (but not `IDENTIFIER`)
Review Comment:
@cloud-fan This doesn't work. (see commit history for what I tried).
On the bubble I think the current solution is the best.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-45132][SQL] Fix IDENTIFIER for function invocation [spark]
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on code in PR #42888:
URL: https://github.com/apache/spark/pull/42888#discussion_r1354740611
##########
sql/api/src/main/antlr4/org/apache/spark/sql/catalyst/parser/SqlBaseParser.g4:
##########
@@ -1196,6 +1195,7 @@ qualifiedNameList
functionName
: IDENTIFIER_KW LEFT_PAREN expression RIGHT_PAREN
+ | identFunc=IDENTIFIER_KW // IDENTIFIER itself is also a valid function name.
Review Comment:
```suggestion
| identFunc=IDENTIFIER_KW // IDENTIFIER itself is also a valid function name.
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] cloud-fan commented on a diff in pull request #42888: [SPARK-45132][SQL] Fix IDENTIFIER for function invocation
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on code in PR #42888:
URL: https://github.com/apache/spark/pull/42888#discussion_r1323021687
##########
sql/core/src/test/resources/sql-tests/analyzer-results/identifier-clause.sql.out:
##########
@@ -187,10 +187,11 @@ Project [coalesce(cast(null as int), 1) AS coalesce(NULL, 1)#x]
-- !query
-SELECT IDENTIFIER('abs')(-1)
+SELECT IDENTIFIER('abs')(c1) FROM VALUES(-1) AS T(c1)
Review Comment:
what was the behavior before this PR?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] srielau commented on a diff in pull request #42888: [SPARK-45132][SQL] Fix IDENTIFIER for function invocation
Posted by "srielau (via GitHub)" <gi...@apache.org>.
srielau commented on code in PR #42888:
URL: https://github.com/apache/spark/pull/42888#discussion_r1323148343
##########
sql/core/src/test/resources/sql-tests/analyzer-results/identifier-clause.sql.out:
##########
@@ -187,10 +187,11 @@ Project [coalesce(cast(null as int), 1) AS coalesce(NULL, 1)#x]
-- !query
-SELECT IDENTIFIER('abs')(-1)
+SELECT IDENTIFIER('abs')(c1) FROM VALUES(-1) AS T(c1)
Review Comment:
`scala> spark.sql("SELECT IDENTIFIER(:agg)(c1) FROM VALUES(1), (2) AS T(c1)", args = Map("agg" -> "max"))
org.apache.spark.sql.catalyst.ExtendedAnalysisException: [UNRESOLVED_COLUMN.WITH_SUGGESTION] A column, variable, or function parameter with name `max` cannot be resolved. Did you mean one of the following? [`c1`].; line 1 pos 7;
'Project ['max AS (c1)]
+- SubqueryAlias T
+- LocalRelation [c1#0]
`
It appears to have treated (c1) as an alias!
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-45132][SQL] Fix IDENTIFIER for function invocation [spark]
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on code in PR #42888:
URL: https://github.com/apache/spark/pull/42888#discussion_r1356029023
##########
sql/api/src/main/antlr4/org/apache/spark/sql/catalyst/parser/SqlBaseParser.g4:
##########
@@ -1196,6 +1195,7 @@ qualifiedNameList
functionName
: IDENTIFIER_KW LEFT_PAREN expression RIGHT_PAREN
+ | identFunc=IDENTIFIER_KW // IDENTIFIER itself is also a valid function name.
Review Comment:
```suggestion
| identFunc=IDENTIFIER_KW // IDENTIFIER itself is also a valid function name.
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-45132][SQL] Fix IDENTIFIER for function invocation [spark]
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan closed pull request #42888: [SPARK-45132][SQL] Fix IDENTIFIER for function invocation
URL: https://github.com/apache/spark/pull/42888
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org