unification: change 'bound_info' to 'pbin'

funbringer · funbringer · commit d765b14be48b · 2017-05-31T14:55:16.000+03:00
diff --git a/src/relation_info.c b/src/relation_info.c
@@ -465,7 +465,7 @@ fill_prel_with_partitions(PartRelationInfo *prel,
 	/* Initialize bounds of partitions */
 	for (i = 0; i < PrelChildrenCount(prel); i++)
 	{
-		PartBoundInfo *bound_info;
+		PartBoundInfo *pbin;
 
 		/* Clear all previous allocations */
 		MemoryContextReset(temp_mcxt);
@@ -474,30 +474,30 @@ fill_prel_with_partitions(PartRelationInfo *prel,
 		old_mcxt = MemoryContextSwitchTo(temp_mcxt);
 		{
 			/* Fetch constraint's expression tree */
-			bound_info = get_bounds_of_partition(partitions[i], prel);
+			pbin = get_bounds_of_partition(partitions[i], prel);
 		}
 		MemoryContextSwitchTo(old_mcxt);
 
 		/* Copy bounds from bound cache */
 		switch (prel->parttype)
 		{
 			case PT_HASH:
-				prel->children[bound_info->part_idx] = bound_info->child_rel;
+				prel->children[pbin->part_idx] = pbin->child_rel;
 				break;
 
 			case PT_RANGE:
 				{
 					/* Copy child's Oid */
-					prel->ranges[i].child_oid = bound_info->child_rel;
+					prel->ranges[i].child_oid = pbin->child_rel;
 
 					/* Copy all min & max Datums to the persistent mcxt */
 					old_mcxt = MemoryContextSwitchTo(cache_mcxt);
 					{
-						prel->ranges[i].min = CopyBound(&bound_info->range_min,
+						prel->ranges[i].min = CopyBound(&pbin->range_min,
 														prel->ev_byval,
 														prel->ev_len);
 
-						prel->ranges[i].max = CopyBound(&bound_info->range_max,
+						prel->ranges[i].max = CopyBound(&pbin->range_max,
 														prel->ev_byval,
 														prel->ev_len);
 					}

Original file line number	Diff line number	Diff line change
`@@ -465,7 +465,7 @@ fill_prel_with_partitions(PartRelationInfo *prel,`
`465`	`465`	`/* Initialize bounds of partitions */`
`466`	`466`	`for (i = 0; i < PrelChildrenCount(prel); i++)`
`467`	`467`	`{`
`468`		`- PartBoundInfo *bound_info;`
	`468`	`+ PartBoundInfo *pbin;`
`469`	`469`
`470`	`470`	`/* Clear all previous allocations */`
`471`	`471`	`MemoryContextReset(temp_mcxt);`
`@@ -474,30 +474,30 @@ fill_prel_with_partitions(PartRelationInfo *prel,`
`474`	`474`	`old_mcxt = MemoryContextSwitchTo(temp_mcxt);`
`475`	`475`	`{`
`476`	`476`	`/* Fetch constraint's expression tree */`
`477`		`- bound_info = get_bounds_of_partition(partitions[i], prel);`
	`477`	`+ pbin = get_bounds_of_partition(partitions[i], prel);`
`478`	`478`	`}`
`479`	`479`	`MemoryContextSwitchTo(old_mcxt);`
`480`	`480`
`481`	`481`	`/* Copy bounds from bound cache */`
`482`	`482`	`switch (prel->parttype)`
`483`	`483`	`{`
`484`	`484`	`case PT_HASH:`
`485`		`- prel->children[bound_info->part_idx] = bound_info->child_rel;`
	`485`	`+ prel->children[pbin->part_idx] = pbin->child_rel;`
`486`	`486`	`break;`
`487`	`487`
`488`	`488`	`case PT_RANGE:`
`489`	`489`	`{`
`490`	`490`	`/* Copy child's Oid */`
`491`		`- prel->ranges[i].child_oid = bound_info->child_rel;`
	`491`	`+ prel->ranges[i].child_oid = pbin->child_rel;`
`492`	`492`
`493`	`493`	`/* Copy all min & max Datums to the persistent mcxt */`
`494`	`494`	`old_mcxt = MemoryContextSwitchTo(cache_mcxt);`
`495`	`495`	`{`
`496`		`- prel->ranges[i].min = CopyBound(&bound_info->range_min,`
	`496`	`+ prel->ranges[i].min = CopyBound(&pbin->range_min,`
`497`	`497`	`prel->ev_byval,`
`498`	`498`	`prel->ev_len);`
`499`	`499`
`500`		`- prel->ranges[i].max = CopyBound(&bound_info->range_max,`
	`500`	`+ prel->ranges[i].max = CopyBound(&pbin->range_max,`
`501`	`501`	`prel->ev_byval,`
`502`	`502`	`prel->ev_len);`
`503`	`503`	`}`