database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-09-02 04:21:28 +03:00
Code Activity

Update some comments that should've covered MERGE

Browse Source 
Oversight in 7103ebb7aa.  Backpatch to 15.

Author: Richard Guo <guofenglinux@gmail.com>
Discussion: https://postgr.es/m/CAMbWs48gnDjZXq3-b56dVpQCNUJ5hD9kdtWN4QFwKCEapspNsA@mail.gmail.com
This commit is contained in:
Alvaro Herrera
2022-10-24 12:52:43 +02:00
parent 8328a15f8f
commit 3b2db22fe2
14 changed files with 42 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/backend/optimizer/plan/planmain.c
View File

@@ -266,7 +266,7 @@ query_planner(PlannerInfo *root,
add_other_rels_to_query(root);
/*
* Distribute any UPDATE/DELETE row identity variables to the target
* Distribute any UPDATE/DELETE/MERGE row identity variables to the target
* relations. This can't be done till we've finished expansion of
* appendrels.
*/

4
src/backend/optimizer/plan/planner.c
View File

@@ -1749,7 +1749,7 @@ grouping_planner(PlannerInfo *root, double tuple_fraction)
if (bms_membership(root->all_result_relids) == BMS_MULTIPLE)
{
/* Inherited UPDATE/DELETE */
/* Inherited UPDATE/DELETE/MERGE */
RelOptInfo *top_result_rel = find_base_rel(root,
parse->resultRelation);
int resultRelation = -1;
@@ -1876,7 +1876,7 @@ grouping_planner(PlannerInfo *root, double tuple_fraction)
}
else
{
/* Single-relation INSERT/UPDATE/DELETE. */
/* Single-relation INSERT/UPDATE/DELETE/MERGE. */
resultRelations = list_make1_int(parse->resultRelation);
if (parse->commandType == CMD_UPDATE)
updateColnosLists = list_make1(root->update_colnos);