Use updated API to work with iterators in the Red-Black Tree

Artur Zakirov · Artur Zakirov · commit 5df5c3ef3e06 · 2016-09-02T14:06:51.000+03:00
diff --git a/rum.h b/rum.h
@@ -743,6 +743,9 @@ typedef struct
 	RumEntryAccumulator *entryallocator;
 	uint32		eas_used;
 	RBTree	   *tree;
+#if PG_VERSION_NUM >= 100000
+	RBTreeIterator tree_walk;
+#endif
 	RumKey	   *sortSpace;
 	uint32		sortSpaceN;
 } BuildAccumulator;
diff --git a/rumbulk.c b/rumbulk.c
@@ -272,7 +272,11 @@ qsortCompareRumKey(const void *a, const void *b, void *arg)
 void
 rumBeginBAScan(BuildAccumulator *accum)
 {
+#if PG_VERSION_NUM >= 100000
+	rb_begin_iterate(accum->tree, LeftRightWalk, &accum->tree_walk);
+#else
 	rb_begin_iterate(accum->tree, LeftRightWalk);
+#endif
 }
 
 /*
@@ -288,7 +292,11 @@ rumGetBAEntry(BuildAccumulator *accum,
 	RumEntryAccumulator *entry;
 	RumKey	   *list;
 
+#if PG_VERSION_NUM >= 100000
+	entry = (RumEntryAccumulator *) rb_iterate(&accum->tree_walk);
+#else
 	entry = (RumEntryAccumulator *) rb_iterate(accum->tree);
+#endif
 
 	if (entry == NULL)
 		return NULL;			/* no more entries */
