Merge branch 'picky_nodes' of github.com:postgrespro/pg_pathman into picky_nodes

Author: funbringer

hooks.c

@@ -40,6 +40,7 @@ pathman_join_pathlist_hook(PlannerInfo *root,
 	List			   *joinclauses,
 					   *otherclauses;
 	ListCell		   *lc;
+	double				paramsel;
 
 	if (set_join_pathlist_next)
 		set_join_pathlist_next(root, joinrel, outerrel,
@@ -74,6 +75,15 @@ pathman_join_pathlist_hook(PlannerInfo *root,
 		otherclauses = NIL;
 	}
 
+	paramsel = 1.0;
+	foreach (lc, joinclauses)
+	{
+		WrapperNode	   *wrap;
+
+		wrap = walk_expr_tree(NULL, (Expr *) lfirst(lc), inner_prel);
+		paramsel *= wrap->paramsel;
+	}
+
 	foreach (lc, innerrel->pathlist)
 	{
 		AppendPath *cur_inner_path = (AppendPath *) lfirst(lc);
@@ -89,7 +99,7 @@ pathman_join_pathlist_hook(PlannerInfo *root,
 		inner = create_pickyappend_path(root, cur_inner_path,
 										get_appendrel_parampathinfo(innerrel,
 																	inner_required),
-										joinclauses);
+										joinclauses, paramsel);
 
 		initial_cost_nestloop(root, &workspace, jointype,
 							  outer, inner,
@@ -139,6 +149,7 @@ pathman_rel_pathlist_hook(PlannerInfo *root, RelOptInfo *rel, Index rti, RangeTb
 				   *wrappers;
 		PathKey	   *pathkeyAsc = NULL,
 				   *pathkeyDesc = NULL;
+		double		paramsel = 1.0;
 
 		if (prel->parttype == PT_RANGE)
 		{
@@ -186,6 +197,7 @@ pathman_rel_pathlist_hook(PlannerInfo *root, RelOptInfo *rel, Index rti, RangeTb
 			RestrictInfo *rinfo = (RestrictInfo*) lfirst(lc);
 
 			wrap = walk_expr_tree(NULL, rinfo->clause, prel);
+			paramsel *= wrap->paramsel;
 			wrappers = lappend(wrappers, wrap);
 			ranges = irange_list_intersect(ranges, wrap->rangeset);
 		}
@@ -305,7 +317,8 @@ pathman_rel_pathlist_hook(PlannerInfo *root, RelOptInfo *rel, Index rti, RangeTb
 				continue;
 
 			inner_path = create_pickyappend_path(root, cur_path,
-												 ppi, picky_quals);
+												 ppi, picky_quals,
+												 paramsel);
 
 			add_path(rel, inner_path);
 		}

nodes_common.c

@@ -217,7 +217,8 @@ create_append_path_common(PlannerInfo *root,
 						  AppendPath *inner_append,
 						  ParamPathInfo *param_info,
 						  List *picky_clauses,
-						  CustomPathMethods *path_methods)
+						  CustomPathMethods *path_methods,
+						  double sel)
 {
 	RelOptInfo *innerrel = inner_append->path.parent;
 	ListCell   *lc;
@@ -237,13 +238,13 @@ create_append_path_common(PlannerInfo *root,
 #if PG_VERSION_NUM >= 90600
 	result->cpath.path.pathtarget = inner_append->path.pathtarget;
 #endif
-	result->cpath.path.rows = inner_append->path.rows;
+	result->cpath.path.rows = inner_append->path.rows * sel;
 	result->cpath.flags = 0;
 	result->cpath.methods = path_methods;
 
 	/* TODO: real costs */
-	result->cpath.path.startup_cost = 0;
-	result->cpath.path.total_cost = 0;
+	result->cpath.path.startup_cost = 0.0;
+	result->cpath.path.total_cost = 0.0;
 
 	/* Set 'partitioned column'-related clauses */
 	result->cpath.custom_private = picky_clauses;
@@ -261,6 +262,9 @@ create_append_path_common(PlannerInfo *root,
 		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;
+
 		child->content.path = path;
 		child->relid = root->simple_rte_array[relindex]->relid;
 		Assert(child->relid != InvalidOid);
@@ -272,6 +276,9 @@ create_append_path_common(PlannerInfo *root,
 		i++;
 	}
 
+	result->cpath.path.startup_cost *= sel;
+	result->cpath.path.total_cost *= sel;
+
 	return &result->cpath.path;
 }
 

nodes_common.h

@@ -57,7 +57,8 @@ Path * create_append_path_common(PlannerInfo *root,
 								 AppendPath *inner_append,
 								 ParamPathInfo *param_info,
 								 List *picky_clauses,
-								 CustomPathMethods *path_methods);
+								 CustomPathMethods *path_methods,
+								 double sel);
 
 Plan * create_append_plan_common(PlannerInfo *root, RelOptInfo *rel,
 								 CustomPath *best_path, List *tlist,

pathman.h

@@ -212,6 +212,7 @@ typedef struct
 	const Node	   *orig;
 	List		   *args;
 	List		   *rangeset;
+	double			paramsel;
 } WrapperNode;
 
 typedef struct

pg_pathman.c

@@ -30,8 +30,9 @@
 #include "utils/elog.h"
 #include "utils/array.h"
 #include "utils/date.h"
-#include "utils/lsyscache.h"
 #include "utils/guc.h"
+#include "utils/lsyscache.h"
+#include "utils/selfuncs.h"
 #include "access/heapam.h"
 #include "access/nbtree.h"
 #include "storage/ipc.h"
@@ -841,6 +842,7 @@ walk_expr_tree(WalkerContext *wcxt, Expr *expr, const PartRelationInfo *prel)
 			result->orig = (const Node *)expr;
 			result->args = NIL;
 			result->rangeset = list_make1_irange(make_irange(0, prel->children_count - 1, true));
+			result->paramsel = 1.0;
 			return result;
 	}
 }
@@ -866,8 +868,7 @@ handle_binary_opexpr(const PartRelationInfo *prel, WrapperNode *result,
 	TypeCacheEntry	   *tce;
 
 	/* Determine operator type */
-	tce = lookup_type_cache(v->vartype,
-		TYPECACHE_EQ_OPR | TYPECACHE_LT_OPR | TYPECACHE_GT_OPR | TYPECACHE_CMP_PROC | TYPECACHE_CMP_PROC_FINFO);
+	tce = lookup_type_cache(v->vartype, TYPECACHE_BTREE_OPFAMILY | TYPECACHE_CMP_PROC | TYPECACHE_CMP_PROC_FINFO);
 	strategy = get_op_opfamily_strategy(expr->opno, tce->btree_opf);
 	cmp_proc_oid = get_opfamily_proc(tce->btree_opf,
 									 c->consttype,
@@ -1036,6 +1037,38 @@ handle_binary_opexpr(const PartRelationInfo *prel, WrapperNode *result,
 	}
 
 	result->rangeset = list_make1_irange(make_irange(0, prel->children_count - 1, true));
+	result->paramsel = 1.0;
+}
+
+/*
+ *	Estimate selectivity of parametrized quals.
+ */
+static void
+handle_binary_opexpr_param(const PartRelationInfo *prel,
+						   WrapperNode *result, const Var *v)
+{
+	const OpExpr	   *expr = (const OpExpr *)result->orig;
+	TypeCacheEntry	   *tce;
+	int					strategy;
+
+	/* Determine operator type */
+	tce = lookup_type_cache(v->vartype, TYPECACHE_BTREE_OPFAMILY);
+	strategy = get_op_opfamily_strategy(expr->opno, tce->btree_opf);
+
+	result->rangeset = list_make1_irange(make_irange(0, prel->children_count - 1, true));
+
+	if (strategy == BTEqualStrategyNumber)
+	{
+		result->paramsel = 1.0 / (double) prel->children_count;
+	}
+	else if (prel->parttype == PT_RANGE && strategy > 0)
+	{
+		result->paramsel = DEFAULT_INEQ_SEL;
+	}
+	else
+	{
+		result->paramsel = 1.0;
+	}
 }
 
 /*
@@ -1135,24 +1168,36 @@ handle_opexpr(WalkerContext *wcxt, const OpExpr *expr, const PartRelationInfo *p
 
 	if (list_length(expr->args) == 2)
 	{
-		firstarg = (Node *) linitial(expr->args);
-		secondarg = (Node *) lsecond(expr->args);
-
-		if (IsA(firstarg, Var) && IsConstValue(wcxt, secondarg) &&
-			((Var *)firstarg)->varattno == prel->attnum)
+		if (IsA(linitial(expr->args), Var)
+			&& ((Var *)linitial(expr->args))->varattno == prel->attnum)
 		{
-			handle_binary_opexpr(prel, result, (Var *)firstarg, ExtractConst(wcxt, secondarg));
-			return result;
+			firstarg = (Node *) linitial(expr->args);
+			secondarg = (Node *) lsecond(expr->args);
 		}
-		else if (IsA(secondarg, Var) && IsConstValue(wcxt, firstarg) &&
-				 ((Var *)secondarg)->varattno == prel->attnum)
+		else if (IsA(lsecond(expr->args), Var)
+			&& ((Var *)lsecond(expr->args))->varattno == prel->attnum)
 		{
-			handle_binary_opexpr(prel, result, (Var *)secondarg, ExtractConst(wcxt, firstarg));
-			return result;
+			firstarg = (Node *) lsecond(expr->args);
+			secondarg = (Node *) linitial(expr->args);
+		}
+
+		if (firstarg && secondarg)
+		{
+			if (IsConstValue(wcxt, secondarg))
+			{
+				handle_binary_opexpr(prel, result, (Var *)firstarg, ExtractConst(wcxt, secondarg));
+				return result;
+			}
+			else if (IsA(secondarg, Param) || IsA(secondarg, Var))
+			{
+				handle_binary_opexpr_param(prel, result, (Var *)firstarg);
+				return result;
+			}
 		}
 	}
 
 	result->rangeset = list_make1_irange(make_irange(0, prel->children_count - 1, true));
+	result->paramsel = 1.0;
 	return result;
 }
 
@@ -1167,6 +1212,7 @@ handle_boolexpr(WalkerContext *wcxt, const BoolExpr *expr, const PartRelationInf
 
 	result->orig = (const Node *)expr;
 	result->args = NIL;
+	result->paramsel = 1.0;
 
 	if (expr->boolop == AND_EXPR)
 		result->rangeset = list_make1_irange(make_irange(0, prel->children_count - 1, false));
@@ -1186,13 +1232,28 @@ handle_boolexpr(WalkerContext *wcxt, const BoolExpr *expr, const PartRelationInf
 				break;
 			case AND_EXPR:
 				result->rangeset = irange_list_intersect(result->rangeset, arg->rangeset);
+				result->paramsel *= arg->paramsel;
 				break;
 			default:
 				result->rangeset = list_make1_irange(make_irange(0, prel->children_count - 1, false));
 				break;
 		}
 	}
 
+	if (expr->boolop == OR_EXPR)
+	{
+		int totallen = irange_list_length(result->rangeset);
+
+		foreach (lc, result->args)
+		{
+			WrapperNode *arg = (WrapperNode *) lfirst(lc);
+			int len = irange_list_length(arg->rangeset);
+
+			result->paramsel *= (1.0 - arg->paramsel * (double)len / (double)totallen);
+		}
+		result->paramsel = 1.0 - result->paramsel;
+	}
+
 	return result;
 }
 
@@ -1209,6 +1270,7 @@ handle_arrexpr(WalkerContext *wcxt, const ScalarArrayOpExpr *expr, const PartRel
 
 	result->orig = (const Node *)expr;
 	result->args = NIL;
+	result->paramsel = 1.0;
 
 	if (varnode == NULL || !IsA(varnode, Var))
 	{
@@ -1254,6 +1316,11 @@ handle_arrexpr(WalkerContext *wcxt, const ScalarArrayOpExpr *expr, const PartRel
 		return result;
 	}
 
+	if (IsA(arraynode, Param))
+	{
+		result->paramsel = DEFAULT_INEQ_SEL;
+	}
+
 	result->rangeset = list_make1_irange(make_irange(0, prel->children_count - 1, true));
 	return result;
 }

pickyappend.c

@@ -23,11 +23,12 @@ Path *
 create_pickyappend_path(PlannerInfo *root,
 						AppendPath *inner_append,
 						ParamPathInfo *param_info,
-						List *picky_clauses)
+						List *picky_clauses,
+						double sel)
 {
 	return create_append_path_common(root, inner_append,
 									 param_info, picky_clauses,
-									 &pickyappend_path_methods);
+									 &pickyappend_path_methods, sel);
 }
 
 Plan *

pickyappend.h

@@ -61,7 +61,8 @@ extern CustomScanMethods	pickyappend_plan_methods;
 extern CustomExecMethods	pickyappend_exec_methods;
 
 Path * create_pickyappend_path(PlannerInfo *root, AppendPath *inner_append,
-							   ParamPathInfo *param_info, List *picky_clauses);
+							   ParamPathInfo *param_info, List *picky_clauses,
+							   double sel);
 
 Plan * create_pickyappend_plan(PlannerInfo *root, RelOptInfo *rel,
 							   CustomPath *best_path, List *tlist,