Issue - (#2): Extended pg_stat_statement to provide new features.
Support for database/user/client based aggregates added to access these statistics with three new views added. Some new counters added including min/max/mean's time histograms. We are saving the parameters of the slow queries, which can be tested later. Did some refactoring of the code, by renaming the whole extension from pg_stat_statement to pg_stat_monitor.pull/9/head
Ibrar Ahmed
parent
f70ad5ad48
commit
56d8375c38
25
Makefile
25
Makefile
|
|
@ -1,20 +1,19 @@
|
|||
# contrib/pg_stat_statements/Makefile
|
||||
# contrib/pg_stat_monitor/Makefile
|
||||
|
||||
MODULE_big = pg_stat_statements
|
||||
OBJS = pg_stat_statements.o $(WIN32RES)
|
||||
MODULE_big = pg_stat_monitor
|
||||
OBJS = pg_stat_monitor.o $(WIN32RES)
|
||||
|
||||
EXTENSION = pg_stat_statements
|
||||
DATA = pg_stat_statements--1.4.sql pg_stat_statements--1.5--1.6.sql \
|
||||
pg_stat_statements--1.4--1.5.sql pg_stat_statements--1.3--1.4.sql \
|
||||
pg_stat_statements--1.2--1.3.sql pg_stat_statements--1.1--1.2.sql \
|
||||
pg_stat_statements--1.0--1.1.sql \
|
||||
pg_stat_statements--unpackaged--1.0.sql
|
||||
PGFILEDESC = "pg_stat_statements - execution statistics of SQL statements"
|
||||
EXTENSION = pg_stat_monitor
|
||||
|
||||
DATA = pg_stat_monitor--1.0.sql
|
||||
|
||||
PGFILEDESC = "pg_stat_monitor - execution statistics of SQL statements"
|
||||
|
||||
LDFLAGS_SL += $(filter -lm, $(LIBS))
|
||||
|
||||
REGRESS_OPTS = --temp-config $(top_srcdir)/contrib/pg_stat_statements/pg_stat_statements.conf
|
||||
REGRESS = pg_stat_statements
|
||||
REGRESS_OPTS = --temp-config $(top_srcdir)/contrib/pg_stat_monitor/pg_stat_monitor.conf
|
||||
REGRESS = pg_stat_monitor
|
||||
|
||||
# Disabled because these tests require "shared_preload_libraries=pg_stat_statements",
|
||||
# which typical installcheck users do not have (e.g. buildfarm clients).
|
||||
NO_INSTALLCHECK = 1
|
||||
|
|
@ -24,7 +23,7 @@ PG_CONFIG = pg_config
|
|||
PGXS := $(shell $(PG_CONFIG) --pgxs)
|
||||
include $(PGXS)
|
||||
else
|
||||
subdir = contrib/pg_stat_statements
|
||||
subdir = contrib/pg_stat_monitor
|
||||
top_builddir = ../..
|
||||
include $(top_builddir)/src/Makefile.global
|
||||
include $(top_srcdir)/contrib/contrib-global.mk
|
||||
|
|
|
|||
|
|
@ -0,0 +1,142 @@
|
|||
/* contrib/pg_stat_monitor/pg_stat_monitor--1.4.sql */
|
||||
|
||||
-- complain if script is sourced in psql, rather than via CREATE EXTENSION
|
||||
\echo Use "CREATE EXTENSION pg_stat_monitor" to load this file. \quit
|
||||
|
||||
-- Register functions.
|
||||
CREATE FUNCTION pg_stat_monitor_reset()
|
||||
RETURNS void
|
||||
AS 'MODULE_PATHNAME'
|
||||
LANGUAGE C PARALLEL SAFE;
|
||||
|
||||
CREATE FUNCTION pg_stat_monitor(IN showtext boolean,
|
||||
OUT userid oid,
|
||||
OUT dbid oid,
|
||||
OUT queryid bigint,
|
||||
OUT query text,
|
||||
OUT calls int8,
|
||||
OUT total_time float8,
|
||||
OUT min_time float8,
|
||||
OUT max_time float8,
|
||||
OUT mean_time float8,
|
||||
OUT stddev_time float8,
|
||||
OUT rows int8,
|
||||
OUT shared_blks_hit int8,
|
||||
OUT shared_blks_read int8,
|
||||
OUT shared_blks_dirtied int8,
|
||||
OUT shared_blks_written int8,
|
||||
OUT local_blks_hit int8,
|
||||
OUT local_blks_read int8,
|
||||
OUT local_blks_dirtied int8,
|
||||
OUT local_blks_written int8,
|
||||
OUT temp_blks_read int8,
|
||||
OUT temp_blks_written int8,
|
||||
OUT blk_read_time float8,
|
||||
OUT blk_write_time float8,
|
||||
OUT host int,
|
||||
OUT hist_calls text,
|
||||
OUT hist_min_time text,
|
||||
OUT hist_max_time text,
|
||||
OUT hist_mean_time text,
|
||||
OUT slow_query text,
|
||||
OUT cpu_user_time float8,
|
||||
OUT cpu_sys_time float8
|
||||
)
|
||||
RETURNS SETOF record
|
||||
AS 'MODULE_PATHNAME', 'pg_stat_monitor_1_3'
|
||||
LANGUAGE C STRICT VOLATILE PARALLEL SAFE;
|
||||
|
||||
CREATE FUNCTION pg_stat_agg(
|
||||
OUT queryid bigint,
|
||||
OUT id bigint,
|
||||
OUT type bigint,
|
||||
OUT total_calls int,
|
||||
OUT first_call_time timestamptz,
|
||||
OUT last_call_time timestamptz)
|
||||
RETURNS SETOF record
|
||||
AS 'MODULE_PATHNAME', 'pg_stat_agg'
|
||||
LANGUAGE C STRICT VOLATILE PARALLEL SAFE;
|
||||
|
||||
-- Register a view on the function for ease of use.
|
||||
CREATE VIEW pg_stat_monitor AS
|
||||
SELECT * FROM pg_stat_monitor(true);
|
||||
|
||||
GRANT SELECT ON pg_stat_monitor TO PUBLIC;
|
||||
|
||||
CREATE VIEW pg_stat_agg_database AS
|
||||
SELECT
|
||||
agg.queryid,
|
||||
agg.id AS dbid,
|
||||
ss.userid,
|
||||
'0.0.0.0'::inet + ss.host AS host,
|
||||
agg.total_calls,
|
||||
ss.min_time,
|
||||
ss.max_time,
|
||||
ss.mean_time,
|
||||
(string_to_array(hist_calls, ',')) hist_calls,
|
||||
(string_to_array(hist_min_time, ',')) hist_min_time,
|
||||
(string_to_array(hist_max_time, ',')) hist_max_time,
|
||||
(string_to_array(hist_mean_time, ',')) hist_mean_time,
|
||||
agg.first_call_time AS first_log_time,
|
||||
agg.last_call_time AS last_log_time,
|
||||
ss.cpu_user_time,
|
||||
ss.cpu_sys_time,
|
||||
ss.query,
|
||||
ss.slow_query
|
||||
FROM pg_stat_agg() agg
|
||||
INNER JOIN (SELECT DISTINCT queryid, userid, query, host, min_time, max_time, mean_time, hist_calls, hist_min_time, hist_max_time,hist_mean_time,slow_query,cpu_user_time,cpu_sys_time
|
||||
FROM pg_stat_monitor) ss
|
||||
ON agg.queryid = ss.queryid AND agg.type = 0;
|
||||
|
||||
CREATE VIEW pg_stat_agg_user AS
|
||||
SELECT
|
||||
agg.queryid,
|
||||
agg.id AS dbid,
|
||||
ss.userid,
|
||||
'0.0.0.0'::inet + ss.host AS host,
|
||||
agg.total_calls,
|
||||
ss.min_time,
|
||||
ss.max_time,
|
||||
ss.mean_time,
|
||||
(string_to_array(hist_calls, ',')) hist_calls,
|
||||
(string_to_array(hist_min_time, ',')) hist_min_time,
|
||||
(string_to_array(hist_max_time, ',')) hist_max_time,
|
||||
(string_to_array(hist_mean_time, ',')) hist_mean_time,
|
||||
agg.first_call_time AS first_log_time,
|
||||
agg.last_call_time AS last_log_time,
|
||||
ss.cpu_user_time,
|
||||
ss.cpu_sys_time,
|
||||
ss.query,
|
||||
ss.slow_query
|
||||
FROM pg_stat_agg() agg
|
||||
INNER JOIN (SELECT DISTINCT queryid, userid, query, host, min_time, max_time, mean_time, hist_calls, hist_min_time, hist_max_time,hist_mean_time,slow_query,cpu_user_time,cpu_sys_time FROM pg_stat_monitor) ss
|
||||
ON agg.queryid = ss.queryid AND agg.type = 1;
|
||||
|
||||
CREATE VIEW pg_stat_agg_host AS
|
||||
SELECT
|
||||
agg.queryid,
|
||||
agg.id AS dbid,
|
||||
ss.userid,
|
||||
'0.0.0.0'::inet + ss.host AS host,
|
||||
agg.total_calls,
|
||||
ss.min_time,
|
||||
ss.max_time,
|
||||
ss.mean_time,
|
||||
(string_to_array(hist_calls, ',')) hist_calls,
|
||||
(string_to_array(hist_min_time, ',')) hist_min_time,
|
||||
(string_to_array(hist_max_time, ',')) hist_max_time,
|
||||
(string_to_array(hist_mean_time, ',')) hist_mean_time,
|
||||
agg.first_call_time AS first_log_time,
|
||||
agg.last_call_time AS last_log_time,
|
||||
ss.cpu_user_time,
|
||||
ss.cpu_sys_time,
|
||||
ss.query,
|
||||
ss.slow_query
|
||||
FROM pg_stat_agg() agg
|
||||
INNER JOIN (SELECT DISTINCT queryid, userid, query, host, min_time, max_time, mean_time, hist_calls, hist_min_time, hist_max_time,hist_mean_time,slow_query,cpu_user_time,cpu_sys_time FROM pg_stat_monitor) ss
|
||||
ON agg.queryid = ss.queryid AND agg.type = 2;
|
||||
|
||||
GRANT SELECT ON pg_stat_agg_database TO PUBLIC;
|
||||
|
||||
-- Don't want this to be available to non-superusers.
|
||||
REVOKE ALL ON FUNCTION pg_stat_monitor_reset() FROM PUBLIC;
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1 @@
|
|||
shared_preload_libraries = 'pg_stat_monitor'
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
# pg_stat_monitor extension
|
||||
comment = 'track execution statistics of all SQL statements executed'
|
||||
default_version = '1.0'
|
||||
module_pathname = '$libdir/pg_stat_monitor'
|
||||
relocatable = true
|
||||
|
|
@ -1,42 +0,0 @@
|
|||
/* contrib/pg_stat_statements/pg_stat_statements--1.0--1.1.sql */
|
||||
|
||||
-- complain if script is sourced in psql, rather than via ALTER EXTENSION
|
||||
\echo Use "ALTER EXTENSION pg_stat_statements UPDATE TO '1.1'" to load this file. \quit
|
||||
|
||||
/* First we have to remove them from the extension */
|
||||
ALTER EXTENSION pg_stat_statements DROP VIEW pg_stat_statements;
|
||||
ALTER EXTENSION pg_stat_statements DROP FUNCTION pg_stat_statements();
|
||||
|
||||
/* Then we can drop them */
|
||||
DROP VIEW pg_stat_statements;
|
||||
DROP FUNCTION pg_stat_statements();
|
||||
|
||||
/* Now redefine */
|
||||
CREATE FUNCTION pg_stat_statements(
|
||||
OUT userid oid,
|
||||
OUT dbid oid,
|
||||
OUT query text,
|
||||
OUT calls int8,
|
||||
OUT total_time float8,
|
||||
OUT rows int8,
|
||||
OUT shared_blks_hit int8,
|
||||
OUT shared_blks_read int8,
|
||||
OUT shared_blks_dirtied int8,
|
||||
OUT shared_blks_written int8,
|
||||
OUT local_blks_hit int8,
|
||||
OUT local_blks_read int8,
|
||||
OUT local_blks_dirtied int8,
|
||||
OUT local_blks_written int8,
|
||||
OUT temp_blks_read int8,
|
||||
OUT temp_blks_written int8,
|
||||
OUT blk_read_time float8,
|
||||
OUT blk_write_time float8
|
||||
)
|
||||
RETURNS SETOF record
|
||||
AS 'MODULE_PATHNAME'
|
||||
LANGUAGE C;
|
||||
|
||||
CREATE VIEW pg_stat_statements AS
|
||||
SELECT * FROM pg_stat_statements();
|
||||
|
||||
GRANT SELECT ON pg_stat_statements TO PUBLIC;
|
||||
|
|
@ -1,43 +0,0 @@
|
|||
/* contrib/pg_stat_statements/pg_stat_statements--1.1--1.2.sql */
|
||||
|
||||
-- complain if script is sourced in psql, rather than via ALTER EXTENSION
|
||||
\echo Use "ALTER EXTENSION pg_stat_statements UPDATE TO '1.2'" to load this file. \quit
|
||||
|
||||
/* First we have to remove them from the extension */
|
||||
ALTER EXTENSION pg_stat_statements DROP VIEW pg_stat_statements;
|
||||
ALTER EXTENSION pg_stat_statements DROP FUNCTION pg_stat_statements();
|
||||
|
||||
/* Then we can drop them */
|
||||
DROP VIEW pg_stat_statements;
|
||||
DROP FUNCTION pg_stat_statements();
|
||||
|
||||
/* Now redefine */
|
||||
CREATE FUNCTION pg_stat_statements(IN showtext boolean,
|
||||
OUT userid oid,
|
||||
OUT dbid oid,
|
||||
OUT queryid bigint,
|
||||
OUT query text,
|
||||
OUT calls int8,
|
||||
OUT total_time float8,
|
||||
OUT rows int8,
|
||||
OUT shared_blks_hit int8,
|
||||
OUT shared_blks_read int8,
|
||||
OUT shared_blks_dirtied int8,
|
||||
OUT shared_blks_written int8,
|
||||
OUT local_blks_hit int8,
|
||||
OUT local_blks_read int8,
|
||||
OUT local_blks_dirtied int8,
|
||||
OUT local_blks_written int8,
|
||||
OUT temp_blks_read int8,
|
||||
OUT temp_blks_written int8,
|
||||
OUT blk_read_time float8,
|
||||
OUT blk_write_time float8
|
||||
)
|
||||
RETURNS SETOF record
|
||||
AS 'MODULE_PATHNAME', 'pg_stat_statements_1_2'
|
||||
LANGUAGE C STRICT VOLATILE;
|
||||
|
||||
CREATE VIEW pg_stat_statements AS
|
||||
SELECT * FROM pg_stat_statements(true);
|
||||
|
||||
GRANT SELECT ON pg_stat_statements TO PUBLIC;
|
||||
|
|
@ -1,47 +0,0 @@
|
|||
/* contrib/pg_stat_statements/pg_stat_statements--1.2--1.3.sql */
|
||||
|
||||
-- complain if script is sourced in psql, rather than via ALTER EXTENSION
|
||||
\echo Use "ALTER EXTENSION pg_stat_statements UPDATE TO '1.3'" to load this file. \quit
|
||||
|
||||
/* First we have to remove them from the extension */
|
||||
ALTER EXTENSION pg_stat_statements DROP VIEW pg_stat_statements;
|
||||
ALTER EXTENSION pg_stat_statements DROP FUNCTION pg_stat_statements(boolean);
|
||||
|
||||
/* Then we can drop them */
|
||||
DROP VIEW pg_stat_statements;
|
||||
DROP FUNCTION pg_stat_statements(boolean);
|
||||
|
||||
/* Now redefine */
|
||||
CREATE FUNCTION pg_stat_statements(IN showtext boolean,
|
||||
OUT userid oid,
|
||||
OUT dbid oid,
|
||||
OUT queryid bigint,
|
||||
OUT query text,
|
||||
OUT calls int8,
|
||||
OUT total_time float8,
|
||||
OUT min_time float8,
|
||||
OUT max_time float8,
|
||||
OUT mean_time float8,
|
||||
OUT stddev_time float8,
|
||||
OUT rows int8,
|
||||
OUT shared_blks_hit int8,
|
||||
OUT shared_blks_read int8,
|
||||
OUT shared_blks_dirtied int8,
|
||||
OUT shared_blks_written int8,
|
||||
OUT local_blks_hit int8,
|
||||
OUT local_blks_read int8,
|
||||
OUT local_blks_dirtied int8,
|
||||
OUT local_blks_written int8,
|
||||
OUT temp_blks_read int8,
|
||||
OUT temp_blks_written int8,
|
||||
OUT blk_read_time float8,
|
||||
OUT blk_write_time float8
|
||||
)
|
||||
RETURNS SETOF record
|
||||
AS 'MODULE_PATHNAME', 'pg_stat_statements_1_3'
|
||||
LANGUAGE C STRICT VOLATILE;
|
||||
|
||||
CREATE VIEW pg_stat_statements AS
|
||||
SELECT * FROM pg_stat_statements(true);
|
||||
|
||||
GRANT SELECT ON pg_stat_statements TO PUBLIC;
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
/* contrib/pg_stat_statements/pg_stat_statements--1.3--1.4.sql */
|
||||
|
||||
-- complain if script is sourced in psql, rather than via ALTER EXTENSION
|
||||
\echo Use "ALTER EXTENSION pg_stat_statements UPDATE TO '1.4'" to load this file. \quit
|
||||
|
||||
ALTER FUNCTION pg_stat_statements_reset() PARALLEL SAFE;
|
||||
ALTER FUNCTION pg_stat_statements(boolean) PARALLEL SAFE;
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
/* contrib/pg_stat_statements/pg_stat_statements--1.4--1.5.sql */
|
||||
|
||||
-- complain if script is sourced in psql, rather than via ALTER EXTENSION
|
||||
\echo Use "ALTER EXTENSION pg_stat_statements UPDATE TO '1.5'" to load this file. \quit
|
||||
|
||||
GRANT EXECUTE ON FUNCTION pg_stat_statements_reset() TO pg_read_all_stats;
|
||||
|
|
@ -1,48 +0,0 @@
|
|||
/* contrib/pg_stat_statements/pg_stat_statements--1.4.sql */
|
||||
|
||||
-- complain if script is sourced in psql, rather than via CREATE EXTENSION
|
||||
\echo Use "CREATE EXTENSION pg_stat_statements" to load this file. \quit
|
||||
|
||||
-- Register functions.
|
||||
CREATE FUNCTION pg_stat_statements_reset()
|
||||
RETURNS void
|
||||
AS 'MODULE_PATHNAME'
|
||||
LANGUAGE C PARALLEL SAFE;
|
||||
|
||||
CREATE FUNCTION pg_stat_statements(IN showtext boolean,
|
||||
OUT userid oid,
|
||||
OUT dbid oid,
|
||||
OUT queryid bigint,
|
||||
OUT query text,
|
||||
OUT calls int8,
|
||||
OUT total_time float8,
|
||||
OUT min_time float8,
|
||||
OUT max_time float8,
|
||||
OUT mean_time float8,
|
||||
OUT stddev_time float8,
|
||||
OUT rows int8,
|
||||
OUT shared_blks_hit int8,
|
||||
OUT shared_blks_read int8,
|
||||
OUT shared_blks_dirtied int8,
|
||||
OUT shared_blks_written int8,
|
||||
OUT local_blks_hit int8,
|
||||
OUT local_blks_read int8,
|
||||
OUT local_blks_dirtied int8,
|
||||
OUT local_blks_written int8,
|
||||
OUT temp_blks_read int8,
|
||||
OUT temp_blks_written int8,
|
||||
OUT blk_read_time float8,
|
||||
OUT blk_write_time float8
|
||||
)
|
||||
RETURNS SETOF record
|
||||
AS 'MODULE_PATHNAME', 'pg_stat_statements_1_3'
|
||||
LANGUAGE C STRICT VOLATILE PARALLEL SAFE;
|
||||
|
||||
-- Register a view on the function for ease of use.
|
||||
CREATE VIEW pg_stat_statements AS
|
||||
SELECT * FROM pg_stat_statements(true);
|
||||
|
||||
GRANT SELECT ON pg_stat_statements TO PUBLIC;
|
||||
|
||||
-- Don't want this to be available to non-superusers.
|
||||
REVOKE ALL ON FUNCTION pg_stat_statements_reset() FROM PUBLIC;
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
/* contrib/pg_stat_statements/pg_stat_statements--1.5--1.6.sql */
|
||||
|
||||
-- complain if script is sourced in psql, rather than via ALTER EXTENSION
|
||||
\echo Use "ALTER EXTENSION pg_stat_statements UPDATE TO '1.6'" to load this file. \quit
|
||||
|
||||
-- Execution is only allowed for superusers, fixing issue with 1.5.
|
||||
REVOKE EXECUTE ON FUNCTION pg_stat_statements_reset() FROM pg_read_all_stats;
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
/* contrib/pg_stat_statements/pg_stat_statements--unpackaged--1.0.sql */
|
||||
|
||||
-- complain if script is sourced in psql, rather than via CREATE EXTENSION
|
||||
\echo Use "CREATE EXTENSION pg_stat_statements FROM unpackaged" to load this file. \quit
|
||||
|
||||
ALTER EXTENSION pg_stat_statements ADD function pg_stat_statements_reset();
|
||||
ALTER EXTENSION pg_stat_statements ADD function pg_stat_statements();
|
||||
ALTER EXTENSION pg_stat_statements ADD view pg_stat_statements;
|
||||
|
|
@ -1 +0,0 @@
|
|||
shared_preload_libraries = 'pg_stat_statements'
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
# pg_stat_statements extension
|
||||
comment = 'track execution statistics of all SQL statements executed'
|
||||
default_version = '1.6'
|
||||
module_pathname = '$libdir/pg_stat_statements'
|
||||
relocatable = true
|
||||
Loading…
Reference in New Issue