rename PickyAppend to RuntimeAppend

Author: funbringer

Makefile

@@ -1,7 +1,7 @@
 # contrib/pg_pathman/Makefile
 
 MODULE_big = pg_pathman
-OBJS = init.o utils.o pickyappend.o pg_pathman.o dsm_array.o \
+OBJS = init.o utils.o runtimeappend.o pg_pathman.o dsm_array.o \
 	rangeset.o pl_funcs.o worker.o hooks.o nodes_common.o $(WIN32RES)
 
 EXTENSION = pg_pathman

hooks.c

@@ -13,7 +13,7 @@
 #include "hooks.h"
 #include "utils.h"
 #include "pathman.h"
-#include "pickyappend.h"
+#include "runtimeappend.h"
 
 
 set_join_pathlist_hook_type		set_join_pathlist_next = NULL;
@@ -52,7 +52,7 @@ pathman_join_pathlist_hook(PlannerInfo *root,
 		jointype = JOIN_INNER;
 	}
 
-	if (jointype == JOIN_FULL || !pg_pathman_enable_pickyappend)
+	if (jointype == JOIN_FULL || !pg_pathman_enable_runtimeappend)
 		return;
 
 	if (innerrel->reloptkind != RELOPT_BASEREL ||
@@ -96,10 +96,10 @@ pathman_join_pathlist_hook(PlannerInfo *root,
 		inner_required = bms_union(PATH_REQ_OUTER((Path *) cur_inner_path),
 								   bms_make_singleton(outerrel->relid));
 
-		inner = create_pickyappend_path(root, cur_inner_path,
-										get_appendrel_parampathinfo(innerrel,
-																	inner_required),
-										joinclauses, paramsel);
+		inner = create_runtimeappend_path(root, cur_inner_path,
+										  get_appendrel_parampathinfo(innerrel,
+																	  inner_required),
+										  joinclauses, paramsel);
 
 		initial_cost_nestloop(root, &workspace, jointype,
 							  outer, inner,
@@ -266,7 +266,7 @@ pathman_rel_pathlist_hook(PlannerInfo *root, RelOptInfo *rel, Index rti, RangeTb
 		set_append_rel_pathlist(root, rel, rti, rte, pathkeyAsc, pathkeyDesc);
 		set_append_rel_size(root, rel, rti, rte);
 
-		if (!pg_pathman_enable_pickyappend)
+		if (!pg_pathman_enable_runtimeappend)
 			return;
 
 		foreach (lc, rel->pathlist)
@@ -276,7 +276,7 @@ pathman_rel_pathlist_hook(PlannerInfo *root, RelOptInfo *rel, Index rti, RangeTb
 			ParamPathInfo  *ppi = get_appendrel_parampathinfo(rel, inner_required);
 			Path		   *inner_path;
 			ListCell	   *subpath_cell;
-			List		   *picky_quals = NIL;
+			List		   *runtime_quals = NIL;
 
 			if (!IsA(cur_path, AppendPath) ||
 				rel->has_eclass_joins ||
@@ -302,30 +302,30 @@ pathman_rel_pathlist_hook(PlannerInfo *root, RelOptInfo *rel, Index rti, RangeTb
 				/* Do not proceed if there's a rel containing quals without params */
 				if (!clause_contains_params((Node *) quals))
 				{
-					picky_quals = NIL; /* skip this path */
+					runtime_quals = NIL; /* skip this path */
 					break;
 				}
 
 				/* Replace child Vars with a parent rel's Var */
 				quals = (List *) replace_child_vars_with_parent_var((Node *) quals,
 																	&repl_var_cxt);
 
-				/* Combine unique 'picky' quals */
+				/* Combine unique quals for RuntimeAppend */
 				foreach (qual_cell, quals)
-					picky_quals = list_append_unique(picky_quals,
-													 (Node *) lfirst(qual_cell));
+					runtime_quals = list_append_unique(runtime_quals,
+													   (Node *) lfirst(qual_cell));
 			}
 
 			/*
-			 * Dismiss PickyAppend if there
+			 * Dismiss RuntimeAppend if there
 			 * are no parameterized quals
 			 */
-			if (picky_quals == NIL)
+			if (runtime_quals == NIL)
 				continue;
 
-			inner_path = create_pickyappend_path(root, cur_path,
-												 ppi, picky_quals,
-												 paramsel);
+			inner_path = create_runtimeappend_path(root, cur_path,
+												   ppi, runtime_quals,
+												   paramsel);
 
 			add_path(rel, inner_path);
 		}

nodes_common.c

@@ -10,7 +10,7 @@
 #include "postgres.h"
 #include "optimizer/paths.h"
 #include "nodes_common.h"
-#include "pickyappend.h"
+#include "runtimeappend.h"
 
 
 
@@ -46,7 +46,7 @@ free_child_scan_common_array(ChildScanCommon *cur_plans, int n)
 }
 
 static void
-transform_plans_into_states(PickyAppendState *scan_state,
+transform_plans_into_states(RuntimeAppendState *scan_state,
 							ChildScanCommon *selected_plans, int n,
 							EState *estate)
 {
@@ -152,7 +152,7 @@ get_partition_oids(List *ranges, int *n, PartRelationInfo *prel)
 }
 
 static void
-pack_pickyappend_private(CustomScan *cscan, PickyAppendPath *path)
+pack_runtimeappend_private(CustomScan *cscan, RuntimeAppendPath *path)
 {
 	ChildScanCommon    *children = path->children;
 	int					nchildren = path->nchildren;
@@ -162,7 +162,7 @@ pack_pickyappend_private(CustomScan *cscan, PickyAppendPath *path)
 
 	for (i = 0; i < nchildren; i++)
 	{
-		/* We've already filled 'custom_paths' in create_pickyappend_path */
+		/* We've already filled 'custom_paths' in create_runtimeappend_path */
 		custom_oids = lappend_oid(custom_oids, children[i]->relid);
 		pfree(children[i]);
 	}
@@ -174,7 +174,7 @@ pack_pickyappend_private(CustomScan *cscan, PickyAppendPath *path)
 }
 
 static void
-unpack_pickyappend_private(PickyAppendState *scan_state, CustomScan *cscan)
+unpack_runtimeappend_private(RuntimeAppendState *scan_state, CustomScan *cscan)
 {
 	ListCell   *oid_cell;
 	ListCell   *plan_cell;
@@ -216,19 +216,19 @@ Path *
 create_append_path_common(PlannerInfo *root,
 						  AppendPath *inner_append,
 						  ParamPathInfo *param_info,
-						  List *picky_clauses,
+						  List *runtime_clauses,
 						  CustomPathMethods *path_methods,
 						  double sel)
 {
-	RelOptInfo *innerrel = inner_append->path.parent;
-	ListCell   *lc;
-	int			i;
+	RelOptInfo		   *innerrel = inner_append->path.parent;
+	ListCell		   *lc;
+	int					i;
 
-	RangeTblEntry  *inner_entry = root->simple_rte_array[innerrel->relid];
+	RangeTblEntry	   *inner_entry = root->simple_rte_array[innerrel->relid];
 
-	PickyAppendPath *result;
+	RuntimeAppendPath  *result;
 
-	result = palloc0(sizeof(PickyAppendPath));
+	result = palloc0(sizeof(RuntimeAppendPath));
 	NodeSetTag(result, T_CustomPath);
 
 	result->cpath.path.pathtype = T_CustomScan;
@@ -247,7 +247,7 @@ create_append_path_common(PlannerInfo *root,
 	result->cpath.path.total_cost = 0.0;
 
 	/* Set 'partitioned column'-related clauses */
-	result->cpath.custom_private = picky_clauses;
+	result->cpath.custom_private = runtime_clauses;
 	result->cpath.custom_paths = NIL;
 
 	Assert(inner_entry->relid != 0);
@@ -258,9 +258,9 @@ create_append_path_common(PlannerInfo *root,
 	i = 0;
 	foreach (lc, inner_append->subpaths)
 	{
-		Path		   *path = lfirst(lc);
-		Index			relindex = path->parent->relid;
-		ChildScanCommon	child = palloc(sizeof(ChildScanCommonData));
+		Path			   *path = lfirst(lc);
+		Index				relindex = path->parent->relid;
+		ChildScanCommon		child = palloc(sizeof(ChildScanCommonData));
 
 		result->cpath.path.startup_cost += path->startup_cost;
 		result->cpath.path.total_cost += path->total_cost;
@@ -288,7 +288,7 @@ create_append_plan_common(PlannerInfo *root, RelOptInfo *rel,
 						  List *clauses, List *custom_plans,
 						  CustomScanMethods *scan_methods)
 {
-	PickyAppendPath    *gpath = (PickyAppendPath *) best_path;
+	RuntimeAppendPath  *gpath = (RuntimeAppendPath *) best_path;
 	CustomScan		   *cscan;
 
 	cscan = makeNode(CustomScan);
@@ -302,7 +302,7 @@ create_append_plan_common(PlannerInfo *root, RelOptInfo *rel,
 
 	cscan->methods = scan_methods;
 
-	pack_pickyappend_private(cscan, gpath);
+	pack_runtimeappend_private(cscan, gpath);
 
 	return &cscan->scan.plan;
 }
@@ -312,14 +312,14 @@ create_append_scan_state_common(CustomScan *node,
 								CustomExecMethods *exec_methods,
 								uint32 size)
 {
-	PickyAppendState *scan_state = palloc0(size);
+	RuntimeAppendState *scan_state = palloc0(size);
 
 	NodeSetTag(scan_state, T_CustomScanState);
 	scan_state->css.flags = node->flags;
 	scan_state->css.methods = exec_methods;
 	scan_state->custom_exprs = node->custom_exprs;
 
-	unpack_pickyappend_private(scan_state, node);
+	unpack_runtimeappend_private(scan_state, node);
 
 	/* Fill in relation info using main table's relid */
 	scan_state->prel = get_pathman_relation_info(scan_state->relid, NULL);
@@ -335,7 +335,7 @@ create_append_scan_state_common(CustomScan *node,
 void
 begin_append_common(CustomScanState *node, EState *estate, int eflags)
 {
-	PickyAppendState   *scan_state = (PickyAppendState *) node;
+	RuntimeAppendState *scan_state = (RuntimeAppendState *) node;
 	HTAB			   *plan_state_table;
 	HASHCTL			   *plan_state_table_config = &scan_state->plan_state_table_config;
 
@@ -356,7 +356,7 @@ begin_append_common(CustomScanState *node, EState *estate, int eflags)
 void
 end_append_common(CustomScanState *node)
 {
-	PickyAppendState   *scan_state = (PickyAppendState *) node;
+	RuntimeAppendState *scan_state = (RuntimeAppendState *) node;
 
 	clear_plan_states(&scan_state->css);
 	hash_destroy(scan_state->plan_state_table);
@@ -366,7 +366,7 @@ end_append_common(CustomScanState *node)
 void
 rescan_append_common(CustomScanState *node)
 {
-	PickyAppendState   *scan_state = (PickyAppendState *) node;
+	RuntimeAppendState *scan_state = (RuntimeAppendState *) node;
 	ExprContext		   *econtext = node->ss.ps.ps_ExprContext;
 	PartRelationInfo   *prel = scan_state->prel;
 	List			   *ranges;

nodes_common.h

@@ -56,7 +56,7 @@ clear_plan_states(CustomScanState *scan_state)
 Path * create_append_path_common(PlannerInfo *root,
 								 AppendPath *inner_append,
 								 ParamPathInfo *param_info,
-								 List *picky_clauses,
+								 List *runtime_clauses,
 								 CustomPathMethods *path_methods,
 								 double sel);
 

pg_pathman.c

@@ -40,7 +40,7 @@
 #include "catalog/pg_type.h"
 #include "foreign/fdwapi.h"
 #include "hooks.h"
-#include "pickyappend.h"
+#include "runtimeappend.h"
 
 PG_MODULE_MAGIC;
 
@@ -155,20 +155,20 @@ _PG_init(void)
 	planner_hook_original = planner_hook;
 	planner_hook = pathman_planner_hook;
 
-	pickyappend_path_methods.CustomName				= "PickyAppend";
-	pickyappend_path_methods.PlanCustomPath			= create_pickyappend_plan;
+	runtimeappend_path_methods.CustomName				= "RuntimeAppend";
+	runtimeappend_path_methods.PlanCustomPath			= create_runtimeappend_plan;
 
-	pickyappend_plan_methods.CustomName 			= "PickyAppend";
-	pickyappend_plan_methods.CreateCustomScanState	= pickyappend_create_scan_state;
+	runtimeappend_plan_methods.CustomName 				= "RuntimeAppend";
+	runtimeappend_plan_methods.CreateCustomScanState	= runtimeappend_create_scan_state;
 
-	pickyappend_exec_methods.CustomName				= "PickyAppend";
-	pickyappend_exec_methods.BeginCustomScan		= pickyappend_begin;
-	pickyappend_exec_methods.ExecCustomScan			= pickyappend_exec;
-	pickyappend_exec_methods.EndCustomScan			= pickyappend_end;
-	pickyappend_exec_methods.ReScanCustomScan		= pickyappend_rescan;
-	pickyappend_exec_methods.MarkPosCustomScan		= NULL;
-	pickyappend_exec_methods.RestrPosCustomScan		= NULL;
-	pickyappend_exec_methods.ExplainCustomScan		= pickyppend_explain;
+	runtimeppend_exec_methods.CustomName				= "RuntimeAppend";
+	runtimeppend_exec_methods.BeginCustomScan			= runtimeappend_begin;
+	runtimeppend_exec_methods.ExecCustomScan			= runtimeappend_exec;
+	runtimeppend_exec_methods.EndCustomScan				= runtimeappend_end;
+	runtimeppend_exec_methods.ReScanCustomScan			= runtimeappend_rescan;
+	runtimeppend_exec_methods.MarkPosCustomScan			= NULL;
+	runtimeppend_exec_methods.RestrPosCustomScan		= NULL;
+	runtimeppend_exec_methods.ExplainCustomScan			= runtimeppend_explain;
 
 	DefineCustomBoolVariable("pg_pathman.enable",
 							 "Enables pg_pathman's optimizations during the planner stage",
@@ -181,10 +181,10 @@ _PG_init(void)
 							 NULL,
 							 NULL);
 
-	DefineCustomBoolVariable("pg_pathman.enable_pickyappend",
-							 "Enables the planner's use of PickyAppend custom node.",
+	DefineCustomBoolVariable("pg_pathman.enable_runtimeappend",
+							 "Enables the planner's use of RuntimeAppend custom node.",
 							 NULL,
-							 &pg_pathman_enable_pickyappend,
+							 &pg_pathman_enable_runtimeappend,
 							 true,
 							 PGC_USERSET,
 							 0,