@@ -1020,8 +1020,6 @@ partition_bounds_merge(int partnatts,
1020
1020
JoinType jointype ,
1021
1021
List * * outer_parts , List * * inner_parts )
1022
1022
{
1023
- PartitionBoundInfo outer_binfo = outer_rel -> boundinfo ;
1024
-
1025
1023
/*
1026
1024
* Currently, this function is called only from try_partitionwise_join(),
1027
1025
* so the join type should be INNER, LEFT, FULL, SEMI, or ANTI.
@@ -1031,10 +1029,10 @@ partition_bounds_merge(int partnatts,
1031
1029
jointype == JOIN_ANTI );
1032
1030
1033
1031
/* The partitioning strategies should be the same. */
1034
- Assert (outer_binfo -> strategy == inner_rel -> boundinfo -> strategy );
1032
+ Assert (outer_rel -> boundinfo -> strategy == inner_rel -> boundinfo -> strategy );
1035
1033
1036
1034
* outer_parts = * inner_parts = NIL ;
1037
- switch (outer_binfo -> strategy )
1035
+ switch (outer_rel -> boundinfo -> strategy )
1038
1036
{
1039
1037
case PARTITION_STRATEGY_HASH :
1040
1038
@@ -1075,7 +1073,7 @@ partition_bounds_merge(int partnatts,
1075
1073
1076
1074
default :
1077
1075
elog (ERROR , "unexpected partition strategy: %d" ,
1078
- (int ) outer_binfo -> strategy );
1076
+ (int ) outer_rel -> boundinfo -> strategy );
1079
1077
return NULL ; /* keep compiler quiet */
1080
1078
}
1081
1079
}
@@ -1528,7 +1526,7 @@ merge_range_bounds(int partnatts, FmgrInfo *partsupfuncs,
1528
1526
& next_index );
1529
1527
Assert (merged_index >= 0 );
1530
1528
1531
- /* Get the range of the merged partition. */
1529
+ /* Get the range bounds of the merged partition. */
1532
1530
get_merged_range_bounds (partnatts , partsupfuncs ,
1533
1531
partcollations , jointype ,
1534
1532
& outer_lb , & outer_ub ,
@@ -1833,7 +1831,7 @@ merge_matching_partitions(PartitionMap *outer_map, PartitionMap *inner_map,
1833
1831
1834
1832
/*
1835
1833
* If neither of them has been merged, merge them. Otherwise, if one has
1836
- * been merged with a dummy relation on the other side (and the other
1834
+ * been merged with a dummy partition on the other side (and the other
1837
1835
* hasn't yet been merged with anything), re-merge them. Otherwise, they
1838
1836
* can't be merged, so return -1.
1839
1837
*/
0 commit comments