Use TupleDescAttr macro consistently

david-rowley · david-rowley · commit 65b71dec2d57 · 2024-07-02T13:41:47.000+12:00
A few places were directly accessing the attrs[] array. This goes against the standards set by 2cd7084. Fix that. Discussion: https://postgr.es/m/CAApHDvrBztXP3yx=NKNmo3xwFAFhEdyPnvrDg3=M0RhDs+4vYw@mail.gmail.com
diff --git a/contrib/pageinspect/gistfuncs.c b/contrib/pageinspect/gistfuncs.c
@@ -309,7 +309,7 @@ gist_page_items(PG_FUNCTION_ARGS)
 					bool		typisvarlena;
 					Oid			typoid;
 
-					typoid = tupdesc->attrs[i].atttypid;
+					typoid = TupleDescAttr(tupdesc, i)->atttypid;
 					getTypeOutputInfo(typoid, &foutoid, &typisvarlena);
 					value = OidOutputFunctionCall(foutoid, itup_values[i]);
 				}
diff --git a/src/backend/catalog/heap.c b/src/backend/catalog/heap.c
@@ -839,18 +839,19 @@ AddNewAttributeTuples(Oid new_rel_oid,
 	/* add dependencies on their datatypes and collations */
 	for (int i = 0; i < natts; i++)
 	{
+		Form_pg_attribute attr = TupleDescAttr(tupdesc, i);
+
 		/* Add dependency info */
 		ObjectAddressSubSet(myself, RelationRelationId, new_rel_oid, i + 1);
-		ObjectAddressSet(referenced, TypeRelationId,
-						 tupdesc->attrs[i].atttypid);
+		ObjectAddressSet(referenced, TypeRelationId, attr->atttypid);
 		recordDependencyOn(&myself, &referenced, DEPENDENCY_NORMAL);
 
 		/* The default collation is pinned, so don't bother recording it */
-		if (OidIsValid(tupdesc->attrs[i].attcollation) &&
-			tupdesc->attrs[i].attcollation != DEFAULT_COLLATION_OID)
+		if (OidIsValid(attr->attcollation) &&
+			attr->attcollation != DEFAULT_COLLATION_OID)
 		{
 			ObjectAddressSet(referenced, CollationRelationId,
-							 tupdesc->attrs[i].attcollation);
+							 attr->attcollation);
 			recordDependencyOn(&myself, &referenced, DEPENDENCY_NORMAL);
 		}
 	}
diff --git a/src/backend/commands/prepare.c b/src/backend/commands/prepare.c
@@ -717,7 +717,7 @@ pg_prepared_statement(PG_FUNCTION_ARGS)
 
 				result_types = palloc_array(Oid, result_desc->natts);
 				for (int i = 0; i < result_desc->natts; i++)
-					result_types[i] = result_desc->attrs[i].atttypid;
+					result_types[i] = TupleDescAttr(result_desc, i)->atttypid;
 				values[4] = build_regtype_array(result_types, result_desc->natts);
 			}
 			else
