Skip to content

Commit 939aa7e

Browse files
author
Karina Litskevich
committed
[PGPRO-14916] Update create_foreignscan_path() and create_foreign_upper_path() calls.
Caused by 9e9931d2 (postgres) "Re-allow FDWs and custom scan providers to replace joins with pseudoconstant quals." This is a fix from 9dd4c1e (vops), which fixes vops to work with version 17. This fix is improved to take into account that vops should keep working with versions 16-. Also add some cosmetic changes in comments. Tags: vops
1 parent 50e2b13 commit 939aa7e

File tree

1 file changed

+14
-5
lines changed

1 file changed

+14
-5
lines changed

vops_fdw.c

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -440,9 +440,12 @@ postgresGetForeignPaths(PlannerInfo *root,
440440
fpinfo->rows,
441441
fpinfo->startup_cost,
442442
fpinfo->total_cost,
443-
NIL, /* no pathkeys */
443+
NIL, /* no pathkeys */
444444
NULL, /* no outer rel either */
445445
NULL, /* no extra plan */
446+
#if PG_VERSION_NUM>=170000
447+
NIL, /* no fdw_restrictinfo list */
448+
#endif
446449
NIL); /* no fdw_private list */
447450
add_path(baserel, (Path *) path);
448451
}
@@ -1411,8 +1414,11 @@ add_foreign_grouping_paths(PlannerInfo *root, RelOptInfo *input_rel,
14111414
startup_cost,
14121415
total_cost,
14131416
NIL, /* no pathkeys */
1414-
NULL,
1415-
NIL); /* no fdw_private */
1417+
NULL, /* no extra plan */
1418+
#if PG_VERSION_NUM>=170000
1419+
NIL, /* no fdw_restrictinfo list */
1420+
#endif
1421+
NIL); /* no fdw_private list */
14161422
#else
14171423
grouppath = create_foreignscan_path(root,
14181424
grouped_rel,
@@ -1422,8 +1428,11 @@ add_foreign_grouping_paths(PlannerInfo *root, RelOptInfo *input_rel,
14221428
total_cost,
14231429
NIL, /* no pathkeys */
14241430
grouped_rel->lateral_relids,
1425-
NULL,
1426-
NIL); /* no fdw_private */
1431+
NULL, /* no extra plan */
1432+
#if PG_VERSION_NUM>=170000
1433+
NIL, /* no fdw_restrictinfo list */
1434+
#endif
1435+
NIL); /* no fdw_private list */
14271436
#endif
14281437

14291438
/* Add generated path into grouped_rel by add_path(). */

0 commit comments

Comments
 (0)