Refactor attribute mappings used in logical tuple conversion

Enterprise / PostgreSQL - Michael Paquier [paquier.xyz] - 18 December 2019 07:23 EST

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

e1551f96e6 Refactor attribute mappings used in logical tuple conversion
src/backend/access/common/Makefile | 1 +
src/backend/access/common/attmap.c | 320 +++++++++++++++++++++++++++++
src/backend/access/common/tupconvert.c | 287 ++------------------------
src/backend/catalog/index.c | 12 +-
src/backend/catalog/partition.c | 11 +-
src/backend/catalog/pg_constraint.c | 1 -
src/backend/commands/indexcmds.c | 16 +-
src/backend/commands/tablecmds.c | 98 +++++----
src/backend/executor/execMain.c | 22 +-
src/backend/executor/execPartition.c | 57 +++--
src/backend/jit/llvm/llvmjit_expr.c | 1 -
src/backend/parser/parse_utilcmd.c | 18 +-
src/backend/replication/logical/relation.c | 10 +-
src/backend/replication/logical/worker.c | 9 +-
src/backend/rewrite/rewriteManip.c | 12 +-
src/include/access/attmap.h | 52 +++++
src/include/access/tupconvert.h | 13 +-
src/include/catalog/index.h | 2 +-
src/include/parser/parse_utilcmd.h | 3 +-
src/include/replication/logicalrelation.h | 3 +-
src/include/rewrite/rewriteManip.h | 3 +-
src/tools/pgindent/typedefs.list | 1 +
22 files changed, 533 insertions(+), 419 deletions(-)

Upstream: git.postgresql.org


  • Share