diff options
| author | David Rowley <drowley@postgresql.org> | 2024-12-03 17:12:38 +1300 |
|---|---|---|
| committer | David Rowley <drowley@postgresql.org> | 2024-12-03 17:12:38 +1300 |
| commit | 4171c44c9b791da3c00386dc6d8e6b1842e3036b (patch) | |
| tree | 304a009d9a2b3b3df52033019a3f210a53f79823 /src/backend/utils/cache/relcache.c | |
| parent | d28dff3f6cd6a7562fb2c211ac0fb74a33ffd032 (diff) | |
Revert "Introduce CompactAttribute array in TupleDesc"
This reverts commit d28dff3f6cd6a7562fb2c211ac0fb74a33ffd032.
Quite a large number of buildfarm members didn't like this commit and
it's not yet clear why. Reverting this before too many animals turn
red.
Discussion: https://postgr.es/m/CAApHDvr9i6T5=iAwQCxFDgMsthr_obVxgwBaEJkC8KUH6yM3Hw@mail.gmail.com
Diffstat (limited to 'src/backend/utils/cache/relcache.c')
| -rw-r--r-- | src/backend/utils/cache/relcache.c | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c index e230450d2c3..d0892cee24d 100644 --- a/src/backend/utils/cache/relcache.c +++ b/src/backend/utils/cache/relcache.c @@ -585,8 +585,6 @@ RelationBuildTupleDesc(Relation relation) attp, ATTRIBUTE_FIXED_PART_SIZE); - populate_compact_attribute(relation->rd_att, attnum - 1); - /* Update constraint/default info */ if (attp->attnotnull) constr->has_not_null = true; @@ -676,12 +674,12 @@ RelationBuildTupleDesc(Relation relation) #endif /* - * 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(). + * 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(). */ if (RelationGetNumberOfAttributes(relation) > 0) - TupleDescCompactAttr(relation->rd_att, 0)->attcacheoff = 0; + TupleDescAttr(relation->rd_att, 0)->attcacheoff = 0; /* * Set up constraint/default info @@ -1967,12 +1965,10 @@ 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(relation->rd_att, i); } /* initialize first attribute's attcacheoff, cf RelationBuildTupleDesc */ - TupleDescCompactAttr(relation->rd_att, 0)->attcacheoff = 0; + TupleDescAttr(relation->rd_att, 0)->attcacheoff = 0; /* mark not-null status */ if (has_not_null) @@ -3583,7 +3579,6 @@ RelationBuildLocalRelation(const char *relname, datt->attgenerated = satt->attgenerated; datt->attnotnull = satt->attnotnull; has_not_null |= satt->attnotnull; - populate_compact_attribute(rel->rd_att, i); } if (has_not_null) @@ -4404,12 +4399,10 @@ 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(result, i); } /* initialize first attribute's attcacheoff, cf RelationBuildTupleDesc */ - TupleDescCompactAttr(result, 0)->attcacheoff = 0; + TupleDescAttr(result, 0)->attcacheoff = 0; /* Note: we don't bother to set up a TupleConstr entry */ @@ -6173,8 +6166,6 @@ load_relcache_init_file(bool shared) goto read_failed; has_not_null |= attr->attnotnull; - - populate_compact_attribute(rel->rd_att, i); } /* next read the access method specific field */ |