From 0cb841fd3d6ded93a54f499b328b49e63ad1541f Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Thu, 11 Jan 2024 10:26:04 +0100 Subject: [PATCH v3 2/3] Generalize handling of nullable pg_attribute columns in DDL DDL code uses tuple descriptors to pass around pg_attribute values during table and index creation. But tuple descriptors don't include the variable-length/nullable columns of pg_attribute, so they have to be handled separately. Right now, the attoptions field is handled in a one-off way with a separate argument passed to InsertPgAttributeTuples(). The other affected fields of pg_attribute are right now not needed at relation creation time. The goal of this patch is to generalize this to allow handling additional variable-length/nullable columns of pg_attribute in a similar manner. For that, create a new struct Form_pg_attribute_extra, which is to be passed around in parallel to the tuple descriptor and optionally supplies the additional columns. Right now, this struct only contains one field for attoptions, so no functionality is actually changed by this. Discussion: https://www.postgresql.org/message-id/flat/4da8d211-d54d-44b9-9847-f2a9f1184c76@eisentraut.org --- src/backend/catalog/heap.c | 12 +++++++++--- src/backend/catalog/index.c | 16 +++++++++++++++- src/include/catalog/heap.h | 2 +- src/include/catalog/pg_attribute.h | 15 +++++++++++++++ src/tools/pgindent/typedefs.list | 2 ++ 5 files changed, 42 insertions(+), 5 deletions(-) diff --git a/src/backend/catalog/heap.c b/src/backend/catalog/heap.c index 45a71081d42..e0fa12a0a96 100644 --- a/src/backend/catalog/heap.c +++ b/src/backend/catalog/heap.c @@ -697,7 +697,7 @@ void InsertPgAttributeTuples(Relation pg_attribute_rel, TupleDesc tupdesc, Oid new_rel_oid, - const Datum *attoptions, + const FormData_pg_attribute_extra tupdesc_extra[], CatalogIndexState indstate) { TupleTableSlot **slot; @@ -719,6 +719,7 @@ InsertPgAttributeTuples(Relation pg_attribute_rel, while (natts < tupdesc->natts) { Form_pg_attribute attrs = TupleDescAttr(tupdesc, natts); + const FormData_pg_attribute_extra *attrs_extra = tupdesc_extra ? &tupdesc_extra[natts] : NULL; ExecClearTuple(slot[slotCount]); @@ -750,10 +751,15 @@ InsertPgAttributeTuples(Relation pg_attribute_rel, slot[slotCount]->tts_values[Anum_pg_attribute_attislocal - 1] = BoolGetDatum(attrs->attislocal); slot[slotCount]->tts_values[Anum_pg_attribute_attinhcount - 1] = Int16GetDatum(attrs->attinhcount); slot[slotCount]->tts_values[Anum_pg_attribute_attcollation - 1] = ObjectIdGetDatum(attrs->attcollation); - if (attoptions && attoptions[natts] != (Datum) 0) - slot[slotCount]->tts_values[Anum_pg_attribute_attoptions - 1] = attoptions[natts]; + if (attrs_extra) + { + slot[slotCount]->tts_values[Anum_pg_attribute_attoptions - 1] = attrs_extra->attoptions.value; + slot[slotCount]->tts_isnull[Anum_pg_attribute_attoptions - 1] = attrs_extra->attoptions.isnull; + } else + { slot[slotCount]->tts_isnull[Anum_pg_attribute_attoptions - 1] = true; + } /* * The remaining fields are not set for new columns. diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c index fbef3d5382d..d14e42ad8bb 100644 --- a/src/backend/catalog/index.c +++ b/src/backend/catalog/index.c @@ -517,6 +517,20 @@ AppendAttributeTuples(Relation indexRelation, const Datum *attopts) Relation pg_attribute; CatalogIndexState indstate; TupleDesc indexTupDesc; + FormData_pg_attribute_extra *attrs_extra = NULL; + + if (attopts) + { + attrs_extra = palloc0_array(FormData_pg_attribute_extra, indexRelation->rd_att->natts); + + for (int i = 0; i < indexRelation->rd_att->natts; i++) + { + if (attopts[i]) + attrs_extra[i].attoptions.value = attopts[i]; + else + attrs_extra[i].attoptions.isnull = true; + } + } /* * open the attribute relation and its indexes @@ -530,7 +544,7 @@ AppendAttributeTuples(Relation indexRelation, const Datum *attopts) */ indexTupDesc = RelationGetDescr(indexRelation); - InsertPgAttributeTuples(pg_attribute, indexTupDesc, InvalidOid, attopts, indstate); + InsertPgAttributeTuples(pg_attribute, indexTupDesc, InvalidOid, attrs_extra, indstate); CatalogCloseIndexes(indstate); diff --git a/src/include/catalog/heap.h b/src/include/catalog/heap.h index 1d7f8380d90..1e694a40919 100644 --- a/src/include/catalog/heap.h +++ b/src/include/catalog/heap.h @@ -98,7 +98,7 @@ extern List *heap_truncate_find_FKs(List *relationIds); extern void InsertPgAttributeTuples(Relation pg_attribute_rel, TupleDesc tupdesc, Oid new_rel_oid, - const Datum *attoptions, + const FormData_pg_attribute_extra tupdesc_extra[], CatalogIndexState indstate); extern void InsertPgClassTuple(Relation pg_class_desc, diff --git a/src/include/catalog/pg_attribute.h b/src/include/catalog/pg_attribute.h index 1a487441e50..6258da3f683 100644 --- a/src/include/catalog/pg_attribute.h +++ b/src/include/catalog/pg_attribute.h @@ -208,6 +208,21 @@ CATALOG(pg_attribute,1249,AttributeRelationId) BKI_BOOTSTRAP BKI_ROWTYPE_OID(75, */ typedef FormData_pg_attribute *Form_pg_attribute; +/* + * FormData_pg_attribute_extra contains (some of) the fields that are not in + * FormData_pg_attribute because they are excluded by CATALOG_VARLEN. It is + * meant to be used by DDL code so that the combination of + * FormData_pg_attribute (often via tuple descriptor) and + * FormData_pg_attribute_extra can be used to pass around all the information + * about an attribute. Fields can be included here as needed. + */ +typedef struct FormData_pg_attribute_extra +{ + NullableDatum attoptions; +} FormData_pg_attribute_extra; + +typedef FormData_pg_attribute_extra *Form_pg_attribute_extra; + DECLARE_UNIQUE_INDEX(pg_attribute_relid_attnam_index, 2658, AttributeRelidNameIndexId, pg_attribute, btree(attrelid oid_ops, attname name_ops)); DECLARE_UNIQUE_INDEX_PKEY(pg_attribute_relid_attnum_index, 2659, AttributeRelidNumIndexId, pg_attribute, btree(attrelid oid_ops, attnum int2_ops)); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index 5fd46b7bd1f..e811341ce06 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -792,6 +792,7 @@ FormData_pg_amop FormData_pg_amproc FormData_pg_attrdef FormData_pg_attribute +FormData_pg_attribute_extra FormData_pg_auth_members FormData_pg_authid FormData_pg_cast @@ -850,6 +851,7 @@ Form_pg_amop Form_pg_amproc Form_pg_attrdef Form_pg_attribute +Form_pg_attribute_extra Form_pg_auth_members Form_pg_authid Form_pg_cast -- 2.43.0