Add support PostgreSQL 11devel

za-arthur · za-arthur · commit 873b106ec2a8 · 2017-11-02T14:12:18.000+03:00
diff --git a/src/rum.h b/src/rum.h
@@ -391,6 +391,13 @@ typedef struct RumState
 	Oid			supportCollation[INDEX_MAX_KEYS];
 }	RumState;
 
+/* Accessor for the i'th attribute of tupdesc. */
+#if PG_VERSION_NUM > 100000
+#define RumTupleDescAttr(tupdesc, i) (TupleDescAttr(tupdesc, i))
+#else
+#define RumTupleDescAttr(tupdesc, i) ((tupdesc)->attrs[(i)])
+#endif
+
 /* rumutil.c */
 extern bytea *rumoptions(Datum reloptions, bool validate);
 extern Datum rumhandler(PG_FUNCTION_ARGS);
@@ -662,7 +669,7 @@ typedef struct RumScanEntryData
 	 * For a partial-match or full-scan query, we accumulate all TIDs and
 	 * and additional information here
 	 */
-	Tuplesortstate *matchSortstate;
+	RumTuplesortstate *matchSortstate;
 	RumScanItem	collectRumItem;
 
 	/* for full-scan query with order-by */
@@ -722,7 +729,7 @@ typedef struct RumScanOpaqueData
 	uint32		allocentries;		/* allocated length of entries[] and
 									   sortedEntries[] */
 
-	Tuplesortstate *sortstate;
+	RumTuplesortstate *sortstate;
 	int			norderbys;		/* Number of columns in ordering.
 								   Will be assigned to sortstate->nKeys */
 
diff --git a/src/rum_arr_utils.c b/src/rum_arr_utils.c
@@ -72,6 +72,10 @@
 #define DIST_FROM_SML(sml) \
 	( (sml == 0.0) ? get_float8_infinity() : ((float8) 1) / ((float8) (sml)) )
 
+#if PG_VERSION_NUM <= 100000
+#define HASHSTANDARD_PROC HASHPROC
+#endif
+
 
 typedef struct AnyArrayTypeInfo
 {
@@ -583,15 +587,15 @@ getAMProc(Oid amOid, Oid typid)
 
 	procOid = get_opfamily_proc(get_opclass_family(opclassOid),
 							 typid, typid,
-							 (amOid == BTREE_AM_OID) ? BTORDER_PROC : HASHPROC);
+							 (amOid == BTREE_AM_OID) ? BTORDER_PROC : HASHSTANDARD_PROC);
 
 	if (!OidIsValid(procOid))
 	{
 		typid = get_opclass_input_type(opclassOid);
 
 		procOid = get_opfamily_proc(get_opclass_family(opclassOid),
 								 typid, typid,
-								 (amOid == BTREE_AM_OID) ? BTORDER_PROC : HASHPROC);
+								 (amOid == BTREE_AM_OID) ? BTORDER_PROC : HASHSTANDARD_PROC);
 	}
 
 	return procOid;
