Skip to content

fix: support PostgreSQL 17 #570

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

fix: support PostgreSQL 17 #570

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
315adba
fix: support PostgreSQL 17
pdecat Jun 20, 2025
ddd6860
fix: use extract_actual_clauses to properly handle RestrictInfo nodes
pdecat Jul 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion fdw/fdw.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,10 @@ static void fdwGetForeignPaths(PlannerInfo *root, RelOptInfo *baserel, Oid forei
NIL, /* no pathkeys */
NULL,
NULL,
(void *)fdw_private));
#if PG_VERSION_NUM >= 170000
NULL,
#endif
(void *)fdw_private));

/* Add each ForeignPath previously found */
foreach (lc, paths)
Expand All @@ -284,6 +287,9 @@ static void fdwGetForeignPaths(PlannerInfo *root, RelOptInfo *baserel, Oid forei
path->path.startup_cost, path->path.total_cost,
apply_pathkeys, NULL,
NULL,
#if PG_VERSION_NUM >= 170000
NULL,
#endif
(void *)fdw_private);
newpath->path.param_info = path->path.param_info;
add_path(baserel, (Path *)newpath);
Expand Down
11 changes: 8 additions & 3 deletions fdw/logging.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,17 @@ char* tagTypeToString(NodeTag type)
"T_JoinExpr",
"T_FromExpr",
"T_OnConflictExpr",
"T_IntoClause"
"T_IntoClause",
"T_RestrictInfo" /* Add RestrictInfo for PostgreSQL v16+ compatibility */
};
int idx = (int)type - (int)T_Alias;
if (idx < sizeof(tagNames) / sizeof(tagNames[0])){
return tagNames[idx];
}
return "";

}
/* DEBUG: Log unknown node types for PostgreSQL v16+ compatibility debugging */
static char unknown_type_buf[64];
snprintf(unknown_type_buf, sizeof(unknown_type_buf), "T_Unknown_%d", (int)type);
return unknown_type_buf;

}
105 changes: 78 additions & 27 deletions fdw/query.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ List *clausesInvolvingAttr(Index relid, AttrNumber attnum,

Expr *fdw_get_em_expr(EquivalenceClass *ec, RelOptInfo *rel);


/*
* The list of needed columns (represented by their respective vars)
* is pulled from:
Expand All @@ -59,30 +60,61 @@ extractColumns(List *reltargetlist, List *restrictinfolist)
List *targetcolumns;
Node *node = (Node *)lfirst(lc);

targetcolumns = pull_var_clause(node,
elog(DEBUG1, "DEBUG: Processing node in target list (nodeTag=%d)", nodeTag(node));

/* Check if this is a RestrictInfo node and handle it properly */
if (IsA(node, RestrictInfo))
{
List *actual_clauses = extract_actual_clauses(list_make1(node), false);
ListCell *clause_lc;

foreach (clause_lc, actual_clauses)
{
Node *clause = (Node *)lfirst(clause_lc);
List *clause_vars = pull_var_clause(clause,
#if PG_VERSION_NUM >= 90600
PVC_RECURSE_AGGREGATES | PVC_RECURSE_PLACEHOLDERS);
#else
PVC_RECURSE_AGGREGATES, PVC_RECURSE_PLACEHOLDERS);
#endif
columns = list_union(columns, clause_vars);
}
}
else
{
/* For non-RestrictInfo nodes, call pull_var_clause directly */
targetcolumns = pull_var_clause(node,
#if PG_VERSION_NUM >= 90600
PVC_RECURSE_AGGREGATES |
PVC_RECURSE_PLACEHOLDERS);
PVC_RECURSE_AGGREGATES | PVC_RECURSE_PLACEHOLDERS);
#else
PVC_RECURSE_AGGREGATES,
PVC_RECURSE_PLACEHOLDERS);
PVC_RECURSE_AGGREGATES, PVC_RECURSE_PLACEHOLDERS);
#endif
columns = list_union(columns, targetcolumns);
columns = list_union(columns, targetcolumns);
}
i++;
}
foreach (lc, restrictinfolist)
/* Use extract_actual_clauses to properly handle RestrictInfo nodes */
if (restrictinfolist != NIL)
{
List *targetcolumns;
RestrictInfo *node = (RestrictInfo *)lfirst(lc);
targetcolumns = pull_var_clause((Node *)node->clause,
List *actual_clauses = extract_actual_clauses(restrictinfolist, false);
ListCell *clause_lc;

elog(DEBUG1, "DEBUG: Processing %d actual clauses from restrictinfo list", list_length(actual_clauses));

foreach (clause_lc, actual_clauses)
{
List *targetcolumns;
Node *clause = (Node *)lfirst(clause_lc);

elog(DEBUG1, "DEBUG: Processing actual clause (nodeTag=%d)", nodeTag(clause));
targetcolumns = pull_var_clause(clause,
#if PG_VERSION_NUM >= 90600
PVC_RECURSE_AGGREGATES |
PVC_RECURSE_PLACEHOLDERS);
PVC_RECURSE_AGGREGATES | PVC_RECURSE_PLACEHOLDERS);
#else
PVC_RECURSE_AGGREGATES,
PVC_RECURSE_PLACEHOLDERS);
PVC_RECURSE_AGGREGATES, PVC_RECURSE_PLACEHOLDERS);
#endif
columns = list_union(columns, targetcolumns);
columns = list_union(columns, targetcolumns);
}
}
return columns;
}
Expand Down Expand Up @@ -151,6 +183,10 @@ unnestClause(Node *node)
return (Node *)((RelabelType *)node)->arg;
case T_ArrayCoerceExpr:
return (Node *)((ArrayCoerceExpr *)node)->arg;
#if PG_VERSION_NUM >= 160000
case T_RestrictInfo:
return (Node *)((RestrictInfo *)node)->clause;
#endif
default:
return node;
}
Expand Down Expand Up @@ -341,23 +377,35 @@ colnameFromVar(Var *var, PlannerInfo *root, FdwPlanState *planstate)
*/
bool isAttrInRestrictInfo(Index relid, AttrNumber attno, RestrictInfo *restrictinfo)
{
List *vars = pull_var_clause((Node *)restrictinfo->clause,
#if PG_VERSION_NUM >= 90600
PVC_RECURSE_AGGREGATES |
PVC_RECURSE_PLACEHOLDERS);
#else
PVC_RECURSE_AGGREGATES,
PVC_RECURSE_PLACEHOLDERS);
#endif
List *vars;
ListCell *lc;
List *actual_clauses;
ListCell *clause_lc;

