Issue #52: Handle rbtree renames for PostgreSQL 11.0

za-arthur · za-arthur · commit 039b495c085e · 2019-01-22T20:04:36.000+03:00
diff --git a/src/rum.h b/src/rum.h
@@ -783,7 +783,7 @@ extern IndexBulkDeleteResult *rumvacuumcleanup(IndexVacuumInfo *info,
 extern bool rumvalidate(Oid opclassoid);
 
 /* rumbulk.c */
-#if PG_VERSION_NUM <= 100006
+#if PG_VERSION_NUM <= 100006 || PG_VERSION_NUM == 110000
 typedef RBNode RBTNode;
 #endif
 
diff --git a/src/rumbulk.c b/src/rumbulk.c
@@ -22,7 +22,7 @@
 #define DEF_NPTR	5			/* ItemPointer initial allocation quantum */
 
 /* PostgreSQL pre 10 has different names for this functions */
-#if PG_VERSION_NUM <= 100006
+#if PG_VERSION_NUM <= 100006 || PG_VERSION_NUM == 110000
 #define rbt_create(node_size, comparator, combiner, allocfunc, freefunc, arg) \
 	(rb_create(node_size, comparator, combiner, allocfunc, freefunc, arg))
 #define rbt_insert(rbt, data, isNew) \
@@ -280,7 +280,7 @@ qsortCompareRumItem(const void *a, const void *b, void *arg)
 void
 rumBeginBAScan(BuildAccumulator *accum)
 {
-#if PG_VERSION_NUM > 100006
+#if PG_VERSION_NUM > 100006 && PG_VERSION_NUM >= 110001
 	rbt_begin_iterate(accum->tree, LeftRightWalk, &accum->tree_walk);
 #elif PG_VERSION_NUM >= 100000
 	rb_begin_iterate(accum->tree, LeftRightWalk, &accum->tree_walk);
@@ -302,7 +302,7 @@ rumGetBAEntry(BuildAccumulator *accum,
 	RumEntryAccumulator *entry;
 	RumItem	   *list;
 
-#if PG_VERSION_NUM > 100006
+#if PG_VERSION_NUM > 100006 && PG_VERSION_NUM >= 110001
 	entry = (RumEntryAccumulator *) rbt_iterate(&accum->tree_walk);
 #elif PG_VERSION_NUM >= 100000
 	entry = (RumEntryAccumulator *) rb_iterate(&accum->tree_walk);
