Introduce TupleDescAttr macro for future compability with pg11

Author: ildus

src/compat/pg_compat.c

@@ -520,6 +520,9 @@ get_rel_persistence(Oid relid)
 }
 #endif
 
+#if PG_VERSION_NUM < 110000
+#define TupleDescAttr(tupdesc, i) ((tupdesc)->attrs[(i)])
+#endif
 
 #if (PG_VERSION_NUM >= 90500 && PG_VERSION_NUM <= 90505) || \
 	(PG_VERSION_NUM >= 90600 && PG_VERSION_NUM <= 90601)
@@ -542,7 +545,7 @@ convert_tuples_by_name_map(TupleDesc indesc,
 	attrMap = (AttrNumber *) palloc0(n * sizeof(AttrNumber));
 	for (i = 0; i < n; i++)
 	{
-		Form_pg_attribute att = outdesc->attrs[i];
+		Form_pg_attribute att = TupleDescAttr(outdesc, i);
 		char	   *attname;
 		Oid			atttypid;
 		int32		atttypmod;
@@ -555,7 +558,7 @@ convert_tuples_by_name_map(TupleDesc indesc,
 		atttypmod = att->atttypmod;
 		for (j = 0; j < indesc->natts; j++)
 		{
-			att = indesc->attrs[j];
+			att = TupleDescAttr(indesc, j);
 			if (att->attisdropped)
 				continue;
 			if (strcmp(attname, NameStr(att->attname)) == 0)
@@ -587,8 +590,6 @@ convert_tuples_by_name_map(TupleDesc indesc,
 }
 #endif
 
-
-
 /*
  * -------------
  *  Common code

src/init.c

@@ -631,9 +631,8 @@ pathman_config_contains_relation(Oid relid, Datum *values, bool *isnull,
 	rel = heap_open(get_pathman_config_relid(false), AccessShareLock);
 
 	/* Check that 'partrel' column is of regclass type */
-	Assert(RelationGetDescr(rel)->
-		   attrs[Anum_pathman_config_partrel - 1]->
-		   atttypid == REGCLASSOID);
+	Assert(TupleDescAttr(RelationGetDescr(rel),
+				Anum_pathman_config_partrel - 1)->atttypid == REGCLASSOID);
 
 	/* Check that number of columns == Natts_pathman_config */
 	Assert(RelationGetDescr(rel)->natts == Natts_pathman_config);
@@ -880,9 +879,8 @@ read_pathman_config(void (*per_row_cb)(Datum *values,
 	rel = heap_open(get_pathman_config_relid(false), AccessShareLock);
 
 	/* Check that 'partrel' column is if regclass type */
-	Assert(RelationGetDescr(rel)->
-		   attrs[Anum_pathman_config_partrel - 1]->
-		   atttypid == REGCLASSOID);
+	Assert(TupleDescAttr(RelationGetDescr(rel),
+				Anum_pathman_config_partrel - 1)->atttypid == REGCLASSOID);
 
 	/* Check that number of columns == Natts_pathman_config */
 	Assert(RelationGetDescr(rel)->natts == Natts_pathman_config);

src/partition_creation.c

@@ -920,8 +920,7 @@ postprocess_child_table_and_atts(Oid parent_relid, Oid partition_relid)
 	{
 		Form_pg_attribute acl_column;
 
-		acl_column = pg_class_desc->attrs[Anum_pg_class_relacl - 1];
-
+		acl_column = TupleDescAttr(pg_class_desc, Anum_pg_class_relacl - 1);
 		acl_datum = datumCopy(acl_datum, acl_column->attbyval, acl_column->attlen);
 	}
 
@@ -997,7 +996,7 @@ postprocess_child_table_and_atts(Oid parent_relid, Oid partition_relid)
 		{
 			Form_pg_attribute acl_column;
 
-			acl_column = pg_attribute_desc->attrs[Anum_pg_attribute_attacl - 1];
+			acl_column = TupleDescAttr(pg_attribute_desc, Anum_pg_attribute_attacl - 1);
 
 			acl_datum = datumCopy(acl_datum,
 								  acl_column->attbyval,

src/partition_filter.c

@@ -1022,7 +1022,7 @@ prepare_rri_fdw_for_insert(EState *estate,
 			TargetEntry		   *te;
 			Param			   *param;
 
-			attr = tupdesc->attrs[i];
+			attr = TupleDescAttr(tupdesc, i);
 
 			if (attr->attisdropped)
 				continue;

src/pg_pathman.c

@@ -1787,7 +1787,7 @@ make_inh_translation_list(Relation oldrelation, Relation newrelation,
 		Oid			attcollation;
 		int			new_attno;
 
-		att = old_tupdesc->attrs[old_attno];
+		att = TupleDescAttr(old_tupdesc, old_attno);
 		if (att->attisdropped)
 		{
 			/* Just put NULL into this list entry */
@@ -1825,15 +1825,15 @@ make_inh_translation_list(Relation oldrelation, Relation newrelation,
 		 * notational device to include the assignment into the if-clause.
 		 */
 		if (old_attno < newnatts &&
-			(att = new_tupdesc->attrs[old_attno]) != NULL &&
+			(att = TupleDescAttr(new_tupdesc, old_attno)) != NULL &&
 			!att->attisdropped && att->attinhcount != 0 &&
 			strcmp(attname, NameStr(att->attname)) == 0)
 			new_attno = old_attno;
 		else
 		{
 			for (new_attno = 0; new_attno < newnatts; new_attno++)
 			{
-				att = new_tupdesc->attrs[new_attno];
+				att = TupleDescAttr(new_tupdesc, new_attno);
 
 				/*
 				 * Make clang analyzer happy:

src/relation_info.c

@@ -1478,7 +1478,7 @@ PrelExpressionAttributesMap(const PartRelationInfo *prel,
 
 		for (j = 0; j < source_natts; j++)
 		{
-			Form_pg_attribute att = source_tupdesc->attrs[j];
+			Form_pg_attribute att = TupleDescAttr(source_tupdesc, j);
 
 			if (att->attisdropped)
 				continue; /* attrMap[attnum - 1] is already 0 */

src/utility_stmt_hooking.c

@@ -262,13 +262,12 @@ CopyGetAttnums(TupleDesc tupDesc, Relation rel, List *attnamelist)
 	if (attnamelist == NIL)
 	{
 		/* Generate default column list */
-		Form_pg_attribute *attr = tupDesc->attrs;
 		int			attr_count = tupDesc->natts;
 		int			i;
 
 		for (i = 0; i < attr_count; i++)
 		{
-			if (attr[i]->attisdropped)
+			if (TupleDescAttr(tupDesc, i)->attisdropped)
 				continue;
 			attnums = lappend_int(attnums, i + 1);
 		}
@@ -288,11 +287,13 @@ CopyGetAttnums(TupleDesc tupDesc, Relation rel, List *attnamelist)
 			attnum = InvalidAttrNumber;
 			for (i = 0; i < tupDesc->natts; i++)
 			{
-				if (tupDesc->attrs[i]->attisdropped)
+				Form_pg_attribute att = TupleDescAttr(tupDesc, i);
+
+				if (att->attisdropped)
 					continue;
-				if (namestrcmp(&(tupDesc->attrs[i]->attname), name) == 0)
+				if (namestrcmp(&(att->attname), name) == 0)
 				{
-					attnum = tupDesc->attrs[i]->attnum;
+					attnum = att->attnum;
 					break;
 				}
 			}