Fix ExecEvalExpr wrapper macro and add compat versions of initial_cost_nextloop and create_nestloop_path routines

Author: Maksim Milyutin

src/compat/pg_compat.c

@@ -202,6 +202,17 @@ create_plain_partial_paths(PlannerInfo *root, RelOptInfo *rel)
 #endif
 
 
+/*
+ * ExecEvalExpr
+ *
+ * global variables for macro wrapper evaluation
+ */
+#if PG_VERSION_NUM >= 90500 && PG_VERSION_NUM < 100000
+Datum exprResult;
+ExprDoneCond isDone;
+#endif
+
+
 /*
  * make_result
  *	  Build a Result plan node

src/hooks.c

@@ -217,18 +217,8 @@ pathman_join_pathlist_hook(PlannerInfo *root,
 			 have_dangerous_phv(root, outer->parent->relids, required_inner)))
 			return;
 
-
-/* TODO: create macro initial_cost_nestloop_compat() */
-#if (defined(PGPRO_VERSION) && PG_VERSION_NUM >= 90603) || \
-	PG_VERSION_NUM >= 100000
-		initial_cost_nestloop(root, &workspace, jointype,
-							  outer, inner, /* built paths */
-							  extra);
-#else
-		initial_cost_nestloop(root, &workspace, jointype,
-							  outer, inner, /* built paths */
-							  extra->sjinfo, &extra->semifactors);
-#endif
+		initial_cost_nestloop_compat(root, &workspace, jointype, outer, inner,
+									 extra);
 
 		pathkeys = build_join_pathkeys(root, joinrel, jointype, outer->pathkeys);
 
@@ -242,24 +232,11 @@ pathman_join_pathlist_hook(PlannerInfo *root,
 				filtered_joinclauses = lappend(filtered_joinclauses, rinfo);
 		}
 
-/* TODO: create macro create_nestloop_path_compat() */
-#if (defined(PGPRO_VERSION) && PG_VERSION_NUM >= 90603) || \
-	PG_VERSION_NUM >= 100000
-		nest_path = create_nestloop_path(root, joinrel, jointype, &workspace,
-										 extra,
-										 outer, inner,
-										 filtered_joinclauses,
-										 pathkeys,
-										 calc_nestloop_required_outer(outer, inner));
-#else
-		nest_path = create_nestloop_path(root, joinrel, jointype, &workspace,
-										 extra->sjinfo,
-										 &extra->semifactors,
-										 outer, inner,
-										 filtered_joinclauses,
-										 pathkeys,
-										 calc_nestloop_required_outer(outer, inner));
-#endif
+		nest_path =
+			create_nestloop_path_compat(root, joinrel, jointype,
+										&workspace, extra, outer, inner,
+										filtered_joinclauses, pathkeys,
+										calc_nestloop_required_outer(outer, inner));
 
 		/*
 		 * NOTE: Override 'rows' value produced by standard estimator.

src/include/compat/pg_compat.h

@@ -137,6 +137,27 @@ void CatalogIndexInsert(CatalogIndexState indstate, HeapTuple heapTuple);
 #endif /* PG_VERSION_NUM */
 
 
+/*
+ * create_nestloop_path()
+ */
+#if PG_VERSION_NUM >= 100000
+#define create_nestloop_path_compat(root, joinrel, jointype, workspace, extra, \
+									outer, inner, filtered_joinclauses, pathkeys, \
+									required_outer) \
+		create_nestloop_path((root), (joinrel), (jointype), (workspace), (extra), \
+							 (outer), (inner), (filtered_joinclauses), (pathkeys), \
+							 (required_outer))
+#elif PG_VERSION_NUM >= 90500
+#define create_nestloop_path_compat(root, joinrel, jointype, workspace, extra, \
+									outer, inner, filtered_joinclauses, pathkeys, \
+									required_outer) \
+		create_nestloop_path((root), (joinrel), (jointype), (workspace), \
+							 (extra)->sjinfo, &(extra)->semifactors, (outer), \
+							 (inner), (filtered_joinclauses), (pathkeys), \
+							 (required_outer))
+#endif
+
+
 /*
  * create_plain_partial_paths()
  */
