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 4a6de748d3
commit fb2a83b2b7
14 changed files with 42 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/backend/optimizer/util/appendinfo.c
View File

@@ -748,7 +748,7 @@ find_appinfos_by_relids(PlannerInfo *root, Relids relids, int *nappinfos)
/*
* add_row_identity_var
* Register a row-identity column to be used in UPDATE/DELETE.
* Register a row-identity column to be used in UPDATE/DELETE/MERGE.
*
* The Var must be equal(), aside from varno, to any other row-identity
* column with the same rowid_name. Thus, for example, "wholerow"
@@ -927,8 +927,8 @@ add_row_identity_columns(PlannerInfo *root, Index rtindex,
* distribute_row_identity_vars
*
* After we have finished identifying all the row identity columns
* needed by an inherited UPDATE/DELETE query, make sure that these
* columns will be generated by all the target relations.
* needed by an inherited UPDATE/DELETE/MERGE query, make sure that
* these columns will be generated by all the target relations.
*
* This is more or less like what build_base_rel_tlists() does,
* except that it would not understand what to do with ROWID_VAR Vars.

2
src/backend/optimizer/util/inherit.c
View File

@@ -609,7 +609,7 @@ expand_single_inheritance_child(PlannerInfo *root, RangeTblEntry *parentrte,
/*
* If we are creating a child of the query target relation (only possible
* in UPDATE/DELETE), add it to all_result_relids, as well as
* in UPDATE/DELETE/MERGE), add it to all_result_relids, as well as
* leaf_result_relids if appropriate, and make sure that we generate
* required row-identity data.
*/

3
src/backend/optimizer/util/pathnode.c
View File

@@ -3613,7 +3613,8 @@ create_lockrows_path(PlannerInfo *root, RelOptInfo *rel,
/*
* create_modifytable_path
* Creates a pathnode that represents performing INSERT/UPDATE/DELETE mods
* Creates a pathnode that represents performing INSERT/UPDATE/DELETE/MERGE
* mods
*
* 'rel' is the parent relation associated with the result
* 'subpath' is a Path producing source data

2
src/backend/optimizer/util/relnode.c
View File

@@ -999,7 +999,7 @@ build_joinrel_tlist(PlannerInfo *root, RelOptInfo *joinrel,
if (var->varno == ROWID_VAR)
{
/* UPDATE/DELETE row identity vars are always needed */
/* UPDATE/DELETE/MERGE row identity vars are always needed */
RowIdentityVarInfo *ridinfo = (RowIdentityVarInfo *)
list_nth(root->row_identity_vars, var->varattno - 1);