Skip to content

Add PostgreSQL 19 compatibility #654

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
adeshthack wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add PostgreSQL 19 compatibility #654

Show file tree
Hide file tree
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
12 changes: 12 additions & 0 deletions hash_query.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,11 @@ pgsm_startup(void)
pgsm->raw_dsa_area = p;
dsa = dsa_create_in_place(pgsm->raw_dsa_area,
pgsm_query_area_size(),
#if PG_VERSION_NUM >= 190000
LWLockNewTrancheId("pg_stat_monitor_dsa"), 0);
#else
LWLockNewTrancheId(), 0);
#endif
dsa_pin(dsa);
dsa_set_size_limit(dsa, pgsm_query_area_size());

Expand Down Expand Up @@ -180,7 +184,11 @@ pgsm_create_bucket_hash(pgsmSharedState *pgsm, dsa_area *dsa)
#if USE_DYNAMIC_HASH
dshash_table *dsh;

#if PG_VERSION_NUM >= 190000
pgsm->hash_tranche_id = LWLockNewTrancheId("pg_stat_monitor_hash");
#else
pgsm->hash_tranche_id = LWLockNewTrancheId();
#endif
dsh_params.tranche_id = pgsm->hash_tranche_id;
dsh = dshash_create(dsa, &dsh_params, 0);
bucket_hash = dshash_get_hash_table_handle(dsh);
Expand All @@ -191,7 +199,11 @@ pgsm_create_bucket_hash(pgsmSharedState *pgsm, dsa_area *dsa)
memset(&info, 0, sizeof(info));
info.keysize = sizeof(pgsmHashKey);
info.entrysize = sizeof(pgsmEntry);
#if PG_VERSION_NUM >= 190000
bucket_hash = ShmemInitHash("pg_stat_monitor: bucket hashtable", MAX_BUCKET_ENTRIES, &info, HASH_ELEM | HASH_BLOBS);
#else
bucket_hash = ShmemInitHash("pg_stat_monitor: bucket hashtable", MAX_BUCKET_ENTRIES, MAX_BUCKET_ENTRIES, &info, HASH_ELEM | HASH_BLOBS);
#endif
#endif
return bucket_hash;
}
Expand Down
57 changes: 57 additions & 0 deletions pg_stat_monitor.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,11 @@ static int pg_get_application_name(char *name, int buff_size);
static PgBackendStatus *pg_get_backend_status(void);
static Datum intarray_get_datum(int32 arr[], int len);

#if PG_VERSION_NUM >= 190000
DECLARE_HOOK(void pgsm_post_parse_analyze, ParseState *pstate, Query *query, const JumbleState *jstate);
#else
DECLARE_HOOK(void pgsm_post_parse_analyze, ParseState *pstate, Query *query, JumbleState *jstate);
#endif
DECLARE_HOOK(void pgsm_ExecutorStart, QueryDesc *queryDesc, int eflags);
#if PG_VERSION_NUM < 180000
DECLARE_HOOK(void pgsm_ExecutorRun, QueryDesc *queryDesc, ScanDirection direction, uint64 count, bool execute_once);
Expand All @@ -186,7 +190,11 @@ DECLARE_HOOK(bool pgsm_ExecutorCheckPerms, List *rt, bool abort);
DECLARE_HOOK(bool pgsm_ExecutorCheckPerms, List *rt, List *rp, bool abort);
#endif

