Works in simple case.

akorotkov · zilder · commit 3f8e4183797a · 2016-01-15T16:19:48.000+03:00
diff --git a/contrib/pathman/pathman.c b/contrib/pathman/pathman.c
@@ -297,7 +297,7 @@ append_child_relation(PlannerInfo *root, RelOptInfo *rel, Index rti,
 	PartRelationInfo *prel;
 
 	Node *node;
-	ListCell *lc;
+	ListCell *lc, *lc2;
 
 	prel = (PartRelationInfo *)
 			hash_search(relations, (const void *) &rte->relid, HASH_FIND, 0);
@@ -328,18 +328,24 @@ append_child_relation(PlannerInfo *root, RelOptInfo *rel, Index rti,
 
 	/* copy restrictions */
 	childrel->baserestrictinfo = NIL;
-	foreach(lc, wrappers)
+	forboth(lc, wrappers, lc2, rel->baserestrictinfo)
 	{
 		bool alwaysTrue;
 		WrapperNode *wrap = (WrapperNode *) lfirst(lc);
-		Node *new_rinfo = wrapper_make_expression(wrap, index, &alwaysTrue);
+		Node *new_clause = wrapper_make_expression(wrap, index, &alwaysTrue);
+		RestrictInfo *new_rinfo;
 
 		if (alwaysTrue)
 			continue;
-		Assert(new_rinfo);
+		Assert(new_clause);
+
+		/* TODO: evade double copy of clause */
+
+		new_rinfo = copyObject((Node *) lfirst(lc2));
+		new_rinfo->clause = (Expr *)new_clause;
 
 		/* replace old relids with new ones */
-		change_varnos(new_rinfo, rel->relid, childrel->relid);
+		change_varnos((Node *)new_rinfo, rel->relid, childrel->relid);
 
 		childrel->baserestrictinfo = lappend(childrel->baserestrictinfo,
 											 new_rinfo);
@@ -380,20 +386,24 @@ wrapper_make_expression(WrapperNode *wrap, int index, bool *alwaysTrue)
 		if (expr->boolop == OR_EXPR || expr->boolop == AND_EXPR)
 		{
 			ListCell *lc;
-			List *args;
+			List *args = NIL;
 
 			foreach (lc, wrap->args)
 			{
 				Node *arg;
 
 				arg = wrapper_make_expression((WrapperNode *)lfirst(lc), index, alwaysTrue);
-				Assert(!(*alwaysTrue));
-				Assert(arg || *alwaysTrue);
+#ifdef USE_ASSERT_CHECKING
+				if (expr->boolop == OR_EXPR)
+					Assert(!(*alwaysTrue));
+				if (expr->boolop == AND_EXPR)
+					Assert(arg || *alwaysTrue);
+#endif
 				if (arg)
 					args = lappend(args, arg);
 			}
 
-			Assert(list_length(args) > 1);
+			Assert(list_length(args) >= 1);
 			if (list_length(args) == 1)
 				return (Node *) linitial(args);
 
diff --git a/contrib/pathman/rangeset.c b/contrib/pathman/rangeset.c
@@ -50,17 +50,25 @@ irange_list_union(List *a, List *b)
 		if (ca && cb)
 		{
 			if (irange_lower(lfirst_irange(ca)) <= irange_lower(lfirst_irange(cb)))
+			{
 				next = lfirst_irange(ca);
+				ca = lnext(ca);
+			}
 			else
+			{
 				next = lfirst_irange(cb);
+				cb = lnext(cb);
+			}
 		}
 		else if (ca)
 		{
 			next = lfirst_irange(ca);
+			ca = lnext(ca);
 		}
 		else if (cb)
 		{
 			next = lfirst_irange(cb);
+			cb = lnext(cb);
 		}
 
 		if (!have_cur)

Original file line number	Diff line number	Diff line change
`@@ -50,17 +50,25 @@ irange_list_union(List a, List b)`
`50`	`50`	`if (ca && cb)`
`51`	`51`	`{`
`52`	`52`	`if (irange_lower(lfirst_irange(ca)) <= irange_lower(lfirst_irange(cb)))`
	`53`	`+ {`
`53`	`54`	`next = lfirst_irange(ca);`
	`55`	`+ ca = lnext(ca);`
	`56`	`+ }`
`54`	`57`	`else`
	`58`	`+ {`
`55`	`59`	`next = lfirst_irange(cb);`
	`60`	`+ cb = lnext(cb);`
	`61`	`+ }`
`56`	`62`	`}`
`57`	`63`	`else if (ca)`
`58`	`64`	`{`
`59`	`65`	`next = lfirst_irange(ca);`
	`66`	`+ ca = lnext(ca);`
`60`	`67`	`}`
`61`	`68`	`else if (cb)`
`62`	`69`	`{`
`63`	`70`	`next = lfirst_irange(cb);`
	`71`	`+ cb = lnext(cb);`
`64`	`72`	`}`
`65`	`73`
`66`	`74`	`if (!have_cur)`