diff options
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/nodes/parsenodes.h | 4 | ||||
| -rw-r--r-- | src/include/nodes/pathnodes.h | 16 | ||||
| -rw-r--r-- | src/include/nodes/plannodes.h | 4 | ||||
| -rw-r--r-- | src/include/nodes/primnodes.h | 4 |
4 files changed, 14 insertions, 14 deletions
diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h index 633e7671b3e..7e7ad3f7e47 100644 --- a/src/include/nodes/parsenodes.h +++ b/src/include/nodes/parsenodes.h @@ -1043,8 +1043,8 @@ typedef struct RangeTblEntry * * rellockmode is really LOCKMODE, but it's declared int to avoid having * to include lock-related headers here. It must be RowExclusiveLock if - * the RTE is an INSERT/UPDATE/DELETE target, else RowShareLock if the RTE - * is a SELECT FOR UPDATE/FOR SHARE target, else AccessShareLock. + * the RTE is an INSERT/UPDATE/DELETE/MERGE target, else RowShareLock if + * the RTE is a SELECT FOR UPDATE/FOR SHARE target, else AccessShareLock. * * Note: in some cases, rule expansion may result in RTEs that are marked * with RowExclusiveLock even though they are not the target of the diff --git a/src/include/nodes/pathnodes.h b/src/include/nodes/pathnodes.h index 6bda383bead..09342d128d5 100644 --- a/src/include/nodes/pathnodes.h +++ b/src/include/nodes/pathnodes.h @@ -328,11 +328,11 @@ struct PlannerInfo /* * all_result_relids is empty for SELECT, otherwise it contains at least - * parse->resultRelation. For UPDATE/DELETE across an inheritance or - * partitioning tree, the result rel's child relids are added. When using - * multi-level partitioning, intermediate partitioned rels are included. - * leaf_result_relids is similar except that only actual result tables, - * not partitioned tables, are included in it. + * parse->resultRelation. For UPDATE/DELETE/MERGE across an inheritance + * or partitioning tree, the result rel's child relids are added. When + * using multi-level partitioning, intermediate partitioned rels are + * included. leaf_result_relids is similar except that only actual result + * tables, not partitioned tables, are included in it. */ /* set of all result relids */ Relids all_result_relids; @@ -2792,10 +2792,10 @@ typedef struct AppendRelInfo } AppendRelInfo; /* - * Information about a row-identity "resjunk" column in UPDATE/DELETE. + * Information about a row-identity "resjunk" column in UPDATE/DELETE/MERGE. * - * In partitioned UPDATE/DELETE it's important for child partitions to share - * row-identity columns whenever possible, so as not to chew up too many + * In partitioned UPDATE/DELETE/MERGE it's important for child partitions to + * share row-identity columns whenever possible, so as not to chew up too many * targetlist columns. We use these structs to track which identity columns * have been requested. In the finished plan, each of these will give rise * to one resjunk entry in the targetlist of the ModifyTable's subplan node. diff --git a/src/include/nodes/plannodes.h b/src/include/nodes/plannodes.h index 21e642a64c4..5c2ab1b3792 100644 --- a/src/include/nodes/plannodes.h +++ b/src/include/nodes/plannodes.h @@ -72,7 +72,7 @@ typedef struct PlannedStmt List *rtable; /* list of RangeTblEntry nodes */ - /* rtable indexes of target relations for INSERT/UPDATE/DELETE */ + /* rtable indexes of target relations for INSERT/UPDATE/DELETE/MERGE */ List *resultRelations; /* integer list of RT indexes, or NIL */ List *appendRelations; /* list of AppendRelInfo nodes */ @@ -217,7 +217,7 @@ typedef struct ProjectSet * nominalRelation and rootRelation contain the RT index of the partition * root, which is not otherwise mentioned in the plan. Otherwise rootRelation * is zero. However, nominalRelation will always be set, as it's the rel that - * EXPLAIN should claim is the INSERT/UPDATE/DELETE target. + * EXPLAIN should claim is the INSERT/UPDATE/DELETE/MERGE target. * * Note that rowMarks and epqParam are presumed to be valid for all the * table(s); they can't contain any info that varies across tables. diff --git a/src/include/nodes/primnodes.h b/src/include/nodes/primnodes.h index 40661334bbe..f71f551782f 100644 --- a/src/include/nodes/primnodes.h +++ b/src/include/nodes/primnodes.h @@ -177,8 +177,8 @@ typedef struct Expr * is abused to signify references to columns of a custom scan tuple type.) * * ROWID_VAR is used in the planner to identify nonce variables that carry - * row identity information during UPDATE/DELETE. This value should never - * be seen outside the planner. + * row identity information during UPDATE/DELETE/MERGE. This value should + * never be seen outside the planner. * * In the parser, varnosyn and varattnosyn are either identical to * varno/varattno, or they specify the column's position in an aliased JOIN |