You are viewing a plain text version of this content. The canonical link for it is here.
Posted to gitbox@hive.apache.org by "deniskuzZ (via GitHub)" <gi...@apache.org> on 2024/03/14 13:37:39 UTC
[PR] HIVE-28119: Allow insert clause with a column list in Merge query not_matched condition [hive]
deniskuzZ opened a new pull request, #5127:
URL: https://github.com/apache/hive/pull/5127
<!--
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://cwiki.apache.org/confluence/display/Hive/HowToContribute
2. Ensure that you have created an issue on the Hive project JIRA: https://issues.apache.org/jira/projects/HIVE/summary
3. Ensure you have added or run the appropriate tests for your PR:
4. If the PR is unfinished, add '[WIP]' in your PR title, e.g., '[WIP]HIVE-XXXXX: Your PR title ...'.
5. Be sure to keep the PR description updated to reflect all changes.
6. Please write your PR title to summarize what this PR proposes.
7. If possible, provide a concise example to reproduce the issue for a faster review.
-->
### 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.
-->
Syntax improvement for the Merge query with insert clause
### 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.
-->
Usability
### 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, screenshot and/or a reproducable example to show the behavior difference if possible.
If possible, please also clarify if this is a user-facing change compared to the released Hive versions or within the unreleased branches such as master.
If no, write 'No'.
-->
No
### Is the change a dependency upgrade?
<!--
If yes, please attach a file with output from mvn dependency:tree to validate a complete upgrade of dependency.
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.
-->
mvn test -Dtest=TestIcebergCliDriver -Dqfile=merge_iceberg_copy_on_write_partitioned.q,merge_iceberg_copy_on_write_unpartitioned.q
--
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: gitbox-unsubscribe@hive.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: gitbox-unsubscribe@hive.apache.org
For additional commands, e-mail: gitbox-help@hive.apache.org
Re: [PR] HIVE-28119: Iceberg: Allow insert clause with a column list in Merge query not_matched condition [hive]
Posted by "deniskuzZ (via GitHub)" <gi...@apache.org>.
deniskuzZ commented on code in PR #5127:
URL: https://github.com/apache/hive/pull/5127#discussion_r1531743773
##########
ql/src/java/org/apache/hadoop/hive/ql/parse/rewrite/CopyOnWriteMergeRewriter.java:
##########
@@ -149,8 +153,20 @@ public void appendWhenNotMatchedInsertClause(MergeStatement.InsertClause insertC
hintStr = null;
}
List<String> values = sqlGenerator.getDeleteValues(Context.Operation.MERGE);
- values.add(insertClause.getValuesClause());
+ if (insertClause.getColumnListText() != null) {
+ String[] columnNames = insertClause.getColumnListText()
+ .substring(1, insertClause.getColumnListText().length() - 1).split(",");
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: gitbox-unsubscribe@hive.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: gitbox-unsubscribe@hive.apache.org
For additional commands, e-mail: gitbox-help@hive.apache.org
Re: [PR] HIVE-28119: Iceberg: Allow insert clause with a column list in Merge query not_matched condition [hive]
Posted by "deniskuzZ (via GitHub)" <gi...@apache.org>.
deniskuzZ merged PR #5127:
URL: https://github.com/apache/hive/pull/5127
--
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: gitbox-unsubscribe@hive.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: gitbox-unsubscribe@hive.apache.org
For additional commands, e-mail: gitbox-help@hive.apache.org
Re: [PR] HIVE-28119: Iceberg: Allow insert clause with a column list in Merge query not_matched condition [hive]
Posted by "kasakrisz (via GitHub)" <gi...@apache.org>.
kasakrisz commented on code in PR #5127:
URL: https://github.com/apache/hive/pull/5127#discussion_r1531691872
##########
ql/src/java/org/apache/hadoop/hive/ql/parse/rewrite/CopyOnWriteMergeRewriter.java:
##########
@@ -149,8 +153,20 @@ public void appendWhenNotMatchedInsertClause(MergeStatement.InsertClause insertC
hintStr = null;
}
List<String> values = sqlGenerator.getDeleteValues(Context.Operation.MERGE);
- values.add(insertClause.getValuesClause());
+ if (insertClause.getColumnListText() != null) {
+ String[] columnNames = insertClause.getColumnListText()
+ .substring(1, insertClause.getColumnListText().length() - 1).split(",");
Review Comment:
Is this works when a column name has `,` ?
```
merge into target_ice as t using source src ON t.a = src.a
when not matched then insert (a, `c,c`) values (src.a, src.c);
```
The original AST of the merge statement already contains the column names in separate AST nodes:
```
TOK_TABCOLNAME
a
c,c
```
https://github.com/apache/hive/blob/df45194268ffb10f9f7aae0ab4e3aec35a7b31d8/ql/src/java/org/apache/hadoop/hive/ql/parse/MergeSemanticAnalyzer.java#L343-L345
and these are collected to a list
https://github.com/apache/hive/blob/df45194268ffb10f9f7aae0ab4e3aec35a7b31d8/ql/src/java/org/apache/hadoop/hive/ql/parse/MergeSemanticAnalyzer.java#L355
Can you please try changing `MergeStatement.InsertClause.columnListText` from `String` to `List<String>`?
##########
ql/src/java/org/apache/hadoop/hive/ql/parse/rewrite/CopyOnWriteMergeRewriter.java:
##########
@@ -149,8 +153,20 @@ public void appendWhenNotMatchedInsertClause(MergeStatement.InsertClause insertC
hintStr = null;
}
List<String> values = sqlGenerator.getDeleteValues(Context.Operation.MERGE);
- values.add(insertClause.getValuesClause());
+ if (insertClause.getColumnListText() != null) {
+ String[] columnNames = insertClause.getColumnListText()
+ .substring(1, insertClause.getColumnListText().length() - 1).split(",");
+ String[] columnValues = insertClause.getValuesClause().split(",");
Review Comment:
Initially values are also represented in the AST
```
TOK_FUNCTION
struct
.
TOK_TABLE_OR_COL
some_alias
a
.
TOK_TABLE_OR_COL
some_alias
c,c
```
We can try transform it to a `List<String>`
--
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: gitbox-unsubscribe@hive.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: gitbox-unsubscribe@hive.apache.org
For additional commands, e-mail: gitbox-help@hive.apache.org
Re: [PR] HIVE-28119: Allow insert clause with a column list in Merge query not_matched condition [hive]
Posted by "sonarcloud[bot] (via GitHub)" <gi...@apache.org>.
sonarcloud[bot] commented on PR #5127:
URL: https://github.com/apache/hive/pull/5127#issuecomment-1997740544
## [](https://sonarcloud.io/dashboard?id=apache_hive&pullRequest=5127) **Quality Gate passed**
Issues
 [0 New issues](https://sonarcloud.io/project/issues?id=apache_hive&pullRequest=5127&resolved=false&inNewCodePeriod=true)
 [0 Accepted issues](https://sonarcloud.io/component_measures?id=apache_hive&pullRequest=5127&metric=new_accepted_issues&view=list)
Measures
 [0 Security Hotspots](https://sonarcloud.io/project/security_hotspots?id=apache_hive&pullRequest=5127&resolved=false&inNewCodePeriod=true)
 No data about Coverage
 No data about Duplication
[See analysis details on SonarCloud](https://sonarcloud.io/dashboard?id=apache_hive&pullRequest=5127)
--
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: gitbox-unsubscribe@hive.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: gitbox-unsubscribe@hive.apache.org
For additional commands, e-mail: gitbox-help@hive.apache.org
Re: [PR] HIVE-28119: Iceberg: Allow insert clause with a column list in Merge query not_matched condition [hive]
Posted by "deniskuzZ (via GitHub)" <gi...@apache.org>.
deniskuzZ commented on PR #5127:
URL: https://github.com/apache/hive/pull/5127#issuecomment-2009098354
@kasakrisz, thanks for checking and sorry i didn't wait enough, I'll address your comments in the addendum
--
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: gitbox-unsubscribe@hive.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: gitbox-unsubscribe@hive.apache.org
For additional commands, e-mail: gitbox-help@hive.apache.org