#if PG_VERSION_NUM >= 190000
DECLARE_HOOK(PlannedStmt *pgsm_planner_hook, Query *parse, const char *query_string, int cursorOptions, ParamListInfo boundParams, ExplainState *es);
#else
DECLARE_HOOK(PlannedStmt *pgsm_planner_hook, Query *parse, const char *query_string, int cursorOptions, ParamListInfo boundParams);
#endif
DECLARE_HOOK(void pgsm_ProcessUtility, PlannedStmt *pstmt, const char *queryString,
bool readOnlyTree,
ProcessUtilityContext context,
Expand Down Expand Up @@ -376,7 +384,11 @@ pgsm_shmem_request(void)
#endif

static void
#if PG_VERSION_NUM >= 190000
pgsm_post_parse_analyze_internal(ParseState *pstate, Query *query, const JumbleState *jstate)
#else
pgsm_post_parse_analyze_internal(ParseState *pstate, Query *query, JumbleState *jstate)
#endif
{
pgsmEntry *entry;
const char *query_text;
Expand Down Expand Up @@ -495,7 +507,11 @@ pgsm_post_parse_analyze_internal(ParseState *pstate, Query *query, JumbleState *
* Post-parse-analysis hook: mark query with a queryId
*/
static void
#if PG_VERSION_NUM >= 190000
pgsm_post_parse_analyze(ParseState *pstate, Query *query, const JumbleState *jstate)
#else
pgsm_post_parse_analyze(ParseState *pstate, Query *query, JumbleState *jstate)
#endif
{
if (prev_post_parse_analyze_hook)
prev_post_parse_analyze_hook(pstate, query, jstate);
Expand All @@ -512,6 +528,14 @@ pgsm_ExecutorStart(QueryDesc *queryDesc, int eflags)
if (getrusage(RUSAGE_SELF, &rusage_start) != 0)
elog(DEBUG1, "[pg_stat_monitor] pgsm_ExecutorStart: failed to execute getrusage.");

#if PG_VERSION_NUM >= 190000
if (pgsm_enabled(nesting_level) &&
queryDesc->plannedstmt->queryId != INT64CONST(0))
{
queryDesc->query_instr_options |= INSTRUMENT_TIMER | INSTRUMENT_BUFFERS | INSTRUMENT_WAL;
}
#endif

if (prev_ExecutorStart)
prev_ExecutorStart(queryDesc, eflags);
else
Expand All @@ -525,6 +549,7 @@ pgsm_ExecutorStart(QueryDesc *queryDesc, int eflags)
if (pgsm_enabled(nesting_level) &&
queryDesc->plannedstmt->queryId != INT64CONST(0))
{
#if PG_VERSION_NUM < 190000
/*
* Set up to track total elapsed time in ExecutorRun. Make sure the
* space is allocated in the per-query context so it will go away at
Expand All @@ -538,6 +563,7 @@ pgsm_ExecutorStart(QueryDesc *queryDesc, int eflags)
queryDesc->totaltime = InstrAlloc(1, INSTRUMENT_ALL, false);
MemoryContextSwitchTo(oldcxt);
}
#endif
}
}

Expand Down Expand Up @@ -688,7 +714,11 @@ pgsm_ExecutorEnd(QueryDesc *queryDesc)
MemoryContextSwitchTo(oldctx);
}

#if PG_VERSION_NUM >= 190000
if (queryId != INT64CONST(0) && queryDesc->query_instr && pgsm_enabled(nesting_level))
#else
if (queryId != INT64CONST(0) && queryDesc->totaltime && pgsm_enabled(nesting_level))
#endif
{
entry = pgsm_get_entry_for_query(queryId, plan_ptr, (char *) queryDesc->sourceText, strlen(queryDesc->sourceText), true, queryDesc->operation);
if (!entry)
Expand All @@ -704,7 +734,9 @@ pgsm_ExecutorEnd(QueryDesc *queryDesc)
* Make sure stats accumulation is done. (Note: it's okay if several
* levels of hook all do this.)
*/
#if PG_VERSION_NUM < 190000
InstrEndLoop(queryDesc->totaltime);
#endif

sys_info.utime = 0;
sys_info.stime = 0;
Expand All @@ -727,10 +759,17 @@ pgsm_ExecutorEnd(QueryDesc *queryDesc)
&sys_info, /* SysInfo */
NULL, /* ErrorInfo */
0, /* plan_total_time */
#if PG_VERSION_NUM >= 190000
INSTR_TIME_GET_MILLISEC(queryDesc->query_instr->total), /* exec_total_time */
queryDesc->estate->es_processed, /* rows */
&queryDesc->query_instr->bufusage, /* bufusage */
&queryDesc->query_instr->walusage, /* walusage */
#else
queryDesc->totaltime->total * 1000.0, /* exec_total_time */
queryDesc->estate->es_processed, /* rows */
&queryDesc->totaltime->bufusage, /* bufusage */
&queryDesc->totaltime->walusage, /* walusage */
#endif
#if PG_VERSION_NUM >= 150000
queryDesc->estate->es_jit ? &queryDesc->estate->es_jit->instr : NULL, /* jitusage */
#else
Expand Down Expand Up @@ -822,7 +861,11 @@ pgsm_ExecutorCheckPerms(List *rt, List *rp, bool abort)
}

static PlannedStmt *
#if PG_VERSION_NUM >= 190000
pgsm_planner_hook(Query *parse, const char *query_string, int cursorOptions, ParamListInfo boundParams, ExplainState *es)
#else
pgsm_planner_hook(Query *parse, const char *query_string, int cursorOptions, ParamListInfo boundParams)
#endif
{
PlannedStmt *result;
int64 queryId = parse->queryId;
Expand Down Expand Up @@ -885,9 +928,15 @@ pgsm_planner_hook(Query *parse, const char *query_string, int cursorOptions, Par
* the second call would trigger an assertion failure.
*/
if (planner_hook_next)
#if PG_VERSION_NUM >= 190000
result = planner_hook_next(parse, query_string, cursorOptions, boundParams, es);
else
result = standard_planner(parse, query_string, cursorOptions, boundParams, es);
#else
result = planner_hook_next(parse, query_string, cursorOptions, boundParams);
else
result = standard_planner(parse, query_string, cursorOptions, boundParams);
#endif
}
PG_FINALLY();
{
Expand Down Expand Up @@ -952,9 +1001,15 @@ pgsm_planner_hook(Query *parse, const char *query_string, int cursorOptions, Par
PG_TRY();
{
if (planner_hook_next)
#if PG_VERSION_NUM >= 190000
result = planner_hook_next(parse, query_string, cursorOptions, boundParams, es);
else
result = standard_planner(parse, query_string, cursorOptions, boundParams, es);
#else
result = planner_hook_next(parse, query_string, cursorOptions, boundParams);
else
result = standard_planner(parse, query_string, cursorOptions, boundParams);
#endif
}
PG_FINALLY();
{
Expand Down Expand Up @@ -2873,8 +2928,10 @@ fill_in_constant_lengths(JumbleState *jstate, const char *query,
&ScanKeywords,
ScanKeywordTokens);

#if PG_VERSION_NUM < 190000
/* we don't want to re-emit any escape string warnings */
yyextra.escape_string_warning = false;
#endif

/* Search for each constant, in sequence */
for (i = 0; i < jstate->clocations_count; i++)
Expand Down
5 changes: 5 additions & 0 deletions pg_stat_monitor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,11 @@
#include <lib/dshash.h>
#include <nodes/nodes.h>
#include <storage/lwlock.h>
#if PG_VERSION_NUM >= 190000
#include <storage/shmem.h>
#include <storage/proc.h>
#include <utils/tuplestore.h>
#endif
#include <storage/spin.h>
#include <utils/dsa.h>
#include <utils/guc.h>
Expand Down
Loading