Merge master, resolve conflicts

funbringer · funbringer · commit 3ede4fa4ce38 · 2016-05-11T17:16:48.000+03:00
diff --git a/hooks.c b/hooks.c
@@ -200,12 +200,11 @@ pathman_rel_pathlist_hook(PlannerInfo *root, RelOptInfo *rel, Index rti, RangeTb
 		dsm_arr = (Oid *) dsm_array_get_pointer(&prel->children);
 		ranges = list_make1_int(make_irange(0, prel->children_count - 1, false));
 
+		/* Make wrappers over restrictions and collect final rangeset */
 		context.prel = prel;
 		context.econtext = NULL;
 		context.hasLeast = false;
 		context.hasGreatest = false;
-
-		/* Make wrappers over restrictions and collect final rangeset */
 		wrappers = NIL;
 		foreach(lc, rel->baserestrictinfo)
 		{
diff --git a/pg_pathman.c b/pg_pathman.c
@@ -879,6 +879,7 @@ walk_expr_tree(Expr *expr, WalkerContext *context)
 			result->args = NIL;
 			result->rangeset = list_make1_irange(make_irange(0, context->prel->children_count - 1, true));
 			result->paramsel = 1.0;
+
 			return result;
 	}
 }
@@ -1452,9 +1453,7 @@ handle_arrexpr(const ScalarArrayOpExpr *expr, WalkerContext *context)
 	}
 
 	if (arraynode && IsA(arraynode, Param))
-	{
 		result->paramsel = DEFAULT_INEQ_SEL;
-	}
 
 handle_arrexpr_return:
 	result->rangeset = list_make1_irange(make_irange(0, prel->children_count - 1, true));

Original file line number	Diff line number	Diff line change
`@@ -879,6 +879,7 @@ walk_expr_tree(Expr expr, WalkerContext context)`
`879`	`879`	`result->args = NIL;`
`880`	`880`	`result->rangeset = list_make1_irange(make_irange(0, context->prel->children_count - 1, true));`
`881`	`881`	`result->paramsel = 1.0;`
	`882`	`+`
`882`	`883`	`return result;`
`883`	`884`	`}`
`884`	`885`	`}`
`@@ -1452,9 +1453,7 @@ handle_arrexpr(const ScalarArrayOpExpr expr, WalkerContext context)`
`1452`	`1453`	`}`
`1453`	`1454`
`1454`	`1455`	`if (arraynode && IsA(arraynode, Param))`
`1455`		`- {`
`1456`	`1456`	`result->paramsel = DEFAULT_INEQ_SEL;`
`1457`		`- }`
`1458`	`1457`
`1459`	`1458`	`handle_arrexpr_return:`
`1460`	`1459`	`result->rangeset = list_make1_irange(make_irange(0, prel->children_count - 1, true));`