diff options
Diffstat (limited to 'src/backend/optimizer/prep/preptlist.c')
| -rw-r--r-- | src/backend/optimizer/prep/preptlist.c | 94 |
1 files changed, 20 insertions, 74 deletions
diff --git a/src/backend/optimizer/prep/preptlist.c b/src/backend/optimizer/prep/preptlist.c index 363132185d0..aefb6f8d4e8 100644 --- a/src/backend/optimizer/prep/preptlist.c +++ b/src/backend/optimizer/prep/preptlist.c @@ -46,9 +46,7 @@ #include "parser/parsetree.h" #include "utils/rel.h" -static List *extract_update_colnos(List *tlist); -static List *expand_targetlist(List *tlist, int command_type, - Index result_relation, Relation rel); +static List *expand_insert_targetlist(List *tlist, Relation rel); /* @@ -59,9 +57,6 @@ static List *expand_targetlist(List *tlist, int command_type, * Also, if this is an UPDATE, we return a list of target column numbers * in root->update_colnos. (Resnos in processed_tlist will be consecutive, * so do not look at that to find out which columns are targets!) - * - * As a side effect, if there's an ON CONFLICT UPDATE clause, its targetlist - * is also preprocessed (and updated in-place). */ void preprocess_targetlist(PlannerInfo *root) @@ -107,10 +102,9 @@ preprocess_targetlist(PlannerInfo *root) */ tlist = parse->targetList; if (command_type == CMD_INSERT) - tlist = expand_targetlist(tlist, command_type, - result_relation, target_relation); + tlist = expand_insert_targetlist(tlist, target_relation); else if (command_type == CMD_UPDATE) - root->update_colnos = extract_update_colnos(tlist); + root->update_colnos = extract_update_targetlist_colnos(tlist); /* * For non-inherited UPDATE/DELETE, register any junk column(s) needed to @@ -245,23 +239,12 @@ preprocess_targetlist(PlannerInfo *root) root->processed_tlist = tlist; - /* - * If there's an ON CONFLICT UPDATE clause, preprocess its targetlist too - * while we have the relation open. - */ - if (parse->onConflict) - parse->onConflict->onConflictSet = - expand_targetlist(parse->onConflict->onConflictSet, - CMD_UPDATE, - result_relation, - target_relation); - if (target_relation) table_close(target_relation, NoLock); } /* - * extract_update_colnos + * extract_update_targetlist_colnos * Extract a list of the target-table column numbers that * an UPDATE's targetlist wants to assign to, then renumber. * @@ -270,9 +253,12 @@ preprocess_targetlist(PlannerInfo *root) * to assign to. Here, we extract that info into a separate list, and * then convert the tlist to the sequential-numbering convention that's * used by all other query types. + * + * This is also applied to the tlist associated with INSERT ... ON CONFLICT + * ... UPDATE, although not till much later in planning. */ -static List * -extract_update_colnos(List *tlist) +List * +extract_update_targetlist_colnos(List *tlist) { List *update_colnos = NIL; AttrNumber nextresno = 1; @@ -297,18 +283,16 @@ extract_update_colnos(List *tlist) *****************************************************************************/ /* - * expand_targetlist + * expand_insert_targetlist * Given a target list as generated by the parser and a result relation, * add targetlist entries for any missing attributes, and ensure the * non-junk attributes appear in proper field order. * - * command_type is a bit of an archaism now: it's CMD_INSERT when we're - * processing an INSERT, all right, but the only other use of this function - * is for ON CONFLICT UPDATE tlists, for which command_type is CMD_UPDATE. + * Once upon a time we also did more or less this with UPDATE targetlists, + * but now this code is only applied to INSERT targetlists. */ static List * -expand_targetlist(List *tlist, int command_type, - Index result_relation, Relation rel) +expand_insert_targetlist(List *tlist, Relation rel) { List *new_tlist = NIL; ListCell *tlist_item; @@ -347,15 +331,11 @@ expand_targetlist(List *tlist, int command_type, /* * Didn't find a matching tlist entry, so make one. * - * For INSERT, generate a NULL constant. (We assume the rewriter - * would have inserted any available default value.) Also, if the - * column isn't dropped, apply any domain constraints that might - * exist --- this is to catch domain NOT NULL. - * - * For UPDATE, generate a Var reference to the existing value of - * the attribute, so that it gets copied to the new tuple. But - * generate a NULL for dropped columns (we want to drop any old - * values). + * INSERTs should insert NULL in this case. (We assume the + * rewriter would have inserted any available non-NULL default + * value.) Also, if the column isn't dropped, apply any domain + * constraints that might exist --- this is to catch domain NOT + * NULL. * * When generating a NULL constant for a dropped column, we label * it INT4 (any other guaranteed-to-exist datatype would do as @@ -367,13 +347,9 @@ expand_targetlist(List *tlist, int command_type, * relation, however. */ Oid atttype = att_tup->atttypid; - int32 atttypmod = att_tup->atttypmod; Oid attcollation = att_tup->attcollation; Node *new_expr; - switch (command_type) - { - case CMD_INSERT: if (!att_tup->attisdropped) { new_expr = (Node *) makeConst(atttype, @@ -402,35 +378,6 @@ expand_targetlist(List *tlist, int command_type, true, /* isnull */ true /* byval */ ); } - break; - case CMD_UPDATE: - if (!att_tup->attisdropped) - { - new_expr = (Node *) makeVar(result_relation, - attrno, - atttype, - atttypmod, - attcollation, - 0); - } - else - { - /* Insert NULL for dropped column */ - new_expr = (Node *) makeConst(INT4OID, - -1, - InvalidOid, - sizeof(int32), - (Datum) 0, - true, /* isnull */ - true /* byval */ ); - } - break; - default: - elog(ERROR, "unrecognized command_type: %d", - (int) command_type); - new_expr = NULL; /* keep compiler quiet */ - break; - } new_tle = makeTargetEntry((Expr *) new_expr, attrno, @@ -445,9 +392,8 @@ expand_targetlist(List *tlist, int command_type, * The remaining tlist entries should be resjunk; append them all to the * end of the new tlist, making sure they have resnos higher than the last * real attribute. (Note: although the rewriter already did such - * renumbering, we have to do it again here in case we are doing an UPDATE - * in a table with dropped columns, or an inheritance child table with - * extra columns.) + * renumbering, we have to do it again here in case we added NULL entries + * above.) */ while (tlist_item) { |