Skip to content

Try to be consistent when we check for PostgreSQL versions #661

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
jeltz merged 1 commit into from
Jun 5, 2026
+33 −33
Merged

Try to be consistent when we check for PostgreSQL versions #661

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
66 changes: 33 additions & 33 deletions pg_stat_monitor.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,17 +157,17 @@ static void pgsm_shmem_request(void);
static void pgsm_emit_log_hook(ErrorData *edata);
static void pgsm_post_parse_analyze(ParseState *pstate, Query *query, JumbleState *jstate);
static void pgsm_ExecutorStart(QueryDesc *queryDesc, int eflags);
#if PG_VERSION_NUM < 180000
static void pgsm_ExecutorRun(QueryDesc *queryDesc, ScanDirection direction, uint64 count, bool execute_once);
#else
#if PG_VERSION_NUM >= 180000
static void pgsm_ExecutorRun(QueryDesc *queryDesc, ScanDirection direction, uint64 count);
#else
static void pgsm_ExecutorRun(QueryDesc *queryDesc, ScanDirection direction, uint64 count, bool execute_once);
#endif
static void pgsm_ExecutorFinish(QueryDesc *queryDesc);
static void pgsm_ExecutorEnd(QueryDesc *queryDesc);
#if PG_VERSION_NUM < 160000
static bool pgsm_ExecutorCheckPerms(List *rt, bool abort);
#else
#if PG_VERSION_NUM >= 160000
static bool pgsm_ExecutorCheckPerms(List *rt, List *rp, bool abort);
#else
static bool pgsm_ExecutorCheckPerms(List *rt, bool abort);
#endif
static PlannedStmt *pgsm_planner_hook(Query *parse, const char *query_string,
int cursorOptions, ParamListInfo boundParams);
Expand Down Expand Up @@ -546,11 +546,11 @@ pgsm_ExecutorStart(QueryDesc *queryDesc, int eflags)
* ExecutorRun hook: all we need do is track nesting depth
*/
static void
#if PG_VERSION_NUM < 180000
#if PG_VERSION_NUM >= 180000
pgsm_ExecutorRun(QueryDesc *queryDesc, ScanDirection direction, uint64 count)
#else
pgsm_ExecutorRun(QueryDesc *queryDesc, ScanDirection direction, uint64 count,
bool execute_once)
#else
pgsm_ExecutorRun(QueryDesc *queryDesc, ScanDirection direction, uint64 count)
#endif
{
if (nesting_level >= 0 && nesting_level < max_stack_depth)
Expand All @@ -564,18 +564,18 @@ pgsm_ExecutorRun(QueryDesc *queryDesc, ScanDirection direction, uint64 count)
{
if (prev_ExecutorRun)
{
#if PG_VERSION_NUM < 180000
prev_ExecutorRun(queryDesc, direction, count, execute_once);
#else
#if PG_VERSION_NUM >= 180000
prev_ExecutorRun(queryDesc, direction, count);
#else
prev_ExecutorRun(queryDesc, direction, count, execute_once);
#endif
}
else
{
#if PG_VERSION_NUM < 180000
standard_ExecutorRun(queryDesc, direction, count, execute_once);
#else
#if PG_VERSION_NUM >= 180000
standard_ExecutorRun(queryDesc, direction, count);
#else
standard_ExecutorRun(queryDesc, direction, count, execute_once);
#endif
}
nesting_level--;
Expand Down Expand Up @@ -760,10 +760,10 @@ pgsm_ExecutorEnd(QueryDesc *queryDesc)
}

static bool
#if PG_VERSION_NUM < 160000
pgsm_ExecutorCheckPerms(List *rt, bool abort)
#else
#if PG_VERSION_NUM >= 160000
pgsm_ExecutorCheckPerms(List *rt, List *rp, bool abort)
#else
pgsm_ExecutorCheckPerms(List *rt, bool abort)
#endif
{
ListCell *lr = NULL;
Expand Down Expand Up @@ -812,10 +812,10 @@ pgsm_ExecutorCheckPerms(List *rt, List *rp, bool abort)
num_relations = i;

if (prev_ExecutorCheckPerms_hook)
#if PG_VERSION_NUM < 160000
return prev_ExecutorCheckPerms_hook(rt, abort);
#else
#if PG_VERSION_NUM >= 160000
return prev_ExecutorCheckPerms_hook(rt, rp, abort);
#else
return prev_ExecutorCheckPerms_hook(rt, abort);
#endif

return true;
Expand Down Expand Up @@ -1462,29 +1462,29 @@ pgsm_update_entry(pgsmEntry *entry,
entry->counters.blocks.temp_blks_read += bufusage->temp_blks_read;
entry->counters.blocks.temp_blks_written += bufusage->temp_blks_written;

#if PG_VERSION_NUM < 170000
entry->counters.blocks.shared_blk_read_time += INSTR_TIME_GET_MILLISEC(bufusage->blk_read_time);
entry->counters.blocks.shared_blk_write_time += INSTR_TIME_GET_MILLISEC(bufusage->blk_write_time);
#else
#if PG_VERSION_NUM >= 170000
entry->counters.blocks.shared_blk_read_time += INSTR_TIME_GET_MILLISEC(bufusage->shared_blk_read_time);
entry->counters.blocks.shared_blk_write_time += INSTR_TIME_GET_MILLISEC(bufusage->shared_blk_write_time);
entry->counters.blocks.local_blk_read_time += INSTR_TIME_GET_MILLISEC(bufusage->local_blk_read_time);
entry->counters.blocks.local_blk_write_time += INSTR_TIME_GET_MILLISEC(bufusage->local_blk_write_time);
#else
entry->counters.blocks.shared_blk_read_time += INSTR_TIME_GET_MILLISEC(bufusage->blk_read_time);
entry->counters.blocks.shared_blk_write_time += INSTR_TIME_GET_MILLISEC(bufusage->blk_write_time);
#endif

#if PG_VERSION_NUM >= 150000
entry->counters.blocks.temp_blk_read_time += INSTR_TIME_GET_MILLISEC(bufusage->temp_blk_read_time);
entry->counters.blocks.temp_blk_write_time += INSTR_TIME_GET_MILLISEC(bufusage->temp_blk_write_time);
#endif

#if PG_VERSION_NUM < 170000
memcpy((void *) &entry->counters.blocks.instr_shared_blk_read_time, &bufusage->blk_read_time, sizeof(instr_time));
memcpy((void *) &entry->counters.blocks.instr_shared_blk_write_time, &bufusage->blk_write_time, sizeof(instr_time));
#else
#if PG_VERSION_NUM >= 170000
memcpy((void *) &entry->counters.blocks.instr_shared_blk_read_time, &bufusage->shared_blk_read_time, sizeof(instr_time));
memcpy((void *) &entry->counters.blocks.instr_shared_blk_write_time, &bufusage->shared_blk_write_time, sizeof(instr_time));
memcpy((void *) &entry->counters.blocks.instr_local_blk_write_time, &bufusage->local_blk_write_time, sizeof(instr_time));
memcpy((void *) &entry->counters.blocks.instr_local_blk_write_time, &bufusage->local_blk_write_time, sizeof(instr_time));
#else
memcpy((void *) &entry->counters.blocks.instr_shared_blk_read_time, &bufusage->blk_read_time, sizeof(instr_time));
memcpy((void *) &entry->counters.blocks.instr_shared_blk_write_time, &bufusage->blk_write_time, sizeof(instr_time));
#endif


Expand Down Expand Up @@ -1816,14 +1816,14 @@ pgsm_store(pgsmEntry *entry)
bufusage.temp_blks_read = entry->counters.blocks.temp_blks_read;
bufusage.temp_blks_written = entry->counters.blocks.temp_blks_written;

#if PG_VERSION_NUM < 170000
memcpy(&bufusage.blk_read_time, &entry->counters.blocks.instr_shared_blk_read_time, sizeof(instr_time));
memcpy(&bufusage.blk_write_time, &entry->counters.blocks.instr_shared_blk_write_time, sizeof(instr_time));
#else
#if PG_VERSION_NUM >= 170000
memcpy(&bufusage.shared_blk_read_time, &entry->counters.blocks.instr_shared_blk_read_time, sizeof(instr_time));
memcpy(&bufusage.shared_blk_write_time, &entry->counters.blocks.instr_shared_blk_write_time, sizeof(instr_time));
memcpy(&bufusage.local_blk_read_time, &entry->counters.blocks.instr_local_blk_read_time, sizeof(instr_time));
memcpy(&bufusage.local_blk_write_time, &entry->counters.blocks.instr_local_blk_write_time, sizeof(instr_time));
#else
memcpy(&bufusage.blk_read_time, &entry->counters.blocks.instr_shared_blk_read_time, sizeof(instr_time));
memcpy(&bufusage.blk_write_time, &entry->counters.blocks.instr_shared_blk_write_time, sizeof(instr_time));
#endif

#if PG_VERSION_NUM >= 150000
Expand Down
Loading