external
/
pg_stat_monitor
mirror of https://github.com/percona/pg_stat_monitor.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PG-168: "calls" and histogram parameter does not match.

pull/71/head
Ibrar Ahmed 2021-01-19 13:05:54 +00:00
parent 10e0b4f0f6
commit 401e2b0505
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hash_query.c
View File

@ -155,7 +155,6 @@ hash_entry_alloc(pgssSharedState *pgss, pgssHashKey *key,int encoding)
{ {
pgss->bucket_entry[pgss->current_wbucket]++; pgss->bucket_entry[pgss->current_wbucket]++;
/* New entry, initialize it */ /* New entry, initialize it */
/* reset the statistics */ /* reset the statistics */
memset(&entry->counters, 0, sizeof(Counters)); memset(&entry->counters, 0, sizeof(Counters));
/* set the appropriate initial usage count */ /* set the appropriate initial usage count */
@ -165,7 +164,7 @@ hash_entry_alloc(pgssSharedState *pgss, pgssHashKey *key,int encoding)
entry->encoding = encoding; entry->encoding = encoding;
} }
if (entry == NULL) if (entry == NULL)
elog(FATAL, "%s", "Ibrar"); elog(FATAL, "%s", "pg_stat_monitor: out of memory");
return entry; return entry;
} }

11
pg_stat_monitor.c
View File

@ -940,7 +940,7 @@ static void pgss_store(uint64 queryId,
/* increment only in case of PGSS_EXEC */ /* increment only in case of PGSS_EXEC */
if (kind == PGSS_EXEC) if (kind == PGSS_EXEC)
{ {
for (i = 0; i < MAX_RESPONSE_BUCKET - 1; i++) for (i = 0; i < MAX_RESPONSE_BUCKET; i++)
{ {
if (total_time < PGSM_RESPOSE_TIME_LOWER_BOUND + (PGSM_RESPOSE_TIME_STEP * i)) if (total_time < PGSM_RESPOSE_TIME_LOWER_BOUND + (PGSM_RESPOSE_TIME_STEP * i))
{ {
@ -949,7 +949,7 @@ static void pgss_store(uint64 queryId,
} }
} }
if (total_time > PGSM_RESPOSE_TIME_LOWER_BOUND + (PGSM_RESPOSE_TIME_STEP * MAX_RESPONSE_BUCKET)) if (total_time > PGSM_RESPOSE_TIME_LOWER_BOUND + (PGSM_RESPOSE_TIME_STEP * MAX_RESPONSE_BUCKET))
e->counters.resp_calls[MAX_RESPONSE_BUCKET - 1]++; e->counters.resp_calls[MAX_RESPONSE_BUCKET]++;
} }
for (i = 0; i < application_name_len; i++) for (i = 0; i < application_name_len; i++)
@ -1226,7 +1226,12 @@ pg_stat_monitor_internal(FunctionCallInfo fcinfo,
for (kind = 0; kind < PGSS_NUMKIND; kind++) for (kind = 0; kind < PGSS_NUMKIND; kind++)
{ {
if (tmp.calls[kind].calls == 0) if (tmp.calls[kind].calls == 0)
{
/* Query of pg_stat_monitor itslef started from zero count */
tmp.calls[kind].calls++; tmp.calls[kind].calls++;
if (kind == PGSS_EXEC)
tmp.resp_calls[0]++;
}
values[i++] = Int64GetDatumFast(tmp.calls[kind].calls); values[i++] = Int64GetDatumFast(tmp.calls[kind].calls);
values[i++] = Float8GetDatumFast(tmp.time[kind].total_time); values[i++] = Float8GetDatumFast(tmp.time[kind].total_time);
values[i++] = Float8GetDatumFast(tmp.time[kind].min_time); values[i++] = Float8GetDatumFast(tmp.time[kind].min_time);
@ -1251,7 +1256,7 @@ pg_stat_monitor_internal(FunctionCallInfo fcinfo,
values[i++] = Int64GetDatumFast(tmp.blocks.temp_blks_written); values[i++] = Int64GetDatumFast(tmp.blocks.temp_blks_written);
values[i++] = Float8GetDatumFast(tmp.blocks.blk_read_time); values[i++] = Float8GetDatumFast(tmp.blocks.blk_read_time);
values[i++] = Float8GetDatumFast(tmp.blocks.blk_write_time); values[i++] = Float8GetDatumFast(tmp.blocks.blk_write_time);
values[i++] = IntArrayGetTextDatum(tmp.resp_calls, 10); values[i++] = IntArrayGetTextDatum(tmp.resp_calls, MAX_RESPONSE_BUCKET);
values[i++] = Float8GetDatumFast(tmp.sysinfo.utime); values[i++] = Float8GetDatumFast(tmp.sysinfo.utime);
values[i++] = Float8GetDatumFast(tmp.sysinfo.stime); values[i++] = Float8GetDatumFast(tmp.sysinfo.stime);
tuplestore_putvalues(tupstore, tupdesc, values, nulls); tuplestore_putvalues(tupstore, tupdesc, values, nulls);