Skip to content
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

Jump to bottom

PG-592 Treat queries with different parent queries as separate entries #403

Merged
merged 9 commits into from
Aug 6, 2024
Merged

PG-592 Treat queries with different parent queries as separate entries #403

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
981f707
PG-592: Treat queries with different parent queries as separate entries
dutow Jun 28, 2023
8caa3ea
PG-502: Fixing review comments
dutow Jul 4, 2023
3c8549e
PG-502: Fixing review comments
dutow Jul 5, 2023
6fdb761
Merge branch 'main' into pg592
artemgavrilov Jul 16, 2024
6217019
PG-592 Add regression test
artemgavrilov Jul 17, 2024
381137b
Make test compatible with PG12
artemgavrilov Jul 17, 2024
ada6352
Remove redundant line
artemgavrilov Jul 17, 2024
605a808
Merge remote-tracking branch 'origin/main' into pg592
artemgavrilov Jul 18, 2024
bf208ea
Merge branch 'main' into pg592
artemgavrilov Jul 23, 2024
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
11 changes: 4 additions & 7 deletions pg_stat_monitor.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#include "nodes/pg_list.h"
#include "utils/guc.h"
#include <regex.h>
#include <assert.h>
dutow marked this conversation as resolved.
Show resolved Hide resolved
#include "pgstat.h"
#include "commands/dbcommands.h"
#include "commands/explain.h"
Expand Down Expand Up @@ -1438,9 +1439,9 @@ pgsm_update_entry(pgsmEntry * entry,
e->counters.info.num_relations = num_relations;
_snprintf2(e->counters.info.relations, relations, num_relations, REL_LEN);

if (exec_nested_level > 0 && e->key.parentid != 0 && pgsm_track == PGSM_TRACK_ALL)
if (exec_nested_level > 0 && exec_nested_level < max_stack_depth && e->key.parentid != 0 && pgsm_track == PGSM_TRACK_ALL)
{
if (e->counters.info.parent_query == InvalidDsaPointer && exec_nested_level >= 0 && exec_nested_level < max_stack_depth)
if (e->counters.info.parent_query == InvalidDsaPointer)
dutow marked this conversation as resolved.
Show resolved Hide resolved
{
int parent_query_len = nested_query_txts[exec_nested_level - 1] ?
strlen(nested_query_txts[exec_nested_level - 1]) : 0;
Expand Down Expand Up @@ -1472,11 +1473,7 @@ pgsm_update_entry(pgsmEntry * entry,
}
else
{
if(e->counters.info.parent_query != InvalidDsaPointer) {
dsa_area *query_dsa_area = get_dsa_area_for_query_text();
dsa_free(query_dsa_area, e->counters.info.parent_query);
e->counters.info.parent_query = InvalidDsaPointer;
}
assert(e->counters.info.parent_query == InvalidDsaPointer);
dutow marked this conversation as resolved.
Show resolved Hide resolved
}
}

Expand Down