1
0
mirror of https://github.com/postgres/postgres.git synced 2025-11-22 12:22:45 +03:00

Revert "Introduce CompactAttribute array in TupleDesc"

This reverts commit d28dff3f6c.

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
This commit is contained in:
David Rowley
2024-12-03 17:12:38 +13:00
parent d28dff3f6c
commit 4171c44c9b
14 changed files with 68 additions and 246 deletions

View File

@@ -241,18 +241,12 @@ shared_record_table_compare(const void *a, const void *b, size_t size,
TupleDesc t2;
if (k1->shared)
{
t1 = (TupleDesc) dsa_get_address(area, k1->u.shared_tupdesc);
t1->attrs = TupleDescAttrAddress(t1);
}
else
t1 = k1->u.local_tupdesc;
if (k2->shared)
{
t2 = (TupleDesc) dsa_get_address(area, k2->u.shared_tupdesc);
t2->attrs = TupleDescAttrAddress(t2);
}
else
t2 = k2->u.local_tupdesc;
@@ -270,10 +264,7 @@ shared_record_table_hash(const void *a, size_t size, void *arg)
TupleDesc t;
if (k->shared)
{
t = (TupleDesc) dsa_get_address(area, k->u.shared_tupdesc);
t->attrs = TupleDescAttrAddress(t);
}
else
t = k->u.local_tupdesc;
@@ -1876,7 +1867,6 @@ lookup_rowtype_tupdesc_internal(Oid type_id, int32 typmod, bool noError)
tupdesc = (TupleDesc)
dsa_get_address(CurrentSession->area,
entry->shared_tupdesc);
tupdesc->attrs = TupleDescAttrAddress(tupdesc);
Assert(typmod == tupdesc->tdtypmod);
/* We may need to extend the local RecordCacheArray. */
@@ -2963,7 +2953,6 @@ find_or_make_matching_shared_tupledesc(TupleDesc tupdesc)
result = (TupleDesc)
dsa_get_address(CurrentSession->area,
record_table_entry->key.u.shared_tupdesc);
result->attrs = TupleDescAttrAddress(result);
Assert(result->tdrefcount == -1);
return result;
@@ -3027,7 +3016,6 @@ find_or_make_matching_shared_tupledesc(TupleDesc tupdesc)
result = (TupleDesc)
dsa_get_address(CurrentSession->area,
record_table_entry->key.u.shared_tupdesc);
result->attrs = TupleDescAttrAddress(result);
Assert(result->tdrefcount == -1);
return result;
@@ -3040,7 +3028,6 @@ find_or_make_matching_shared_tupledesc(TupleDesc tupdesc)
record_table_entry);
result = (TupleDesc)
dsa_get_address(CurrentSession->area, shared_dp);
result->attrs = TupleDescAttrAddress(result);
Assert(result->tdrefcount == -1);
return result;