Add compat version of ExecBuildProjectionInfo

Maksim Milyutin · Maksim Milyutin · commit 3fb25830c157 · 2017-05-19T20:45:07.000+03:00
diff --git a/src/hooks.c b/src/hooks.c
@@ -759,8 +759,8 @@ pathman_relcache_hook(Datum arg, Oid relid)
 /*
  * Utility function invoker hook.
  */
-#if PG_VERSION_NUM >= 100000
 void
+#if PG_VERSION_NUM >= 100000
 pathman_process_utility_hook(PlannedStmt *pstmt,
 							 const char *queryString,
 							 ProcessUtilityContext context,
@@ -770,7 +770,6 @@ pathman_process_utility_hook(PlannedStmt *pstmt,
 {
 	Node   *parsetree = pstmt->utilityStmt;
 #else
-void
 pathman_process_utility_hook(Node *parsetree,
 							 const char *queryString,
 							 ProcessUtilityContext context,
diff --git a/src/include/compat/pg_compat.h b/src/include/compat/pg_compat.h
@@ -184,6 +184,23 @@ extern void create_plain_partial_paths(PlannerInfo *root,
 #endif
 
 
+/*
+ * ExecBuildProjectionInfo
+ */
+#if PG_VERSION_NUM >= 100000
+#define ExecBuildProjectionInfoCompat(targetList, econtext, resultSlot, \
+									  ownerPlanState, inputDesc) \
+		ExecBuildProjectionInfo((targetList), (econtext), (resultSlot), \
+								(ownerPlanState), (inputDesc))
+#elif PG_VERSION_NUM >= 90500
+#define ExecBuildProjectionInfoCompat(targetList, econtext, resultSlot, \
+									  ownerPlanState, inputDesc) \
+		ExecBuildProjectionInfo((List *) ExecInitExpr((Expr *) (targetList), \
+													  (ownerPlanState)), \
+								(econtext), (resultSlot), (inputDesc))
+#endif
+
+
 /*
  * ExecEvalExpr
  *
diff --git a/src/partition_filter.c b/src/partition_filter.c
@@ -783,6 +783,7 @@ prepare_rri_returning_for_insert(EState *estate,
 	ResultRelInfo		   *child_rri,
 						   *parent_rri;
 	Index					parent_rt_idx;
+	TupleTableSlot		   *result_slot;
 
 	/* We don't need to do anything ff there's no map */
 	if (!rri_holder->tuple_map)
@@ -809,23 +810,18 @@ prepare_rri_returning_for_insert(EState *estate,
 									   list_make2(makeInteger(parent_rt_idx),
 												  rri_holder));
 
-	/* Build new projection info */
+	/* Specify tuple slot where will be place projection result in */
 #if PG_VERSION_NUM >= 100000
-	child_rri->ri_projectReturning =
-			ExecBuildProjectionInfo((List *) ExecInitExpr((Expr *) returning_list,
-														  /* HACK: no PlanState */ NULL),
-									pfstate->tup_convert_econtext,
-									parent_rri->ri_projectReturning->pi_state.resultslot,
-									(PlanState *) pfstate,
-									RelationGetDescr(child_rri->ri_RelationDesc));
-#else
-	child_rri->ri_projectReturning =
-			ExecBuildProjectionInfo((List *) ExecInitExpr((Expr *) returning_list,
-														  /* HACK: no PlanState */ NULL),
-									pfstate->tup_convert_econtext,
-									parent_rri->ri_projectReturning->pi_slot,
-									RelationGetDescr(child_rri->ri_RelationDesc));
+	result_slot = parent_rri->ri_projectReturning->pi_state.resultslot;
+#elif PG_VERSION_NUM >= 90500
+	result_slot = parent_rri->ri_projectReturning->pi_slot;
 #endif
+
+	/* Build new projection info */
+	child_rri->ri_projectReturning =
+		ExecBuildProjectionInfoCompat(returning_list, pfstate->tup_convert_econtext,
+									  result_slot, NULL /* HACK: no PlanState */,
+									  RelationGetDescr(child_rri->ri_RelationDesc));
 }
 
 /* Prepare FDW access structs */
