From 6a263bd9c2a72cb4da8d4b7a2dbb1d83108c5c04 Mon Sep 17 00:00:00 2001 From: David Rowley Date: Tue, 28 May 2024 20:10:50 +1200 Subject: [PATCH v2 2/4] Introduce CompactAttribute array in TupleDesc This array stores a subset of the fields of FormData_pg_attribute, primarily the ones for deforming tuples, but since we have additional space, pack a few additional boolean columns in the attflags field. Many areas of the code can get away with only accessing the CompactAttribute array, which because the details of each attribute is stored much more densely than FormData_pg_attribute, many operations can be performed accessing fewer cachelines which can improve performance. This also makes pg_attribute.attcacheoff redundant. A follow-on commit will remove it. --- contrib/amcheck/verify_heapam.c | 4 +- contrib/pageinspect/heapfuncs.c | 4 +- contrib/postgres_fdw/postgres_fdw.c | 12 ++-- src/backend/access/brin/brin_inclusion.c | 18 +++--- src/backend/access/brin/brin_tuple.c | 2 +- src/backend/access/common/attmap.c | 14 +++-- src/backend/access/common/heaptuple.c | 57 +++++++++-------- src/backend/access/common/indextuple.c | 24 +++---- src/backend/access/common/tupdesc.c | 69 +++++++++++++++++---- src/backend/access/gin/ginbulk.c | 6 +- src/backend/access/gin/ginget.c | 8 +-- src/backend/access/gist/gistbuild.c | 6 +- src/backend/access/heap/heapam.c | 10 +-- src/backend/access/heap/heapam_handler.c | 2 +- src/backend/access/heap/heaptoast.c | 6 +- src/backend/access/nbtree/nbtutils.c | 6 +- src/backend/access/spgist/spgdoinsert.c | 2 +- src/backend/access/spgist/spgutils.c | 5 +- src/backend/access/table/toast_helper.c | 2 +- src/backend/catalog/index.c | 2 + src/backend/commands/copy.c | 6 +- src/backend/commands/tablecmds.c | 5 ++ src/backend/executor/execExpr.c | 8 +-- src/backend/executor/execExprInterp.c | 8 +-- src/backend/executor/execJunk.c | 2 +- src/backend/executor/execTuples.c | 12 ++-- src/backend/executor/functions.c | 3 +- src/backend/executor/nodeMemoize.c | 12 ++-- src/backend/executor/nodeModifyTable.c | 8 +-- src/backend/executor/nodeValuesscan.c | 4 +- src/backend/executor/tstoreReceiver.c | 8 +-- src/backend/optimizer/util/plancat.c | 8 +-- src/backend/replication/pgoutput/pgoutput.c | 2 +- src/backend/utils/adt/expandedrecord.c | 22 +++---- src/backend/utils/adt/ri_triggers.c | 4 +- src/backend/utils/cache/relcache.c | 24 +++++-- src/include/access/htup_details.h | 4 +- src/include/access/itup.h | 11 ++-- src/include/access/tupdesc.h | 69 +++++++++++++++++++-- src/include/access/tupmacs.h | 4 +- src/tools/pgindent/typedefs.list | 1 + 41 files changed, 314 insertions(+), 170 deletions(-) diff --git a/contrib/amcheck/verify_heapam.c b/contrib/amcheck/verify_heapam.c index f2526ed63a..08772de39f 100644 --- a/contrib/amcheck/verify_heapam.c +++ b/contrib/amcheck/verify_heapam.c @@ -1567,11 +1567,11 @@ check_tuple_attribute(HeapCheckContext *ctx) struct varlena *attr; char *tp; /* pointer to the tuple data */ uint16 infomask; - Form_pg_attribute thisatt; + CompactAttribute *thisatt; struct varatt_external toast_pointer; infomask = ctx->tuphdr->t_infomask; - thisatt = TupleDescAttr(RelationGetDescr(ctx->rel), ctx->attnum); + thisatt = TupleDescCompactAttr(RelationGetDescr(ctx->rel), ctx->attnum); tp = (char *) ctx->tuphdr + ctx->tuphdr->t_hoff; diff --git a/contrib/pageinspect/heapfuncs.c b/contrib/pageinspect/heapfuncs.c index 3faeabc711..6234bb8729 100644 --- a/contrib/pageinspect/heapfuncs.c +++ b/contrib/pageinspect/heapfuncs.c @@ -331,11 +331,11 @@ tuple_data_split_internal(Oid relid, char *tupdata, for (i = 0; i < nattrs; i++) { - Form_pg_attribute attr; + CompactAttribute *attr; bool is_null; bytea *attr_data = NULL; - attr = TupleDescAttr(tupdesc, i); + attr = TupleDescCompactAttr(tupdesc, i); /* * Tuple header can specify fewer attributes than tuple descriptor as diff --git a/contrib/postgres_fdw/postgres_fdw.c b/contrib/postgres_fdw/postgres_fdw.c index fc65d81e21..632643be68 100644 --- a/contrib/postgres_fdw/postgres_fdw.c +++ b/contrib/postgres_fdw/postgres_fdw.c @@ -1814,9 +1814,9 @@ postgresPlanForeignModify(PlannerInfo *root, for (attnum = 1; attnum <= tupdesc->natts; attnum++) { - Form_pg_attribute attr = TupleDescAttr(tupdesc, attnum - 1); + CompactAttribute *attr = TupleDescCompactAttr(tupdesc, attnum - 1); - if (!attr->attisdropped) + if (!CompactAttrIsDropped(attr)) targetAttrs = lappend_int(targetAttrs, attnum); } } @@ -2187,9 +2187,9 @@ postgresBeginForeignInsert(ModifyTableState *mtstate, /* We transmit all columns that are defined in the foreign table. */ for (attnum = 1; attnum <= tupdesc->natts; attnum++) { - Form_pg_attribute attr = TupleDescAttr(tupdesc, attnum - 1); + CompactAttribute *attr = TupleDescCompactAttr(tupdesc, attnum - 1); - if (!attr->attisdropped) + if (!CompactAttrIsDropped(attr)) targetAttrs = lappend_int(targetAttrs, attnum); } @@ -4301,12 +4301,12 @@ convert_prep_stmt_params(PgFdwModifyState *fmstate, foreach(lc, fmstate->target_attrs) { int attnum = lfirst_int(lc); - Form_pg_attribute attr = TupleDescAttr(tupdesc, attnum - 1); + CompactAttribute *attr = TupleDescCompactAttr(tupdesc, attnum - 1); Datum value; bool isnull; /* Ignore generated columns; they are set to DEFAULT */ - if (attr->attgenerated) + if (CompactAttrIsGenerated(attr)) continue; value = slot_getattr(slots[i], attnum, &isnull); if (isnull) diff --git a/src/backend/access/brin/brin_inclusion.c b/src/backend/access/brin/brin_inclusion.c index 750276998c..a6b88e5f4a 100644 --- a/src/backend/access/brin/brin_inclusion.c +++ b/src/backend/access/brin/brin_inclusion.c @@ -146,12 +146,12 @@ brin_inclusion_add_value(PG_FUNCTION_ARGS) Datum result; bool new = false; AttrNumber attno; - Form_pg_attribute attr; + CompactAttribute *attr; Assert(!isnull); attno = column->bv_attno; - attr = TupleDescAttr(bdesc->bd_tupdesc, attno - 1); + attr = TupleDescCompactAttr(bdesc->bd_tupdesc, attno - 1); /* * If the recorded value is null, copy the new value (which we know to be @@ -160,7 +160,7 @@ brin_inclusion_add_value(PG_FUNCTION_ARGS) if (column->bv_allnulls) { column->bv_values[INCLUSION_UNION] = - datumCopy(newval, attr->attbyval, attr->attlen); + datumCopy(newval, CompactAttrByVal(attr), attr->attlen); column->bv_values[INCLUSION_UNMERGEABLE] = BoolGetDatum(false); column->bv_values[INCLUSION_CONTAINS_EMPTY] = BoolGetDatum(false); column->bv_allnulls = false; @@ -225,13 +225,13 @@ brin_inclusion_add_value(PG_FUNCTION_ARGS) Assert(finfo != NULL); result = FunctionCall2Coll(finfo, colloid, column->bv_values[INCLUSION_UNION], newval); - if (!attr->attbyval && + if (!CompactAttrByVal(attr) && DatumGetPointer(result) != DatumGetPointer(column->bv_values[INCLUSION_UNION])) { pfree(DatumGetPointer(column->bv_values[INCLUSION_UNION])); if (result == newval) - result = datumCopy(result, attr->attbyval, attr->attlen); + result = datumCopy(result, CompactAttrByVal(attr), attr->attlen); } column->bv_values[INCLUSION_UNION] = result; @@ -479,7 +479,7 @@ brin_inclusion_union(PG_FUNCTION_ARGS) BrinValues *col_b = (BrinValues *) PG_GETARG_POINTER(2); Oid colloid = PG_GET_COLLATION(); AttrNumber attno; - Form_pg_attribute attr; + CompactAttribute *attr; FmgrInfo *finfo; Datum result; @@ -487,7 +487,7 @@ brin_inclusion_union(PG_FUNCTION_ARGS) Assert(!col_a->bv_allnulls && !col_b->bv_allnulls); attno = col_a->bv_attno; - attr = TupleDescAttr(bdesc->bd_tupdesc, attno - 1); + attr = TupleDescCompactAttr(bdesc->bd_tupdesc, attno - 1); /* If B includes empty elements, mark A similarly, if needed. */ if (!DatumGetBool(col_a->bv_values[INCLUSION_CONTAINS_EMPTY]) && @@ -522,13 +522,13 @@ brin_inclusion_union(PG_FUNCTION_ARGS) result = FunctionCall2Coll(finfo, colloid, col_a->bv_values[INCLUSION_UNION], col_b->bv_values[INCLUSION_UNION]); - if (!attr->attbyval && + if (!CompactAttrByVal(attr) && DatumGetPointer(result) != DatumGetPointer(col_a->bv_values[INCLUSION_UNION])) { pfree(DatumGetPointer(col_a->bv_values[INCLUSION_UNION])); if (result == col_b->bv_values[INCLUSION_UNION]) - result = datumCopy(result, attr->attbyval, attr->attlen); + result = datumCopy(result, CompactAttrByVal(attr), attr->attlen); } col_a->bv_values[INCLUSION_UNION] = result; diff --git a/src/backend/access/brin/brin_tuple.c b/src/backend/access/brin/brin_tuple.c index 997eb6d822..aae646be5d 100644 --- a/src/backend/access/brin/brin_tuple.c +++ b/src/backend/access/brin/brin_tuple.c @@ -699,7 +699,7 @@ brin_deconstruct_tuple(BrinDesc *brdesc, datumno < brdesc->bd_info[attnum]->oi_nstored; datumno++) { - Form_pg_attribute thisatt = TupleDescAttr(diskdsc, stored); + CompactAttribute *thisatt = TupleDescCompactAttr(diskdsc, stored); if (thisatt->attlen == -1) { diff --git a/src/backend/access/common/attmap.c b/src/backend/access/common/attmap.c index b0fe27ef57..e2d46843bc 100644 --- a/src/backend/access/common/attmap.c +++ b/src/backend/access/common/attmap.c @@ -135,7 +135,9 @@ build_attrmap_by_position(TupleDesc indesc, /* Check for unused input columns */ for (; j < indesc->natts; j++) { - if (TupleDescAttr(indesc, j)->attisdropped) + CompactAttribute *attr = TupleDescCompactAttr(indesc, j); + + if (CompactAttrIsDropped(attr)) continue; nincols++; same = false; /* we'll complain below */ @@ -299,25 +301,27 @@ check_attrmap_match(TupleDesc indesc, for (i = 0; i < attrMap->maplen; i++) { - Form_pg_attribute inatt = TupleDescAttr(indesc, i); - Form_pg_attribute outatt = TupleDescAttr(outdesc, i); + CompactAttribute *inatt = TupleDescCompactAttr(indesc, i); + CompactAttribute *outatt; /* * If the input column has a missing attribute, we need a conversion. */ - if (inatt->atthasmissing) + if (CompactAttrHasMissing(inatt)) return false; if (attrMap->attnums[i] == (i + 1)) continue; + outatt = TupleDescCompactAttr(outdesc, i); + /* * If it's a dropped column and the corresponding input column is also * dropped, we don't need a conversion. However, attlen and attalign * must agree. */ if (attrMap->attnums[i] == 0 && - inatt->attisdropped && + CompactAttrIsDropped(inatt) && inatt->attlen == outatt->attlen && inatt->attalign == outatt->attalign) continue; diff --git a/src/backend/access/common/heaptuple.c b/src/backend/access/common/heaptuple.c index 9e3407bf98..70595c55b7 100644 --- a/src/backend/access/common/heaptuple.c +++ b/src/backend/access/common/heaptuple.c @@ -83,6 +83,9 @@ #define VARLENA_ATT_IS_PACKABLE(att) \ ((att)->attstorage != TYPSTORAGE_PLAIN) +#define COMPACT_ATTR_IS_PACKABLE(att) \ + ((att)->attlen == -1 && CompactAttrIsPackable(att)) + /* * Setup for caching pass-by-ref missing attributes in a way that survives * tupleDesc destruction. @@ -147,14 +150,14 @@ Datum getmissingattr(TupleDesc tupleDesc, int attnum, bool *isnull) { - Form_pg_attribute att; + CompactAttribute *att; Assert(attnum <= tupleDesc->natts); Assert(attnum > 0); - att = TupleDescAttr(tupleDesc, attnum - 1); + att = TupleDescCompactAttr(tupleDesc, attnum - 1); - if (att->atthasmissing) + if (CompactAttrHasMissing(att)) { AttrMissing *attrmiss; @@ -173,7 +176,7 @@ getmissingattr(TupleDesc tupleDesc, *isnull = false; /* no need to cache by-value attributes */ - if (att->attbyval) + if (CompactAttrByVal(att)) return attrmiss->am_value; /* set up cache if required */ @@ -223,15 +226,15 @@ heap_compute_data_size(TupleDesc tupleDesc, for (i = 0; i < numberOfAttributes; i++) { Datum val; - Form_pg_attribute atti; + CompactAttribute *atti; if (isnull[i]) continue; val = values[i]; - atti = TupleDescAttr(tupleDesc, i); + atti = TupleDescCompactAttr(tupleDesc, i); - if (ATT_IS_PACKABLE(atti) && + if (COMPACT_ATTR_IS_PACKABLE(atti) && VARATT_CAN_MAKE_SHORT(DatumGetPointer(val))) { /* @@ -268,7 +271,7 @@ heap_compute_data_size(TupleDesc tupleDesc, * Fill in either a data value or a bit in the null bitmask */ static inline void -fill_val(Form_pg_attribute att, +fill_val(CompactAttribute *att, bits8 **bit, int *bitmask, char **dataP, @@ -307,7 +310,7 @@ fill_val(Form_pg_attribute att, * XXX we use the att_align macros on the pointer value itself, not on an * offset. This is a bit of a hack. */ - if (att->attbyval) + if (CompactAttrByVal(att)) { /* pass-by-value */ data = (char *) att_align_nominal(data, att->attalign); @@ -349,7 +352,7 @@ fill_val(Form_pg_attribute att, data_length = VARSIZE_SHORT(val); memcpy(data, val, data_length); } - else if (VARLENA_ATT_IS_PACKABLE(att) && + else if (CompactAttrIsPackable(att) && VARATT_CAN_MAKE_SHORT(val)) { /* convert to short varlena -- no alignment */ @@ -427,7 +430,7 @@ heap_fill_tuple(TupleDesc tupleDesc, for (i = 0; i < numberOfAttributes; i++) { - Form_pg_attribute attr = TupleDescAttr(tupleDesc, i); + CompactAttribute *attr = TupleDescCompactAttr(tupleDesc, i); fill_val(attr, bitP ? &bitP : NULL, @@ -461,7 +464,8 @@ heap_attisnull(HeapTuple tup, int attnum, TupleDesc tupleDesc) Assert(!tupleDesc || attnum <= tupleDesc->natts); if (attnum > (int) HeapTupleHeaderGetNatts(tup->t_data)) { - if (tupleDesc && TupleDescAttr(tupleDesc, attnum - 1)->atthasmissing) + if (tupleDesc && + CompactAttrHasMissing(TupleDescCompactAttr(tupleDesc, attnum - 1))) return false; else return true; @@ -570,13 +574,13 @@ nocachegetattr(HeapTuple tup, if (!slow) { - Form_pg_attribute att; + CompactAttribute *att; /* * If we get here, there are no nulls up to and including the target * attribute. If we have a cached offset, we can use it. */ - att = TupleDescAttr(tupleDesc, attnum); + att = TupleDescCompactAttr(tupleDesc, attnum); if (att->attcacheoff >= 0) return fetchatt(att, tp + att->attcacheoff); @@ -591,7 +595,7 @@ nocachegetattr(HeapTuple tup, for (j = 0; j <= attnum; j++) { - if (TupleDescAttr(tupleDesc, j)->attlen <= 0) + if (TupleDescCompactAttr(tupleDesc, j)->attlen <= 0) { slow = true; break; @@ -614,18 +618,18 @@ nocachegetattr(HeapTuple tup, * fixed-width columns, in hope of avoiding future visits to this * routine. */ - TupleDescAttr(tupleDesc, 0)->attcacheoff = 0; + TupleDescCompactAttr(tupleDesc, 0)->attcacheoff = 0; /* we might have set some offsets in the slow path previously */ - while (j < natts && TupleDescAttr(tupleDesc, j)->attcacheoff > 0) + while (j < natts && TupleDescCompactAttr(tupleDesc, j)->attcacheoff > 0) j++; - off = TupleDescAttr(tupleDesc, j - 1)->attcacheoff + - TupleDescAttr(tupleDesc, j - 1)->attlen; + off = TupleDescCompactAttr(tupleDesc, j - 1)->attcacheoff + + TupleDescCompactAttr(tupleDesc, j - 1)->attlen; for (; j < natts; j++) { - Form_pg_attribute att = TupleDescAttr(tupleDesc, j); + CompactAttribute *att = TupleDescCompactAttr(tupleDesc, j); if (att->attlen <= 0) break; @@ -639,7 +643,7 @@ nocachegetattr(HeapTuple tup, Assert(j > attnum); - off = TupleDescAttr(tupleDesc, attnum)->attcacheoff; + off = TupleDescCompactAttr(tupleDesc, attnum)->attcacheoff; } else { @@ -659,7 +663,7 @@ nocachegetattr(HeapTuple tup, off = 0; for (i = 0;; i++) /* loop exit is at "break" */ { - Form_pg_attribute att = TupleDescAttr(tupleDesc, i); + CompactAttribute *att = TupleDescCompactAttr(tupleDesc, i); if (HeapTupleHasNulls(tup) && att_isnull(i, bp)) { @@ -707,7 +711,7 @@ nocachegetattr(HeapTuple tup, } } - return fetchatt(TupleDescAttr(tupleDesc, attnum), tp + off); + return fetchatt(TupleDescCompactAttr(tupleDesc, attnum), tp + off); } /* ---------------- @@ -892,7 +896,7 @@ expand_tuple(HeapTuple *targetHeapTuple, { if (attrmiss[attnum].am_present) { - Form_pg_attribute att = TupleDescAttr(tupleDesc, attnum); + CompactAttribute *att = TupleDescCompactAttr(tupleDesc, attnum); targetDataLen = att_align_datum(targetDataLen, att->attalign, @@ -1020,8 +1024,7 @@ expand_tuple(HeapTuple *targetHeapTuple, /* Now fill in the missing values */ for (attnum = sourceNatts; attnum < natts; attnum++) { - - Form_pg_attribute attr = TupleDescAttr(tupleDesc, attnum); + CompactAttribute *attr = TupleDescCompactAttr(tupleDesc, attnum); if (attrmiss && attrmiss[attnum].am_present) { @@ -1370,7 +1373,7 @@ heap_deform_tuple(HeapTuple tuple, TupleDesc tupleDesc, for (attnum = 0; attnum < natts; attnum++) { - Form_pg_attribute thisatt = TupleDescAttr(tupleDesc, attnum); + CompactAttribute *thisatt = TupleDescCompactAttr(tupleDesc, attnum); if (hasnulls && att_isnull(attnum, bp)) { diff --git a/src/backend/access/common/indextuple.c b/src/backend/access/common/indextuple.c index 79ae29989d..37133ed7f8 100644 --- a/src/backend/access/common/indextuple.c +++ b/src/backend/access/common/indextuple.c @@ -303,13 +303,13 @@ nocache_index_getattr(IndexTuple tup, if (!slow) { - Form_pg_attribute att; + CompactAttribute *att; /* * If we get here, there are no nulls up to and including the target * attribute. If we have a cached offset, we can use it. */ - att = TupleDescAttr(tupleDesc, attnum); + att = TupleDescCompactAttr(tupleDesc, attnum); if (att->attcacheoff >= 0) return fetchatt(att, tp + att->attcacheoff); @@ -324,7 +324,7 @@ nocache_index_getattr(IndexTuple tup, for (j = 0; j <= attnum; j++) { - if (TupleDescAttr(tupleDesc, j)->attlen <= 0) + if (TupleDescCompactAttr(tupleDesc, j)->attlen <= 0) { slow = true; break; @@ -347,18 +347,18 @@ nocache_index_getattr(IndexTuple tup, * fixed-width columns, in hope of avoiding future visits to this * routine. */ - TupleDescAttr(tupleDesc, 0)->attcacheoff = 0; + TupleDescCompactAttr(tupleDesc, 0)->attcacheoff = 0; /* we might have set some offsets in the slow path previously */ - while (j < natts && TupleDescAttr(tupleDesc, j)->attcacheoff > 0) + while (j < natts && TupleDescCompactAttr(tupleDesc, j)->attcacheoff > 0) j++; - off = TupleDescAttr(tupleDesc, j - 1)->attcacheoff + - TupleDescAttr(tupleDesc, j - 1)->attlen; + off = TupleDescCompactAttr(tupleDesc, j - 1)->attcacheoff + + TupleDescCompactAttr(tupleDesc, j - 1)->attlen; for (; j < natts; j++) { - Form_pg_attribute att = TupleDescAttr(tupleDesc, j); + CompactAttribute *att = TupleDescCompactAttr(tupleDesc, j); if (att->attlen <= 0) break; @@ -372,7 +372,7 @@ nocache_index_getattr(IndexTuple tup, Assert(j > attnum); - off = TupleDescAttr(tupleDesc, attnum)->attcacheoff; + off = TupleDescCompactAttr(tupleDesc, attnum)->attcacheoff; } else { @@ -392,7 +392,7 @@ nocache_index_getattr(IndexTuple tup, off = 0; for (i = 0;; i++) /* loop exit is at "break" */ { - Form_pg_attribute att = TupleDescAttr(tupleDesc, i); + CompactAttribute *att = TupleDescCompactAttr(tupleDesc, i); if (IndexTupleHasNulls(tup) && att_isnull(i, bp)) { @@ -440,7 +440,7 @@ nocache_index_getattr(IndexTuple tup, } } - return fetchatt(TupleDescAttr(tupleDesc, attnum), tp + off); + return fetchatt(TupleDescCompactAttr(tupleDesc, attnum), tp + off); } /* @@ -490,7 +490,7 @@ index_deform_tuple_internal(TupleDesc tupleDescriptor, for (attnum = 0; attnum < natts; attnum++) { - Form_pg_attribute thisatt = TupleDescAttr(tupleDescriptor, attnum); + CompactAttribute *thisatt = TupleDescCompactAttr(tupleDescriptor, attnum); if (hasnulls && att_isnull(attnum, bp)) { diff --git a/src/backend/access/common/tupdesc.c b/src/backend/access/common/tupdesc.c index fba0026520..44d24585b0 100644 --- a/src/backend/access/common/tupdesc.c +++ b/src/backend/access/common/tupdesc.c @@ -56,6 +56,30 @@ ResourceOwnerForgetTupleDesc(ResourceOwner owner, TupleDesc tupdesc) ResourceOwnerForget(owner, PointerGetDatum(tupdesc), &tupdesc_resowner_desc); } +void +populate_compact_attribute(CompactAttribute *dst, Form_pg_attribute src) +{ + dst->attcacheoff = -1; + dst->attlen = src->attlen; + + dst->attflags = 0; + + if (src->attbyval) + dst->attflags |= COMPACT_ATTR_FLAG_BYVAL; + if (src->attstorage != TYPSTORAGE_PLAIN) + dst->attflags |= COMPACT_ATTR_FLAG_IS_PACKABLE; + if (src->atthasmissing) + dst->attflags |= COMPACT_ATTR_FLAG_HAS_MISSING; + if (src->attisdropped) + dst->attflags |= COMPACT_ATTR_FLAG_IS_DROPPED; + if (src->attgenerated) + dst->attflags |= COMPACT_ATTR_FLAG_IS_GENERATED; + if (src->attnotnull) + dst->attflags |= COMPACT_ATTR_FLAG_IS_NOTNULL; + + dst->attalign = src->attalign; +} + /* * CreateTemplateTupleDesc * This function allocates an empty tuple descriptor structure. @@ -74,18 +98,20 @@ CreateTemplateTupleDesc(int natts) Assert(natts >= 0); /* - * Allocate enough memory for the tuple descriptor, including the - * attribute rows. + * Allocate enough memory for the tuple descriptor, the CompactAttribute + * array and also an array of the full FormData_pg_attribute data. We + * store a pointer to this in the 'attrs' field. * - * Note: the attribute array stride is sizeof(FormData_pg_attribute), - * since we declare the array elements as FormData_pg_attribute for - * notational convenience. However, we only guarantee that the first + * Note: the 'attrs' array stride is sizeof(FormData_pg_attribute), since + * we declare the array elements as FormData_pg_attribute for notational + * convenience. However, we only guarantee that the first * ATTRIBUTE_FIXED_PART_SIZE bytes of each entry are valid; most code that * copies tupdesc entries around copies just that much. In principle that * could be less due to trailing padding, although with the current * definition of pg_attribute there probably isn't any padding. */ - desc = (TupleDesc) palloc(MAXALIGN(sizeof(TupleDescData)) + + desc = (TupleDesc) palloc(offsetof(struct TupleDescData, compact_attrs) + + natts * sizeof(CompactAttribute) + natts * sizeof(FormData_pg_attribute)); /* @@ -118,8 +144,11 @@ CreateTupleDesc(int natts, Form_pg_attribute *attrs) desc = CreateTemplateTupleDesc(natts); for (i = 0; i < natts; ++i) + { memcpy(TupleDescAttr(desc, i), attrs[i], ATTRIBUTE_FIXED_PART_SIZE); - + populate_compact_attribute(TupleDescCompactAttr(desc, i), + TupleDescAttr(desc, i)); + } return desc; } @@ -156,6 +185,9 @@ CreateTupleDescCopy(TupleDesc tupdesc) att->atthasmissing = false; att->attidentity = '\0'; att->attgenerated = '\0'; + + populate_compact_attribute(TupleDescCompactAttr(desc, i), + TupleDescAttr(desc, i)); } /* We can copy the tuple type identification, too */ @@ -184,6 +216,10 @@ CreateTupleDescCopyConstr(TupleDesc tupdesc) TupleDescAttr(tupdesc, 0), desc->natts * sizeof(FormData_pg_attribute)); + for (i = 0; i < desc->natts; i++) + populate_compact_attribute(TupleDescCompactAttr(desc, i), + TupleDescAttr(desc, i)); + /* Copy the TupleConstr data structure, if any */ if (constr) { @@ -208,10 +244,10 @@ CreateTupleDescCopyConstr(TupleDesc tupdesc) { if (constr->missing[i].am_present) { - Form_pg_attribute attr = TupleDescAttr(tupdesc, i); + CompactAttribute *attr = TupleDescCompactAttr(tupdesc, i); cpy->missing[i].am_value = datumCopy(constr->missing[i].am_value, - attr->attbyval, + CompactAttrByVal(attr), attr->attlen); } } @@ -275,6 +311,9 @@ TupleDescCopy(TupleDesc dst, TupleDesc src) att->atthasmissing = false; att->attidentity = '\0'; att->attgenerated = '\0'; + + populate_compact_attribute(TupleDescCompactAttr(dst, i), + TupleDescAttr(dst, i)); } dst->constr = NULL; @@ -329,6 +368,8 @@ TupleDescCopyEntry(TupleDesc dst, AttrNumber dstAttno, dstAtt->atthasmissing = false; dstAtt->attidentity = '\0'; dstAtt->attgenerated = '\0'; + + populate_compact_attribute(TupleDescCompactAttr(dst, dstAttno - 1), dstAtt); } /* @@ -528,10 +569,10 @@ equalTupleDescs(TupleDesc tupdesc1, TupleDesc tupdesc2) return false; if (missval1->am_present) { - Form_pg_attribute missatt1 = TupleDescAttr(tupdesc1, i); + CompactAttribute *missatt1 = TupleDescCompactAttr(tupdesc1, i); if (!datumIsEqual(missval1->am_value, missval2->am_value, - missatt1->attbyval, missatt1->attlen)) + CompactAttrByVal(missatt1), missatt1->attlen)) return false; } } @@ -721,6 +762,9 @@ TupleDescInitEntry(TupleDesc desc, att->attcompression = InvalidCompressionMethod; att->attcollation = typeForm->typcollation; + populate_compact_attribute(TupleDescCompactAttr(desc, attributeNumber - 1), + att); + ReleaseSysCache(tuple); } @@ -828,6 +872,9 @@ TupleDescInitBuiltinEntry(TupleDesc desc, default: elog(ERROR, "unsupported type %u", oidtypeid); } + + populate_compact_attribute(TupleDescCompactAttr(desc, attributeNumber - 1), + att); } /* diff --git a/src/backend/access/gin/ginbulk.c b/src/backend/access/gin/ginbulk.c index 7f89cd5e82..91c83a3282 100644 --- a/src/backend/access/gin/ginbulk.c +++ b/src/backend/access/gin/ginbulk.c @@ -127,11 +127,11 @@ ginInitBA(BuildAccumulator *accum) static Datum getDatumCopy(BuildAccumulator *accum, OffsetNumber attnum, Datum value) { - Form_pg_attribute att; + CompactAttribute *att; Datum res; - att = TupleDescAttr(accum->ginstate->origTupdesc, attnum - 1); - if (att->attbyval) + att = TupleDescCompactAttr(accum->ginstate->origTupdesc, attnum - 1); + if (CompactAttrByVal(att)) res = value; else { diff --git a/src/backend/access/gin/ginget.c b/src/backend/access/gin/ginget.c index 0b4f2ebadb..d394e4baeb 100644 --- a/src/backend/access/gin/ginget.c +++ b/src/backend/access/gin/ginget.c @@ -122,7 +122,7 @@ collectMatchBitmap(GinBtreeData *btree, GinBtreeStack *stack, GinScanEntry scanEntry, Snapshot snapshot) { OffsetNumber attnum; - Form_pg_attribute attr; + CompactAttribute *attr; /* Initialize empty bitmap result */ scanEntry->matchBitmap = tbm_create(work_mem * 1024L, NULL); @@ -134,7 +134,7 @@ collectMatchBitmap(GinBtreeData *btree, GinBtreeStack *stack, /* Locate tupdesc entry for key column (for attbyval/attlen data) */ attnum = scanEntry->attnum; - attr = TupleDescAttr(btree->ginstate->origTupdesc, attnum - 1); + attr = TupleDescCompactAttr(btree->ginstate->origTupdesc, attnum - 1); /* * Predicate lock entry leaf page, following pages will be locked by @@ -232,7 +232,7 @@ collectMatchBitmap(GinBtreeData *btree, GinBtreeStack *stack, * tuple after re-locking */ if (icategory == GIN_CAT_NORM_KEY) - idatum = datumCopy(idatum, attr->attbyval, attr->attlen); + idatum = datumCopy(idatum, CompactAttrByVal(attr), attr->attlen); LockBuffer(stack->buffer, GIN_UNLOCK); @@ -291,7 +291,7 @@ collectMatchBitmap(GinBtreeData *btree, GinBtreeStack *stack, stack->off++; } - if (icategory == GIN_CAT_NORM_KEY && !attr->attbyval) + if (icategory == GIN_CAT_NORM_KEY && !CompactAttrByVal(attr)) pfree(DatumGetPointer(idatum)); } else diff --git a/src/backend/access/gist/gistbuild.c b/src/backend/access/gist/gistbuild.c index ba06df30fa..86512f2c89 100644 --- a/src/backend/access/gist/gistbuild.c +++ b/src/backend/access/gist/gistbuild.c @@ -657,10 +657,12 @@ gistInitBuffering(GISTBuildState *buildstate) itupMinSize = (Size) MAXALIGN(sizeof(IndexTupleData)); for (i = 0; i < index->rd_att->natts; i++) { - if (TupleDescAttr(index->rd_att, i)->attlen < 0) + CompactAttribute *attr = TupleDescCompactAttr(index->rd_att, i); + + if (attr->attlen < 0) itupMinSize += VARHDRSZ; else - itupMinSize += TupleDescAttr(index->rd_att, i)->attlen; + itupMinSize += attr->attlen; } /* Calculate average and maximal number of index tuples which fit to page */ diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c index 91b20147a0..7cf06058f7 100644 --- a/src/backend/access/heap/heapam.c +++ b/src/backend/access/heap/heapam.c @@ -4080,8 +4080,6 @@ static bool heap_attr_equals(TupleDesc tupdesc, int attrnum, Datum value1, Datum value2, bool isnull1, bool isnull2) { - Form_pg_attribute att; - /* * If one value is NULL and other is not, then they are certainly not * equal @@ -4111,9 +4109,11 @@ heap_attr_equals(TupleDesc tupdesc, int attrnum, Datum value1, Datum value2, } else { + CompactAttribute *att; + Assert(attrnum <= tupdesc->natts); - att = TupleDescAttr(tupdesc, attrnum - 1); - return datumIsEqual(value1, value2, att->attbyval, att->attlen); + att = TupleDescCompactAttr(tupdesc, attrnum - 1); + return datumIsEqual(value1, value2, CompactAttrByVal(att), att->attlen); } } @@ -4194,7 +4194,7 @@ HeapDetermineColumnsInfo(Relation relation, * that system attributes can't be stored externally. */ if (attrnum < 0 || isnull1 || - TupleDescAttr(tupdesc, attrnum - 1)->attlen != -1) + TupleDescCompactAttr(tupdesc, attrnum - 1)->attlen != -1) continue; /* diff --git a/src/backend/access/heap/heapam_handler.c b/src/backend/access/heap/heapam_handler.c index 6f8b1b7929..9178cdcfc9 100644 --- a/src/backend/access/heap/heapam_handler.c +++ b/src/backend/access/heap/heapam_handler.c @@ -2524,7 +2524,7 @@ reform_and_rewrite_tuple(HeapTuple tuple, /* Be sure to null out any dropped columns */ for (i = 0; i < newTupDesc->natts; i++) { - if (TupleDescAttr(newTupDesc, i)->attisdropped) + if (CompactAttrIsDropped(TupleDescCompactAttr(newTupDesc, i))) isnull[i] = true; } diff --git a/src/backend/access/heap/heaptoast.c b/src/backend/access/heap/heaptoast.c index a420e16530..c3a85d8d32 100644 --- a/src/backend/access/heap/heaptoast.c +++ b/src/backend/access/heap/heaptoast.c @@ -369,7 +369,7 @@ toast_flatten_tuple(HeapTuple tup, TupleDesc tupleDesc) /* * Look at non-null varlena attributes */ - if (!toast_isnull[i] && TupleDescAttr(tupleDesc, i)->attlen == -1) + if (!toast_isnull[i] && TupleDescCompactAttr(tupleDesc, i)->attlen == -1) { struct varlena *new_value; @@ -483,7 +483,7 @@ toast_flatten_tuple_to_datum(HeapTupleHeader tup, */ if (toast_isnull[i]) has_nulls = true; - else if (TupleDescAttr(tupleDesc, i)->attlen == -1) + else if (TupleDescCompactAttr(tupleDesc, i)->attlen == -1) { struct varlena *new_value; @@ -584,7 +584,7 @@ toast_build_flattened_tuple(TupleDesc tupleDesc, /* * Look at non-null varlena attributes */ - if (!isnull[i] && TupleDescAttr(tupleDesc, i)->attlen == -1) + if (!isnull[i] && TupleDescCompactAttr(tupleDesc, i)->attlen == -1) { struct varlena *new_value; diff --git a/src/backend/access/nbtree/nbtutils.c b/src/backend/access/nbtree/nbtutils.c index d6de2072d4..a732af4c5a 100644 --- a/src/backend/access/nbtree/nbtutils.c +++ b/src/backend/access/nbtree/nbtutils.c @@ -4874,17 +4874,17 @@ _bt_keep_natts_fast(Relation rel, IndexTuple lastleft, IndexTuple firstright) datum2; bool isNull1, isNull2; - Form_pg_attribute att; + CompactAttribute *att; datum1 = index_getattr(lastleft, attnum, itupdesc, &isNull1); datum2 = index_getattr(firstright, attnum, itupdesc, &isNull2); - att = TupleDescAttr(itupdesc, attnum - 1); + att = TupleDescCompactAttr(itupdesc, attnum - 1); if (isNull1 != isNull2) break; if (!isNull1 && - !datum_image_eq(datum1, datum2, att->attbyval, att->attlen)) + !datum_image_eq(datum1, datum2, CompactAttrByVal(att), att->attlen)) break; keepnatts++; diff --git a/src/backend/access/spgist/spgdoinsert.c b/src/backend/access/spgist/spgdoinsert.c index a4995c168b..2cb7ce43ba 100644 --- a/src/backend/access/spgist/spgdoinsert.c +++ b/src/backend/access/spgist/spgdoinsert.c @@ -1974,7 +1974,7 @@ spgdoinsert(Relation index, SpGistState *state, { if (!isnulls[i]) { - if (TupleDescAttr(leafDescriptor, i)->attlen == -1) + if (TupleDescCompactAttr(leafDescriptor, i)->attlen == -1) leafDatums[i] = PointerGetDatum(PG_DETOAST_DATUM(datums[i])); else leafDatums[i] = datums[i]; diff --git a/src/backend/access/spgist/spgutils.c b/src/backend/access/spgist/spgutils.c index 76b80146ff..d0978b2ce9 100644 --- a/src/backend/access/spgist/spgutils.c +++ b/src/backend/access/spgist/spgutils.c @@ -330,7 +330,10 @@ getSpGistTupleDesc(Relation index, SpGistTypeDesc *keyType) att->attcollation = InvalidOid; /* In case we changed typlen, we'd better reset following offsets */ for (int i = spgFirstIncludeColumn; i < outTupDesc->natts; i++) - TupleDescAttr(outTupDesc, i)->attcacheoff = -1; + TupleDescCompactAttr(outTupDesc, i)->attcacheoff = -1; + + populate_compact_attribute(TupleDescCompactAttr(outTupDesc, spgKeyColumn), + att); } return outTupDesc; } diff --git a/src/backend/access/table/toast_helper.c b/src/backend/access/table/toast_helper.c index 53224932f0..b16fd21b8d 100644 --- a/src/backend/access/table/toast_helper.c +++ b/src/backend/access/table/toast_helper.c @@ -324,7 +324,7 @@ toast_delete_external(Relation rel, const Datum *values, const bool *isnull, for (i = 0; i < numAttrs; i++) { - if (TupleDescAttr(tupleDesc, i)->attlen == -1) + if (TupleDescCompactAttr(tupleDesc, i)->attlen == -1) { Datum value = values[i]; diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c index a819b4197c..6ffc536317 100644 --- a/src/backend/catalog/index.c +++ b/src/backend/catalog/index.c @@ -477,6 +477,8 @@ ConstructTupleDescriptor(Relation heapRelation, ReleaseSysCache(tuple); } + + populate_compact_attribute(TupleDescCompactAttr(indexTupDesc, i), to); } pfree(amroutine); diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c index df7a4a21c9..f611ac40ec 100644 --- a/src/backend/commands/copy.c +++ b/src/backend/commands/copy.c @@ -867,9 +867,9 @@ CopyGetAttnums(TupleDesc tupDesc, Relation rel, List *attnamelist) for (i = 0; i < attr_count; i++) { - if (TupleDescAttr(tupDesc, i)->attisdropped) - continue; - if (TupleDescAttr(tupDesc, i)->attgenerated) + CompactAttribute *attr = TupleDescCompactAttr(tupDesc, i); + + if (CompactAttrIsDropped(attr) || CompactAttrIsGenerated(attr)) continue; attnums = lappend_int(attnums, i + 1); } diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c index 0b2a52463f..02e3b063b5 100644 --- a/src/backend/commands/tablecmds.c +++ b/src/backend/commands/tablecmds.c @@ -944,6 +944,9 @@ DefineRelation(CreateStmt *stmt, char relkind, Oid ownerId, cookedDefaults = lappend(cookedDefaults, cooked); attr->atthasdef = true; } + + populate_compact_attribute(TupleDescCompactAttr(descriptor, attnum - 1), + attr); } /* @@ -1349,6 +1352,8 @@ BuildDescForRelation(const List *columns) att->attstorage = entry->storage; else if (entry->storage_name) att->attstorage = GetAttributeStorage(att->atttypid, entry->storage_name); + + populate_compact_attribute(TupleDescCompactAttr(desc, attnum - 1), att); } return desc; diff --git a/src/backend/executor/execExpr.c b/src/backend/executor/execExpr.c index 66dda8e5e6..5e59022938 100644 --- a/src/backend/executor/execExpr.c +++ b/src/backend/executor/execExpr.c @@ -598,9 +598,9 @@ ExecBuildUpdateProjection(List *targetList, */ for (int attnum = relDesc->natts; attnum > 0; attnum--) { - Form_pg_attribute attr = TupleDescAttr(relDesc, attnum - 1); + CompactAttribute *attr = TupleDescCompactAttr(relDesc, attnum - 1); - if (attr->attisdropped) + if (CompactAttrIsDropped(attr)) continue; if (bms_is_member(attnum, assignedCols)) continue; @@ -694,9 +694,9 @@ ExecBuildUpdateProjection(List *targetList, */ for (int attnum = 1; attnum <= relDesc->natts; attnum++) { - Form_pg_attribute attr = TupleDescAttr(relDesc, attnum - 1); + CompactAttribute *attr = TupleDescCompactAttr(relDesc, attnum - 1); - if (attr->attisdropped) + if (CompactAttrIsDropped(attr)) { /* Put a null into the ExprState's resvalue/resnull ... */ scratch.opcode = EEOP_CONST; diff --git a/src/backend/executor/execExprInterp.c b/src/backend/executor/execExprInterp.c index 1535fd6b98..623d72cd53 100644 --- a/src/backend/executor/execExprInterp.c +++ b/src/backend/executor/execExprInterp.c @@ -2824,7 +2824,7 @@ ExecEvalRowNullInt(ExprState *state, ExprEvalStep *op, for (int att = 1; att <= tupDesc->natts; att++) { /* ignore dropped columns */ - if (TupleDescAttr(tupDesc, att - 1)->attisdropped) + if (CompactAttrIsDropped(TupleDescCompactAttr(tupDesc, att - 1))) continue; if (heap_attisnull(&tmptup, att, tupDesc)) { @@ -4962,10 +4962,10 @@ ExecEvalWholeRowVar(ExprState *state, ExprEvalStep *op, ExprContext *econtext) for (int i = 0; i < var_tupdesc->natts; i++) { - Form_pg_attribute vattr = TupleDescAttr(var_tupdesc, i); - Form_pg_attribute sattr = TupleDescAttr(tupleDesc, i); + CompactAttribute *vattr = TupleDescCompactAttr(var_tupdesc, i); + CompactAttribute *sattr = TupleDescCompactAttr(tupleDesc, i); - if (!vattr->attisdropped) + if (!CompactAttrIsDropped(vattr)) continue; /* already checked non-dropped cols */ if (slot->tts_isnull[i]) continue; /* null is always okay */ diff --git a/src/backend/executor/execJunk.c b/src/backend/executor/execJunk.c index b962c31383..af6db46f5d 100644 --- a/src/backend/executor/execJunk.c +++ b/src/backend/executor/execJunk.c @@ -169,7 +169,7 @@ ExecInitJunkFilterConversion(List *targetList, t = list_head(targetList); for (i = 0; i < cleanLength; i++) { - if (TupleDescAttr(cleanTupType, i)->attisdropped) + if (CompactAttrIsDropped(TupleDescCompactAttr(cleanTupType, i))) continue; /* map entry is already zero */ for (;;) { diff --git a/src/backend/executor/execTuples.c b/src/backend/executor/execTuples.c index 00dc339615..550b8e8f34 100644 --- a/src/backend/executor/execTuples.c +++ b/src/backend/executor/execTuples.c @@ -187,10 +187,10 @@ tts_virtual_materialize(TupleTableSlot *slot) /* compute size of memory required */ for (int natt = 0; natt < desc->natts; natt++) { - Form_pg_attribute att = TupleDescAttr(desc, natt); + CompactAttribute *att = TupleDescCompactAttr(desc, natt); Datum val; - if (att->attbyval || slot->tts_isnull[natt]) + if (CompactAttrByVal(att) || slot->tts_isnull[natt]) continue; val = slot->tts_values[natt]; @@ -223,10 +223,10 @@ tts_virtual_materialize(TupleTableSlot *slot) /* and copy all attributes into the pre-allocated space */ for (int natt = 0; natt < desc->natts; natt++) { - Form_pg_attribute att = TupleDescAttr(desc, natt); + CompactAttribute *att = TupleDescCompactAttr(desc, natt); Datum val; - if (att->attbyval || slot->tts_isnull[natt]) + if (CompactAttrByVal(att) || slot->tts_isnull[natt]) continue; val = slot->tts_values[natt]; @@ -1044,7 +1044,7 @@ slot_deform_heap_tuple(TupleTableSlot *slot, HeapTuple tuple, uint32 *offp, for (; attnum < natts; attnum++) { - Form_pg_attribute thisatt = TupleDescAttr(tupleDesc, attnum); + CompactAttribute *thisatt = TupleDescCompactAttr(tupleDesc, attnum); if (hasnulls && att_isnull(attnum, bp)) { @@ -2237,7 +2237,7 @@ BuildTupleFromCStrings(AttInMetadata *attinmeta, char **values) */ for (i = 0; i < natts; i++) { - if (!TupleDescAttr(tupdesc, i)->attisdropped) + if (!CompactAttrIsDropped(TupleDescCompactAttr(tupdesc, i))) { /* Non-dropped attributes */ dvalues[i] = InputFunctionCall(&attinmeta->attinfuncs[i], diff --git a/src/backend/executor/functions.c b/src/backend/executor/functions.c index 692854e2b3..5c393e1267 100644 --- a/src/backend/executor/functions.c +++ b/src/backend/executor/functions.c @@ -1886,7 +1886,8 @@ check_sql_fn_retval(List *queryTreeLists, /* remaining columns in rettupdesc had better all be dropped */ for (colindex++; colindex <= tupnatts; colindex++) { - if (!TupleDescAttr(rettupdesc, colindex - 1)->attisdropped) + if (!CompactAttrIsDropped(TupleDescCompactAttr(rettupdesc, + colindex - 1))) ereport(ERROR, (errcode(ERRCODE_INVALID_FUNCTION_DEFINITION), errmsg("return type mismatch in function declared to return %s", diff --git a/src/backend/executor/nodeMemoize.c b/src/backend/executor/nodeMemoize.c index df8e3fff08..cdec311687 100644 --- a/src/backend/executor/nodeMemoize.c +++ b/src/backend/executor/nodeMemoize.c @@ -175,12 +175,12 @@ MemoizeHash_hash(struct memoize_hash *tb, const MemoizeKey *key) if (!pslot->tts_isnull[i]) /* treat nulls as having hash key 0 */ { - Form_pg_attribute attr; + CompactAttribute *attr; uint32 hkey; - attr = TupleDescAttr(pslot->tts_tupleDescriptor, i); + attr = TupleDescCompactAttr(pslot->tts_tupleDescriptor, i); - hkey = datum_image_hash(pslot->tts_values[i], attr->attbyval, attr->attlen); + hkey = datum_image_hash(pslot->tts_values[i], CompactAttrByVal(attr), attr->attlen); hashkey ^= hkey; } @@ -242,7 +242,7 @@ MemoizeHash_equal(struct memoize_hash *tb, const MemoizeKey *key1, for (int i = 0; i < numkeys; i++) { - Form_pg_attribute attr; + CompactAttribute *attr; if (tslot->tts_isnull[i] != pslot->tts_isnull[i]) { @@ -255,9 +255,9 @@ MemoizeHash_equal(struct memoize_hash *tb, const MemoizeKey *key1, continue; /* perform binary comparison on the two datums */ - attr = TupleDescAttr(tslot->tts_tupleDescriptor, i); + attr = TupleDescCompactAttr(tslot->tts_tupleDescriptor, i); if (!datum_image_eq(tslot->tts_values[i], pslot->tts_values[i], - attr->attbyval, attr->attlen)) + CompactAttrByVal(attr), attr->attlen)) { match = false; break; diff --git a/src/backend/executor/nodeModifyTable.c b/src/backend/executor/nodeModifyTable.c index 4913e49319..09a17bf0f0 100644 --- a/src/backend/executor/nodeModifyTable.c +++ b/src/backend/executor/nodeModifyTable.c @@ -496,14 +496,14 @@ ExecComputeStoredGenerated(ResultRelInfo *resultRelInfo, for (int i = 0; i < natts; i++) { - Form_pg_attribute attr = TupleDescAttr(tupdesc, i); + CompactAttribute *attr = TupleDescCompactAttr(tupdesc, i); if (ri_GeneratedExprs[i]) { Datum val; bool isnull; - Assert(attr->attgenerated == ATTRIBUTE_GENERATED_STORED); + Assert(TupleDescAttr(tupdesc, i)->attgenerated == ATTRIBUTE_GENERATED_STORED); econtext->ecxt_scantuple = slot; @@ -514,7 +514,7 @@ ExecComputeStoredGenerated(ResultRelInfo *resultRelInfo, * memory for a pass-by-reference Datum is located. */ if (!isnull) - val = datumCopy(val, attr->attbyval, attr->attlen); + val = datumCopy(val, CompactAttrByVal(attr), attr->attlen); values[i] = val; nulls[i] = isnull; @@ -522,7 +522,7 @@ ExecComputeStoredGenerated(ResultRelInfo *resultRelInfo, else { if (!nulls[i]) - values[i] = datumCopy(slot->tts_values[i], attr->attbyval, attr->attlen); + values[i] = datumCopy(slot->tts_values[i], CompactAttrByVal(attr), attr->attlen); } } diff --git a/src/backend/executor/nodeValuesscan.c b/src/backend/executor/nodeValuesscan.c index 92948917a0..9838977f08 100644 --- a/src/backend/executor/nodeValuesscan.c +++ b/src/backend/executor/nodeValuesscan.c @@ -142,8 +142,8 @@ ValuesNext(ValuesScanState *node) foreach(lc, exprstatelist) { ExprState *estate = (ExprState *) lfirst(lc); - Form_pg_attribute attr = TupleDescAttr(slot->tts_tupleDescriptor, - resind); + CompactAttribute *attr = TupleDescCompactAttr(slot->tts_tupleDescriptor, + resind); values[resind] = ExecEvalExpr(estate, econtext, diff --git a/src/backend/executor/tstoreReceiver.c b/src/backend/executor/tstoreReceiver.c index de4646b5c2..39aa472d1c 100644 --- a/src/backend/executor/tstoreReceiver.c +++ b/src/backend/executor/tstoreReceiver.c @@ -65,9 +65,9 @@ tstoreStartupReceiver(DestReceiver *self, int operation, TupleDesc typeinfo) { for (i = 0; i < natts; i++) { - Form_pg_attribute attr = TupleDescAttr(typeinfo, i); + CompactAttribute *attr = TupleDescCompactAttr(typeinfo, i); - if (attr->attisdropped) + if (CompactAttrIsDropped(attr)) continue; if (attr->attlen == -1) { @@ -154,9 +154,9 @@ tstoreReceiveSlot_detoast(TupleTableSlot *slot, DestReceiver *self) for (i = 0; i < natts; i++) { Datum val = slot->tts_values[i]; - Form_pg_attribute attr = TupleDescAttr(typeinfo, i); + CompactAttribute *attr = TupleDescCompactAttr(typeinfo, i); - if (!attr->attisdropped && attr->attlen == -1 && !slot->tts_isnull[i]) + if (!CompactAttrIsDropped(attr) && attr->attlen == -1 && !slot->tts_isnull[i]) { if (VARATT_IS_EXTERNAL(DatumGetPointer(val))) { diff --git a/src/backend/optimizer/util/plancat.c b/src/backend/optimizer/util/plancat.c index 78a3cfafde..f25da68e4d 100644 --- a/src/backend/optimizer/util/plancat.c +++ b/src/backend/optimizer/util/plancat.c @@ -175,19 +175,19 @@ get_relation_info(PlannerInfo *root, Oid relationObjectId, bool inhparent, { for (int i = 0; i < relation->rd_att->natts; i++) { - Form_pg_attribute attr = TupleDescAttr(relation->rd_att, i); + CompactAttribute *attr = TupleDescCompactAttr(relation->rd_att, i); - if (attr->attnotnull) + if (CompactAttrIsNotNull(attr)) { rel->notnullattnums = bms_add_member(rel->notnullattnums, - attr->attnum); + i + 1); /* * Per RemoveAttributeById(), dropped columns will have their * attnotnull unset, so we needn't check for dropped columns * in the above condition. */ - Assert(!attr->attisdropped); + Assert(!CompactAttrIsDropped(attr)); } } } diff --git a/src/backend/replication/pgoutput/pgoutput.c b/src/backend/replication/pgoutput/pgoutput.c index abef4eaf68..bbb5003e5e 100644 --- a/src/backend/replication/pgoutput/pgoutput.c +++ b/src/backend/replication/pgoutput/pgoutput.c @@ -1305,7 +1305,7 @@ pgoutput_row_filter(Relation relation, TupleTableSlot *old_slot, */ for (i = 0; i < desc->natts; i++) { - Form_pg_attribute att = TupleDescAttr(desc, i); + CompactAttribute *att = TupleDescCompactAttr(desc, i); /* * if the column in the new tuple or old tuple is null, nothing to do diff --git a/src/backend/utils/adt/expandedrecord.c b/src/backend/utils/adt/expandedrecord.c index 7e85ae3825..970a45c896 100644 --- a/src/backend/utils/adt/expandedrecord.c +++ b/src/backend/utils/adt/expandedrecord.c @@ -699,10 +699,10 @@ ER_get_flat_size(ExpandedObjectHeader *eohptr) { for (i = 0; i < erh->nfields; i++) { - Form_pg_attribute attr = TupleDescAttr(tupdesc, i); + CompactAttribute *attr = TupleDescCompactAttr(tupdesc, i); if (!erh->dnulls[i] && - !attr->attbyval && attr->attlen == -1 && + !CompactAttrByVal(attr) && attr->attlen == -1 && VARATT_IS_EXTERNAL(DatumGetPointer(erh->dvalues[i]))) { /* @@ -1115,7 +1115,7 @@ expanded_record_set_field_internal(ExpandedRecordHeader *erh, int fnumber, bool check_constraints) { TupleDesc tupdesc; - Form_pg_attribute attr; + CompactAttribute *attr; Datum *dvalues; bool *dnulls; char *oldValue; @@ -1146,8 +1146,8 @@ expanded_record_set_field_internal(ExpandedRecordHeader *erh, int fnumber, * Copy new field value into record's context, and deal with detoasting, * if needed. */ - attr = TupleDescAttr(tupdesc, fnumber - 1); - if (!isnull && !attr->attbyval) + attr = TupleDescCompactAttr(tupdesc, fnumber - 1); + if (!isnull && !CompactAttrByVal(attr)) { MemoryContext oldcxt; @@ -1201,7 +1201,7 @@ expanded_record_set_field_internal(ExpandedRecordHeader *erh, int fnumber, erh->flat_size = 0; /* Grab old field value for pfree'ing, if needed. */ - if (!attr->attbyval && !dnulls[fnumber - 1]) + if (!CompactAttrByVal(attr) && !dnulls[fnumber - 1]) oldValue = (char *) DatumGetPointer(dvalues[fnumber - 1]); else oldValue = NULL; @@ -1279,18 +1279,18 @@ expanded_record_set_fields(ExpandedRecordHeader *erh, for (fnumber = 0; fnumber < erh->nfields; fnumber++) { - Form_pg_attribute attr = TupleDescAttr(tupdesc, fnumber); + CompactAttribute *attr = TupleDescCompactAttr(tupdesc, fnumber); Datum newValue; bool isnull; /* Ignore dropped columns */ - if (attr->attisdropped) + if (CompactAttrIsDropped(attr)) continue; newValue = newValues[fnumber]; isnull = isnulls[fnumber]; - if (!attr->attbyval) + if (!CompactAttrByVal(attr)) { /* * Copy new field value into record's context, and deal with @@ -1541,9 +1541,9 @@ check_domain_for_new_field(ExpandedRecordHeader *erh, int fnumber, */ if (!isnull) { - Form_pg_attribute attr = TupleDescAttr(erh->er_tupdesc, fnumber - 1); + CompactAttribute *attr = TupleDescCompactAttr(erh->er_tupdesc, fnumber - 1); - if (!attr->attbyval && attr->attlen == -1 && + if (!CompactAttrByVal(attr) && attr->attlen == -1 && VARATT_IS_EXTERNAL(DatumGetPointer(newValue))) dummy_erh->flags |= ER_FLAG_HAVE_EXTERNAL; } diff --git a/src/backend/utils/adt/ri_triggers.c b/src/backend/utils/adt/ri_triggers.c index 62601a6d80..550af1befb 100644 --- a/src/backend/utils/adt/ri_triggers.c +++ b/src/backend/utils/adt/ri_triggers.c @@ -2833,9 +2833,9 @@ ri_KeysEqual(Relation rel, TupleTableSlot *oldslot, TupleTableSlot *newslot, * difference for ON UPDATE CASCADE, but for consistency we treat * all changes to the PK the same. */ - Form_pg_attribute att = TupleDescAttr(oldslot->tts_tupleDescriptor, attnums[i] - 1); + CompactAttribute *att = TupleDescCompactAttr(oldslot->tts_tupleDescriptor, attnums[i] - 1); - if (!datum_image_eq(oldvalue, newvalue, att->attbyval, att->attlen)) + if (!datum_image_eq(oldvalue, newvalue, CompactAttrByVal(att), att->attlen)) return false; } else diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c index 66ed24e401..71c4626b7a 100644 --- a/src/backend/utils/cache/relcache.c +++ b/src/backend/utils/cache/relcache.c @@ -584,6 +584,10 @@ RelationBuildTupleDesc(Relation relation) attp, ATTRIBUTE_FIXED_PART_SIZE); + populate_compact_attribute(TupleDescCompactAttr(relation->rd_att, + attnum - 1), + attp); + /* Update constraint/default info */ if (attp->attnotnull) constr->has_not_null = true; @@ -673,12 +677,12 @@ RelationBuildTupleDesc(Relation relation) #endif /* - * However, we can easily set the attcacheoff value for the first - * attribute: it must be zero. This eliminates the need for special cases - * for attnum=1 that used to exist in fastgetattr() and index_getattr(). + * We can easily set the attcacheoff value for the first attribute: it + * must be zero. This eliminates the need for special cases for attnum=1 + * that used to exist in fastgetattr() and index_getattr(). */ if (RelationGetNumberOfAttributes(relation) > 0) - TupleDescAttr(relation->rd_att, 0)->attcacheoff = 0; + TupleDescCompactAttr(relation->rd_att, 0)->attcacheoff = 0; /* * Set up constraint/default info @@ -1965,10 +1969,13 @@ formrdesc(const char *relationName, Oid relationReltype, has_not_null |= attrs[i].attnotnull; /* make sure attcacheoff is valid */ TupleDescAttr(relation->rd_att, i)->attcacheoff = -1; + + populate_compact_attribute(TupleDescCompactAttr(relation->rd_att, i), + TupleDescAttr(relation->rd_att, i)); } /* initialize first attribute's attcacheoff, cf RelationBuildTupleDesc */ - TupleDescAttr(relation->rd_att, 0)->attcacheoff = 0; + TupleDescCompactAttr(relation->rd_att, 0)->attcacheoff = 0; /* mark not-null status */ if (has_not_null) @@ -4434,10 +4441,13 @@ BuildHardcodedDescriptor(int natts, const FormData_pg_attribute *attrs) memcpy(TupleDescAttr(result, i), &attrs[i], ATTRIBUTE_FIXED_PART_SIZE); /* make sure attcacheoff is valid */ TupleDescAttr(result, i)->attcacheoff = -1; + + populate_compact_attribute(TupleDescCompactAttr(result, i), + TupleDescAttr(result, i)); } /* initialize first attribute's attcacheoff, cf RelationBuildTupleDesc */ - TupleDescAttr(result, 0)->attcacheoff = 0; + TupleDescCompactAttr(result, 0)->attcacheoff = 0; /* Note: we don't bother to set up a TupleConstr entry */ @@ -6172,6 +6182,8 @@ load_relcache_init_file(bool shared) goto read_failed; has_not_null |= attr->attnotnull; + + populate_compact_attribute(TupleDescCompactAttr(rel->rd_att, i), attr); } /* next read the access method specific field */ diff --git a/src/include/access/htup_details.h b/src/include/access/htup_details.h index 5e38ef8696..0d1adff540 100644 --- a/src/include/access/htup_details.h +++ b/src/include/access/htup_details.h @@ -758,9 +758,9 @@ fastgetattr(HeapTuple tup, int attnum, TupleDesc tupleDesc, bool *isnull) *isnull = false; if (HeapTupleNoNulls(tup)) { - Form_pg_attribute att; + CompactAttribute *att; - att = TupleDescAttr(tupleDesc, attnum - 1); + att = TupleDescCompactAttr(tupleDesc, attnum - 1); if (att->attcacheoff >= 0) return fetchatt(att, (char *) tup->t_data + tup->t_data->t_hoff + att->attcacheoff); diff --git a/src/include/access/itup.h b/src/include/access/itup.h index 94885751e5..74461c6073 100644 --- a/src/include/access/itup.h +++ b/src/include/access/itup.h @@ -117,6 +117,7 @@ IndexInfoFindDataOffset(unsigned short t_info) static inline Datum index_getattr(IndexTuple tup, int attnum, TupleDesc tupleDesc, bool *isnull) { + Assert(PointerIsValid(isnull)); Assert(attnum > 0); @@ -124,11 +125,13 @@ index_getattr(IndexTuple tup, int attnum, TupleDesc tupleDesc, bool *isnull) if (!IndexTupleHasNulls(tup)) { - if (TupleDescAttr(tupleDesc, attnum - 1)->attcacheoff >= 0) + CompactAttribute *attr = TupleDescCompactAttr(tupleDesc, attnum - 1); + + if (attr->attcacheoff >= 0) { - return fetchatt(TupleDescAttr(tupleDesc, attnum - 1), - (char *) tup + IndexInfoFindDataOffset(tup->t_info) - + TupleDescAttr(tupleDesc, attnum - 1)->attcacheoff); + return fetchatt(attr, + (char *) tup + IndexInfoFindDataOffset(tup->t_info) + + attr->attcacheoff); } else return nocache_index_getattr(tup, attnum, tupleDesc); diff --git a/src/include/access/tupdesc.h b/src/include/access/tupdesc.h index 2c435cdcb2..ec721f75bc 100644 --- a/src/include/access/tupdesc.h +++ b/src/include/access/tupdesc.h @@ -45,6 +45,46 @@ typedef struct TupleConstr bool has_generated_stored; } TupleConstr; +/* + * CompactAttribute + * Cut-down version of FormData_pg_attribute for faster access for tasks + * such as tuple deformation. + */ +typedef struct CompactAttribute +{ + int32 attcacheoff; /* fixed offset into tuple, if known, or -1 */ + int16 attlen; /* attr len in bytes or -1 = varlen, -2 = + * cstring */ + uint8 attflags; /* bit flags for compact storage of bool + * fields */ + char attalign; /* alignment requirement */ +} CompactAttribute; + +#define COMPACT_ATTR_FLAG_BYVAL (1 << 0) +#define COMPACT_ATTR_FLAG_IS_PACKABLE (1 << 1) +#define COMPACT_ATTR_FLAG_HAS_MISSING (1 << 2) +#define COMPACT_ATTR_FLAG_IS_DROPPED (1 << 3) +#define COMPACT_ATTR_FLAG_IS_GENERATED (1 << 4) +#define COMPACT_ATTR_FLAG_IS_NOTNULL (1 << 5) + +#define CompactAttrByVal(att) \ + (((att)->attflags & COMPACT_ATTR_FLAG_BYVAL) != 0) + +#define CompactAttrIsPackable(att) \ + (((att)->attflags & COMPACT_ATTR_FLAG_IS_PACKABLE) != 0) + +#define CompactAttrHasMissing(att) \ + (((att)->attflags & COMPACT_ATTR_FLAG_HAS_MISSING) != 0) + +#define CompactAttrIsDropped(att) \ + (((att)->attflags & COMPACT_ATTR_FLAG_IS_DROPPED) != 0) + +#define CompactAttrIsGenerated(att) \ + (((att)->attflags & COMPACT_ATTR_FLAG_IS_GENERATED) != 0) + +#define CompactAttrIsNotNull(att) \ + (((att)->attflags & COMPACT_ATTR_FLAG_IS_NOTNULL) != 0) + /* * This struct is passed around within the backend to describe the structure * of tuples. For tuples coming from on-disk relations, the information is @@ -75,6 +115,18 @@ typedef struct TupleConstr * context and go away when the context is freed. We set the tdrefcount * field of such a descriptor to -1, while reference-counted descriptors * always have tdrefcount >= 0. + * + * The attrs field stores the fixed-sized portion of FormData_pg_attribute. + * Because that struct is large, we also store a corresponding + * CompactAttribute for each attribute in compact_attrs. This is stored + * inline with the struct. Because CompactAttribute is significantly smaller + * than FormData_pg_attribute, code, especially performance-critical code + * should prioritize using the fields from the CompactAttribute over the + * equivalent fields in FormData_pg_attribute whenever possible. + * + * Any code making changes manually to the fields in 'attrs' must subsequently + * call populate_compact_attribute() to flush the changes out to the + * corresponding 'compact_attrs' element. */ typedef struct TupleDescData { @@ -85,12 +137,19 @@ typedef struct TupleDescData TupleConstr *constr; /* constraints, or NULL if none */ /* attrs[N] is the description of Attribute Number N+1 */ FormData_pg_attribute *attrs; + CompactAttribute compact_attrs[FLEXIBLE_ARRAY_MEMBER]; } TupleDescData; typedef struct TupleDescData *TupleDesc; -/* Accessor for the i'th attribute of tupdesc. */ +/* Accessor for the i'th FormData_pg_attribute of tupdesc. */ #define TupleDescAttr(tupdesc, i) (&(tupdesc)->attrs[(i)]) +/* Accessor for the i'th CompactAttribute of tupdesc */ +#define TupleDescCompactAttr(tupdesc, i) (&(tupdesc)->compact_attrs[(i)]) + +extern void populate_compact_attribute(CompactAttribute *dst, + Form_pg_attribute src); + extern TupleDesc CreateTemplateTupleDesc(int natts); extern TupleDesc CreateTupleDesc(int natts, Form_pg_attribute *attrs); @@ -99,13 +158,15 @@ extern TupleDesc CreateTupleDescCopy(TupleDesc tupdesc); extern TupleDesc CreateTupleDescCopyConstr(TupleDesc tupdesc); -#define TupleDescSize(src) MAXALIGN(sizeof(TupleDescData)) +#define TupleDescSize(src) \ + (offsetof(struct TupleDescData, compact_attrs) + \ + (src)->natts * sizeof(CompactAttribute)) #define TupleDescFullSize(src) \ - (MAXALIGN(sizeof(TupleDescData)) + sizeof(FormData_pg_attribute) * (src)->natts) + (TupleDescSize(src) + sizeof(FormData_pg_attribute) * (src)->natts) #define TupleDescAttrAddress(desc) \ - (Form_pg_attribute) ((char *) (desc) + MAXALIGN(sizeof(TupleDescData))) + (Form_pg_attribute) ((char *) (desc) + TupleDescSize(desc)) extern void TupleDescCopy(TupleDesc dst, TupleDesc src); diff --git a/src/include/access/tupmacs.h b/src/include/access/tupmacs.h index 58b3a58cfd..9078d03231 100644 --- a/src/include/access/tupmacs.h +++ b/src/include/access/tupmacs.h @@ -30,7 +30,7 @@ att_isnull(int ATT, const bits8 *BITS) #ifndef FRONTEND /* - * Given a Form_pg_attribute and a pointer into a tuple's data area, + * Given a CompactAttribute pointer and a pointer into a tuple's data area, * return the correct value or pointer. * * We return a Datum value in all cases. If the attribute has "byval" false, @@ -43,7 +43,7 @@ att_isnull(int ATT, const bits8 *BITS) * * Note that T must already be properly aligned for this to work correctly. */ -#define fetchatt(A,T) fetch_att(T, (A)->attbyval, (A)->attlen) +#define fetchatt(A, T) fetch_att(T, CompactAttrByVal(A), (A)->attlen) /* * Same, but work from byval/len parameters rather than Form_pg_attribute. diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index 547d14b3e7..a1d1ca58ba 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -453,6 +453,7 @@ CommitTimestampEntry CommitTimestampShared CommonEntry CommonTableExpr +CompactAttribute CompareScalarsContext CompiledExprState CompositeIOData -- 2.34.1