refactoring in subsystem 'pg_compat'

funbringer · funbringer · commit 8eaba425dd69 · 2017-02-16T17:44:00.000+03:00
diff --git a/src/pg_compat.c b/src/pg_compat.c
@@ -5,6 +5,9 @@
  *
  * Copyright (c) 2016, Postgres Professional
  *
+ * Portions Copyright (c) 1996-2016, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1994, Regents of the University of California
+ *
  * ------------------------------------------------------------------------
  */
 
@@ -22,6 +25,7 @@
 #include <math.h>
 
 
+/* Common code */
 void
 set_append_rel_size_compat(PlannerInfo *root, RelOptInfo *rel, Index rti)
 {
@@ -51,6 +55,7 @@ set_append_rel_size_compat(PlannerInfo *root, RelOptInfo *rel, Index rti)
 		Assert(childrel->rows > 0);
 
 		parent_rows += childrel->rows;
+
 #if PG_VERSION_NUM >= 90600
 		parent_size += childrel->reltarget->width * childrel->rows;
 #else
@@ -66,27 +71,20 @@ set_append_rel_size_compat(PlannerInfo *root, RelOptInfo *rel, Index rti)
 #else
 	rel->width = rint(parent_size / parent_rows);
 #endif
+
 	rel->tuples = parent_rows;
 }
 
-void
-adjust_targetlist_compat(PlannerInfo *root, RelOptInfo *dest,
-						 RelOptInfo *rel, AppendRelInfo *appinfo)
-{
-#if PG_VERSION_NUM >= 90600
-	dest->reltarget->exprs = (List *)
-			adjust_appendrel_attrs(root,
-								   (Node *) rel->reltarget->exprs,
-								   appinfo);
-#else
-	dest->reltargetlist = (List *)
-			adjust_appendrel_attrs(root,
-								   (Node *) rel->reltargetlist,
-								   appinfo);
-#endif
-}
+
+/*
+ * ----------
+ *  Variants
+ * ----------
+ */
 
 #if PG_VERSION_NUM >= 90600
+
+
 /*
  * make_result
  *	  Build a Result plan node
@@ -108,6 +106,7 @@ make_result(List *tlist,
 	return node;
 }
 
+
 /*
  * If this relation could possibly be scanned from within a worker, then set
  * its consider_parallel flag.
@@ -256,6 +255,7 @@ set_rel_consider_parallel(PlannerInfo *root, RelOptInfo *rel,
 	rel->consider_parallel = true;
 }
 
+
 /*
  * create_plain_partial_paths
  *	  Build partial access paths for parallel scan of a plain relation
@@ -320,6 +320,7 @@ create_plain_partial_paths(PlannerInfo *root, RelOptInfo *rel)
 
 #else /* PG_VERSION_NUM >= 90500 */
 
+
 /*
  * set_dummy_rel_pathlist
  *	  Build a dummy path for a relation that's been excluded by constraints
diff --git a/src/pg_compat.h b/src/pg_compat.h
@@ -21,76 +21,127 @@
 
 
 void set_append_rel_size_compat(PlannerInfo *root, RelOptInfo *rel, Index rti);
-void adjust_targetlist_compat(PlannerInfo *root, RelOptInfo *dest,
-							  RelOptInfo *rel, AppendRelInfo *appinfo);
 
 
 #if PG_VERSION_NUM >= 90600
 
 
-#define get_parameterized_joinrel_size_compat(root, rel, outer_path, \
-											  inner_path, sjinfo, \
-											  restrict_clauses) \
-		get_parameterized_joinrel_size(root, rel, outer_path, \
-									   inner_path, sjinfo, \
-									   restrict_clauses)
+/* adjust_appendrel_attrs() */
+#define adjust_rel_targetlist_compat(root, dst_rel, src_rel, appinfo) \
+	do { \
+		(dst_rel)->reltarget->exprs = (List *) \
+				adjust_appendrel_attrs((root), \
+									   (Node *) (src_rel)->reltarget->exprs, \
+									   (appinfo)); \
+	} while (0)
 
-#define check_index_predicates_compat(rool, rel) \
-		check_index_predicates(root, rel)
 
+/* create_append_path() */
 #ifndef PGPRO_VERSION
 #define create_append_path_compat(rel, subpaths, required_outer, parallel_workers) \
-		create_append_path(rel, subpaths, required_outer, parallel_workers)
+		create_append_path((rel), (subpaths), (required_outer), (parallel_workers))
 #else
 #define create_append_path_compat(rel, subpaths, required_outer, parallel_workers) \
-		create_append_path(rel, subpaths, required_outer, false, NIL, parallel_workers)
+		create_append_path((rel), (subpaths), (required_outer), \
+						   false, NIL, (parallel_workers))
 #endif
 
-#define pull_var_clause_compat(node, aggbehavior, phbehavior) \
-		pull_var_clause(node, aggbehavior | phbehavior)
 
