Fix building for 434e6e1484418c55561914600de9e180fc408378

Author: za-arthur

pg_variables.c

@@ -1385,11 +1385,17 @@ ensurePackagesHashExists()
 	if (packagesHash)
 		return;
 
+#if PG_VERSION_NUM >= 110000
+	ModuleContext = AllocSetContextCreate(CacheMemoryContext,
+										  "pg_variables memory context",
+										  ALLOCSET_DEFAULT_SIZES);
+#else
 	ModuleContext = AllocSetContextCreate(CacheMemoryContext,
 										  "pg_variables memory context",
 										  ALLOCSET_DEFAULT_MINSIZE,
 										  ALLOCSET_DEFAULT_INITSIZE,
 										  ALLOCSET_DEFAULT_MAXSIZE);
+#endif
 
 	ctl.keysize = NAMEDATALEN;
 	ctl.entrysize = sizeof(HashPackageEntry);
@@ -1441,11 +1447,20 @@ getPackageByName(text* name, bool create, bool strict)
 
 			sprintf(hash_name, "Variables hash for package \"%s\"", key);
 
+#if PG_VERSION_NUM >= 110000
+			package->hctx = AllocSetContextCreateExtended(ModuleContext,
+														  hash_name, 0,
+														  ALLOCSET_DEFAULT_MINSIZE,
+														  ALLOCSET_DEFAULT_INITSIZE,
+														  ALLOCSET_DEFAULT_MAXSIZE);
+#else
 			package->hctx = AllocSetContextCreate(ModuleContext,
 												  hash_name,
 												  ALLOCSET_DEFAULT_MINSIZE,
 												  ALLOCSET_DEFAULT_INITSIZE,
 												  ALLOCSET_DEFAULT_MAXSIZE);
+#endif
+
 			oldcxt = MemoryContextSwitchTo(package->hctx);
 
 			ctl.keysize = NAMEDATALEN;

pg_variables.h

@@ -10,6 +10,8 @@
 #ifndef __PG_VARIABLES_H__
 #define __PG_VARIABLES_H__
 
+#include "pg_config.h"
+
 #include "access/htup.h"
 #include "access/tupdesc.h"
 #include "datatype/timestamp.h"
@@ -18,6 +20,13 @@
 #include "utils/numeric.h"
 #include "utils/jsonb.h"
 
+/* Accessor for the i'th attribute of tupdesc. */
+#if PG_VERSION_NUM > 100000
+#define GetTupleDescAttr(tupdesc, i) (TupleDescAttr(tupdesc, i))
+#else
+#define GetTupleDescAttr(tupdesc, i) ((tupdesc)->attrs[(i)])
+#endif
+
 /* initial number of packages hashes */
 #define NUMPACKAGES 8
 #define NUMVARIABLES 16

pg_variables_record.c

@@ -79,11 +79,21 @@ init_attributes(HashVariableEntry *variable, TupleDesc tupdesc,
 	sprintf(hash_name, "Records hash for variable \"%s\"", variable->name);
 
 	record = &(variable->value.record);
+
+#if PG_VERSION_NUM >= 110000
+	record->hctx = AllocSetContextCreateExtended(topctx,
+												 hash_name, 0,
+												 ALLOCSET_DEFAULT_MINSIZE,
+												 ALLOCSET_DEFAULT_INITSIZE,
+												 ALLOCSET_DEFAULT_MAXSIZE);
+#else
 	record->hctx = AllocSetContextCreate(topctx,
 										 hash_name,
 										 ALLOCSET_DEFAULT_MINSIZE,
 										 ALLOCSET_DEFAULT_INITSIZE,
 										 ALLOCSET_DEFAULT_MAXSIZE);
+#endif
+
 	oldcxt = MemoryContextSwitchTo(record->hctx);
 	record->tupdesc = CreateTupleDescCopyConstr(tupdesc);
 
@@ -99,7 +109,7 @@ init_attributes(HashVariableEntry *variable, TupleDesc tupdesc,
 										HASH_FUNCTION | HASH_COMPARE);
 
 	/* Get hash and match functions for key type. */
-	keyid = record->tupdesc->attrs[0]->atttypid;
+	keyid = GetTupleDescAttr(record->tupdesc, 0)->atttypid;
 	typentry = lookup_type_cache(keyid,
 								 TYPECACHE_HASH_PROC_FINFO |
 								 TYPECACHE_CMP_PROC_FINFO);
@@ -142,8 +152,8 @@ check_attributes(HashVariableEntry *variable, TupleDesc tupdesc)
 	/* Second, check columns type. */
 	for (i = 0; i < tupdesc->natts; i++)
 	{
-		Form_pg_attribute	attr1 = variable->value.record.tupdesc->attrs[i],
-							attr2 = tupdesc->attrs[i];
+		Form_pg_attribute	attr1 = GetTupleDescAttr(variable->value.record.tupdesc, i),
+							attr2 = GetTupleDescAttr(tupdesc, i);
 
 		if ((attr1->atttypid != attr2->atttypid)
 			|| (attr1->attndims != attr2->attndims)
@@ -163,7 +173,7 @@ check_record_key(HashVariableEntry *variable, Oid typid)
 {
 	Assert(variable->typid == RECORDOID);
 
-	if (variable->value.record.tupdesc->attrs[0]->atttypid != typid)
+	if (GetTupleDescAttr(variable->value.record.tupdesc, 0)->atttypid != typid)
 		ereport(ERROR,
 				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
 				 errmsg("requested value type differs from variable \"%s\" "