Fix handling of append_rel_array.

Also a bunch of other stuff noted by @funbringer.

Author: arssher

src/compat/pg_compat.c

@@ -48,12 +48,8 @@ create_plain_partial_paths(PlannerInfo *root, RelOptInfo *rel)
 {
 	int			parallel_workers;
 
-#if PG_VERSION_NUM >= 110000
-	parallel_workers = compute_parallel_worker(rel, rel->pages, -1,
-											   max_parallel_workers_per_gather);
-#else
-	parallel_workers = compute_parallel_worker(rel, rel->pages, -1);
-#endif
+	/* no more than max_parallel_workers_per_gather since 11 */
+	parallel_workers = compute_parallel_worker_compat(rel, rel->pages, -1);
 
 	/* If any limit was set to zero, the user doesn't want a parallel scan. */
 	if (parallel_workers <= 0)

src/hooks.c

@@ -477,6 +477,17 @@ pathman_rel_pathlist_hook(PlannerInfo *root,
 		memset((void *) &root->simple_rte_array[current_len], 0,
 			   irange_len * sizeof(RangeTblEntry *));
 
+#if PG_VERSION_NUM >= 110000
+		/* Make sure append_rel_array is wide enough */
+		if (root->append_rel_array == NULL)
+			root->append_rel_array = (AppendRelInfo **) palloc0(0);
+		root->append_rel_array =  (AppendRelInfo **)
+			repalloc(root->append_rel_array,
+					 new_len * sizeof(AppendRelInfo *));
+		memset((void *) &root->append_rel_array[current_len], 0,
+			   irange_len * sizeof(AppendRelInfo *));
+#endif
+		
 		/* Don't forget to update array size! */
 		root->simple_rel_array_size = new_len;
 	}
@@ -485,7 +496,7 @@ pathman_rel_pathlist_hook(PlannerInfo *root,
 	parent_rel = heap_open(rte->relid, NoLock);
 
 	parent_rowmark = get_plan_rowmark(root->rowMarks, rti);
-
+	
 	/* Add parent if asked to */
 	if (prel->enable_parent)
 		append_child_relation(root, parent_rel, parent_rowmark,
@@ -514,21 +525,12 @@ pathman_rel_pathlist_hook(PlannerInfo *root,
 	rel->partial_pathlist = NIL;
 #endif
 
-/* Convert list to array for faster lookups */
-#if PG_VERSION_NUM >= 110000
-	setup_append_rel_array(root);
-#endif
-
 	/* Generate new paths using the rels we've just added */
 	set_append_rel_pathlist(root, rel, rti, pathkeyAsc, pathkeyDesc);
 	set_append_rel_size_compat(root, rel, rti);
 
-		/* consider gathering partial paths for the parent appendrel */
-#if PG_VERSION_NUM >= 110000
-		generate_gather_paths(root, rel, false);
-#elif PG_VERSION_NUM >= 90600
-		generate_gather_paths(root, rel);
-#endif
+	/* consider gathering partial paths for the parent appendrel */
+	generate_gather_paths_compat(root, rel);
 
 	/* Skip if both custom nodes are disabled */
 	if (!(pg_pathman_enable_runtimeappend ||

src/include/compat/pg_compat.h

@@ -787,6 +787,45 @@ extern AttrNumber *convert_tuples_by_name_map(TupleDesc indesc,
 	heap_delete((relation), (tid), (cid), (crosscheck), (wait), (hufd))
 #endif
 
+/*
+ * compute_parallel_worker
+ */
+#if PG_VERSION_NUM >= 110000
+#define compute_parallel_worker_compat(rel, heap_pages, index_pages) \
+	compute_parallel_worker((rel), (heap_pages), (index_pages), \
+							max_parallel_workers_per_gather)
+#elif PG_VERSION_NUM >= 100000
+#define compute_parallel_worker_compat(rel, heap_pages, index_pages) \
+	compute_parallel_worker((rel), (heap_pages), (index_pages))
+#endif
+
+
+/*
+ * generate_gather_paths
+ */
+#if PG_VERSION_NUM >= 110000
+#define generate_gather_paths_compat(root, rel) \
+	generate_gather_paths((root), (rel), false)
+#elif PG_VERSION_NUM >= 90600
+#define generate_gather_paths_compat(root, rel) \
+	generate_gather_paths((rel), (heap_pages), false)
+#else
+#define generate_gather_paths_compat(root, rel)
+#endif
+
+
+/*
+ * handling appendrelinfo array
+ */
+#if PG_VERSION_NUM >= 110000
+#define find_childrel_appendrelinfo_compat(root, rel) \
+	((root)->append_rel_array[(rel)->relid])
+#else
+#define find_childrel_appendrelinfo_compat(root, rel) \
+		find_childrel_appendrelinfo((root), (rel))
+#endif
+
+
 /*
  * -------------
  *  Common code

src/init.c

@@ -25,9 +25,6 @@
 #include "catalog/indexing.h"
 #include "catalog/pg_extension.h"
 #include "catalog/pg_inherits.h"
-#if PG_VERSION_NUM < 110000
-#include "catalog/pg_inherits_fn.h"
-#endif
 #include "catalog/pg_type.h"
 #include "miscadmin.h"
 #include "optimizer/clauses.h"
@@ -39,6 +36,9 @@
 #include "utils/snapmgr.h"
 #include "utils/syscache.h"
 #include "utils/typcache.h"
+#if PG_VERSION_NUM < 110000
+#include "catalog/pg_inherits_fn.h"
+#endif
 
 #include <stdlib.h>
 

src/nodes_common.c

@@ -569,11 +569,9 @@ create_append_plan_common(PlannerInfo *root, RelOptInfo *rel,
 		{
 			Plan		   *child_plan = (Plan *) lfirst(lc2);
 			RelOptInfo	   *child_rel = ((Path *) lfirst(lc1))->parent;
-#if PG_VERSION_NUM >= 110000
-			AppendRelInfo *appinfo = root->append_rel_array[child_rel->relid];
-#else
-			AppendRelInfo  *appinfo = find_childrel_appendrelinfo(root, child_rel);
-#endif
+			AppendRelInfo  *appinfo;
+
+			appinfo = find_childrel_appendrelinfo_compat(root, child_rel);
 
 			/* Replace rel's tlist with a matching one (for ExecQual()) */
 			if (!processed_rel_tlist)

src/pathman_workers.c

@@ -483,7 +483,6 @@ bgw_main_concurrent_part(Datum main_arg)
 
 		Oid		types[2]	= { OIDOID,				INT4OID };
 		Datum	vals[2]		= { part_slot->relid,	part_slot->batch_size };
-		char	nulls[2]	= { false,				false };
 
 		bool	rel_locked = false;
 
@@ -557,7 +556,7 @@ bgw_main_concurrent_part(Datum main_arg)
 			}
 
 			/* Call concurrent partitioning function */
-			ret = SPI_execute_with_args(sql, 2, types, vals, nulls, false, 0);
+			ret = SPI_execute_with_args(sql, 2, types, vals, NULL, false, 0);
 			if (ret == SPI_OK_SELECT)
 			{
 				TupleDesc	tupdesc	= SPI_tuptable->tupdesc;

src/pg_pathman.c

@@ -535,6 +535,10 @@ append_child_relation(PlannerInfo *root,
 
 	/* Now append 'appinfo' to 'root->append_rel_list' */
 	root->append_rel_list = lappend(root->append_rel_list, appinfo);
+	/* And to array in >= 11, it must be big enough */
+#if PG_VERSION_NUM >= 110000
+	root->append_rel_array[child_rti] = appinfo;
+#endif
 
 	/* Translate column privileges for this child */
 	if (parent_rte->relid != child_oid)