pathman: bugfixes

zilder · zilder · commit e2c16b2677d8 · 2016-01-15T16:14:16.000+03:00
diff --git a/contrib/pathman/pathman.c b/contrib/pathman/pathman.c
@@ -649,6 +649,9 @@ handle_boolexpr(const BoolExpr *expr, const PartRelationInfo *prel)
 	List *ret = ALL;
 	List *b = ALL;
 
+	if (expr->boolop == AND_EXPR)
+		ret = list_make1_int(make_range(0, RANGE_INFINITY));
+
 	foreach (lc, expr->args)
 	{
 		b = walk_expr_tree((Expr*)lfirst(lc), prel);
diff --git a/contrib/pathman/rangeset.c b/contrib/pathman/rangeset.c
@@ -70,13 +70,23 @@ intersect_ranges(List *a, List *b)
 	List *new_list = NIL;
 	int low, high;
 
+	/* if a or b (or both) are empty then intersections is also empty */
+	if (!a || !b)
+	{
+		if (a)
+			pfree(a);
+		if (b)
+			pfree(b);
+		return NIL;
+	}
+
 	foreach(lcb, b)
 	{
 		IndexRange rb = (IndexRange)lfirst_int(lcb);
 
 		/* if "a" is empty then initialize it with infinite range */
-		if (a == NIL)
-			a = list_make1_int(make_range(0, RANGE_INFINITY));
+		// if (a == NIL)
+		// 	a = list_make1_int(make_range(0, RANGE_INFINITY));
 
 		/* intersect entry from "b" and every entry in "a" */
 		foreach(lca, a)

Original file line number	Diff line number	Diff line change
`@@ -649,6 +649,9 @@ handle_boolexpr(const BoolExpr expr, const PartRelationInfo prel)`
`649`	`649`	`List *ret = ALL;`
`650`	`650`	`List *b = ALL;`
`651`	`651`
	`652`	`+ if (expr->boolop == AND_EXPR)`
	`653`	`+ ret = list_make1_int(make_range(0, RANGE_INFINITY));`
	`654`	`+`
`652`	`655`	`foreach (lc, expr->args)`
`653`	`656`	`{`
`654`	`657`	`b = walk_expr_tree((Expr*)lfirst(lc), prel);`