You are viewing a plain text version of this content. The canonical link for it is here.
Posted to reviews@spark.apache.org by "mihailotim-db (via GitHub)" <gi...@apache.org> on 2025/06/03 15:55:33 UTC
[PR] fix [spark]
mihailotim-db opened a new pull request, #51073:
URL: https://github.com/apache/spark/pull/51073
<!--
Thanks for sending a pull request! Here are some tips for you:
1. If this is your first time, please read our contributor guidelines: https://spark.apache.org/contributing.html
2. Ensure you have added or run the appropriate tests for your PR: https://spark.apache.org/developer-tools.html
3. If the PR is unfinished, add '[WIP]' in your PR title, e.g., '[WIP][SPARK-XXXX] Your PR title ...'.
4. Be sure to keep the PR description updated to reflect all changes.
5. Please write your PR title to summarize what this PR proposes.
6. If possible, provide a concise example to reproduce the issue for a faster review.
7. If you want to add a new configuration, please read the guideline first for naming configurations in
'core/src/main/scala/org/apache/spark/internal/config/ConfigEntry.scala'.
8. If you want to add or modify an error type or message, please read the guideline first in
'common/utils/src/main/resources/error/README.md'.
-->
### What changes were proposed in this pull request?
<!--
Please clarify what changes you are proposing. The purpose of this section is to outline the changes and how this PR fixes the issue.
If possible, please consider writing useful notes for better and faster reviews in your PR. See the examples below.
1. If you refactor some codes with changing classes, showing the class hierarchy will help reviewers.
2. If you fix some SQL features, you can provide some references of other DBMSes.
3. If there is design documentation, please add the link.
4. If there is a discussion in the mailing list, please add the link.
-->
### 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.
-->
### Does this PR introduce _any_ user-facing change?
<!--
Note that it means *any* user-facing change including all aspects such as new features, bug fixes, or other behavior changes. Documentation-only updates are not considered user-facing changes.
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'.
-->
### 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.
-->
### 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.
-->
--
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-52388][SQL] Handle named and positional parameters under `PlanWithUnresolvedIdentifier` [spark]
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on PR #51073:
URL: https://github.com/apache/spark/pull/51073#issuecomment-2949983668
Hiding plans/expressions with a lambda function is evil. We should do the right thing even if it's not easy (need to fix commands one by one).
--
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-52388][SQL] Handle named and positional parameters under `PlanWithUnresolvedIdentifier` [spark]
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on PR #51073:
URL: https://github.com/apache/spark/pull/51073#issuecomment-3160566031
I don't believe this is the right fix. We should fix every place in the parser to not hide plans/expressions within a lambda function.
--
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-52388][SQL] Handle named and positional parameters under `PlanWithUnresolvedIdentifier` [spark]
Posted by "github-actions[bot] (via GitHub)" <gi...@apache.org>.
github-actions[bot] commented on PR #51073:
URL: https://github.com/apache/spark/pull/51073#issuecomment-3535159078
We're closing this PR because it hasn't been updated in a while. This isn't a judgement on the merit of the PR in any way. It's just a way of keeping the PR queue manageable.
If you'd like to revive this PR, please reopen it and ask a committer to remove the Stale tag!
--
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-52388][SQL] Handle named and positional parameters under `PlanWithUnresolvedIdentifier` [spark]
Posted by "vladimirg-db (via GitHub)" <gi...@apache.org>.
vladimirg-db commented on code in PR #51073:
URL: https://github.com/apache/spark/pull/51073#discussion_r2132342044
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/parameters.scala:
##########
@@ -186,7 +188,23 @@ object BindParameters extends Rule[LogicalPlan] with QueryErrorsBase {
}
val args = argNames.zip(argValues).toMap
checkArgs(args)
- bind(child) { case NamedParameter(name) if args.contains(name) => args(name) }
+
+ val boundArguments = new HashSet[String]
Review Comment:
Any chance we can move this common code to a common method?
--
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-52388][SQL] Handle named and positional parameters under `PlanWithUnresolvedIdentifier` [spark]
Posted by "mihailotim-db (via GitHub)" <gi...@apache.org>.
mihailotim-db commented on PR #51073:
URL: https://github.com/apache/spark/pull/51073#issuecomment-2949968337
> My opinion is that `PlanWithUnresolvedIdentifier` should hide as few things as possible. We should change `PlanWithUnresolvedIdentifier(... => InsertIntoStatement)` to `InsertIntoStatement(PlanWithUnresolvedIdentifier(... => UnresolvedRelation))`
I don't like the idea of implementing a fix for a specific operator, mostly because we are bound to find more issues like this. For example, in this case we would fail for any query that has this pattern of a parameter inside `PlanWithUnresolvedIdentifier`.
--
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-52388][SQL] Handle named and positional parameters under `PlanWithUnresolvedIdentifier` [spark]
Posted by "vladimirg-db (via GitHub)" <gi...@apache.org>.
vladimirg-db commented on code in PR #51073:
URL: https://github.com/apache/spark/pull/51073#discussion_r2132340945
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/RemoveParametrizedQuery.scala:
##########
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.spark.sql.catalyst.analysis
+
+import org.apache.spark.sql.catalyst.plans.logical.LogicalPlan
+import org.apache.spark.sql.catalyst.rules.Rule
+import org.apache.spark.sql.catalyst.trees.TreePattern.PARAMETERIZED_QUERY
+
+/**
+ * Removes [[ParameterizedQuery]] nodes after the resolution batch has finished.
+ */
+object RemoveParametrizedQuery extends Rule[LogicalPlan] {
Review Comment:
😬
--
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-52388][SQL] Handle named and positional parameters under `PlanWithUnresolvedIdentifier` [spark]
Posted by "mihailotim-db (via GitHub)" <gi...@apache.org>.
mihailotim-db commented on code in PR #51073:
URL: https://github.com/apache/spark/pull/51073#discussion_r2132473659
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/parameters.scala:
##########
@@ -186,7 +188,23 @@ object BindParameters extends Rule[LogicalPlan] with QueryErrorsBase {
}
val args = argNames.zip(argValues).toMap
checkArgs(args)
- bind(child) { case NamedParameter(name) if args.contains(name) => args(name) }
+
+ val boundArguments = new HashSet[String]
Review Comment:
There are subtle differences: index vs string, `case NamedParameter` vs `case PosParameter` and the filtering function
--
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-52388][SQL] Handle named and positional parameters under `PlanWithUnresolvedIdentifier` [spark]
Posted by "mihailotim-db (via GitHub)" <gi...@apache.org>.
mihailotim-db commented on code in PR #51073:
URL: https://github.com/apache/spark/pull/51073#discussion_r2132594007
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/parameters.scala:
##########
@@ -186,7 +188,23 @@ object BindParameters extends Rule[LogicalPlan] with QueryErrorsBase {
}
val args = argNames.zip(argValues).toMap
checkArgs(args)
- bind(child) { case NamedParameter(name) if args.contains(name) => args(name) }
+
+ val boundArguments = new HashSet[String]
+ val childWithBoundArguments = bind(child) {
+ case NamedParameter(name) if args.contains(name) =>
+ boundArguments.add(name)
+ args(name)
+ }
+
+ val missingArguments = args.filterNot { case (argName, _) =>
+ boundArguments.contains(argName)
+ }
+
+ if (missingArguments.nonEmpty) {
+ NameParameterizedQuery(childWithBoundArguments, missingArguments)
Review Comment:
Ah true, but I guess we just shouldn't exhaust parameters but always keep original `ParametrziedQuery` not up until the end?
--
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-52388][SQL] Handle named and positional parameters under `PlanWithUnresolvedIdentifier` [spark]
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on code in PR #51073:
URL: https://github.com/apache/spark/pull/51073#discussion_r2257516299
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/parameters.scala:
##########
@@ -186,7 +188,23 @@ object BindParameters extends Rule[LogicalPlan] with QueryErrorsBase {
}
val args = argNames.zip(argValues).toMap
checkArgs(args)
- bind(child) { case NamedParameter(name) if args.contains(name) => args(name) }
+
+ val boundArguments = new HashSet[String]
+ val childWithBoundArguments = bind(child) {
+ case NamedParameter(name) if args.contains(name) =>
+ boundArguments.add(name)
+ args(name)
+ }
+
+ val missingArguments = args.filterNot { case (argName, _) =>
+ boundArguments.contains(argName)
+ }
+
+ if (missingArguments.nonEmpty) {
+ NameParameterizedQuery(childWithBoundArguments, missingArguments)
Review Comment:
we never know when we can safely remove `ParametrziedQuery`
--
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-52388][SQL] Handle named and positional parameters under `PlanWithUnresolvedIdentifier` [spark]
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on PR #51073:
URL: https://github.com/apache/spark/pull/51073#issuecomment-2949838671
My opinion is that `PlanWithUnresolvedIdentifier` should hide as few things as possible. We should change `PlanWithUnresolvedIdentifier(... => InsertIntoStatement)` to `InsertIntoStatement(PlanWithUnresolvedIdentifier(... => UnresolvedRelation))`
--
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-52388][SQL] Handle named and positional parameters under `PlanWithUnresolvedIdentifier` [spark]
Posted by "github-actions[bot] (via GitHub)" <gi...@apache.org>.
github-actions[bot] closed pull request #51073: [SPARK-52388][SQL] Handle named and positional parameters under `PlanWithUnresolvedIdentifier`
URL: https://github.com/apache/spark/pull/51073
--
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-52388][SQL] Handle named and positional parameters under `PlanWithUnresolvedIdentifier` [spark]
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on code in PR #51073:
URL: https://github.com/apache/spark/pull/51073#discussion_r2132517862
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/parameters.scala:
##########
@@ -186,7 +188,23 @@ object BindParameters extends Rule[LogicalPlan] with QueryErrorsBase {
}
val args = argNames.zip(argValues).toMap
checkArgs(args)
- bind(child) { case NamedParameter(name) if args.contains(name) => args(name) }
+
+ val boundArguments = new HashSet[String]
+ val childWithBoundArguments = bind(child) {
+ case NamedParameter(name) if args.contains(name) =>
+ boundArguments.add(name)
+ args(name)
+ }
+
+ val missingArguments = args.filterNot { case (argName, _) =>
+ boundArguments.contains(argName)
+ }
+
+ if (missingArguments.nonEmpty) {
+ NameParameterizedQuery(childWithBoundArguments, missingArguments)
Review Comment:
This is fragile. Even if all parameters are accessed, it doesn't mean there is no unbound parameter in the query plan, hidden by `PlanWithUnresolvedIdentifier`
--
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-52388][SQL] Handle named and positional parameters under `PlanWithUnresolvedIdentifier` [spark]
Posted by "mihailotim-db (via GitHub)" <gi...@apache.org>.
mihailotim-db commented on code in PR #51073:
URL: https://github.com/apache/spark/pull/51073#discussion_r2132179659
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/parameters.scala:
##########
@@ -186,7 +188,23 @@ object BindParameters extends Rule[LogicalPlan] with QueryErrorsBase {
}
val args = argNames.zip(argValues).toMap
checkArgs(args)
- bind(child) { case NamedParameter(name) if args.contains(name) => args(name) }
+
+ val boundArguments = new HashSet[String]
+ val childWithBoundArguments = bind(child) {
+ case NamedParameter(name) if args.contains(name) =>
+ boundArguments.add(name)
+ args(name)
+ }
+
+ val missingArguments = args.filterNot { case (argName, _) =>
Review Comment:
You are right, changed the approach to address this issue
--
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-52388][SQL] Handle named and positional parameters under `PlanWithUnresolvedIdentifier` [spark]
Posted by "vladimirg-db (via GitHub)" <gi...@apache.org>.
vladimirg-db commented on code in PR #51073:
URL: https://github.com/apache/spark/pull/51073#discussion_r2124555006
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/parameters.scala:
##########
@@ -186,7 +188,23 @@ object BindParameters extends Rule[LogicalPlan] with QueryErrorsBase {
}
val args = argNames.zip(argValues).toMap
checkArgs(args)
- bind(child) { case NamedParameter(name) if args.contains(name) => args(name) }
+
+ val boundArguments = new HashSet[String]
+ val childWithBoundArguments = bind(child) {
+ case NamedParameter(name) if args.contains(name) =>
+ boundArguments.add(name)
+ args(name)
+ }
+
+ val missingArguments = args.filterNot { case (argName, _) =>
+ boundArguments.contains(argName)
+ }
+
+ if(missingArguments.nonEmpty) {
Review Comment:
```suggestion
if (missingArguments.nonEmpty) {
```
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/parameters.scala:
##########
@@ -186,7 +188,23 @@ object BindParameters extends Rule[LogicalPlan] with QueryErrorsBase {
}
val args = argNames.zip(argValues).toMap
checkArgs(args)
- bind(child) { case NamedParameter(name) if args.contains(name) => args(name) }
+
+ val boundArguments = new HashSet[String]
+ val childWithBoundArguments = bind(child) {
+ case NamedParameter(name) if args.contains(name) =>
+ boundArguments.add(name)
+ args(name)
+ }
+
+ val missingArguments = args.filterNot { case (argName, _) =>
Review Comment:
Not sure if this approach will work with the following DF program:
`spark.sql("SELECT :p1", Map("p1" -> "a", "p2" -> "b"))`
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/parameters.scala:
##########
@@ -198,9 +216,22 @@ object BindParameters extends Rule[LogicalPlan] with QueryErrorsBase {
bind(child) { case p @ PosParameter(pos) => positions.add(pos); p }
val posToIndex = positions.toSeq.sorted.zipWithIndex.toMap
- bind(child) {
+ val boundIndices = new HashSet[Int]
+ val childWithBoundArguments = bind(child) {
case PosParameter(pos) if posToIndex.contains(pos) && args.size > posToIndex(pos) =>
- args(posToIndex(pos))
+ val index = posToIndex(pos)
+ boundIndices.add(index)
+ args(index)
+ }
+
+ val missingArguments = indexedArgs.collect {
+ case (arg, index) if !boundIndices.contains(index) => arg
+ }
+
+ if(missingArguments.nonEmpty) {
Review Comment:
```suggestion
if (missingArguments.nonEmpty) {
```
--
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