You are viewing a plain text version of this content. The canonical link for it is here.
Posted to reviews@spark.apache.org by "leonwind (via GitHub)" <gi...@apache.org> on 2026/07/08 21:50:17 UTC
[PR] implement column list and refactor replace where into insertintostate… [spark]
leonwind opened a new pull request, #57142:
URL: https://github.com/apache/spark/pull/57142
…ment
<!--
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-58065] Support column lists for `INSERT REPLACE WHERE` [spark]
Posted by "leonwind (via GitHub)" <gi...@apache.org>.
leonwind commented on code in PR #57142:
URL: https://github.com/apache/spark/pull/57142#discussion_r3610332340
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala:
##########
@@ -1154,6 +1154,8 @@ class Analyzer(
// Thus, we need to look at the raw plan if `relation` is a temporary view.
// unwrapRelationPlan also resolves V2TableReference nodes in temp view plans.
unwrapRelationPlan(relation) match {
+ case v: View if i.replaceCriteriaOpt.exists(_.isReplaceWhere) =>
Review Comment:
Do we really need / should do this? We are just adding old references which do not bring any value for the future as this is outdated by then.
--
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-58065] Support column lists for `INSERT REPLACE WHERE` [spark]
Posted by "leonwind (via GitHub)" <gi...@apache.org>.
leonwind commented on code in PR #57142:
URL: https://github.com/apache/spark/pull/57142#discussion_r3596133134
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala:
##########
@@ -1154,6 +1154,8 @@ class Analyzer(
// Thus, we need to look at the raw plan if `relation` is a temporary view.
// unwrapRelationPlan also resolves V2TableReference nodes in temp view plans.
unwrapRelationPlan(relation) match {
+ case v: View if i.replaceCriteriaOpt.exists(_.isReplaceWhere) =>
Review Comment:
this is needed because before we re-factored `REPLACE WHERE` into `InsertIntoStatement`, it got rejected since it already is a `v2WriteCommand` and fails with the same `writeIntoViewNotAllowedError`.
So this additional guard is preserving the behavior of the refactor.
--
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-58065] Support column lists for `INSERT REPLACE WHERE` [spark]
Posted by "longvu-db (via GitHub)" <gi...@apache.org>.
longvu-db commented on code in PR #57142:
URL: https://github.com/apache/spark/pull/57142#discussion_r3614663423
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala:
##########
@@ -1154,6 +1154,8 @@ class Analyzer(
// Thus, we need to look at the raw plan if `relation` is a temporary view.
// unwrapRelationPlan also resolves V2TableReference nodes in temp view plans.
unwrapRelationPlan(relation) match {
+ case v: View if i.replaceCriteriaOpt.exists(_.isReplaceWhere) =>
Review Comment:
It's a nit, but I was just thinking it's worth pointing out there is another place in this same file which rejects Write, ideally there should only be one place which rejects Write >< View altogether, but unfortunately there are 2.
https://github.com/leonwind/spark/blob/4f49d3f8fd9e33ecbee4eae37be5b95ee05d0a83/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala#L1176C7-L1191C10
> case write: V2WriteCommand =>
write.table match {
case u: UnresolvedRelation if !u.isStreaming =>
resolveRelation(u).map(unwrapRelationPlan).map {
case v: View => throw QueryCompilationErrors.writeIntoViewNotAllowedError(
v.desc.identifier, write)
case u: UnresolvedCatalogRelation =>
throw QueryCompilationErrors.writeIntoV1TableNotAllowedError(
u.tableMeta.identifier, write)
case r: DataSourceV2Relation => write.withNewTable(r)
case _ =>
throw QueryCompilationErrors.writeIntoTempViewNotAllowedError(
u.multipartIdentifier.quoted)
}.getOrElse(write)
case _ => write
}
--
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-58065] Support column lists for `INSERT REPLACE WHERE` [spark]
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on code in PR #57142:
URL: https://github.com/apache/spark/pull/57142#discussion_r3622381145
##########
sql/api/src/main/antlr4/org/apache/spark/sql/catalyst/parser/SqlBaseParser.g4:
##########
@@ -594,7 +594,7 @@ query
insertInto
: INSERT (WITH SCHEMA EVOLUTION)? OVERWRITE TABLE? identifierReference optionsClause? (partitionSpec (IF errorCapturingNot EXISTS)?)? ((BY NAME) | identifierList)? #insertOverwriteTable
| INSERT (WITH SCHEMA EVOLUTION)? INTO TABLE? identifierReference optionsClause? partitionSpec? (IF errorCapturingNot EXISTS)? ((BY NAME) | identifierList)? #insertIntoTable
- | INSERT (WITH SCHEMA EVOLUTION)? INTO TABLE? identifierReference tableAlias optionsClause? (BY NAME)?
+ | INSERT (WITH SCHEMA EVOLUTION)? INTO TABLE? identifierReference tableAlias optionsClause? ((BY NAME) | identifierList)?
Review Comment:
Please restrict `identifierList` to the `REPLACE WHERE` form, or reject it explicitly in `visitInsertIntoReplaceOn`. This shared alternative also accepts `INSERT INTO t (a, b) REPLACE ON ...`, but the ON visitor sets `userSpecifiedCols = Seq.empty`, so the parsed list is silently ignored. A parser test for the ON form would guard this boundary.
--
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] implement column list and refactor replace where into insertintostate… [spark]
Posted by "HyukjinKwon (via GitHub)" <gi...@apache.org>.
HyukjinKwon commented on PR #57142:
URL: https://github.com/apache/spark/pull/57142#issuecomment-4919956935
mind filing a JRA and filling the PR description please?
--
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-58065] Support column lists for `INSERT REPLACE WHERE` [spark]
Posted by "leonwind (via GitHub)" <gi...@apache.org>.
leonwind commented on code in PR #57142:
URL: https://github.com/apache/spark/pull/57142#discussion_r3623519865
##########
sql/api/src/main/antlr4/org/apache/spark/sql/catalyst/parser/SqlBaseParser.g4:
##########
@@ -594,7 +594,7 @@ query
insertInto
: INSERT (WITH SCHEMA EVOLUTION)? OVERWRITE TABLE? identifierReference optionsClause? (partitionSpec (IF errorCapturingNot EXISTS)?)? ((BY NAME) | identifierList)? #insertOverwriteTable
| INSERT (WITH SCHEMA EVOLUTION)? INTO TABLE? identifierReference optionsClause? partitionSpec? (IF errorCapturingNot EXISTS)? ((BY NAME) | identifierList)? #insertIntoTable
- | INSERT (WITH SCHEMA EVOLUTION)? INTO TABLE? identifierReference tableAlias optionsClause? (BY NAME)?
+ | INSERT (WITH SCHEMA EVOLUTION)? INTO TABLE? identifierReference tableAlias optionsClause? ((BY NAME) | identifierList)?
Review Comment:
thanks. I added a guard in `visitInsertIntoReplaceOn` to keep the grammar together.
--
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-58065] Support column lists for `INSERT REPLACE WHERE` [spark]
Posted by "longvu-db (via GitHub)" <gi...@apache.org>.
longvu-db commented on code in PR #57142:
URL: https://github.com/apache/spark/pull/57142#discussion_r3599455687
##########
sql/core/src/test/scala/org/apache/spark/sql/connector/DataSourceV2SQLSuite.scala:
##########
@@ -4155,6 +4155,104 @@ class DataSourceV2SQLSuiteV1Filter
}
}
+ test("Selective Overwrite: REPLACE WHERE with column list - maps source columns by position") {
Review Comment:
Should we add some tests that involving writing data between REPLACE WHERE column list and other features? I.e. WITH SCHEMA EVOLUTION, write options, struct columns, https://github.com/apache/spark/blob/master/sql/core/src/test/scala/org/apache/spark/sql/execution/ExecuteImmediateEndToEndSuite.scala,...
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala:
##########
@@ -1154,6 +1154,8 @@ class Analyzer(
// Thus, we need to look at the raw plan if `relation` is a temporary view.
// unwrapRelationPlan also resolves V2TableReference nodes in temp view plans.
unwrapRelationPlan(relation) match {
+ case v: View if i.replaceCriteriaOpt.exists(_.isReplaceWhere) =>
Review Comment:
Let's put this context into a short comment, so the goal is to simply preserve the exception error class, although.
Another good thing about this comment is to give context on the various places View is rejected, which is currently all over the place.
--
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-58065] Support column lists for `INSERT REPLACE WHERE` [spark]
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on PR #57142:
URL: https://github.com/apache/spark/pull/57142#issuecomment-5047574572
**Merge Summary:**
- merged into master https://github.com/apache/spark/commit/aed53d9d445c28e2e94be10371410c377ec354f6
- merged into branch-4.x https://github.com/apache/spark/commit/442b2ab64c671fa05aca16e5eed296a6c62c2a6a
*Posted by `merge_spark_pr.py`*
--
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-58065] Support column lists for `INSERT REPLACE WHERE` [spark]
Posted by "leonwind (via GitHub)" <gi...@apache.org>.
leonwind commented on code in PR #57142:
URL: https://github.com/apache/spark/pull/57142#discussion_r3610333062
##########
sql/core/src/test/scala/org/apache/spark/sql/connector/DataSourceV2SQLSuite.scala:
##########
@@ -4155,6 +4155,104 @@ class DataSourceV2SQLSuiteV1Filter
}
}
+ test("Selective Overwrite: REPLACE WHERE with column list - maps source columns by position") {
Review Comment:
added more tests
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-58065] Support column lists for `INSERT REPLACE WHERE` [spark]
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan closed pull request #57142: [SPARK-58065] Support column lists for `INSERT REPLACE WHERE`
URL: https://github.com/apache/spark/pull/57142
--
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-58065] Support column lists for `INSERT REPLACE WHERE` [spark]
Posted by "leonwind (via GitHub)" <gi...@apache.org>.
leonwind commented on code in PR #57142:
URL: https://github.com/apache/spark/pull/57142#discussion_r3596133134
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala:
##########
@@ -1154,6 +1154,8 @@ class Analyzer(
// Thus, we need to look at the raw plan if `relation` is a temporary view.
// unwrapRelationPlan also resolves V2TableReference nodes in temp view plans.
unwrapRelationPlan(relation) match {
+ case v: View if i.replaceCriteriaOpt.exists(_.isReplaceWhere) =>
Review Comment:
this is needed because before we re-factored `REPLACE WHERE` into `InsertIntoStatement`, it got rejected since it is a `v2WriteCommand` (`OverwriteByExpression`) and fails with the same `writeIntoViewNotAllowedError`.
So this additional guard is preserving the behavior of the refactor.
--
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