no need for 'runtime_clauses' to be passed to create_path, simplify code, add GucBoolAssignHook

funbringer · funbringer · commit 4b25335b9a15 · 2016-05-10T20:45:44.000+03:00
diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 # contrib/pg_pathman/Makefile
 
 MODULE_big = pg_pathman
-OBJS = init.o utils.o runtimeappend.o runtime_merge_append.o pg_pathman.o dsm_array.o \
+OBJS = init.o runtimeappend.o runtime_merge_append.o pg_pathman.o dsm_array.o \
 	rangeset.o pl_funcs.o worker.o hooks.o nodes_common.o $(WIN32RES)
 
 EXTENSION = pg_pathman
diff --git a/expected/pg_pathman.out b/expected/pg_pathman.out
@@ -116,6 +116,8 @@ SELECT COUNT(*) FROM ONLY test.num_range_rel;
      0
 (1 row)
 
+SET pg_pathman.enable_runtimeappend = OFF;
+SET pg_pathman.enable_runtimemergeappend = OFF;
 VACUUM;
 /* update triggers test */
 SELECT pathman.create_hash_update_trigger('test.hash_rel');
@@ -481,8 +483,6 @@ EXPLAIN (COSTS OFF) SELECT * FROM test.range_rel_1 UNION ALL SELECT * FROM test.
 SET enable_hashjoin = OFF;
 set enable_nestloop = OFF;
 SET enable_mergejoin = ON;
-SET pg_pathman.enable_runtimeappend = OFF;
-SET pg_pathman.enable_runtimemergeappend = OFF;
 EXPLAIN (COSTS OFF)
 SELECT * FROM test.range_rel j1
 JOIN test.range_rel j2 on j2.id = j1.id
@@ -716,7 +716,7 @@ begin
 		perform test.pathman_equal((plan->0->'Plan'->'Plans'->1->'Plans'->0->'Plans'->i->'Relation Name')::text,
 								   format('"runtime_test_2_%s"', i + 1),
 								   'wrong partition');
-								   
+
 		num = plan->0->'Plan'->'Plans'->1->'Plans'->0->'Plans'->i->'Actual Loops';
 		perform test.pathman_assert(num = 1, 'expected no more than 1 loops');
 	end loop;
diff --git a/hooks.c b/hooks.c
@@ -10,6 +10,7 @@
 #include "postgres.h"
 #include "optimizer/cost.h"
 #include "optimizer/restrictinfo.h"
+#include "utils/guc.h"
 #include "hooks.h"
 #include "utils.h"
 #include "pathman.h"
@@ -106,7 +107,7 @@ pathman_join_pathlist_hook(PlannerInfo *root,
 		inner = create_runtimeappend_path(root, cur_inner_path,
 										  get_appendrel_parampathinfo(innerrel,
 																	  inner_required),
-										  joinclauses, paramsel);
+										  paramsel);
 
 		initial_cost_nestloop(root, &workspace, jointype,
 							  outer, inner,
@@ -262,7 +263,6 @@ pathman_rel_pathlist_hook(PlannerInfo *root, RelOptInfo *rel, Index rti, RangeTb
 
 			for (i = irange_lower(irange); i <= irange_upper(irange); i++)
 				append_child_relation(root, rel, rti, rte, i, dsm_arr[i], wrappers);
-
 		}
 
 		/* Clear old path list */
@@ -282,8 +282,6 @@ pathman_rel_pathlist_hook(PlannerInfo *root, RelOptInfo *rel, Index rti, RangeTb
 			Relids			inner_required = PATH_REQ_OUTER((Path *) cur_path);
 			ParamPathInfo  *ppi = get_appendrel_parampathinfo(rel, inner_required);
 			Path		   *inner_path = NULL;
-			ListCell	   *subpath_cell;
-			List		   *runtime_quals = NIL;
 
 			if (!(IsA(cur_path, AppendPath) || IsA(cur_path, MergeAppendPath)) ||
 				rel->has_eclass_joins ||
@@ -292,56 +290,29 @@ pathman_rel_pathlist_hook(PlannerInfo *root, RelOptInfo *rel, Index rti, RangeTb
 				continue;
 			}
 
-			foreach (subpath_cell, cur_path->subpaths)
-			{
-				Path			   *subpath = (Path *) lfirst(subpath_cell);
-				RelOptInfo		   *child_rel = subpath->parent;
-				List			   *quals;
-				ListCell		   *qual_cell;
-				ReplaceVarsContext	repl_var_cxt;
-
-				repl_var_cxt.child = subpath->parent;
-				repl_var_cxt.parent = rel;
-				repl_var_cxt.sublevels_up = 0;
-
-				quals = extract_actual_clauses(child_rel->baserestrictinfo, false);
-
-				/* Do not proceed if there's a rel containing quals without params */
-				if (!clause_contains_params((Node *) quals))
-				{
-					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 quals for RuntimeAppend */
-				foreach (qual_cell, quals)
-					runtime_quals = list_append_unique(runtime_quals,
-													   (Node *) lfirst(qual_cell));
-			}
-
-			/*
-			 * Dismiss RuntimeAppend if there
-			 * are no parameterized quals
-			 */
-			if (runtime_quals == NIL)
-				continue;
-
 			if (IsA(cur_path, AppendPath) && pg_pathman_enable_runtimeappend)
 				inner_path = create_runtimeappend_path(root, cur_path,
-													   ppi, runtime_quals,
-													   paramsel);
+													   ppi, paramsel);
 			else if (IsA(cur_path, MergeAppendPath) &&
 					 pg_pathman_enable_runtime_merge_append)
 				inner_path = create_runtimemergeappend_path(root, cur_path,
-															ppi, runtime_quals,
-															paramsel);
+															ppi, paramsel);
 
 			if (inner_path)
 				add_path(rel, inner_path);
 		}
 	}
 }
