clean pg_compat.h

funbringer · funbringer · commit 4c166c14d930 · 2017-06-05T14:50:10.000+03:00
diff --git a/src/include/compat/pg_compat.h b/src/include/compat/pg_compat.h
@@ -273,25 +273,22 @@ extern void create_plain_partial_paths(PlannerInfo *root,
 
 
 /*
- * ExecEvalExpr
- *
- * 'errmsg' specifies error string when result of ExecEvalExpr doesn't return
- * 		a single value
+ * ExecEvalExpr()
+ * NOTE: 'errmsg' specifies error string when ExecEvalExpr returns multiple values.
  */
 #if PG_VERSION_NUM >= 100000
 #define ExecEvalExprCompat(expr, econtext, isNull, errHandler) \
 	ExecEvalExpr((expr), (econtext), (isNull))
 #elif PG_VERSION_NUM >= 90500
 #include "partition_filter.h"
-extern Datum exprResult;
-extern ExprDoneCond isDone;
-static inline void
-dummy_handler() { }
-static inline void
-not_signle_result_handler()
-{
-	elog(ERROR, ERR_PART_ATTR_MULTIPLE_RESULTS);
-}
+
+/* Variables for ExecEvalExprCompat() */
+extern Datum			exprResult;
+extern ExprDoneCond		isDone;
+
+/* Error handlers */
+static inline void mult_result_handler() { elog(ERROR, ERR_PART_ATTR_MULTIPLE_RESULTS); }
+
 #define ExecEvalExprCompat(expr, econtext, isNull, errHandler) \
 ( \
 	exprResult = ExecEvalExpr((expr), (econtext), (isNull), &isDone), \
@@ -481,11 +478,11 @@ extern int oid_cmp(const void *p1, const void *p2);
 							 completionTag) \
 		do { \
 			PlannedStmt *stmt = makeNode(PlannedStmt); \
-			stmt->commandType = CMD_UTILITY; \
-			stmt->canSetTag = true; \
-			stmt->utilityStmt = (parsetree); \
-			stmt->stmt_location = -1; \
-			stmt->stmt_len = 0; \
+			stmt->commandType	= CMD_UTILITY; \
+			stmt->canSetTag		= true; \
+			stmt->utilityStmt	= (parsetree); \
+			stmt->stmt_location	= -1; \
+			stmt->stmt_len		= 0; \
 			ProcessUtility(stmt, (queryString), (context), (params), NULL, \
 						   (dest), (completionTag)); \
 		} while (0)
@@ -550,9 +547,6 @@ extern void set_rel_consider_parallel(PlannerInfo *root,
  */
 
 void set_append_rel_size_compat(PlannerInfo *root, RelOptInfo *rel, Index rti);
-List *init_createstmts_for_partition(RangeVar *parent_rv,
-									 RangeVar *partition_rv,
-									 char	  *tablespace);
 
 
 #endif /* PG_COMPAT_H */
diff --git a/src/partition_filter.c b/src/partition_filter.c
@@ -642,7 +642,7 @@ partition_filter_exec(CustomScanState *node)
 		tmp_slot = econtext->ecxt_scantuple;
 		econtext->ecxt_scantuple = slot;
 		value = ExecEvalExprCompat(state->expr_state, econtext, &isnull,
-								   not_signle_result_handler);
+								   mult_result_handler);
 		econtext->ecxt_scantuple = tmp_slot;
 
 		if (isnull)
diff --git a/src/pg_pathman.c b/src/pg_pathman.c
@@ -159,7 +159,8 @@ ExtractConst(Node *node, const WalkerContext *context)
 
 	/* Evaluate expression */
 	estate = ExecInitExpr((Expr *) node, NULL);
-	value = ExecEvalExpr(estate, context->econtext, &isnull, NULL);
+	value = ExecEvalExprCompat(estate, context->econtext, &isnull,
+							   mult_result_handler);
 
 	switch (nodeTag(node))
 	{
diff --git a/src/pl_funcs.c b/src/pl_funcs.c
@@ -1233,7 +1233,7 @@ pathman_update_trigger_func(PG_FUNCTION_ARGS)
 														 new_tuple,
 														 &value_type);
 	value = ExecEvalExprCompat(expr_state, econtext, &isnull,
-							   not_signle_result_handler);
+							   mult_result_handler);
 	MemoryContextSwitchTo(old_mcxt);
 
 	if (isnull)
diff --git a/src/utility_stmt_hooking.c b/src/utility_stmt_hooking.c
@@ -649,7 +649,7 @@ PathmanCopyFrom(CopyState cstate, Relation parent_rel,
 		tmp_slot = econtext->ecxt_scantuple;
 		econtext->ecxt_scantuple = slot;
 		value = ExecEvalExprCompat(expr_state, econtext, &isnull,
-								   not_signle_result_handler);
+								   mult_result_handler);
 		econtext->ecxt_scantuple = tmp_slot;
 
 		if (isnull)

Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,8 @@ ExtractConst(Node node, const WalkerContext context)`
`159`	`159`
`160`	`160`	`/* Evaluate expression */`
`161`	`161`	`estate = ExecInitExpr((Expr *) node, NULL);`
`162`		`- value = ExecEvalExpr(estate, context->econtext, &isnull, NULL);`
	`162`	`+ value = ExecEvalExprCompat(estate, context->econtext, &isnull,`
	`163`	`+ mult_result_handler);`
`163`	`164`
`164`	`165`	`switch (nodeTag(node))`
`165`	`166`	`{`