@@ -1489,31 +1489,18 @@ generate_mergeappend_paths(PlannerInfo *root, RelOptInfo *rel,
1489
1489
* cheapest_total ;
1490
1490
1491
1491
/* Locate the right paths, if they are available. */
1492
- #if PG_VERSION_NUM >= 100000
1493
- cheapest_startup =
1494
- get_cheapest_path_for_pathkeys (childrel -> pathlist ,
1495
- pathkeys ,
1496
- NULL ,
1497
- STARTUP_COST ,
1498
- true);
1499
- cheapest_total =
1500
- get_cheapest_path_for_pathkeys (childrel -> pathlist ,
1501
- pathkeys ,
1502
- NULL ,
1503
- TOTAL_COST ,
1504
- true);
1505
- #else
1506
1492
cheapest_startup =
1507
- get_cheapest_path_for_pathkeys (childrel -> pathlist ,
1508
- pathkeys ,
1509
- NULL ,
1510
- STARTUP_COST );
1493
+ get_cheapest_path_for_pathkeys_compat (childrel -> pathlist ,
1494
+ pathkeys ,
1495
+ NULL ,
1496
+ STARTUP_COST ,
1497
+ false);
1511
1498
cheapest_total =
1512
- get_cheapest_path_for_pathkeys (childrel -> pathlist ,
1513
- pathkeys ,
1514
- NULL ,
1515
- TOTAL_COST );
1516
- #endif
1499
+ get_cheapest_path_for_pathkeys_compat (childrel -> pathlist ,
1500
+ pathkeys ,
1501
+ NULL ,
1502
+ TOTAL_COST ,
1503
+ false);
1517
1504
1518
1505
/*
1519
1506
* If we can't find any paths with the right order just use the
@@ -2091,18 +2078,11 @@ get_cheapest_parameterized_child_path(PlannerInfo *root, RelOptInfo *rel,
2091
2078
* parameterization. If it has exactly the needed parameterization, we're
2092
2079
* done.
2093
2080
*/
2094
- #if PG_VERSION_NUM >= 100000
2095
- cheapest = get_cheapest_path_for_pathkeys (rel -> pathlist ,
2096
- NIL ,
2097
- required_outer ,
2098
- TOTAL_COST ,
2099
- false);
2100
- #else
2101
- cheapest = get_cheapest_path_for_pathkeys (rel -> pathlist ,
2102
- NIL ,
2103
- required_outer ,
2104
- TOTAL_COST );
2105
- #endif
2081
+ cheapest = get_cheapest_path_for_pathkeys_compat (rel -> pathlist ,
2082
+ NIL ,
2083
+ required_outer ,
2084
+ TOTAL_COST ,
2085
+ false);
2106
2086
Assert (cheapest != NULL );
2107
2087
if (bms_equal (PATH_REQ_OUTER (cheapest ), required_outer ))
2108
2088
return cheapest ;
0 commit comments