@@ -170,15 +191,23 @@ extern void create_plain_partial_paths(PlannerInfo *root,
  * 		a single value
  */
 #if PG_VERSION_NUM >= 100000
-#define ExecEvalExprCompat(expr, econtext, isNull, errmsg) \
+#define ExecEvalExprCompat(expr, econtext, isNull, errHandler) \
 	ExecEvalExpr((expr), (econtext), (isNull))
 #elif PG_VERSION_NUM >= 90500
-#define ExecEvalExprCompat(expr, econtext, isNull, errmsg) \
-	do { \
-		ExecEvalExpr((expr), (econtext), (isNull), (isDone)); \
-		if (isDone != ExprSingleResult) \
-			elog(ERROR, (errmsg)); \
-	} while (0)
+#include "partition_filter.h"
+extern Datum exprResult;
+extern ExprDoneCond isDone;
+static inline void
+not_signle_result_handler()
+{
+	elog(ERROR, ERR_PART_ATTR_MULTIPLE_RESULTS);
+}
+#define ExecEvalExprCompat(expr, econtext, isNull, errHandler) \
+( \
+	exprResult = ExecEvalExpr((expr), (econtext), (isNull), &isDone), \
+	(isDone != ExprSingleResult) ? (errHandler)() : (0), \
+	exprResult \
+)
 #endif
 
 
@@ -212,6 +241,22 @@ char get_rel_persistence(Oid relid);
 #endif
 
 
+/*
+ * initial_cost_nestloop
+ */
+#if PG_VERSION_NUM >= 100000 || (defined(PGPRO_VERSION) && PG_VERSION_NUM >= 90603)
+#define initial_cost_nestloop_compat(root, workspace, jointype, outer_path, \
+									 inner_path, extra) \
+		initial_cost_nestloop((root), (workspace), (jointype), (outer_path), \
+							  (inner_path), (extra))
+#elif PG_VERSION_NUM >= 90500
+#define initial_cost_nestloop_compat(root, workspace, jointype, outer_path, \
+									 inner_path, extra) \
+		initial_cost_nestloop((root), (workspace), (jointype), (outer_path), \
+							  (inner_path), (extra)->sjinfo, &(extra)->semifactors)
+#endif
+
+
 /*
  * InitResultRelInfo
  *

src/partition_filter.c

@@ -621,7 +621,7 @@ partition_filter_exec(CustomScanState *node)
 		tmp_slot = econtext->ecxt_scantuple;
 		econtext->ecxt_scantuple = slot;
 		value = ExecEvalExprCompat(state->expr_state, econtext, &isnull,
-					ERR_PART_ATTR_MULTIPLE_RESULTS);
+								   not_signle_result_handler);
 		econtext->ecxt_scantuple = tmp_slot;
 
 		if (isnull)

src/pl_funcs.c

@@ -1202,7 +1202,7 @@ pathman_update_trigger_func(PG_FUNCTION_ARGS)
 														 new_tuple,
 														 &value_type);
 	value = ExecEvalExprCompat(expr_state, econtext, &isnull,
-				ERR_PART_ATTR_MULTIPLE_RESULTS);
+							   not_signle_result_handler);
 	MemoryContextSwitchTo(old_mcxt);
 
 	if (isnull)

src/utility_stmt_hooking.c

@@ -651,7 +651,7 @@ PathmanCopyFrom(CopyState cstate, Relation parent_rel,
 		tmp_slot = econtext->ecxt_scantuple;
 		econtext->ecxt_scantuple = slot;
 		value = ExecEvalExprCompat(expr_state, econtext, &isnull,
-					ERR_PART_ATTR_MULTIPLE_RESULTS);
+								   not_signle_result_handler);
 		econtext->ecxt_scantuple = tmp_slot;
 
 		if (isnull)