Skip to content

PG-2395 Fetch datname and username from syscache in pgsm_store() #658

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

PG-2395 Fetch datname and username from syscache in pgsm_store() #658

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
34 changes: 17 additions & 17 deletions pg_stat_monitor.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1695,8 +1695,6 @@ pgsm_create_hash_entry(uint64 bucket_id, int64 queryid, PlanInfo *plan_info)
int sec_ctx;
bool found_client_addr = false;
MemoryContext oldctx;
char *datname = NULL;
char *username = NULL;

/* Create an entry in the pgsm memory context */
oldctx = MemoryContextSwitchTo(GetPgsmMemoryContext());
Expand Down Expand Up @@ -1736,21 +1734,6 @@ pgsm_create_hash_entry(uint64 bucket_id, int64 queryid, PlanInfo *plan_info)
entry->key.toplevel = ((nesting_level + plan_nested_level) == 0);
#endif

if (IsTransactionState())
{
datname = get_database_name(entry->key.dbid);
username = GetUserNameFromId(entry->key.userid, true);

snprintf(entry->datname, sizeof(entry->datname), "%s", datname);
snprintf(entry->username, sizeof(entry->username), "%s", username);

if (datname)
pfree(datname);

if (username)
pfree(username);
}

MemoryContextSwitchTo(oldctx);

return entry;
Expand Down Expand Up @@ -1804,6 +1787,23 @@ pgsm_store(pgsmEntry *entry)
extract_query_comments(query, comments, sizeof(comments));
comments_len = strlen(comments);

if (IsTransactionState() && strlen(entry->datname) == 0)
{
char *datname = get_database_name(entry->key.dbid);

snprintf(entry->datname, sizeof(entry->datname), "%s", datname);
if (datname)
pfree(datname);
}
if (IsTransactionState() && strlen(entry->username) == 0)
{
char *username = GetUserNameFromId(entry->key.userid, true);

snprintf(entry->username, sizeof(entry->username), "%s", username);
if (username)
pfree(username);
}

/* bufusage */
bufusage.shared_blks_hit = entry->counters.blocks.shared_blks_hit;
bufusage.shared_blks_read = entry->counters.blocks.shared_blks_read;
Expand Down
Loading