minor style fixes & refactoring

Author: funbringer

src/include/compat/pg_compat.h

@@ -788,7 +788,7 @@ extern AttrNumber *convert_tuples_by_name_map(TupleDesc indesc,
 #endif
 
 /*
- * compute_parallel_worker
+ * compute_parallel_worker()
  */
 #if PG_VERSION_NUM >= 110000
 #define compute_parallel_worker_compat(rel, heap_pages, index_pages) \
@@ -801,7 +801,7 @@ extern AttrNumber *convert_tuples_by_name_map(TupleDesc indesc,
 
 
 /*
- * generate_gather_paths
+ * generate_gather_paths()
  */
 #if PG_VERSION_NUM >= 110000
 #define generate_gather_paths_compat(root, rel) \
@@ -815,7 +815,7 @@ extern AttrNumber *convert_tuples_by_name_map(TupleDesc indesc,
 
 
 /*
- * handling appendrelinfo array
+ * find_childrel_appendrelinfo()
  */
 #if PG_VERSION_NUM >= 110000
 #define find_childrel_appendrelinfo_compat(root, rel) \
@@ -832,6 +832,29 @@ extern AttrNumber *convert_tuples_by_name_map(TupleDesc indesc,
  * -------------
  */
 
+/* See ExecEvalParamExtern() */
+static inline ParamExternData *
+CustomEvalParamExternCompat(Param *param, ParamListInfo params)
+{
+	ParamExternData *prm;
+
+#if PG_VERSION_NUM >= 110000
+	ParamExternData prmdata;
+
+	if (params->paramFetch != NULL)
+		prm = params->paramFetch(params, param->paramid, false, &prmdata);
+	else
+		prm = &params->params[param->paramid - 1];
+#else
+	prm = &params->params[param->paramid - 1];
+
+	if (!OidIsValid(prm->ptype) && params->paramFetch != NULL)
+		params->paramFetch(params, param->paramid);
+#endif
+
+	return prm;
+}
+
 void set_append_rel_size_compat(PlannerInfo *root, RelOptInfo *rel, Index rti);
 
 

src/include/partition_filter.h

@@ -29,7 +29,6 @@
 
 
 #define ERR_PART_ATTR_NULL				"partitioning expression's value should not be NULL"
-#define ERR_PART_ATTR_MULTIPLE_RESULTS
 #define ERR_PART_ATTR_NO_PART			"no suitable partition for key '%s'"
 #define ERR_PART_ATTR_MULTIPLE			INSERT_NODE_NAME " selected more than one partition"
 #define ERR_PART_DESC_CONVERT			"could not convert row type for partition"

src/init.c

@@ -36,6 +36,7 @@
 #include "utils/snapmgr.h"
 #include "utils/syscache.h"
 #include "utils/typcache.h"
+
 #if PG_VERSION_NUM < 110000
 #include "catalog/pg_inherits_fn.h"
 #endif

src/pl_funcs.c

@@ -23,9 +23,6 @@
 #include "catalog/dependency.h"
 #include "catalog/indexing.h"
 #include "catalog/namespace.h"
-#if PG_VERSION_NUM < 110000
-#include "catalog/pg_inherits_fn.h"
-#endif
 #include "catalog/pg_type.h"
 #include "commands/tablespace.h"
 #include "commands/trigger.h"
@@ -41,6 +38,10 @@
 #include "utils/syscache.h"
 #include "utils/typcache.h"
 
+#if PG_VERSION_NUM < 110000
+#include "catalog/pg_inherits_fn.h"
+#endif
+
 
 /* Function declarations */
 

src/pl_range_funcs.c

@@ -18,9 +18,6 @@
 #include "access/xact.h"
 #include "catalog/heap.h"
 #include "catalog/namespace.h"
-#if PG_VERSION_NUM < 110000
-#include "catalog/pg_inherits_fn.h"
-#endif
 #include "catalog/pg_type.h"
 #include "commands/tablecmds.h"
 #include "executor/spi.h"
@@ -35,6 +32,10 @@
 #include "utils/syscache.h"
 #include "utils/snapmgr.h"
 
+#if PG_VERSION_NUM < 110000
+#include "catalog/pg_inherits_fn.h"
+#endif
+
 #if PG_VERSION_NUM >= 100000
 #include "utils/regproc.h"
 #include "utils/varlena.h"

src/planner_tree_modification.c

@@ -851,20 +851,7 @@ eval_extern_params_mutator(Node *node, ParamListInfo params)
 			param->paramid > 0 &&
 			param->paramid <= params->numParams)
 		{
-			ParamExternData *prm;
-
-#if PG_VERSION_NUM >= 110000
-			ParamExternData prmdata;
-			if (params->paramFetch != NULL)
-				prm = params->paramFetch(params, param->paramid, false, &prmdata);
-			else
-				prm = &params->params[param->paramid - 1];
-#else
-			prm = &params->params[param->paramid - 1];
-			if (!OidIsValid(prm->ptype) && params->paramFetch != NULL)
-				(*params->paramFetch) (params, param->paramid);
-#endif
-
+			ParamExternData *prm = CustomEvalParamExternCompat(param, params);
 
 			if (OidIsValid(prm->ptype))
 			{