introduce convenience macro list_make1_irange_full()

funbringer · funbringer · commit 11f6d4abf8d4 · 2017-04-19T19:14:29.000+03:00
diff --git a/src/hooks.c b/src/hooks.c
@@ -337,7 +337,7 @@ pathman_rel_pathlist_hook(PlannerInfo *root,
 		rte->inh = true;
 
 		children = PrelGetChildrenArray(prel);
-		ranges = list_make1_irange(make_irange(0, PrelLastChild(prel), IR_COMPLETE));
+		ranges = list_make1_irange_full(prel, IR_COMPLETE);
 
 		/* Make wrappers over restrictions and collect final rangeset */
 		InitWalkerContext(&context, rti, prel, NULL, false);
diff --git a/src/include/rangeset.h b/src/include/rangeset.h
@@ -50,6 +50,11 @@ typedef struct {
 #define linitial_irange(list)			( lfirst_irange(list_head(list)) )
 
 
+/* convenience macro (requires relation_info.h) */
+#define list_make1_irange_full(prel, lossy) \
+	( list_make1_irange(make_irange(0, PrelLastChild(prel), (lossy))) )
+
+
 inline static IndexRange
 make_irange(uint32 lower, uint32 upper, bool lossy)
 {
@@ -141,5 +146,4 @@ List *irange_list_intersection(List *a, List *b);
 int irange_list_length(List *rangeset);
 bool irange_list_find(List *rangeset, int index, bool *lossy);
 
-
 #endif /* PATHMAN_RANGESET_H */
diff --git a/src/nodes_common.c b/src/nodes_common.c
@@ -656,7 +656,7 @@ rescan_append_common(CustomScanState *node)
 	Assert(prel);
 
 	/* First we select all available partitions... */
-	ranges = list_make1_irange(make_irange(0, PrelLastChild(prel), IR_COMPLETE));
+	ranges = list_make1_irange_full(prel, IR_COMPLETE);
 
 	InitWalkerContext(&wcxt, INDEX_VAR, prel, econtext, false);
 	foreach (lc, scan_state->custom_exprs)
diff --git a/src/pg_pathman.c b/src/pg_pathman.c
@@ -622,8 +622,7 @@ walk_expr_tree(Expr *expr, WalkerContext *context)
 			result->args = NIL;
 			result->paramsel = 1.0;
 
-			result->rangeset = list_make1_irange(
-						make_irange(0, PrelLastChild(context->prel), IR_LOSSY));
+			result->rangeset = list_make1_irange_full(context->prel, IR_LOSSY);
 
 			return result;
 	}
@@ -804,9 +803,7 @@ handle_boolexpr(const BoolExpr *expr, WalkerContext *context)
 	result->paramsel = 1.0;
 
 	if (expr->boolop == AND_EXPR)
-		result->rangeset = list_make1_irange(make_irange(0,
-														 PrelLastChild(prel),
-														 IR_COMPLETE));
+		result->rangeset = list_make1_irange_full(prel, IR_COMPLETE);
 	else
 		result->rangeset = NIL;
 
@@ -831,9 +828,7 @@ handle_boolexpr(const BoolExpr *expr, WalkerContext *context)
 				break;
 
 			default:
-				result->rangeset = list_make1_irange(make_irange(0,
-																 PrelLastChild(prel),
-																 IR_LOSSY));
+				result->rangeset = list_make1_irange_full(prel, IR_LOSSY);
 				break;
 		}
 	}
@@ -1003,7 +998,7 @@ handle_arrexpr(const ScalarArrayOpExpr *expr, WalkerContext *context)
 		result->paramsel = DEFAULT_INEQ_SEL;
 
 handle_arrexpr_return:
-	result->rangeset = list_make1_irange(make_irange(0, PrelLastChild(prel), IR_LOSSY));
+	result->rangeset = list_make1_irange_full(prel, IR_LOSSY);
 	result->paramsel = 1.0;
 	return result;
 }
@@ -1036,7 +1031,7 @@ handle_opexpr(const OpExpr *expr, WalkerContext *context)
 		}
 	}
 
-	result->rangeset = list_make1_irange(make_irange(0, PrelLastChild(prel), IR_LOSSY));
+	result->rangeset = list_make1_irange_full(prel, IR_LOSSY);
 	result->paramsel = 1.0;
 	return result;
 }
@@ -1131,7 +1126,7 @@ handle_binary_opexpr(WalkerContext *context, WrapperNode *result,
 	}
 
 binary_opexpr_return:
-	result->rangeset = list_make1_irange(make_irange(0, PrelLastChild(prel), IR_LOSSY));
+	result->rangeset = list_make1_irange_full(prel, IR_LOSSY);
 	result->paramsel = 1.0;
 }
 
@@ -1155,7 +1150,7 @@ handle_binary_opexpr_param(const PartRelationInfo *prel,
 	tce = lookup_type_cache(vartype, TYPECACHE_BTREE_OPFAMILY);
 	strategy = get_op_opfamily_strategy(expr->opno, tce->btree_opf);
 
-	result->rangeset = list_make1_irange(make_irange(0, PrelLastChild(prel), IR_LOSSY));
+	result->rangeset = list_make1_irange_full(prel, IR_LOSSY);
 	result->paramsel = estimate_paramsel_using_prel(prel, strategy);
 }
 