elog(DEBUG1, "DEBUG: isAttrInRestrictInfo using extract_actual_clauses (clause nodeTag=%d)", nodeTag((Node *)restrictinfo->clause));

foreach (lc, vars)
/* Use extract_actual_clauses to properly handle RestrictInfo */
actual_clauses = extract_actual_clauses(list_make1(restrictinfo), false);

foreach (clause_lc, actual_clauses)
{
Var *var = (Var *)lfirst(lc);
Node *clause = (Node *)lfirst(clause_lc);

vars = pull_var_clause(clause,
#if PG_VERSION_NUM >= 90600
PVC_RECURSE_AGGREGATES | PVC_RECURSE_PLACEHOLDERS);
#else
PVC_RECURSE_AGGREGATES, PVC_RECURSE_PLACEHOLDERS);
#endif

if (var->varno == relid && var->varattno == attno)
foreach (lc, vars)
{
return true;
Var *var = (Var *)lfirst(lc);

if (var->varno == relid && var->varattno == attno)
{
return true;
}
}
}
return false;
Expand Down Expand Up @@ -538,6 +586,9 @@ findPaths(PlannerInfo *root, RelOptInfo *baserel, List *possiblePaths,
NULL,
#if PG_VERSION_NUM >= 90500
NULL,
#endif
#if PG_VERSION_NUM >= 170000
NULL,
#endif
NULL);

Expand Down
Loading