fix paramsel in handle_array()

funbringer · funbringer · commit e835537206f8 · 2017-05-22T17:51:09.000+03:00
diff --git a/src/pg_pathman.c b/src/pg_pathman.c
@@ -762,7 +762,7 @@ handle_const(const Const *c,
 		}
 		else
 		{
-			result->rangeset = list_make1_irange_full(prel, IR_LOSSY);
+			result->rangeset = list_make1_irange_full(prel, IR_COMPLETE);
 			result->paramsel = 1.0;
 		}
 
@@ -883,7 +883,7 @@ handle_array(ArrayType *array,
 		List   *ranges;
 		int		i;
 
-		/* Set default ranges for OR | AND */
+		/* Set default rangeset */
 		ranges = use_or ? NIL : list_make1_irange_full(prel, IR_COMPLETE);
 
 		/* Select partitions using values */
@@ -910,23 +910,21 @@ handle_array(ArrayType *array,
 			ranges = use_or ?
 						irange_list_union(ranges, wrap.rangeset) :
 						irange_list_intersection(ranges, wrap.rangeset);
-
-			result->paramsel = Max(result->paramsel, wrap.paramsel);
 		}
 
 		/* Free resources */
 		pfree(elem_values);
 		pfree(elem_isnull);
 
-		/* Save rangeset */
 		result->rangeset = ranges;
+		result->paramsel = 1.0;
 
 		return; /* done, exit */
 	}
 
 handle_array_return:
 	result->rangeset = list_make1_irange_full(prel, IR_LOSSY);
-	result->paramsel = estimate_paramsel_using_prel(prel, strategy);
+	result->paramsel = 1.0;
 }
 
 /* Boolean expression handler */

Original file line number	Diff line number	Diff line change
`@@ -762,7 +762,7 @@ handle_const(const Const *c,`
`762`	`762`	`}`
`763`	`763`	`else`
`764`	`764`	`{`
`765`		`- result->rangeset = list_make1_irange_full(prel, IR_LOSSY);`
	`765`	`+ result->rangeset = list_make1_irange_full(prel, IR_COMPLETE);`
`766`	`766`	`result->paramsel = 1.0;`
`767`	`767`	`}`
`768`	`768`
`@@ -883,7 +883,7 @@ handle_array(ArrayType *array,`
`883`	`883`	`List *ranges;`
`884`	`884`	`int i;`
`885`	`885`
`886`		`- /* Set default ranges for OR \| AND */`
	`886`	`+ /* Set default rangeset */`
`887`	`887`	`ranges = use_or ? NIL : list_make1_irange_full(prel, IR_COMPLETE);`
`888`	`888`
`889`	`889`	`/* Select partitions using values */`
`@@ -910,23 +910,21 @@ handle_array(ArrayType *array,`
`910`	`910`	`ranges = use_or ?`
`911`	`911`	`irange_list_union(ranges, wrap.rangeset) :`
`912`	`912`	`irange_list_intersection(ranges, wrap.rangeset);`
`913`		`-`
`914`		`- result->paramsel = Max(result->paramsel, wrap.paramsel);`
`915`	`913`	`}`
`916`	`914`
`917`	`915`	`/* Free resources */`
`918`	`916`	`pfree(elem_values);`
`919`	`917`	`pfree(elem_isnull);`
`920`	`918`
`921`		`- /* Save rangeset */`
`922`	`919`	`result->rangeset = ranges;`
	`920`	`+ result->paramsel = 1.0;`
`923`	`921`
`924`	`922`	`return; /* done, exit */`
`925`	`923`	`}`
`926`	`924`
`927`	`925`	`handle_array_return:`
`928`	`926`	`result->rangeset = list_make1_irange_full(prel, IR_LOSSY);`
`929`		`- result->paramsel = estimate_paramsel_using_prel(prel, strategy);`
	`927`	`+ result->paramsel = 1.0;`
`930`	`928`	`}`
`931`	`929`
`932`	`930`	`/* Boolean expression handler */`