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

zilder · zilder · commit 130463a1642b · 2016-10-10T18:22:24.000+03:00
diff --git a/.gitignore b/.gitignore
@@ -7,3 +7,5 @@ regression.out
 *.so
 *.pyc
 pg_pathman--*.sql
+*.gcda
+*.gcno
diff --git a/src/hooks.c b/src/hooks.c
@@ -51,7 +51,6 @@ pathman_join_pathlist_hook(PlannerInfo *root,
 	ListCell			   *lc;
 	WalkerContext			context;
 	double					paramsel;
-	bool					innerrel_rinfo_contains_part_attr;
 
 	/* Call hooks set by other extensions */
 	if (set_join_pathlist_next)
@@ -103,11 +102,6 @@ pathman_join_pathlist_hook(PlannerInfo *root,
 		paramsel *= wrap->paramsel;
 	}
 
-	/* Check that innerrel's RestrictInfos contain partitioned column */
-	innerrel_rinfo_contains_part_attr =
-		get_partitioned_attr_clauses(innerrel->baserestrictinfo,
-									 inner_prel, innerrel->relid) != NULL;
-
 	foreach (lc, innerrel->pathlist)
 	{
 		AppendPath	   *cur_inner_path = (AppendPath *) lfirst(lc);
@@ -132,14 +126,10 @@ pathman_join_pathlist_hook(PlannerInfo *root,
 		/* Get the ParamPathInfo for a parameterized path */
 		ppi = get_baserel_parampathinfo(root, innerrel, inner_required);
 
-		/*
-		 * Skip if neither rel->baserestrictinfo nor
-		 * ppi->ppi_clauses reference partition attribute
-		 */
-		if (!(innerrel_rinfo_contains_part_attr ||
-			  (ppi && get_partitioned_attr_clauses(ppi->ppi_clauses,
-												   inner_prel,
-												   innerrel->relid))))
+		/* Skip ppi->ppi_clauses don't reference partition attribute */
+		if (!(ppi && get_partitioned_attr_clauses(ppi->ppi_clauses,
+												  inner_prel,
+												  innerrel->relid)))
 			continue;
 
 		inner = create_runtimeappend_path(root, cur_inner_path, ppi, paramsel);
@@ -213,13 +203,13 @@ pathman_rel_pathlist_hook(PlannerInfo *root,
 		ListCell	   *lc;
 		Oid			   *children;
 		List		   *ranges,
-					   *wrappers;
+					   *wrappers,
+					   *rel_partattr_clauses = NIL;
 		PathKey		   *pathkeyAsc = NULL,
 					   *pathkeyDesc = NULL;
 		double			paramsel = 1.0;
 		WalkerContext	context;
 		int				i;
-		bool			rel_rinfo_contains_part_attr = false;
 
 		if (prel->parttype == PT_RANGE)
 		{
@@ -336,20 +326,19 @@ pathman_rel_pathlist_hook(PlannerInfo *root,
 			  pg_pathman_enable_runtime_merge_append))
 			return;
 
+		/* Check that rel's RestrictInfo contains partitioned column */
+		rel_partattr_clauses = get_partitioned_attr_clauses(rel->baserestrictinfo,
+															prel, rel->relid);
+
 		/* Runtime[Merge]Append is pointless if there are no params in clauses */
-		if (!clause_contains_params((Node *) get_actual_clauses(rel->baserestrictinfo)))
+		if (!clause_contains_params((Node *) rel_partattr_clauses))
 			return;
 
-		/* Check that rel's RestrictInfo contains partitioned column */
-		rel_rinfo_contains_part_attr =
-			get_partitioned_attr_clauses(rel->baserestrictinfo,
-										 prel, rel->relid) != NULL;
-
 		foreach (lc, rel->pathlist)
 		{
 			AppendPath	   *cur_path = (AppendPath *) lfirst(lc);
 			Relids			inner_required = PATH_REQ_OUTER((Path *) cur_path);
-			ParamPathInfo  *ppi = get_appendrel_parampathinfo(rel, inner_required);
+			ParamPathInfo  *ppi = get_baserel_parampathinfo(root, rel, inner_required);
 			Path		   *inner_path = NULL;
 
 			/* Skip if rel contains some join-related stuff or path type mismatched */
@@ -363,7 +352,7 @@ pathman_rel_pathlist_hook(PlannerInfo *root,
 			 * Skip if neither rel->baserestrictinfo nor
 			 * ppi->ppi_clauses reference partition attribute
 			 */
-			if (!(rel_rinfo_contains_part_attr ||
+			if (!(rel_partattr_clauses ||
 				  (ppi && get_partitioned_attr_clauses(ppi->ppi_clauses,
 													   prel, rel->relid))))
 				continue;
diff --git a/src/pg_pathman.c b/src/pg_pathman.c
@@ -83,6 +83,7 @@ static void handle_binary_opexpr_param(const PartRelationInfo *prel, WrapperNode
 static WrapperNode *handle_opexpr(const OpExpr *expr, WalkerContext *context);
 static WrapperNode *handle_boolexpr(const BoolExpr *expr, WalkerContext *context);
 static WrapperNode *handle_arrexpr(const ScalarArrayOpExpr *expr, WalkerContext *context);
+static double estimate_paramsel_using_prel(const PartRelationInfo *prel, int strategy);
 static RestrictInfo *rebuild_restrictinfo(Node *clause, RestrictInfo *old_rinfo);
 static bool pull_var_param(const WalkerContext *ctx, const OpExpr *expr, Node **var_ptr, Node **param_ptr);
 
@@ -1189,6 +1190,7 @@ handle_binary_opexpr(WalkerContext *context, WrapperNode *result,
 				uint32	idx = hash_to_part_index(DatumGetInt32(value),
 												 PrelChildrenCount(prel));
 
+				result->paramsel = estimate_paramsel_using_prel(prel, strategy);
 				result->rangeset = list_make1_irange(make_irange(idx, idx, true));
 
 				return; /* exit on equal */
@@ -1203,6 +1205,7 @@ handle_binary_opexpr(WalkerContext *context, WrapperNode *result,
 										PrelChildrenCount(context->prel),
 										strategy,
 										result);
+				result->paramsel = estimate_paramsel_using_prel(prel, strategy);
 				return;
 			}
 
@@ -1237,19 +1240,25 @@ handle_binary_opexpr_param(const PartRelationInfo *prel,
 	strategy = get_op_opfamily_strategy(expr->opno, tce->btree_opf);
 
 	result->rangeset = list_make1_irange(make_irange(0, PrelLastChild(prel), true));
+	result->paramsel = estimate_paramsel_using_prel(prel, strategy);
+}
 
+/*
+ * Extracted common 'paramsel' estimator.
+ */
+static double
+estimate_paramsel_using_prel(const PartRelationInfo *prel, int strategy)
+{
+	/* If it's "=", divide by partitions number */
 	if (strategy == BTEqualStrategyNumber)
-	{
-		result->paramsel = 1.0 / (double) PrelChildrenCount(prel);
-	}
+		return 1.0 / (double) PrelChildrenCount(prel);
+
+	/* Default selectivity estimate for inequalities */
 	else if (prel->parttype == PT_RANGE && strategy > 0)
-	{
-		result->paramsel = DEFAULT_INEQ_SEL;
-	}
-	else
-	{
-		result->paramsel = 1.0;
-	}
+		return DEFAULT_INEQ_SEL;
+
+	/* Else there's not much to do */
+	else return 1.0;
 }
 
 /*
@@ -1324,6 +1333,7 @@ handle_const(const Const *c, WalkerContext *context)
 {
 	const PartRelationInfo *prel = context->prel;
 	WrapperNode			   *result = (WrapperNode *) palloc(sizeof(WrapperNode));
+	int						strategy = BTEqualStrategyNumber;
 
 	result->orig = (const Node *) c;
 
@@ -1348,6 +1358,8 @@ handle_const(const Const *c, WalkerContext *context)
 				Datum	value = OidFunctionCall1(prel->hash_proc, c->constvalue);
 				uint32	idx = hash_to_part_index(DatumGetInt32(value),
 												 PrelChildrenCount(prel));
+
+				result->paramsel = estimate_paramsel_using_prel(prel, strategy);
 				result->rangeset = list_make1_irange(make_irange(idx, idx, true));
 			}
 			break;
@@ -1362,8 +1374,10 @@ handle_const(const Const *c, WalkerContext *context)
 										&tce->cmp_proc_finfo,
 										PrelGetRangesArray(context->prel),
 										PrelChildrenCount(context->prel),
-										BTEqualStrategyNumber,
+										strategy,
 										result);
+
+				result->paramsel = estimate_paramsel_using_prel(prel, strategy);
 			}
 			break;
 

-Original file line number
+Diff line change
 *.so
 *.pyc
 pg_pathman--*.sql
 +*.gcda
 +*.gcno