Add compat version of build_simple_rel routine

maksm90 · maksm90 · commit cc6b1e80809e · 2017-05-24T19:52:20.000+03:00
diff --git a/src/include/compat/pg_compat.h b/src/include/compat/pg_compat.h
@@ -75,6 +75,19 @@
 #endif
 
 
+/*
+ * build_simple_rel()
+ */
+#if PG_VERSION_NUM >= 100000
+#define build_simple_rel_compat(root, childRTindex, parent_rel) \
+		build_simple_rel((root), (childRTindex), (parent_rel))
+#elif PG_VERSION_NUM >= 90500
+#define build_simple_rel_compat(root, childRTindex, parent_rel) \
+		build_simple_rel((root), (childRTindex), \
+			(parent_rel) ? RELOPT_OTHER_MEMBER_REL : RELOPT_BASEREL)
+#endif
+
+
 /*
  * Define ALLOCSET_DEFAULT_SIZES for our precious MemoryContexts
  */
diff --git a/src/pg_pathman.c b/src/pg_pathman.c
@@ -338,11 +338,7 @@ append_child_relation(PlannerInfo *root, Relation parent_relation,
 	root->simple_rte_array[childRTindex] = child_rte;
 
 	/* Create RelOptInfo for this child (and make some estimates as well) */
-#if PG_VERSION_NUM >= 100000
-	child_rel = build_simple_rel(root, childRTindex, parent_rel);
-#else
-	child_rel = build_simple_rel(root, childRTindex, RELOPT_OTHER_MEMBER_REL);
-#endif
+	child_rel = build_simple_rel_compat(root, childRTindex, parent_rel);
 
 	/* Increase total_table_pages using the 'child_rel' */
 	root->total_table_pages += (double) child_rel->pages;