diff --git a/src/planner_tree_modification.c b/src/planner_tree_modification.c
@@ -268,7 +268,7 @@ handle_modification_query(Query *parse)
 	if (prel->enable_parent) return;
 
 	/* Parse syntax tree and extract partition ranges */
-	ranges = list_make1_irange(make_irange(0, PrelLastChild(prel), false));
+	ranges = list_make1_irange_full(prel, IR_COMPLETE);
 	expr = (Expr *) eval_const_expressions(NULL, parse->jointree->quals);
 
 	/* Exit if there's no expr (no use) */

Original file line number	Diff line number	Diff line change
`@@ -622,8 +622,7 @@ walk_expr_tree(Expr expr, WalkerContext context)`
`622`	`622`	`result->args = NIL;`
`623`	`623`	`result->paramsel = 1.0;`
`624`	`624`
`625`		`- result->rangeset = list_make1_irange(`
`626`		`- make_irange(0, PrelLastChild(context->prel), IR_LOSSY));`
	`625`	`+ result->rangeset = list_make1_irange_full(context->prel, IR_LOSSY);`
`627`	`626`
`628`	`627`	`return result;`
`629`	`628`	`}`
`@@ -804,9 +803,7 @@ handle_boolexpr(const BoolExpr expr, WalkerContext context)`
`804`	`803`	`result->paramsel = 1.0;`
`805`	`804`
`806`	`805`	`if (expr->boolop == AND_EXPR)`
`807`		`- result->rangeset = list_make1_irange(make_irange(0,`
`808`		`- PrelLastChild(prel),`
`809`		`- IR_COMPLETE));`
	`806`	`+ result->rangeset = list_make1_irange_full(prel, IR_COMPLETE);`
`810`	`807`	`else`
`811`	`808`	`result->rangeset = NIL;`
`812`	`809`
`@@ -831,9 +828,7 @@ handle_boolexpr(const BoolExpr expr, WalkerContext context)`
`831`	`828`	`break;`
`832`	`829`
`833`	`830`	`default:`
`834`		`- result->rangeset = list_make1_irange(make_irange(0,`
`835`		`- PrelLastChild(prel),`
`836`		`- IR_LOSSY));`
	`831`	`+ result->rangeset = list_make1_irange_full(prel, IR_LOSSY);`
`837`	`832`	`break;`
`838`	`833`	`}`
`839`	`834`	`}`
`@@ -1003,7 +998,7 @@ handle_arrexpr(const ScalarArrayOpExpr expr, WalkerContext context)`
`1003`	`998`	`result->paramsel = DEFAULT_INEQ_SEL;`
`1004`	`999`
`1005`	`1000`	`handle_arrexpr_return:`
`1006`		`- result->rangeset = list_make1_irange(make_irange(0, PrelLastChild(prel), IR_LOSSY));`
	`1001`	`+ result->rangeset = list_make1_irange_full(prel, IR_LOSSY);`
`1007`	`1002`	`result->paramsel = 1.0;`
`1008`	`1003`	`return result;`
`1009`	`1004`	`}`
`@@ -1036,7 +1031,7 @@ handle_opexpr(const OpExpr expr, WalkerContext context)`
`1036`	`1031`	`}`
`1037`	`1032`	`}`
`1038`	`1033`
`1039`		`- result->rangeset = list_make1_irange(make_irange(0, PrelLastChild(prel), IR_LOSSY));`
	`1034`	`+ result->rangeset = list_make1_irange_full(prel, IR_LOSSY);`
`1040`	`1035`	`result->paramsel = 1.0;`
`1041`	`1036`	`return result;`
`1042`	`1037`	`}`
`@@ -1131,7 +1126,7 @@ handle_binary_opexpr(WalkerContext context, WrapperNode result,`
`1131`	`1126`	`}`
`1132`	`1127`
`1133`	`1128`	`binary_opexpr_return:`
`1134`		`- result->rangeset = list_make1_irange(make_irange(0, PrelLastChild(prel), IR_LOSSY));`
	`1129`	`+ result->rangeset = list_make1_irange_full(prel, IR_LOSSY);`
`1135`	`1130`	`result->paramsel = 1.0;`
`1136`	`1131`	`}`
`1137`	`1132`
`@@ -1155,7 +1150,7 @@ handle_binary_opexpr_param(const PartRelationInfo *prel,`
`1155`	`1150`	`tce = lookup_type_cache(vartype, TYPECACHE_BTREE_OPFAMILY);`
`1156`	`1151`	`strategy = get_op_opfamily_strategy(expr->opno, tce->btree_opf);`
`1157`	`1152`
`1158`		`- result->rangeset = list_make1_irange(make_irange(0, PrelLastChild(prel), IR_LOSSY));`
	`1153`	`+ result->rangeset = list_make1_irange_full(prel, IR_LOSSY);`
`1159`	`1154`	`result->paramsel = estimate_paramsel_using_prel(prel, strategy);`
`1160`	`1155`	`}`
`1161`	`1156`