diff --git a/expected/guc.out b/expected/guc.out index 4f859dc..d4198fe 100644 --- a/expected/guc.out +++ b/expected/guc.out @@ -24,7 +24,7 @@ SELECT * FROM pg_stat_monitor_settings ORDER BY name COLLATE "C"; pg_stat_monitor.pgsm_normalized_query | 1 | 1 | Selects whether save query in normalized format. | 0 | 0 | 0 pg_stat_monitor.pgsm_query_max_len | 1024 | 1024 | Sets the maximum length of query. | 1024 | 2147483647 | 1 pg_stat_monitor.pgsm_query_shared_buffer | 20 | 20 | Sets the maximum size of shared memory in (MB) used for query tracked by pg_stat_monitor. | 1 | 10000 | 1 - pg_stat_monitor.pgsm_track_utility | 0 | 0 | Selects whether utility commands are tracked. | 0 | 0 | 0 + pg_stat_monitor.pgsm_track_utility | 1 | 1 | Selects whether utility commands are tracked. | 0 | 0 | 0 (11 rows) SELECT pg_stat_monitor_reset(); diff --git a/expected/pg_stat_monitor.out b/expected/pg_stat_monitor.out index 84234e3..8d1de44 100644 --- a/expected/pg_stat_monitor.out +++ b/expected/pg_stat_monitor.out @@ -98,6 +98,8 @@ DEALLOCATE pgss_test; SELECT query, calls, rows FROM pg_stat_monitor ORDER BY query COLLATE "C"; query | calls | rows ---------------------------------------------------+-------+------ + BEGIN | 2 | 0 + COMMIT | 2 | 0 PREPARE pgss_test (int) AS SELECT $1, $2 LIMIT $3 | 1 | 1 SELECT $1 | 2 | 2 SELECT $1 +| 4 | 4 @@ -114,7 +116,7 @@ SELECT query, calls, rows FROM pg_stat_monitor ORDER BY query COLLATE "C"; ) +| | SELECT f FROM t ORDER BY f | | select $1::jsonb ? $2 | 1 | 1 -(11 rows) +(13 rows) -- -- CRUD: INSERT SELECT UPDATE DELETE on test table @@ -198,6 +200,9 @@ SELECT * FROM test WHERE a IN (1, 2, 3, 4, 5); SELECT query, calls, rows FROM pg_stat_monitor ORDER BY query COLLATE "C"; query | calls | rows -------------------------------------------------------------+-------+------ + BEGIN | 3 | 0 + COMMIT | 3 | 0 + CREATE TEMP TABLE test (a int, b char(20)) | 1 | 0 DELETE FROM test WHERE a > $1 | 1 | 1 INSERT INTO test (a, b) VALUES ($1, $2), ($3, $4), ($5, $6) | 1 | 3 INSERT INTO test VALUES(generate_series($1, $2), $3) | 1 | 10 @@ -207,7 +212,7 @@ SELECT query, calls, rows FROM pg_stat_monitor ORDER BY query COLLATE "C"; SELECT pg_stat_monitor_reset() | 1 | 1 UPDATE test SET b = $1 WHERE a = $2 | 6 | 6 UPDATE test SET b = $1 WHERE a > $2 | 1 | 3 -(9 rows) +(12 rows) -- -- pg_stat_monitor.track = none @@ -291,17 +296,32 @@ SELECT PLUS_ONE(10); (1 row) SELECT query, calls, rows FROM pg_stat_monitor ORDER BY query COLLATE "C"; - query | calls | rows ------------------------------------+-------+------ - SELECT $1 +| 1 | 1 - +| | - AS "text" | | - SELECT (i + $2 + $3)::INTEGER | 2 | 2 - SELECT (i + $2)::INTEGER LIMIT $3 | 2 | 2 - SELECT PLUS_ONE($1) | 2 | 2 - SELECT PLUS_TWO($1) | 2 | 2 - SELECT pg_stat_monitor_reset() | 1 | 1 -(6 rows) + query | calls | rows +-----------------------------------------------------------+-------+------ + CREATE FUNCTION PLUS_ONE(i INTEGER) RETURNS INTEGER AS +| 1 | 0 + $$ SELECT (i + 1.0)::INTEGER LIMIT 1 $$ LANGUAGE SQL | | + CREATE FUNCTION PLUS_TWO(i INTEGER) RETURNS INTEGER AS $$+| 1 | 0 + DECLARE +| | + r INTEGER; +| | + BEGIN +| | + SELECT (i + 1 + 1.0)::INTEGER INTO r; +| | + RETURN r; +| | + END; $$ LANGUAGE plpgsql | | + DO LANGUAGE plpgsql $$ +| 1 | 0 + BEGIN +| | + -- this is a SELECT +| | + PERFORM 'hello world'::TEXT; +| | + END; +| | + $$ | | + SELECT $1 +| 1 | 1 + +| | + AS "text" | | + SELECT (i + $2 + $3)::INTEGER | 2 | 2 + SELECT (i + $2)::INTEGER LIMIT $3 | 2 | 2 + SELECT PLUS_ONE($1) | 2 | 2 + SELECT PLUS_TWO($1) | 2 | 2 + SELECT pg_stat_monitor_reset() | 1 | 1 +(9 rows) -- -- pg_stat_monitor.track = all @@ -352,14 +372,25 @@ SELECT PLUS_ONE(1); (1 row) SELECT query, calls, rows FROM pg_stat_monitor ORDER BY query COLLATE "C"; - query | calls | rows ------------------------------------+-------+------ - SELECT (i + $2 + $3)::INTEGER | 2 | 2 - SELECT (i + $2)::INTEGER LIMIT $3 | 2 | 2 - SELECT PLUS_ONE($1) | 2 | 2 - SELECT PLUS_TWO($1) | 2 | 2 - SELECT pg_stat_monitor_reset() | 1 | 1 -(5 rows) + query | calls | rows +-----------------------------------------------------------+-------+------ + CREATE FUNCTION PLUS_ONE(i INTEGER) RETURNS INTEGER AS +| 1 | 0 + $$ SELECT (i + 1.0)::INTEGER LIMIT 1 $$ LANGUAGE SQL | | + CREATE FUNCTION PLUS_TWO(i INTEGER) RETURNS INTEGER AS $$+| 1 | 0 + DECLARE +| | + r INTEGER; +| | + BEGIN +| | + SELECT (i + 1 + 1.0)::INTEGER INTO r; +| | + RETURN r; +| | + END; $$ LANGUAGE plpgsql | | + DROP FUNCTION PLUS_ONE(INTEGER) | 1 | 0 + DROP FUNCTION PLUS_TWO(INTEGER) | 1 | 0 + SELECT (i + $2 + $3)::INTEGER | 2 | 2 + SELECT (i + $2)::INTEGER LIMIT $3 | 2 | 2 + SELECT PLUS_ONE($1) | 2 | 2 + SELECT PLUS_TWO($1) | 2 | 2 + SELECT pg_stat_monitor_reset() | 1 | 1 +(9 rows) -- -- utility commands @@ -390,10 +421,16 @@ NOTICE: table "test" does not exist, skipping NOTICE: function plus_one(pg_catalog.int4) does not exist, skipping DROP FUNCTION PLUS_TWO(INTEGER); SELECT query, calls, rows FROM pg_stat_monitor ORDER BY query COLLATE "C"; - query | calls | rows ---------------------------------+-------+------ - SELECT $1 | 1 | 1 - SELECT pg_stat_monitor_reset() | 1 | 1 -(2 rows) + query | calls | rows +-------------------------------------------+-------+------ + CREATE INDEX test_b ON test(b) | 1 | 0 + DROP FUNCTION IF EXISTS PLUS_ONE(INTEGER) | 1 | 0 + DROP FUNCTION PLUS_ONE(INTEGER) | 1 | 0 + DROP FUNCTION PLUS_TWO(INTEGER) | 1 | 0 + DROP TABLE IF EXISTS test | 3 | 0 + DROP TABLE test | 1 | 0 + SELECT $1 | 1 | 1 + SELECT pg_stat_monitor_reset() | 1 | 1 +(8 rows) DROP EXTENSION pg_stat_monitor;