diff --git a/src/backend/executor/nodeIndexonlyscan.c b/src/backend/executor/nodeIndexonlyscan.c
@@ -658,7 +658,7 @@ ExecInitIndexOnlyScan(IndexOnlyScan *node, EState *estate, int eflags)
 	/* First, count the number of such index keys */
 	for (int attnum = 0; attnum < indnkeyatts; attnum++)
 	{
-		if (indexRelation->rd_att->attrs[attnum].atttypid == CSTRINGOID &&
+		if (TupleDescAttr(indexRelation->rd_att, attnum)->atttypid == CSTRINGOID &&
 			indexRelation->rd_opcintype[attnum] == NAMEOID)
 			namecount++;
 	}
@@ -676,7 +676,7 @@ ExecInitIndexOnlyScan(IndexOnlyScan *node, EState *estate, int eflags)
 
 		for (int attnum = 0; attnum < indnkeyatts; attnum++)
 		{
-			if (indexRelation->rd_att->attrs[attnum].atttypid == CSTRINGOID &&
+			if (TupleDescAttr(indexRelation->rd_att, attnum)->atttypid == CSTRINGOID &&
 				indexRelation->rd_opcintype[attnum] == NAMEOID)
 				indexstate->ioss_NameCStringAttNums[idx++] = (AttrNumber) attnum;
 		}
diff --git a/src/backend/executor/nodeMemoize.c b/src/backend/executor/nodeMemoize.c
@@ -175,10 +175,10 @@ MemoizeHash_hash(struct memoize_hash *tb, const MemoizeKey *key)
 
 			if (!pslot->tts_isnull[i])	/* treat nulls as having hash key 0 */
 			{
-				FormData_pg_attribute *attr;
+				Form_pg_attribute attr;
 				uint32		hkey;
 
-				attr = &pslot->tts_tupleDescriptor->attrs[i];
+				attr = TupleDescAttr(pslot->tts_tupleDescriptor, i);
 
 				hkey = datum_image_hash(pslot->tts_values[i], attr->attbyval, attr->attlen);
 
@@ -242,7 +242,7 @@ MemoizeHash_equal(struct memoize_hash *tb, const MemoizeKey *key1,
 
 		for (int i = 0; i < numkeys; i++)
 		{
-			FormData_pg_attribute *attr;
+			Form_pg_attribute attr;
 
 			if (tslot->tts_isnull[i] != pslot->tts_isnull[i])
 			{
@@ -255,7 +255,7 @@ MemoizeHash_equal(struct memoize_hash *tb, const MemoizeKey *key1,
 				continue;
 
 			/* perform binary comparison on the two datums */
-			attr = &tslot->tts_tupleDescriptor->attrs[i];
+			attr = TupleDescAttr(tslot->tts_tupleDescriptor, i);
 			if (!datum_image_eq(tslot->tts_values[i], pslot->tts_values[i],
 								attr->attbyval, attr->attlen))
 			{
diff --git a/src/backend/optimizer/util/plancat.c b/src/backend/optimizer/util/plancat.c
@@ -174,7 +174,7 @@ get_relation_info(PlannerInfo *root, Oid relationObjectId, bool inhparent,
 	{
 		for (int i = 0; i < relation->rd_att->natts; i++)
 		{
-			FormData_pg_attribute *attr = &relation->rd_att->attrs[i];
+			Form_pg_attribute attr = TupleDescAttr(relation->rd_att, i);
 
 			if (attr->attnotnull)
 			{

Original file line number	Diff line number	Diff line change
`@@ -309,7 +309,7 @@ gist_page_items(PG_FUNCTION_ARGS)`
`309`	`309`	`bool typisvarlena;`
`310`	`310`	`Oid typoid;`
`311`	`311`
`312`		`- typoid = tupdesc->attrs[i].atttypid;`
	`312`	`+ typoid = TupleDescAttr(tupdesc, i)->atttypid;`
`313`	`313`	`getTypeOutputInfo(typoid, &foutoid, &typisvarlena);`
`314`	`314`	`value = OidOutputFunctionCall(foutoid, itup_values[i]);`
`315`	`315`	`}`
Original file line number	Diff line number	Diff line change
`@@ -839,18 +839,19 @@ AddNewAttributeTuples(Oid new_rel_oid,`
`839`	`839`	`/* add dependencies on their datatypes and collations */`
`840`	`840`	`for (int i = 0; i < natts; i++)`
`841`	`841`	`{`
	`842`	`+ Form_pg_attribute attr = TupleDescAttr(tupdesc, i);`
	`843`	`+`
`842`	`844`	`/* Add dependency info */`
`843`	`845`	`ObjectAddressSubSet(myself, RelationRelationId, new_rel_oid, i + 1);`
`844`		`- ObjectAddressSet(referenced, TypeRelationId,`
`845`		`- tupdesc->attrs[i].atttypid);`
	`846`	`+ ObjectAddressSet(referenced, TypeRelationId, attr->atttypid);`
`846`	`847`	`recordDependencyOn(&myself, &referenced, DEPENDENCY_NORMAL);`
`847`	`848`
`848`	`849`	`/* The default collation is pinned, so don't bother recording it */`
`849`		`- if (OidIsValid(tupdesc->attrs[i].attcollation) &&`
`850`		`- tupdesc->attrs[i].attcollation != DEFAULT_COLLATION_OID)`
	`850`	`+ if (OidIsValid(attr->attcollation) &&`
	`851`	`+ attr->attcollation != DEFAULT_COLLATION_OID)`
`851`	`852`	`{`
`852`	`853`	`ObjectAddressSet(referenced, CollationRelationId,`
`853`		`- tupdesc->attrs[i].attcollation);`
	`854`	`+ attr->attcollation);`
`854`	`855`	`recordDependencyOn(&myself, &referenced, DEPENDENCY_NORMAL);`
`855`	`856`	`}`
`856`	`857`	`}`
Original file line number	Diff line number	Diff line change
`@@ -717,7 +717,7 @@ pg_prepared_statement(PG_FUNCTION_ARGS)`
`717`	`717`
`718`	`718`	`result_types = palloc_array(Oid, result_desc->natts);`
`719`	`719`	`for (int i = 0; i < result_desc->natts; i++)`
`720`		`- result_types[i] = result_desc->attrs[i].atttypid;`
	`720`	`+ result_types[i] = TupleDescAttr(result_desc, i)->atttypid;`
`721`	`721`	`values[4] = build_regtype_array(result_types, result_desc->natts);`
`722`	`722`	`}`
`723`	`723`	`else`
Original file line number	Diff line number	Diff line change
`@@ -658,7 +658,7 @@ ExecInitIndexOnlyScan(IndexOnlyScan node, EState estate, int eflags)`
`658`	`658`	`/* First, count the number of such index keys */`
`659`	`659`	`for (int attnum = 0; attnum < indnkeyatts; attnum++)`
`660`	`660`	`{`
`661`		`- if (indexRelation->rd_att->attrs[attnum].atttypid == CSTRINGOID &&`
	`661`	`+ if (TupleDescAttr(indexRelation->rd_att, attnum)->atttypid == CSTRINGOID &&`
`662`	`662`	`indexRelation->rd_opcintype[attnum] == NAMEOID)`
`663`	`663`	`namecount++;`
`664`	`664`	`}`
`@@ -676,7 +676,7 @@ ExecInitIndexOnlyScan(IndexOnlyScan node, EState estate, int eflags)`
`676`	`676`
`677`	`677`	`for (int attnum = 0; attnum < indnkeyatts; attnum++)`
`678`	`678`	`{`
`679`		`- if (indexRelation->rd_att->attrs[attnum].atttypid == CSTRINGOID &&`
	`679`	`+ if (TupleDescAttr(indexRelation->rd_att, attnum)->atttypid == CSTRINGOID &&`
`680`	`680`	`indexRelation->rd_opcintype[attnum] == NAMEOID)`
`681`	`681`	`indexstate->ioss_NameCStringAttNums[idx++] = (AttrNumber) attnum;`
`682`	`682`	`}`
Original file line number	Diff line number	Diff line change
`@@ -175,10 +175,10 @@ MemoizeHash_hash(struct memoize_hash tb, const MemoizeKey key)`
`175`	`175`
`176`	`176`	`if (!pslot->tts_isnull[i]) /* treat nulls as having hash key 0 */`
`177`	`177`	`{`
`178`		`- FormData_pg_attribute *attr;`
	`178`	`+ Form_pg_attribute attr;`
`179`	`179`	`uint32 hkey;`
`180`	`180`
`181`		`- attr = &pslot->tts_tupleDescriptor->attrs[i];`
	`181`	`+ attr = TupleDescAttr(pslot->tts_tupleDescriptor, i);`
`182`	`182`
`183`	`183`	`hkey = datum_image_hash(pslot->tts_values[i], attr->attbyval, attr->attlen);`
`184`	`184`
`@@ -242,7 +242,7 @@ MemoizeHash_equal(struct memoize_hash tb, const MemoizeKey key1,`
`242`	`242`
`243`	`243`	`for (int i = 0; i < numkeys; i++)`
`244`	`244`	`{`
`245`		`- FormData_pg_attribute *attr;`
	`245`	`+ Form_pg_attribute attr;`
`246`	`246`
`247`	`247`	`if (tslot->tts_isnull[i] != pslot->tts_isnull[i])`
`248`	`248`	`{`
`@@ -255,7 +255,7 @@ MemoizeHash_equal(struct memoize_hash tb, const MemoizeKey key1,`
`255`	`255`	`continue;`
`256`	`256`
`257`	`257`	`/* perform binary comparison on the two datums */`
`258`		`- attr = &tslot->tts_tupleDescriptor->attrs[i];`
	`258`	`+ attr = TupleDescAttr(tslot->tts_tupleDescriptor, i);`
`259`	`259`	`if (!datum_image_eq(tslot->tts_values[i], pslot->tts_values[i],`
`260`	`260`	`attr->attbyval, attr->attlen))`
`261`	`261`	`{`
Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,7 @@ get_relation_info(PlannerInfo *root, Oid relationObjectId, bool inhparent,`
`174`	`174`	`{`
`175`	`175`	`for (int i = 0; i < relation->rd_att->natts; i++)`
`176`	`176`	`{`
`177`		`- FormData_pg_attribute *attr = &relation->rd_att->attrs[i];`
	`177`	`+ Form_pg_attribute attr = TupleDescAttr(relation->rd_att, i);`
`178`	`178`
`179`	`179`	`if (attr->attnotnull)`
`180`	`180`	`{`