commit a7aa12dc882ec8e42ef0379190aeacb00297e9c4 Author: Chao Li (Evan) Date: Mon Oct 20 16:59:13 2025 +0800 Found more occurrances to replace diff --git a/contrib/dblink/dblink.c b/contrib/dblink/dblink.c index 8bf8fc8ea2f..bdebb7893cd 100644 --- a/contrib/dblink/dblink.c +++ b/contrib/dblink/dblink.c @@ -2169,7 +2169,7 @@ get_sql_insert(Relation rel, int *pkattnums, int pknumatts, char **src_pkattvals needComma = false; for (i = 0; i < natts; i++) { - if (TupleDescAttr(tupdesc, i)->attisdropped) + if (TupleDescCompactAttr(tupdesc, i)->attisdropped) continue; if (needComma) diff --git a/src/backend/access/common/tupdesc.c b/src/backend/access/common/tupdesc.c index d715c345dd8..5ab7d34fb9a 100644 --- a/src/backend/access/common/tupdesc.c +++ b/src/backend/access/common/tupdesc.c @@ -526,7 +526,7 @@ FreeTupleDesc(TupleDesc tupdesc) for (i = tupdesc->natts - 1; i >= 0; i--) { if (attrmiss[i].am_present - && !TupleDescAttr(tupdesc, i)->attbyval) + && !TupleDescCompactAttr(tupdesc, i)->attbyval) pfree(DatumGetPointer(attrmiss[i].am_value)); } pfree(attrmiss); diff --git a/src/backend/utils/adt/rowtypes.c b/src/backend/utils/adt/rowtypes.c index 9e5449f17d7..48f959474d8 100644 --- a/src/backend/utils/adt/rowtypes.c +++ b/src/backend/utils/adt/rowtypes.c @@ -924,12 +924,12 @@ record_cmp(FunctionCallInfo fcinfo) /* * Skip dropped columns */ - if (i1 < ncolumns1 && TupleDescAttr(tupdesc1, i1)->attisdropped) + if (i1 < ncolumns1 && TupleDescCompactAttr(tupdesc1, i1)->attisdropped) { i1++; continue; } - if (i2 < ncolumns2 && TupleDescAttr(tupdesc2, i2)->attisdropped) + if (i2 < ncolumns2 && TupleDescCompactAttr(tupdesc2, i2)->attisdropped) { i2++; continue; @@ -1170,12 +1170,12 @@ record_eq(PG_FUNCTION_ARGS) /* * Skip dropped columns */ - if (i1 < ncolumns1 && TupleDescAttr(tupdesc1, i1)->attisdropped) + if (i1 < ncolumns1 && TupleDescCompactAttr(tupdesc1, i1)->attisdropped) { i1++; continue; } - if (i2 < ncolumns2 && TupleDescAttr(tupdesc2, i2)->attisdropped) + if (i2 < ncolumns2 && TupleDescCompactAttr(tupdesc2, i2)->attisdropped) { i2++; continue; @@ -1692,12 +1692,12 @@ record_image_eq(PG_FUNCTION_ARGS) /* * Skip dropped columns */ - if (i1 < ncolumns1 && TupleDescAttr(tupdesc1, i1)->attisdropped) + if (i1 < ncolumns1 && TupleDescCompactAttr(tupdesc1, i1)->attisdropped) { i1++; continue; } - if (i2 < ncolumns2 && TupleDescAttr(tupdesc2, i2)->attisdropped) + if (i2 < ncolumns2 && TupleDescCompactAttr(tupdesc2, i2)->attisdropped) { i2++; continue;