diff options
| author | Michael Paquier <michael@paquier.xyz> | 2019-12-18 16:23:02 +0900 |
|---|---|---|
| committer | Michael Paquier <michael@paquier.xyz> | 2019-12-18 16:23:02 +0900 |
| commit | e1551f96e643a52a035c3b35777d968bc073f7fc (patch) | |
| tree | 9010890c3289462dc42a51a4d03498423359d375 /src/include/replication/logicalrelation.h | |
| parent | 04c8a69c0cccbc271e0feeb22a74c69fbd87c37e (diff) | |
Refactor attribute mappings used in logical tuple conversion
Tuple conversion support in tupconvert.c is able to convert rowtypes
between two relations, inner and outer, which are logically equivalent
but have a different ordering or even dropped columns (used mainly for
inheritance tree and partitions). This makes use of attribute mappings,
which are simple arrays made of AttrNumber elements with a length
matching the number of attributes of the outer relation. The length of
the attribute mapping has been treated as completely independent of the
mapping itself until now, making it easy to pass down an incorrect
mapping length.
This commit refactors the code related to attribute mappings and moves
it into an independent facility called attmap.c, extracted from
tupconvert.c. This merges the attribute mapping with its length,
avoiding to try to guess what is the length of a mapping to use as this
is computed once, when the map is built.
This will avoid mistakes like what has been fixed in dc816e58, which has
used an incorrect mapping length by matching it with the number of
attributes of an inner relation (a child partition) instead of an outer
relation (a partitioned table).
Author: Michael Paquier
Reviewed-by: Amit Langote
Discussion: https://postgr.es/m/20191121042556.GD153437@paquier.xyz
Diffstat (limited to 'src/include/replication/logicalrelation.h')
| -rw-r--r-- | src/include/replication/logicalrelation.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/include/replication/logicalrelation.h b/src/include/replication/logicalrelation.h index 2642a3f94ec..9922c2ed95a 100644 --- a/src/include/replication/logicalrelation.h +++ b/src/include/replication/logicalrelation.h @@ -12,6 +12,7 @@ #ifndef LOGICALRELATION_H #define LOGICALRELATION_H +#include "access/attmap.h" #include "replication/logicalproto.h" typedef struct LogicalRepRelMapEntry @@ -21,7 +22,7 @@ typedef struct LogicalRepRelMapEntry /* Mapping to local relation, filled as needed. */ Oid localreloid; /* local relation id */ Relation localrel; /* relcache entry */ - AttrNumber *attrmap; /* map of local attributes to remote ones */ + AttrMap *attrmap; /* map of local attributes to remote ones */ bool updatable; /* Can apply updates/deletes? */ /* Sync state. */ |