introduce convenience macro list_make1_irange_full()

Author: funbringer

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

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 */

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)

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);
 }
 

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) */