database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-05 07:21:24 +03:00
Code Activity

Make ExecGetInsertedCols() and friends more robust and improve comments.

Browse Source 
If ExecGetInsertedCols(), ExecGetUpdatedCols() or ExecGetExtraUpdatedCols()
were called with a ResultRelInfo that's not in the range table and isn't a
partition routing target, the functions would dereference a NULL pointer,
relinfo->ri_RootResultRelInfo. Such ResultRelInfos are created when firing
RI triggers in tables that are not modified directly. None of the current
callers of these functions pass such relations, so this isn't a live bug,
but let's make them more robust.

Also update comment in ResultRelInfo; after commit 6214e2b228,
ri_RangeTableIndex is zero for ResultRelInfos created for partition tuple
routing.

Noted by Coverity. Backpatch down to v11, like commit 6214e2b228.

Reviewed-by: Tom Lane, Amit Langote
This commit is contained in:
Heikki Linnakangas
2021-02-15 09:28:08 +02:00
parent 46d6e5f567
commit 54e51dcde0
2 changed files with 30 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/include/nodes/execnodes.h
View File

@ -394,12 +394,15 @@ typedef struct OnConflictSetState
* relation, and perhaps also fire triggers. ResultRelInfo holds all the
* information needed about a result relation, including indexes.
*
* Normally, a ResultRelInfo refers to a table that is in the query's
* range table; then ri_RangeTableIndex is the RT index and ri_RelationDesc
* is just a copy of the relevant es_relations[] entry. But sometimes,
* in ResultRelInfos used only for triggers, ri_RangeTableIndex is zero
* and ri_RelationDesc is a separately-opened relcache pointer that needs
* to be separately closed. See ExecGetTriggerResultRel.
* Normally, a ResultRelInfo refers to a table that is in the query's range
* table; then ri_RangeTableIndex is the RT index and ri_RelationDesc is
* just a copy of the relevant es_relations[] entry. However, in some
* situations we create ResultRelInfos for relations that are not in the
* range table, namely for targets of tuple routing in a partitioned table,
* and when firing triggers in tables other than the target tables (See
* ExecGetTriggerResultRel). In these situations, ri_RangeTableIndex is 0
* and ri_RelationDesc is a separately-opened relcache pointer that needs to
* be separately closed.
*/
typedef struct ResultRelInfo
{