Skip to content

Function signature change in server version 18 #51

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

Merged
merged 1 commit into from
Jul 21, 2025
Merged

Function signature change in server version 18 #51

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
42 changes: 5 additions & 37 deletions pg_show_plans.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,13 +107,7 @@ static void pgsp_shmem_request(void);
#endif
static void pgsp_shmem_startup(void);
/* Saves query plans to the shared hash table. */
static
#if PG_VERSION_NUM < 180000
void
#else
bool
#endif
pgsp_ExecutorStart(QueryDesc *queryDesc, int eflags);
static void pgsp_ExecutorStart(QueryDesc *queryDesc, int eflags);
/* Keeps track of the nest level. */
static void pgsp_ExecutorRun(QueryDesc *queryDesc, ScanDirection direction,
uint64 count
Expand Down Expand Up @@ -469,31 +463,17 @@ pgsp_shmem_startup(void)
LWLockRelease(AddinShmemInitLock);
}

static
#if PG_VERSION_NUM < 180000
void
#else
bool
#endif
static void
pgsp_ExecutorStart(QueryDesc *queryDesc, int eflags)
{
ExplainState *es;
#if PG_VERSION_NUM >= 180000
bool ret_val;
#endif

if (prev_ExecutorStart)
{
#if PG_VERSION_NUM >= 180000
ret_val =
#endif
prev_ExecutorStart(queryDesc, eflags);
}
else
{
#if PG_VERSION_NUM >= 180000
ret_val =
#endif
standard_ExecutorStart(queryDesc, eflags);
}

Expand All @@ -502,20 +482,12 @@ pgsp_ExecutorStart(QueryDesc *queryDesc, int eflags)
errcode(ERRCODE_OUT_OF_MEMORY),
errmsg("not enough memory to append new query plans"),
errhint("Try increasing 'pg_show_plans.max_plan_length'."));
return
#if PG_VERSION_NUM >= 180000
ret_val
#endif
;
return;
}

if (!pgsp->is_enabled)
{
return
#if PG_VERSION_NUM >= 180000
ret_val
#endif
;
return;
}

es = NewExplainState();
Expand All @@ -527,11 +499,7 @@ pgsp_ExecutorStart(QueryDesc *queryDesc, int eflags)
append_query_plan(es);
pfree(es->str->data);

return
#if PG_VERSION_NUM >= 180000
ret_val
#endif
;
return;
}

static void
Expand Down