remove innerrel_rinfo_contains_part_attr in pathman_join_pathlist_hook(), reorder clause_contains_params() check in pathman_rel_pathlist_hook(), use get_baserel_parampathinfo() instead of get_appendrel_parampathinfo()

funbringer · funbringer · commit 7e7cb1bd4b14 · 2016-10-10T14:36:37.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;

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