Define compatible version for InitResultRelInfo routine

maksm90 · maksm90 · commit c9f5368a15c2 · 2017-04-24T20:58:04.000+03:00
diff --git a/src/include/compat/pg_compat.h b/src/include/compat/pg_compat.h
@@ -71,7 +71,7 @@
 /*
  * DefineRelation()
  *
- * for v10 set NULL on 'queryString' parameter as it uses only under vanilla
+ * for v10 set NULL into 'queryString' argument as it's used only under vanilla
  * partition creating
  */
 #if PG_VERSION_NUM >= 100000
@@ -172,6 +172,25 @@ extern void create_plain_partial_paths(PlannerInfo *root,
 #endif
 
 
+/*
+ * InitResultRelInfo
+ *
+ * for v10 set NULL into 'partition_root' argument to specify that result
+ * relation is not vanilla partition
+ */
+#if PG_VERSION_NUM >= 100000
+#define InitResultRelInfoCompat(resultRelInfo, resultRelationDesc, \
+								resultRelationIndex, instrument_options) \
+		InitResultRelInfo((resultRelInfo), (resultRelationDesc), \
+						  (resultRelationIndex), NULL, (instrument_options))
+#elif PG_VERSION_NUM >= 90500
+#define InitResultRelInfoCompat(resultRelInfo, resultRelationDesc, \
+								resultRelationIndex, instrument_options) \
+		InitResultRelInfo((resultRelInfo), (resultRelationDesc), \
+						  (resultRelationIndex), (instrument_options))
+#endif
+
+
 /*
  * make_result()
  */
diff --git a/src/partition_filter.c b/src/partition_filter.c
@@ -8,6 +8,7 @@
  * ------------------------------------------------------------------------
  */
 
+#include "compat/pg_compat.h"
 #include "init.h"
 #include "nodes_common.h"
 #include "pathman.h"
@@ -295,18 +296,10 @@ scan_result_parts_storage(Oid partid, ResultPartsStorage *parts_storage)
 		if (!parts_storage->saved_rel_info)
 			elog(ERROR, "ResultPartsStorage contains no saved_rel_info");
 
-#if PG_VERSION_NUM >= 100000
-		InitResultRelInfo(child_result_rel_info,
-						  child_rel,
-						  child_rte_idx,
-						  parent_rel,
-						  parts_storage->estate->es_instrument);
-#else
-		InitResultRelInfo(child_result_rel_info,
-						  child_rel,
-						  child_rte_idx,
-						  parts_storage->estate->es_instrument);
-#endif
+		InitResultRelInfoCompat(child_result_rel_info,
+								child_rel,
+								child_rte_idx,
+								parts_storage->estate->es_instrument);
 
 		if (parts_storage->command_type != CMD_DELETE)
 			ExecOpenIndices(child_result_rel_info, parts_storage->speculative_inserts);
diff --git a/src/utility_stmt_hooking.c b/src/utility_stmt_hooking.c
@@ -12,6 +12,7 @@
  */
 
 #include "compat/debug_compat_features.h"
+#include "compat/pg_compat.h"
 #include "init.h"
 #include "utility_stmt_hooking.h"
 #include "partition_filter.h"
@@ -561,18 +562,10 @@ PathmanCopyFrom(CopyState cstate, Relation parent_rel,
 	tupDesc = RelationGetDescr(parent_rel);
 
 	parent_result_rel = makeNode(ResultRelInfo);
-#if PG_VERSION_NUM >= 100000
-	InitResultRelInfo(parent_result_rel,
-					  parent_rel,
-					  1,		/* dummy rangetable index */
-					  NULL,
-					  0);
-#else
-	InitResultRelInfo(parent_result_rel,
-					  parent_rel,
-					  1,		/* dummy rangetable index */
-					  0);
-#endif
+	InitResultRelInfoCompat(parent_result_rel,
+							parent_rel,
+							1,		/* dummy rangetable index */
+							0);
 	ExecOpenIndices(parent_result_rel, false);
 
 	estate->es_result_relations = parent_result_rel;
