postgrespro
diff --git a/‎src/hooks.c
Lines changed: 2 additions & 2 deletions b/‎src/hooks.c
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/nodes_common.c
Lines changed: 3 additions & 3 deletions b/‎src/nodes_common.c
Lines changed: 3 additions & 3 deletions
diff --git a/‎src/pg_pathman.c
Lines changed: 10 additions & 10 deletions b/‎src/pg_pathman.c
Lines changed: 10 additions & 10 deletions
@@ -270,7 +270,7 @@ pathman_rel_pathlist_hook(PlannerInfo *root,
 
 			paramsel *= wrap->paramsel;
 			wrappers = lappend(wrappers, wrap);
-			ranges = irange_list_intersect(ranges, wrap->rangeset);
+			ranges = irange_list_intersection(ranges, wrap->rangeset);
 		}
 
 		/*
@@ -318,7 +318,7 @@ pathman_rel_pathlist_hook(PlannerInfo *root,
 		{
 			IndexRange	irange = lfirst_irange(lc);
 
-			for (i = irange.ir_lower; i <= irange.ir_upper; i++)
+			for (i = irange_lower(irange); i <= irange_upper(irange); i++)
 				append_child_relation(root, rel, rti, rte, i, children[i], wrappers);
 		}
 
 
@@ -303,8 +303,8 @@ get_partition_oids(List *ranges, int *n, const PartRelationInfo *prel,
 	foreach (range_cell, ranges)
 	{
 		uint32	i;
-		uint32	a = lfirst_irange(range_cell).ir_lower,
-				b = lfirst_irange(range_cell).ir_upper;
+		uint32	a = irange_lower(lfirst_irange(range_cell)),
+				b = irange_upper(lfirst_irange(range_cell));
 
 		for (i = a; i <= b; i++)
 		{
@@ -565,7 +565,7 @@ rescan_append_common(CustomScanState *node)
 
 		/* ... then we cut off irrelevant ones using the provided clauses */
 		wn = walk_expr_tree((Expr *) lfirst(lc), &wcxt);
-		ranges = irange_list_intersect(ranges, wn->rangeset);
+		ranges = irange_list_intersection(ranges, wn->rangeset);
 	}
 
 	/* Get Oids of the required partitions */
 
@@ -333,16 +333,16 @@ handle_modification_query(Query *parse)
 	InitWalkerContext(&context, prel, NULL, false);
 	wrap = walk_expr_tree(expr, &context);
 
-	ranges = irange_list_intersect(ranges, wrap->rangeset);
+	ranges = irange_list_intersection(ranges, wrap->rangeset);
 
 	/* If only one partition is affected then substitute parent table with partition */
 	if (irange_list_length(ranges) == 1)
 	{
 		IndexRange irange = linitial_irange(ranges);
-		if (irange.ir_lower == irange.ir_upper)
+		if (irange_lower(irange) == irange_upper(irange))
 		{
 			Oid *children = PrelGetChildrenArray(prel);
-			rte->relid = children[irange.ir_lower];
+			rte->relid = children[irange_lower(irange)];
 			rte->inh = false;
 		}
 	}
@@ -1317,13 +1317,13 @@ search_range_partition_eq(const Datum value,
 		IndexRange irange = linitial_irange(result.rangeset);
 
 		Assert(list_length(result.rangeset) == 1);
-		Assert(irange.ir_lower == irange.ir_upper);
-		Assert(irange.ir_valid);
+		Assert(irange_lower(irange) == irange_upper(irange));
+		Assert(is_irange_valid(irange));
 
 		/* Write result to the 'out_rentry' if necessary */
 		if (out_re)
 			memcpy((void *) out_re,
-				   (const void *) &ranges[irange.ir_lower],
+				   (const void *) &ranges[irange_lower(irange)],
 				   sizeof(RangeEntry));
 
 		return SEARCH_RANGEREL_FOUND;
@@ -1525,8 +1525,8 @@ handle_boolexpr(const BoolExpr *expr, WalkerContext *context)
 				break;
 
 			case AND_EXPR:
-				result->rangeset = irange_list_intersect(result->rangeset,
-														 arg->rangeset);
+				result->rangeset = irange_list_intersection(result->rangeset,
+															arg->rangeset);
 				result->paramsel *= arg->paramsel;
 				break;
 
@@ -1544,8 +1544,8 @@ handle_boolexpr(const BoolExpr *expr, WalkerContext *context)
 
 		foreach (lc, result->args)
 		{
-			WrapperNode *arg = (WrapperNode *) lfirst(lc);
-			int len = irange_list_length(arg->rangeset);
+			WrapperNode	   *arg = (WrapperNode *) lfirst(lc);
+			int				len = irange_list_length(arg->rangeset);
 
 			result->paramsel *= (1.0 - arg->paramsel * (double)len / (double)totallen);
 		}
Original file line number	Diff line number	Diff line change
`@@ -270,7 +270,7 @@ pathman_rel_pathlist_hook(PlannerInfo *root,`
`270`	`270`
`271`	`271`	`paramsel *= wrap->paramsel;`
`272`	`272`	`wrappers = lappend(wrappers, wrap);`
`273`		`- ranges = irange_list_intersect(ranges, wrap->rangeset);`
	`273`	`+ ranges = irange_list_intersection(ranges, wrap->rangeset);`
`274`	`274`	`}`
`275`	`275`
`276`	`276`	`/*`
`@@ -318,7 +318,7 @@ pathman_rel_pathlist_hook(PlannerInfo *root,`
`318`	`318`	`{`
`319`	`319`	`IndexRange irange = lfirst_irange(lc);`
`320`	`320`
`321`		`- for (i = irange.ir_lower; i <= irange.ir_upper; i++)`
	`321`	`+ for (i = irange_lower(irange); i <= irange_upper(irange); i++)`
`322`	`322`	`append_child_relation(root, rel, rti, rte, i, children[i], wrappers);`
`323`	`323`	`}`
`324`	`324`
Original file line number	Diff line number	Diff line change
`@@ -303,8 +303,8 @@ get_partition_oids(List ranges, int n, const PartRelationInfo *prel,`
`303`	`303`	`foreach (range_cell, ranges)`
`304`	`304`	`{`
`305`	`305`	`uint32 i;`
`306`		`- uint32 a = lfirst_irange(range_cell).ir_lower,`
`307`		`- b = lfirst_irange(range_cell).ir_upper;`
	`306`	`+ uint32 a = irange_lower(lfirst_irange(range_cell)),`
	`307`	`+ b = irange_upper(lfirst_irange(range_cell));`
`308`	`308`
`309`	`309`	`for (i = a; i <= b; i++)`
`310`	`310`	`{`
`@@ -565,7 +565,7 @@ rescan_append_common(CustomScanState *node)`
`565`	`565`
`566`	`566`	`/* ... then we cut off irrelevant ones using the provided clauses */`
`567`	`567`	`wn = walk_expr_tree((Expr *) lfirst(lc), &wcxt);`
`568`		`- ranges = irange_list_intersect(ranges, wn->rangeset);`
	`568`	`+ ranges = irange_list_intersection(ranges, wn->rangeset);`
`569`	`569`	`}`
`570`	`570`
`571`	`571`	`/* Get Oids of the required partitions */`