-extern void set_rel_consider_parallel(PlannerInfo *root, RelOptInfo *rel,
-									  RangeTblEntry *rte);
-#define set_rel_consider_parallel_compat(root, rel, rte) \
-		set_rel_consider_parallel(root, rel, rte)
+/* check_index_predicates() */
+#define check_index_predicates_compat(rool, rel) \
+		check_index_predicates((root), (rel))
 
-extern void create_plain_partial_paths(PlannerInfo *root, RelOptInfo *rel);
+
+/* create_plain_partial_paths() */
+extern void create_plain_partial_paths(PlannerInfo *root,
+									   RelOptInfo *rel);
 #define create_plain_partial_paths_compat(root, rel) \
-		create_plain_partial_paths(root, rel)
+		create_plain_partial_paths((root), (rel))
+
 
-extern Result *make_result(List *tlist, Node *resconstantqual, Plan *subplan);
+/* get_parameterized_joinrel_size() */
+#define get_parameterized_joinrel_size_compat(root, rel, outer_path, \
+											  inner_path, sjinfo, \
+											  restrict_clauses) \
+		get_parameterized_joinrel_size((root), (rel), (outer_path), \
+									   (inner_path), (sjinfo), \
+									   (restrict_clauses))
+
+
+/* make_result() */
+extern Result *make_result(List *tlist,
+						   Node *resconstantqual,
+						   Plan *subplan);
 #define make_result_compat(root, tlist, resconstantqual, subplan) \
-		make_result(tlist, resconstantqual, subplan)
+		make_result((tlist), (resconstantqual), (subplan))
+
+
+/* pull_var_clause() */
+#define pull_var_clause_compat(node, aggbehavior, phbehavior) \
+		pull_var_clause((node), (aggbehavior) | (phbehavior))
+
+
+/* set_rel_consider_parallel() */
+extern void set_rel_consider_parallel(PlannerInfo *root,
+									  RelOptInfo *rel,
+									  RangeTblEntry *rte);
+#define set_rel_consider_parallel_compat(root, rel, rte) \
+		set_rel_consider_parallel((root), (rel), (rte))
 
 
 #else /* PG_VERSION_NUM >= 90500 */
 
 
+/* adjust_appendrel_attrs() */
+#define adjust_rel_targetlist_compat(root, dst_rel, src_rel, appinfo) \
+	do { \
+		(dst_rel)->reltargetlist = (List *) \
+				adjust_appendrel_attrs((root), \
+									   (Node *) (src_rel)->reltargetlist, \
+									   (appinfo)); \
+	} while (0)
+
+
+/* create_append_path() */
+#define create_append_path_compat(rel, subpaths, required_outer, parallel_workers) \
+		create_append_path((rel), (subpaths), (required_outer))
+
+
+/* check_partial_indexes() */
+#define check_index_predicates_compat(rool, rel) \
+		check_partial_indexes((root), (rel))
+
+
+/* create_plain_partial_paths() */
+#define create_plain_partial_paths_compat(root, rel) ((void) true)
+
+
+/* get_parameterized_joinrel_size() */
 #define get_parameterized_joinrel_size_compat(root, rel, \
 											  outer_path, \
 											  inner_path, \
 											  sjinfo, restrict_clauses) \
-		get_parameterized_joinrel_size(root, rel, \
+		get_parameterized_joinrel_size((root), (rel), \
 									   (outer_path)->rows, \
 									   (inner_path)->rows, \
-									   sjinfo, restrict_clauses)
+									   (sjinfo), (restrict_clauses))
 
-#define check_index_predicates_compat(rool, rel) \
-		check_partial_indexes(root, rel)
 
-#define create_append_path_compat(rel, subpaths, required_outer, parallel_workers) \
-		create_append_path(rel, subpaths, required_outer)
+/* make_result() */
+#define make_result_compat(root, tlist, resconstantqual, subplan) \
+		make_result((root), (tlist), (resconstantqual), (subplan))
+
 
+/* pull_var_clause() */
 #define pull_var_clause_compat(node, aggbehavior, phbehavior) \
-		pull_var_clause(node, aggbehavior, phbehavior)
+		pull_var_clause((node), (aggbehavior), (phbehavior))
 
-#define make_result_compat(root, tlist, resconstantqual, subplan) \
-		make_result(root, tlist, resconstantqual, subplan)
 
+/* set_rel_consider_parallel() */
 #define set_rel_consider_parallel_compat(root, rel, rte) ((void) true)
 
-#define create_plain_partial_paths_compat(root, rel) ((void) true)
 
+/* set_dummy_rel_pathlist() */
 void set_dummy_rel_pathlist(RelOptInfo *rel);
 
 
diff --git a/src/pg_pathman.c b/src/pg_pathman.c
@@ -341,7 +341,7 @@ append_child_relation(PlannerInfo *root, Relation parent_relation,
 	root->append_rel_list = lappend(root->append_rel_list, appinfo);
 
 	/* Adjust target list for this child */
-	adjust_targetlist_compat(root, child_rel, parent_rel, appinfo);
+	adjust_rel_targetlist_compat(root, child_rel, parent_rel, appinfo);
 
 	/*
 	 * Copy restrictions. If it's not the parent table, copy only
