Commit3ede4fa

committed

Merge master, resolve conflicts

2 parents2f22ff3 +77ee808 commit3ede4faCopy full SHA for 3ede4fa

File tree

-4

lines changed

-4

lines changed

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -200,12 +200,11 @@ pathman_rel_pathlist_hook(PlannerInfo root, RelOptInfo rel, Index rti, RangeTb`
`200`	`200`	`dsm_arr= (Oid*)dsm_array_get_pointer(&prel->children);`
`201`	`201`	`ranges=list_make1_int(make_irange(0,prel->children_count-1, false));`
`202`	`202`
	`203`	`+/* Make wrappers over restrictions and collect final rangeset */`
`203`	`204`	`context.prel=prel;`
`204`	`205`	`context.econtext=NULL;`
`205`	`206`	`context.hasLeast= false;`
`206`	`207`	`context.hasGreatest= false;`
`207`		`-`
`208`		`-/* Make wrappers over restrictions and collect final rangeset */`
`209`	`208`	`wrappers=NIL;`
`210`	`209`	`foreach(lc,rel->baserestrictinfo)`
`211`	`210`	`{`

Lines changed: 1 addition & 2 deletions

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`	`returnresult;`
`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));`

Comments

(0)