get rid of ugly ExecEvalExprCompat() macro

Author: funbringer

src/compat/pg_compat.c

@@ -118,17 +118,6 @@ 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
-
-
 /*
  * get_all_actual_clauses
  */

src/include/compat/pg_compat.h

@@ -367,26 +367,20 @@ extern void create_plain_partial_paths(PlannerInfo *root,
  * NOTE: 'errmsg' specifies error string when ExecEvalExpr returns multiple values.
  */
 #if PG_VERSION_NUM >= 100000
-#define ExecEvalExprCompat(expr, econtext, isNull, errHandler) \
+#define ExecEvalExprCompat(expr, econtext, isNull) \
 	ExecEvalExpr((expr), (econtext), (isNull))
 #elif PG_VERSION_NUM >= 90500
+static inline Datum
+ExecEvalExprCompat(ExprState *expr, ExprContext *econtext, bool *isnull)
+{
+	ExprDoneCond	isdone;
+	Datum			result = ExecEvalExpr(expr, econtext, isnull, &isdone);
 
-/* Variables for ExecEvalExprCompat() */
-extern Datum			exprResult;
-extern ExprDoneCond		isDone;
+	if (isdone != ExprSingleResult)
+		elog(ERROR, "expression should return single value");
 
-/* Error handlers */
-static inline void mult_result_handler()
-{
-	elog(ERROR, "partitioning expression should return single value");
+	return result;
 }
-
-#define ExecEvalExprCompat(expr, econtext, isNull, errHandler) \
-( \
-	exprResult = ExecEvalExpr((expr), (econtext), (isNull), &isDone), \
-	(isDone != ExprSingleResult) ? (errHandler)() : (0), \
-	exprResult \
-)
 #endif
 
 

src/partition_filter.c

@@ -519,8 +519,7 @@ select_partition_for_insert(ResultPartsStorage *parts_storage,
 			expr_context->ecxt_scantuple = slot;
 
 			/* Execute expression */
-			value = ExecEvalExprCompat(expr_state, expr_context,
-									   &isnull, mult_result_handler);
+			value = ExecEvalExprCompat(expr_state, expr_context, &isnull);
 
 			if (isnull)
 				elog(ERROR, ERR_PART_ATTR_NULL);

src/pg_pathman.c

@@ -202,8 +202,7 @@ ExtractConst(Node *node, const WalkerContext *context)
 
 	/* Evaluate expression */
 	estate = ExecInitExpr((Expr *) node, NULL);
-	value = ExecEvalExprCompat(estate, econtext, &isnull,
-							   mult_result_handler);
+	value = ExecEvalExprCompat(estate, econtext, &isnull);
 
 #if PG_VERSION_NUM >= 100000
 	/* Free temp econtext if needed */