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

Resolving compilation failures after cherry-picking of require commits 

from the main branch.
pull/188/head
Diego Fronza 2022-03-01 19:24:14 +05:00 committed by Hamid Akhtar
parent d839cc4255
commit 5db7056840
8 changed files with 54 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hash_query.c
View File

@ -135,13 +135,13 @@ hash_entry_alloc(pgssSharedState *pgss, pgssHashKey *key, int encoding)
if (hash_get_num_entries(pgss_hash) >= MAX_BUCKET_ENTRIES) if (hash_get_num_entries(pgss_hash) >= MAX_BUCKET_ENTRIES)
{ {
elog(DEBUG1, "%s", "pg_stat_monitor: out of memory"); elog(DEBUG1, "pg_stat_monitor: out of memory");
return NULL; return NULL;
} }
/* Find or create an entry with desired hash code */ /* Find or create an entry with desired hash code */
entry = (pgssEntry *) hash_search(pgss_hash, key, HASH_ENTER_NULL, &found); entry = (pgssEntry *) hash_search(pgss_hash, key, HASH_ENTER_NULL, &found);
if (entry == NULL) if (entry == NULL)
pgsm_log_error("hash_entry_alloc: OUT OF MEMORY"); elog(DEBUG1, "hash_entry_alloc: OUT OF MEMORY");
else if (!found) else if (!found)
{ {
pgss->bucket_entry[pg_atomic_read_u64(&pgss->current_wbucket)]++; pgss->bucket_entry[pg_atomic_read_u64(&pgss->current_wbucket)]++;
@ -216,7 +216,7 @@ hash_entry_dealloc(int new_bucket_id, int old_bucket_id, unsigned char *query_bu
pgssEntry *bkp_entry = malloc(sizeof(pgssEntry)); pgssEntry *bkp_entry = malloc(sizeof(pgssEntry));
if (!bkp_entry) if (!bkp_entry)
{ {
pgsm_log_error("hash_entry_dealloc: out of memory"); elog(DEBUG1, "hash_entry_dealloc: out of memory");
/* /*
* No memory, If the entry has calls > 1 then we change the state to finished, * No memory, If the entry has calls > 1 then we change the state to finished,
* as the pending query will likely finish execution during the new bucket * as the pending query will likely finish execution during the new bucket

40
pg_stat_monitor--1.0.13.sql.in
View File

@ -119,13 +119,12 @@ LANGUAGE SQL PARALLEL SAFE;
CREATE FUNCTION pg_stat_monitor_settings( CREATE FUNCTION pg_stat_monitor_settings(
OUT name text, OUT name text,
OUT value text, OUT value INTEGER,
OUT default_value text, OUT default_value INTEGER,
OUT description text, OUT description text,
OUT minimum INTEGER, OUT minimum INTEGER,
OUT maximum INTEGER, OUT maximum INTEGER,
OUT options text, OUT restart INTEGER
OUT restart text
) )
RETURNS SETOF record RETURNS SETOF record
AS 'MODULE_PATHNAME', 'pg_stat_monitor_settings' AS 'MODULE_PATHNAME', 'pg_stat_monitor_settings'
@ -138,7 +137,6 @@ CREATE VIEW pg_stat_monitor_settings AS SELECT
description, description,
minimum, minimum,
maximum, maximum,
options,
restart restart
FROM pg_stat_monitor_settings(); FROM pg_stat_monitor_settings();
@ -259,40 +257,8 @@ $$ language plpgsql;
-- ROUND(CAST(total_time / greatest(sum(total_time) OVER(), 0.00000001) * 100 as numeric), 2)::text || '%' as load_comparison -- ROUND(CAST(total_time / greatest(sum(total_time) OVER(), 0.00000001) * 100 as numeric), 2)::text || '%' as load_comparison
-- FROM pg_stat_monitor_hook_stats(); -- FROM pg_stat_monitor_hook_stats();
CREATE FUNCTION pg_stat_monitor_errors(
OUT severity int,
OUT message text,
OUT msgtime text,
OUT calls int8
)
RETURNS SETOF record
AS 'MODULE_PATHNAME', 'pg_stat_monitor_errors'
LANGUAGE C STRICT VOLATILE PARALLEL SAFE;
CREATE OR REPLACE FUNCTION pgsm_log_severity_as_text(severity int) RETURNS TEXT AS
$$
SELECT
CASE
WHEN severity = 0 THEN 'INFO'
WHEN severity = 1 THEN 'WARNING'
WHEN severity = 2 THEN 'ERROR'
END
$$
LANGUAGE SQL PARALLEL SAFE;
CREATE VIEW pg_stat_monitor_errors AS SELECT
pgsm_log_severity_as_text(severity) as severity, message, msgtime, calls
FROM pg_stat_monitor_errors();
CREATE FUNCTION pg_stat_monitor_reset_errors()
RETURNS void
AS 'MODULE_PATHNAME'
LANGUAGE C PARALLEL SAFE;
GRANT SELECT ON pg_stat_monitor TO PUBLIC; GRANT SELECT ON pg_stat_monitor TO PUBLIC;
GRANT SELECT ON pg_stat_monitor_settings TO PUBLIC; GRANT SELECT ON pg_stat_monitor_settings TO PUBLIC;
GRANT SELECT ON pg_stat_monitor_errors TO PUBLIC;
-- Don't want this to be available to non-superusers. -- Don't want this to be available to non-superusers.
REVOKE ALL ON FUNCTION pg_stat_monitor_reset() FROM PUBLIC; REVOKE ALL ON FUNCTION pg_stat_monitor_reset() FROM PUBLIC;
REVOKE ALL ON FUNCTION pg_stat_monitor_reset_errors() FROM PUBLIC;

40
pg_stat_monitor--1.0.14.sql.in
View File

@ -119,13 +119,12 @@ LANGUAGE SQL PARALLEL SAFE;
CREATE FUNCTION pg_stat_monitor_settings( CREATE FUNCTION pg_stat_monitor_settings(
OUT name text, OUT name text,
OUT value text, OUT value INTEGER,
OUT default_value text, OUT default_value INTEGER,
OUT description text, OUT description text,
OUT minimum INTEGER, OUT minimum INTEGER,
OUT maximum INTEGER, OUT maximum INTEGER,
OUT options text, OUT restart INTEGER
OUT restart text
) )
RETURNS SETOF record RETURNS SETOF record
AS 'MODULE_PATHNAME', 'pg_stat_monitor_settings' AS 'MODULE_PATHNAME', 'pg_stat_monitor_settings'
@ -138,7 +137,6 @@ CREATE VIEW pg_stat_monitor_settings AS SELECT
description, description,
minimum, minimum,
maximum, maximum,
options,
restart restart
FROM pg_stat_monitor_settings(); FROM pg_stat_monitor_settings();
@ -260,40 +258,8 @@ $$ language plpgsql;
-- ROUND(CAST(total_time / greatest(sum(total_time) OVER(), 0.00000001) * 100 as numeric), 2)::text || '%' as load_comparison -- ROUND(CAST(total_time / greatest(sum(total_time) OVER(), 0.00000001) * 100 as numeric), 2)::text || '%' as load_comparison
-- FROM pg_stat_monitor_hook_stats(); -- FROM pg_stat_monitor_hook_stats();
CREATE FUNCTION pg_stat_monitor_errors(
OUT severity int,
OUT message text,
OUT msgtime text,
OUT calls int8
)
RETURNS SETOF record
AS 'MODULE_PATHNAME', 'pg_stat_monitor_errors'
LANGUAGE C STRICT VOLATILE PARALLEL SAFE;
CREATE OR REPLACE FUNCTION pgsm_log_severity_as_text(severity int) RETURNS TEXT AS
$$
SELECT
CASE
WHEN severity = 0 THEN 'INFO'
WHEN severity = 1 THEN 'WARNING'
WHEN severity = 2 THEN 'ERROR'
END
$$
LANGUAGE SQL PARALLEL SAFE;
CREATE VIEW pg_stat_monitor_errors AS SELECT
pgsm_log_severity_as_text(severity) as severity, message, msgtime, calls
FROM pg_stat_monitor_errors();
CREATE FUNCTION pg_stat_monitor_reset_errors()
RETURNS void
AS 'MODULE_PATHNAME'
LANGUAGE C PARALLEL SAFE;
GRANT SELECT ON pg_stat_monitor TO PUBLIC; GRANT SELECT ON pg_stat_monitor TO PUBLIC;
GRANT SELECT ON pg_stat_monitor_settings TO PUBLIC; GRANT SELECT ON pg_stat_monitor_settings TO PUBLIC;
GRANT SELECT ON pg_stat_monitor_errors TO PUBLIC;
-- Don't want this to be available to non-superusers. -- Don't want this to be available to non-superusers.
REVOKE ALL ON FUNCTION pg_stat_monitor_reset() FROM PUBLIC; REVOKE ALL ON FUNCTION pg_stat_monitor_reset() FROM PUBLIC;
REVOKE ALL ON FUNCTION pg_stat_monitor_reset_errors() FROM PUBLIC;

17
pg_stat_monitor.c
View File

@ -485,7 +485,7 @@ static void
pgss_ExecutorStart(QueryDesc *queryDesc, int eflags) pgss_ExecutorStart(QueryDesc *queryDesc, int eflags)
{ {
if (getrusage(RUSAGE_SELF, &rusage_start) != 0) if (getrusage(RUSAGE_SELF, &rusage_start) != 0)
pgsm_log_error("pgss_ExecutorStart: failed to execute getrusage"); elog(DEBUG1, "pgss_ExecutorStart: failed to execute getrusage");
if (prev_ExecutorStart) if (prev_ExecutorStart)
prev_ExecutorStart(queryDesc, eflags); prev_ExecutorStart(queryDesc, eflags);
@ -980,7 +980,7 @@ static void pgss_ProcessUtility(PlannedStmt *pstmt, const char *queryString,
WalUsage walusage_start = pgWalUsage; WalUsage walusage_start = pgWalUsage;
#endif #endif
INSTR_TIME_SET_CURRENT(start); INSTR_TIME_SET_CURRENT(start);
exec_nested_level++; nested_level++;
PG_TRY(); PG_TRY();
{ {
#if PG_VERSION_NUM >= 140000 #if PG_VERSION_NUM >= 140000
@ -1019,7 +1019,7 @@ static void pgss_ProcessUtility(PlannedStmt *pstmt, const char *queryString,
dest, dest,
completionTag); completionTag);
#endif #endif
exec_nested_level--; nested_level--;
} }
PG_CATCH(); PG_CATCH();
{ {
@ -1514,7 +1514,7 @@ pgss_store(uint64 queryid,
#if PG_VERSION_NUM < 140000 #if PG_VERSION_NUM < 140000
key.toplevel = 1; key.toplevel = 1;
#else #else
key.toplevel = ((exec_nested_level + plan_nested_level) == 0); key.toplevel = ((nested_level + plan_nested_level) == 0);
#endif #endif
pgss_hash = pgsm_get_hash(); pgss_hash = pgsm_get_hash();
@ -1553,7 +1553,7 @@ pgss_store(uint64 queryid,
LWLockRelease(pgss->lock); LWLockRelease(pgss->lock);
if (norm_query) if (norm_query)
pfree(norm_query); pfree(norm_query);
pgsm_log_error("pgss_store: out of memory (pgss_query_hash)."); elog(DEBUG1, "pgss_store: out of memory (pgss_query_hash).");
return; return;
} }
else if (!query_found) else if (!query_found)
@ -1579,7 +1579,7 @@ pgss_store(uint64 queryid,
LWLockRelease(pgss->lock); LWLockRelease(pgss->lock);
if (norm_query) if (norm_query)
pfree(norm_query); pfree(norm_query);
pgsm_log_error("pgss_store: insufficient shared space for query."); elog(DEBUG1, "pgss_store: insufficient shared space for query.");
return; return;
} }
/* /*
@ -1625,7 +1625,6 @@ pgss_store(uint64 queryid,
kind, /* kind */ kind, /* kind */
app_name_ptr, app_name_ptr,
app_name_len); app_name_len);
}
LWLockRelease(pgss->lock); LWLockRelease(pgss->lock);
if (norm_query) if (norm_query)
@ -1795,7 +1794,7 @@ pg_stat_monitor_internal(FunctionCallInfo fcinfo,
{ {
if (read_query(pgss_qbuf, tmp.info.parentid, parent_query_txt, 0) == 0) if (read_query(pgss_qbuf, tmp.info.parentid, parent_query_txt, 0) == 0)
{ {
rc = read_query_buffer(bucketid, tmp.info.parentid, parent_query_txt, 0); int rc = read_query_buffer(bucketid, tmp.info.parentid, parent_query_txt, 0);
if (rc != 1) if (rc != 1)
snprintf(parent_query_txt, 32, "%s", "<insufficient disk/shared space>"); snprintf(parent_query_txt, 32, "%s", "<insufficient disk/shared space>");
} }
@ -3216,7 +3215,7 @@ SaveQueryText(uint64 bucketid,
if (pgss->overflow) if (pgss->overflow)
{ {
pgsm_log_error("query buffer overflowed twice"); elog(DEBUG1, "query buffer overflowed twice");
return false; return false;
} }

17
regression/expected/application_name_unique.out
View File

@ -20,14 +20,15 @@ SELECT 1 AS num;
(1 row) (1 row)
SELECT query,application_name FROM pg_stat_monitor ORDER BY query, application_name COLLATE "C"; SELECT query,application_name FROM pg_stat_monitor ORDER BY query, application_name COLLATE "C";
query | application_name query | application_name
--------------------------------+------------------------------------ -------------------------------------------------------------------------------------------------+------------------------------------
SELECT $1 AS num | naeem SELECT $1 AS num | naeem
SELECT $1 AS num | psql SELECT $1 AS num | psql
SELECT pg_stat_monitor_reset() | pg_regress/application_name_unique SELECT pg_stat_monitor_reset() | pg_regress/application_name_unique
Set application_name = 'naeem' | naeem SELECT query,application_name FROM pg_stat_monitor ORDER BY query, application_name COLLATE "C" | psql
Set application_name = 'psql' | psql Set application_name = 'naeem' | naeem
(5 rows) Set application_name = 'psql' | psql
(6 rows)
SELECT pg_stat_monitor_reset(); SELECT pg_stat_monitor_reset();
pg_stat_monitor_reset pg_stat_monitor_reset

15
regression/expected/error_insert.out
View File

@ -17,13 +17,14 @@ ERROR: duplicate key value violates unique constraint "company_pkey"
DETAIL: Key (id)=(1) already exists. DETAIL: Key (id)=(1) already exists.
Drop Table if exists Company; Drop Table if exists Company;
SELECT query, elevel, sqlcode, message FROM pg_stat_monitor ORDER BY query COLLATE "C",elevel; SELECT query, elevel, sqlcode, message FROM pg_stat_monitor ORDER BY query COLLATE "C",elevel;
query | elevel | sqlcode | message query | elevel | sqlcode | message
-------------------------------------------------------+--------+---------+--------------------------------------------------------------- -----------------------------------------------------------------------------------------------+--------+---------+---------------------------------------------------------------
Drop Table if exists Company | 0 | | Drop Table if exists Company | 0 | |
INSERT INTO Company(ID, Name) VALUES ($1, $2) | 0 | | INSERT INTO Company(ID, Name) VALUES ($1, $2) | 0 | |
INSERT INTO Company(ID, Name) VALUES (1, 'Percona'); | 21 | 23505 | duplicate key value violates unique constraint "company_pkey" INSERT INTO Company(ID, Name) VALUES (1, 'Percona'); | 21 | 23505 | duplicate key value violates unique constraint "company_pkey"
SELECT pg_stat_monitor_reset() | 0 | | SELECT pg_stat_monitor_reset() | 0 | |
(4 rows) SELECT query, elevel, sqlcode, message FROM pg_stat_monitor ORDER BY query COLLATE "C",elevel | 0 | |
(5 rows)
SELECT pg_stat_monitor_reset(); SELECT pg_stat_monitor_reset();
pg_stat_monitor_reset pg_stat_monitor_reset

15
regression/expected/error_insert_1.out
View File

@ -17,13 +17,14 @@ ERROR: duplicate key value violates unique constraint "company_pkey"
DETAIL: Key (id)=(1) already exists. DETAIL: Key (id)=(1) already exists.
Drop Table if exists Company; Drop Table if exists Company;
SELECT query, elevel, sqlcode, message FROM pg_stat_monitor ORDER BY query COLLATE "C",elevel; SELECT query, elevel, sqlcode, message FROM pg_stat_monitor ORDER BY query COLLATE "C",elevel;
query | elevel | sqlcode | message query | elevel | sqlcode | message
-------------------------------------------------------+--------+---------+--------------------------------------------------------------- -----------------------------------------------------------------------------------------------+--------+---------+---------------------------------------------------------------
Drop Table if exists Company | 0 | | Drop Table if exists Company | 0 | |
INSERT INTO Company(ID, Name) VALUES ($1, $2) | 0 | | INSERT INTO Company(ID, Name) VALUES ($1, $2) | 0 | |
INSERT INTO Company(ID, Name) VALUES (1, 'Percona'); | 20 | 23505 | duplicate key value violates unique constraint "company_pkey" INSERT INTO Company(ID, Name) VALUES (1, 'Percona'); | 20 | 23505 | duplicate key value violates unique constraint "company_pkey"
SELECT pg_stat_monitor_reset() | 0 | | SELECT pg_stat_monitor_reset() | 0 | |
(4 rows) SELECT query, elevel, sqlcode, message FROM pg_stat_monitor ORDER BY query COLLATE "C",elevel | 0 | |
(5 rows)
SELECT pg_stat_monitor_reset(); SELECT pg_stat_monitor_reset();
pg_stat_monitor_reset pg_stat_monitor_reset

19
regression/expected/histogram.out
View File

@ -45,17 +45,18 @@ INFO: Sleep 5 seconds
(1 row) (1 row)
SELECT substr(query, 0,50) as query, calls, resp_calls FROM pg_stat_monitor ORDER BY query COLLATE "C"; SELECT substr(query, 0,50) as query, calls, resp_calls FROM pg_stat_monitor ORDER BY query COLLATE "C";
query | calls | resp_calls query | calls | resp_calls
---------------------------------+-------+----------------------- ---------------------------------------------------+-------+-----------------------
SELECT pg_sleep(i) | 5 | {0,0,0,0,0,0,3,2,0,0} SELECT pg_sleep(i) | 5 | {0,0,0,0,0,0,3,2,0,0}
SELECT pg_stat_monitor_reset() | 1 | {1,0,0,0,0,0,0,0,0,0} SELECT pg_stat_monitor_reset() | 1 | {1,0,0,0,0,0,0,0,0,0}
Set pg_stat_monitor.track='all' | 1 | {1,0,0,0,0,0,0,0,0,0} SELECT substr(query, $1,$2) as query, calls, resp | 1 | {1,0,0,0,0,0,0,0,0,0}
select run_pg_sleep($1) | 1 | {0,0,0,0,0,0,0,0,1,0} Set pg_stat_monitor.track='all' | 1 | {1,0,0,0,0,0,0,0,0,0}
(4 rows) select run_pg_sleep($1) | 1 | {0,0,0,0,0,0,0,0,1,0}
(5 rows)
select * from generate_histogram(); select * from generate_histogram();
range | freq | bar range | freq | bar
--------------------+------+-------------------------------------------------------------------------------------------- --------------------+------+--------------------------------
(0 - 3)} | 0 | (0 - 3)} | 0 |
(3 - 10)} | 0 | (3 - 10)} | 0 |
(10 - 31)} | 0 | (10 - 31)} | 0 |