+
+void pg_pathman_enable_assign_hook(bool newval, void *extra)
+{
+	if (pg_pathman_enable == newval)
+		return;
+
+	pg_pathman_enable_runtime_merge_append = newval;
+	pg_pathman_enable_runtimeappend = newval;
+
+	elog(NOTICE,
+		 "RuntimeAppend and RuntimeMergeAppend nodes have been %s",
+		 newval ? "enabled" : "disabled");
+}
diff --git a/hooks.h b/hooks.h
@@ -21,4 +21,6 @@ void pathman_join_pathlist_hook(PlannerInfo *root, RelOptInfo *joinrel, RelOptIn
 
 void pathman_rel_pathlist_hook(PlannerInfo *root, RelOptInfo *rel, Index rti, RangeTblEntry *rte);
 
+void pg_pathman_enable_assign_hook(char newval, void *extra);
+
 #endif
diff --git a/nodes_common.c b/nodes_common.c
@@ -11,6 +11,7 @@
 #include "optimizer/paths.h"
 #include "nodes_common.h"
 #include "runtimeappend.h"
+#include "optimizer/restrictinfo.h"
 
 
 
@@ -203,7 +204,6 @@ Path *
 create_append_path_common(PlannerInfo *root,
 						  AppendPath *inner_append,
 						  ParamPathInfo *param_info,
-						  List *runtime_clauses,
 						  CustomPathMethods *path_methods,
 						  uint32 size,
 						  double sel)
@@ -234,10 +234,6 @@ create_append_path_common(PlannerInfo *root,
 	result->cpath.path.startup_cost = 0.0;
 	result->cpath.path.total_cost = 0.0;
 
-	/* Set 'partitioned column'-related clauses */
-	result->cpath.custom_private = runtime_clauses;
-	result->cpath.custom_paths = NIL;
-
 	Assert(inner_entry->relid != 0);
 	result->relid = inner_entry->relid;
 
@@ -286,7 +282,7 @@ create_append_plan_common(PlannerInfo *root, RelOptInfo *rel,
 	cscan->custom_scan_tlist = tlist;
 	cscan->scan.scanrelid = 0;
 
-	cscan->custom_exprs = gpath->cpath.custom_private;
+	cscan->custom_exprs = get_actual_clauses(clauses);
 	cscan->custom_plans = custom_plans;
 
 	cscan->methods = scan_methods;
diff --git a/nodes_common.h b/nodes_common.h
@@ -63,7 +63,6 @@ clear_plan_states(CustomScanState *scan_state)
 Path * create_append_path_common(PlannerInfo *root,
 								 AppendPath *inner_append,
 								 ParamPathInfo *param_info,
-								 List *runtime_clauses,
 								 CustomPathMethods *path_methods,
 								 uint32 size,
 								 double sel);
diff --git a/pg_pathman.c b/pg_pathman.c
@@ -198,7 +198,7 @@ _PG_init(void)
 							 PGC_USERSET,
 							 0,
 							 NULL,
-							 NULL,
+							 pg_pathman_enable_assign_hook,
 							 NULL);
 
 	DefineCustomBoolVariable("pg_pathman.enable_runtimeappend",
@@ -1357,7 +1357,7 @@ handle_boolexpr(const BoolExpr *expr, WalkerContext *context)
 	foreach (lc, expr->args)
 	{
 		WrapperNode *arg;
-		
+
 		arg = walk_expr_tree((Expr *)lfirst(lc), context);
 		result->args = lappend(result->args, arg);
 		switch (expr->boolop)
diff --git a/runtime_merge_append.c b/runtime_merge_append.c
@@ -171,16 +171,16 @@ unpack_runtimemergeappend_private(RuntimeMergeAppendState *scan_state,
 
 Path *
 create_runtimemergeappend_path(PlannerInfo *root,
-						  AppendPath *inner_append,
-						  ParamPathInfo *param_info,
-						  List *picky_clauses, double sel)
+							   AppendPath *inner_append,
+							   ParamPathInfo *param_info,
+							   double sel)
 {
 	RelOptInfo *rel = inner_append->path.parent;
 	Path	   *path;
 	double		limit_tuples;
 
 	path = create_append_path_common(root, inner_append,
-									 param_info, picky_clauses,
+									 param_info,
 									 &runtime_merge_append_path_methods,
 									 sizeof(RuntimeMergeAppendPath),
 									 sel);
diff --git a/runtime_merge_append.h b/runtime_merge_append.h
@@ -50,7 +50,7 @@ extern CustomExecMethods	runtime_merge_append_exec_methods;
 
 
 Path * create_runtimemergeappend_path(PlannerInfo *root, AppendPath *inner_append,
-									  ParamPathInfo *param_info, List *runtime_clauses,
+									  ParamPathInfo *param_info,
 									  double sel);
 
 Plan * create_runtimemergeappend_plan(PlannerInfo *root, RelOptInfo *rel,
diff --git a/runtimeappend.c b/runtimeappend.c
@@ -24,11 +24,10 @@ Path *
 create_runtimeappend_path(PlannerInfo *root,
 						  AppendPath *inner_append,
 						  ParamPathInfo *param_info,
-						  List *runtime_clauses,
 						  double sel)
 {
 	return create_append_path_common(root, inner_append,
-									 param_info, runtime_clauses,
+									 param_info,
 									 &runtimeappend_path_methods,
 									 sizeof(RuntimeAppendPath),
 									 sel);
diff --git a/runtimeappend.h b/runtimeappend.h
@@ -57,7 +57,7 @@ extern CustomScanMethods	runtimeappend_plan_methods;
 extern CustomExecMethods	runtimeappend_exec_methods;
 
 Path * create_runtimeappend_path(PlannerInfo *root, AppendPath *inner_append,
-								 ParamPathInfo *param_info, List *runtime_clauses,
+								 ParamPathInfo *param_info,
 								 double sel);
 
 Plan * create_runtimeappend_plan(PlannerInfo *root, RelOptInfo *rel,
diff --git a/sql/pg_pathman.sql b/sql/pg_pathman.sql
@@ -46,6 +46,9 @@ INSERT INTO test.num_range_rel
 SELECT COUNT(*) FROM test.num_range_rel;
 SELECT COUNT(*) FROM ONLY test.num_range_rel;
 
+SET pg_pathman.enable_runtimeappend = OFF;
+SET pg_pathman.enable_runtimemergeappend = OFF;
+
 VACUUM;
 
 /* update triggers test */
@@ -115,8 +118,7 @@ EXPLAIN (COSTS OFF) SELECT * FROM test.range_rel_1 UNION ALL SELECT * FROM test.
 SET enable_hashjoin = OFF;
 set enable_nestloop = OFF;
 SET enable_mergejoin = ON;
-SET pg_pathman.enable_runtimeappend = OFF;
-SET pg_pathman.enable_runtimemergeappend = OFF;
+
 EXPLAIN (COSTS OFF)
 SELECT * FROM test.range_rel j1
 JOIN test.range_rel j2 on j2.id = j1.id
@@ -292,7 +294,7 @@ begin
 		perform test.pathman_equal((plan->0->'Plan'->'Plans'->1->'Plans'->0->'Plans'->i->'Relation Name')::text,
 								   format('"runtime_test_2_%s"', i + 1),
 								   'wrong partition');
-								   
+
 		num = plan->0->'Plan'->'Plans'->1->'Plans'->0->'Plans'->i->'Actual Loops';
 		perform test.pathman_assert(num = 1, 'expected no more than 1 loops');
 	end loop;
diff --git a/utils.c b/utils.c
diff --git a/utils.h b/utils.h