diff --git a/src/rumbulk.c b/src/rumbulk.c
@@ -123,7 +123,7 @@ rumInitBA(BuildAccumulator *accum)
 static Datum
 getDatumCopy(BuildAccumulator *accum, OffsetNumber attnum, Datum value)
 {
-	Form_pg_attribute att = accum->rumstate->origTupdesc->attrs[attnum - 1];
+	Form_pg_attribute att = RumTupleDescAttr(accum->rumstate->origTupdesc, attnum - 1);
 	Datum		res;
 
 	if (att->attbyval)
diff --git a/src/rumget.c b/src/rumget.c
@@ -313,7 +313,7 @@ collectMatchBitmap(RumBtreeData * btree, RumBtreeStack * stack,
 
 	/* Locate tupdesc entry for key column (for attbyval/attlen data) */
 	attnum = scanEntry->attnumOrig;
-	attr = rumstate->origTupdesc->attrs[attnum - 1];
+	attr = RumTupleDescAttr(rumstate->origTupdesc, attnum - 1);
 
 	for (;;)
 	{
diff --git a/src/ruminsert.c b/src/ruminsert.c
@@ -516,8 +516,13 @@ rumHeapTupleBulkInsert(RumBuildState * buildstate, OffsetNumber attnum,
 		{
 			/* Check existance of additional information attribute in index */
 			if (!attr)
+			{
+				Form_pg_attribute attr = RumTupleDescAttr(
+					buildstate->rumstate.origTupdesc, attnum - 1);
+
 				elog(ERROR, "additional information attribute \"%s\" is not found in index",
-					 NameStr(buildstate->rumstate.origTupdesc->attrs[attnum - 1]->attname));
+					 NameStr(attr->attname));
+			}
 
 			addInfo[i] = datumCopy(addInfo[i], attr->attbyval, attr->attlen);
 		}
@@ -775,8 +780,13 @@ rumHeapTupleInsert(RumState * rumstate, OffsetNumber attnum,
 
 		/* Check existance of additional information attribute in index */
 		if (!addInfoIsNull[i] && !rumstate->addAttrs[attnum - 1])
+		{
+			Form_pg_attribute attr = RumTupleDescAttr(rumstate->origTupdesc,
+													  attnum - 1);
+
 			elog(ERROR, "additional information attribute \"%s\" is not found in index",
-				 NameStr(rumstate->origTupdesc->attrs[attnum - 1]->attname));
+				 NameStr(attr->attname));
+		}
 
 		insert_item.iptr = *item;
 		insert_item.addInfo = addInfo[i];
diff --git a/src/rumscan.c b/src/rumscan.c
@@ -182,9 +182,12 @@ rumFillScanKey(RumScanOpaque so, OffsetNumber attnum,
 			/* ...add key to order by index key value */
 			key->useCurKey)
 		{
+			Form_pg_attribute attr = RumTupleDescAttr(rumstate->origTupdesc,
+													  attnum - 1);
+
 			if (nQueryValues != 1)
 				elog(ERROR, "extractQuery should return only one value for ordering");
-			if (rumstate->origTupdesc->attrs[key->attnum - 1]->attbyval == false)
+			if (attr->attbyval == false)
 				elog(ERROR, "doesn't support order by over pass-by-reference column");
 
 			if (key->attnum == rumstate->attrnAttachColumn)
diff --git a/src/rumsort.c b/src/rumsort.c
diff --git a/src/rumsort.h b/src/rumsort.h
diff --git a/src/rumutil.c b/src/rumutil.c

Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ rumInitBA(BuildAccumulator *accum)`
`123`	`123`	`static Datum`
`124`	`124`	`getDatumCopy(BuildAccumulator *accum, OffsetNumber attnum, Datum value)`
`125`	`125`	`{`
`126`		`- Form_pg_attribute att = accum->rumstate->origTupdesc->attrs[attnum - 1];`
	`126`	`+ Form_pg_attribute att = RumTupleDescAttr(accum->rumstate->origTupdesc, attnum - 1);`
`127`	`127`	`Datum res;`
`128`	`128`
`129`	`129`	`if (att->attbyval)`
Original file line number	Diff line number	Diff line change
`@@ -313,7 +313,7 @@ collectMatchBitmap(RumBtreeData * btree, RumBtreeStack * stack,`
`313`	`313`
`314`	`314`	`/* Locate tupdesc entry for key column (for attbyval/attlen data) */`
`315`	`315`	`attnum = scanEntry->attnumOrig;`
`316`		`- attr = rumstate->origTupdesc->attrs[attnum - 1];`
	`316`	`+ attr = RumTupleDescAttr(rumstate->origTupdesc, attnum - 1);`
`317`	`317`
`318`	`318`	`for (;;)`
`319`	`319`	`{`