Skip to content

Commit 56546f0

Browse files
authored
Merge pull request #91 from RekGRpth/patch-2
Fix compatibility with pg18 Upstream commit postgres/postgres@525392d changed return type of ExecutorStart_hook API from void to bool.
2 parents fbf8346 + 637679b commit 56546f0

File tree

1 file changed

+15
-4
lines changed

1 file changed

+15
-4
lines changed

Diff for: pg_wait_sampling.c

+15-4
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,13 @@ static PlannedStmt *pgws_planner_hook(Query *parse,
7676
const char *query_string,
7777
#endif
7878
int cursorOptions, ParamListInfo boundParams);
79-
static void pgws_ExecutorStart(QueryDesc *queryDesc, int eflags);
79+
static
80+
#if PG_VERSION_NUM >= 180000
81+
bool
82+
#else
83+
void
84+
#endif
85+
pgws_ExecutorStart(QueryDesc *queryDesc, int eflags);
8086
static void pgws_ExecutorRun(QueryDesc *queryDesc,
8187
ScanDirection direction,
8288
uint64 count
@@ -976,17 +982,22 @@ pgws_planner_hook(Query *parse,
976982
/*
977983
* ExecutorStart hook: save queryId for collector
978984
*/
979-
static void
985+
static
986+
#if PG_VERSION_NUM >= 180000
987+
bool
988+
#else
989+
void
990+
#endif
980991
pgws_ExecutorStart(QueryDesc *queryDesc, int eflags)
981992
{
982993
int i = MyProc - ProcGlobal->allProcs;
983994

984995
if (pgws_enabled(nesting_level))
985996
pgws_proc_queryids[i] = queryDesc->plannedstmt->queryId;
986997
if (prev_ExecutorStart)
987-
prev_ExecutorStart(queryDesc, eflags);
998+
return prev_ExecutorStart(queryDesc, eflags);
988999
else
989-
standard_ExecutorStart(queryDesc, eflags);
1000+
return standard_ExecutorStart(queryDesc, eflags);
9901001
}
9911002

9921003
static void

0 commit comments

Comments
 (0)