database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-30 11:03:19 +03:00
Code Activity

Add NOT NULL checking of pg_stat_statements_reset() in tests

Browse Source 
This is preliminary patch.  It adds NOT NULL checking for the result of
pg_stat_statements_reset() function. It is needed for upcoming patch
"Track statement entry timestamp" that will change the result type of
this function to the timestamp of a reset performed.

Discussion: https://postgr.es/m/flat/72e80e7b160a6eb189df9ef6f068cce3765d37f8.camel%40moonset.ru
Author: Andrei Zubkov
Reviewed-by: Julien Rouhaud, Hayato Kuroda, Yuki Seino, Chengxi Sun
Reviewed-by: Anton Melnikov, Darren Rush, Michael Paquier, Sergei Kornilov
Reviewed-by: Alena Rybakina, Andrei Lepikhov
This commit is contained in:
Alexander Korotkov
2023-11-27 02:50:59 +02:00
parent 01eca6a913
commit 6ab1dbd26b
16 changed files with 317 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/pg_stat_statements/sql/cursors.sql
View File

@ -4,7 +4,7 @@
-- These tests require track_utility to be enabled.
SET pg_stat_statements.track_utility = TRUE;
SELECT pg_stat_statements_reset();
SELECT pg_stat_statements_reset() IS NOT NULL AS t;
-- DECLARE
-- SELECT is normalized.
@ -14,7 +14,7 @@ DECLARE cursor_stats_1 CURSOR WITH HOLD FOR SELECT 2;
CLOSE cursor_stats_1;
SELECT calls, rows, query FROM pg_stat_statements ORDER BY query COLLATE "C";
SELECT pg_stat_statements_reset();
SELECT pg_stat_statements_reset() IS NOT NULL AS t;
-- FETCH
BEGIN;
@ -27,4 +27,4 @@ CLOSE cursor_stats_2;
COMMIT;
SELECT calls, rows, query FROM pg_stat_statements ORDER BY query COLLATE "C";
SELECT pg_stat_statements_reset();
SELECT pg_stat_statements_reset() IS NOT NULL AS t;

6
contrib/pg_stat_statements/sql/dml.sql
View File

@ -46,7 +46,7 @@ SELECT * FROM pgss_dml_tab ORDER BY a;
SELECT * FROM pgss_dml_tab WHERE a IN (1, 2, 3, 4, 5);
SELECT calls, rows, query FROM pg_stat_statements ORDER BY query COLLATE "C";
SELECT pg_stat_statements_reset();
SELECT pg_stat_statements_reset() IS NOT NULL AS t;
-- MERGE
MERGE INTO pgss_dml_tab USING pgss_dml_tab st ON (st.a = pgss_dml_tab.a AND st.a >= 4)
@ -77,7 +77,7 @@ SELECT calls, rows, query FROM pg_stat_statements ORDER BY query COLLATE "C";
-- check that [temp] table relation extensions are tracked as writes
CREATE TABLE pgss_extend_tab (a int, b text);
CREATE TEMP TABLE pgss_extend_temp_tab (a int, b text);
SELECT pg_stat_statements_reset();
SELECT pg_stat_statements_reset() IS NOT NULL AS t;
INSERT INTO pgss_extend_tab (a, b) SELECT generate_series(1, 1000), 'something';
INSERT INTO pgss_extend_temp_tab (a, b) SELECT generate_series(1, 1000), 'something';
WITH sizes AS (
@ -92,4 +92,4 @@ SELECT
SUM(shared_blks_dirtied) >= (SELECT rel_size FROM sizes) AS dirtied_ok
FROM pg_stat_statements;
SELECT pg_stat_statements_reset();
SELECT pg_stat_statements_reset() IS NOT NULL AS t;

16
contrib/pg_stat_statements/sql/level_tracking.sql
View File

@ -3,7 +3,7 @@
--
SET pg_stat_statements.track_utility = TRUE;
SELECT pg_stat_statements_reset();
SELECT pg_stat_statements_reset() IS NOT NULL AS t;
-- DO block - top-level tracking.
CREATE TABLE stats_track_tab (x int);
@ -16,7 +16,7 @@ END;
$$ LANGUAGE plpgsql;
SELECT toplevel, calls, query FROM pg_stat_statements
WHERE query LIKE '%DELETE%' ORDER BY query COLLATE "C", toplevel;
SELECT pg_stat_statements_reset();
SELECT pg_stat_statements_reset() IS NOT NULL AS t;
-- DO block - all-level tracking.
SET pg_stat_statements.track = 'all';
@ -36,7 +36,7 @@ SELECT toplevel, calls, query FROM pg_stat_statements
-- DO block - top-level tracking without utility.
SET pg_stat_statements.track = 'top';
SET pg_stat_statements.track_utility = FALSE;
SELECT pg_stat_statements_reset();
SELECT pg_stat_statements_reset() IS NOT NULL AS t;
DELETE FROM stats_track_tab;
DO $$
BEGIN
@ -52,7 +52,7 @@ SELECT toplevel, calls, query FROM pg_stat_statements
-- DO block - all-level tracking without utility.
SET pg_stat_statements.track = 'all';
SELECT pg_stat_statements_reset();
SELECT pg_stat_statements_reset() IS NOT NULL AS t;
DELETE FROM stats_track_tab;
DO $$
BEGIN
@ -69,7 +69,7 @@ SELECT toplevel, calls, query FROM pg_stat_statements
-- PL/pgSQL function - top-level tracking.
SET pg_stat_statements.track = 'top';
SET pg_stat_statements.track_utility = FALSE;
SELECT pg_stat_statements_reset();
SELECT pg_stat_statements_reset() IS NOT NULL AS t;
CREATE FUNCTION PLUS_TWO(i INTEGER) RETURNS INTEGER AS $$
DECLARE
r INTEGER;
@ -101,7 +101,7 @@ SELECT toplevel, calls, rows, query FROM pg_stat_statements ORDER BY query COLLA
-- PL/pgSQL function - all-level tracking.
SET pg_stat_statements.track = 'all';
SELECT pg_stat_statements_reset();
SELECT pg_stat_statements_reset() IS NOT NULL AS t;
-- we drop and recreate the functions to avoid any caching funnies
DROP FUNCTION PLUS_ONE(INTEGER);
@ -142,10 +142,10 @@ SELECT toplevel, calls, rows, query FROM pg_stat_statements ORDER BY query COLLA
-- pg_stat_statements.track = none
--
SET pg_stat_statements.track = 'none';
SELECT pg_stat_statements_reset();
SELECT pg_stat_statements_reset() IS NOT NULL AS t;
SELECT 1 AS "one";
SELECT 1 + 1 AS "two";
SELECT calls, rows, query FROM pg_stat_statements ORDER BY query COLLATE "C";
SELECT pg_stat_statements_reset();
SELECT pg_stat_statements_reset() IS NOT NULL AS t;

4
contrib/pg_stat_statements/sql/planning.sql
View File

@ -4,7 +4,7 @@
-- These tests require track_planning to be enabled.
SET pg_stat_statements.track_planning = TRUE;
SELECT pg_stat_statements_reset();
SELECT pg_stat_statements_reset() IS NOT NULL AS t;
--
-- [re]plan counting
@ -28,4 +28,4 @@ SELECT plans >= 2 AND plans <= calls AS plans_ok, calls, rows, query FROM pg_sta
-- Cleanup
DROP TABLE stats_plan_test;
SELECT pg_stat_statements_reset();
SELECT pg_stat_statements_reset() IS NOT NULL AS t;

10
contrib/pg_stat_statements/sql/select.sql
View File

@ -5,7 +5,7 @@
CREATE EXTENSION pg_stat_statements;
SET pg_stat_statements.track_utility = FALSE;
SET pg_stat_statements.track_planning = TRUE;
SELECT pg_stat_statements_reset();
SELECT pg_stat_statements_reset() IS NOT NULL AS t;
--
-- simple and compound statements
@ -56,7 +56,7 @@ EXECUTE pgss_test(1);
DEALLOCATE pgss_test;
SELECT calls, rows, query FROM pg_stat_statements ORDER BY query COLLATE "C";
SELECT pg_stat_statements_reset();
SELECT pg_stat_statements_reset() IS NOT NULL AS t;
--
-- queries with locking clauses
@ -64,7 +64,7 @@ SELECT pg_stat_statements_reset();
CREATE TABLE pgss_a (id integer PRIMARY KEY);
CREATE TABLE pgss_b (id integer PRIMARY KEY, a_id integer REFERENCES pgss_a);
SELECT pg_stat_statements_reset();
SELECT pg_stat_statements_reset() IS NOT NULL AS t;
-- control query
SELECT * FROM pgss_a JOIN pgss_b ON pgss_b.a_id = pgss_a.id;
@ -92,7 +92,7 @@ DROP TABLE pgss_a, pgss_b CASCADE;
--
-- access to pg_stat_statements_info view
--
SELECT pg_stat_statements_reset();
SELECT pg_stat_statements_reset() IS NOT NULL AS t;
SELECT dealloc FROM pg_stat_statements_info;
-- FROM [ONLY]
@ -146,4 +146,4 @@ SELECT (
) FROM (VALUES(6,7)) v3(e,f) GROUP BY ROLLUP(e,f);
SELECT COUNT(*) FROM pg_stat_statements WHERE query LIKE '%SELECT GROUPING%';
SELECT pg_stat_statements_reset();
SELECT pg_stat_statements_reset() IS NOT NULL AS t;

15
contrib/pg_stat_statements/sql/user_activity.sql
View File

@ -3,7 +3,7 @@
--
SET pg_stat_statements.track_utility = TRUE;
SELECT pg_stat_statements_reset();
SELECT pg_stat_statements_reset() IS NOT NULL AS t;
CREATE ROLE regress_stats_user1;
CREATE ROLE regress_stats_user2;
@ -24,7 +24,7 @@ SELECT query, calls, rows FROM pg_stat_statements ORDER BY query COLLATE "C";
--
-- Don't reset anything if any of the parameter is NULL
--
SELECT pg_stat_statements_reset(NULL);
SELECT pg_stat_statements_reset(NULL) IS NOT NULL AS t;
SELECT query, calls, rows FROM pg_stat_statements ORDER BY query COLLATE "C";
--
@ -35,27 +35,28 @@ SELECT pg_stat_statements_reset(
(SELECT r.oid FROM pg_roles AS r WHERE r.rolname = 'regress_stats_user2'),
(SELECT d.oid FROM pg_database As d where datname = current_database()),
(SELECT s.queryid FROM pg_stat_statements AS s
WHERE s.query = 'SELECT $1+$2 AS "TWO"' LIMIT 1));
WHERE s.query = 'SELECT $1+$2 AS "TWO"' LIMIT 1))
IS NOT NULL AS t;
SELECT query, calls, rows FROM pg_stat_statements ORDER BY query COLLATE "C";
--
-- remove query ('SELECT $1 AS "ONE"') executed by two users
--
SELECT pg_stat_statements_reset(0,0,s.queryid)
SELECT pg_stat_statements_reset(0,0,s.queryid) IS NOT NULL AS t
FROM pg_stat_statements AS s WHERE s.query = 'SELECT $1 AS "ONE"';
SELECT query, calls, rows FROM pg_stat_statements ORDER BY query COLLATE "C";
--
-- remove query of a user (regress_stats_user1)
--
SELECT pg_stat_statements_reset(r.oid)
SELECT pg_stat_statements_reset(r.oid) IS NOT NULL AS t
FROM pg_roles AS r WHERE r.rolname = 'regress_stats_user1';
SELECT query, calls, rows FROM pg_stat_statements ORDER BY query COLLATE "C";
--
-- reset all
--
SELECT pg_stat_statements_reset(0,0,0);
SELECT pg_stat_statements_reset(0,0,0) IS NOT NULL AS t;
SELECT query, calls, rows FROM pg_stat_statements ORDER BY query COLLATE "C";
--
@ -63,4 +64,4 @@ SELECT query, calls, rows FROM pg_stat_statements ORDER BY query COLLATE "C";
--
DROP ROLE regress_stats_user1;
DROP ROLE regress_stats_user2;
SELECT pg_stat_statements_reset();
SELECT pg_stat_statements_reset() IS NOT NULL AS t;

32
contrib/pg_stat_statements/sql/utility.sql
View File

@ -4,7 +4,7 @@
-- These tests require track_utility to be enabled.
SET pg_stat_statements.track_utility = TRUE;
SELECT pg_stat_statements_reset();
SELECT pg_stat_statements_reset() IS NOT NULL AS t;
-- Tables, indexes, triggers
CREATE TEMP TABLE tab_stats (a int, b char(20));
@ -18,7 +18,7 @@ DROP TABLE IF EXISTS tab_stats \;
DROP TABLE IF EXISTS tab_stats \;
Drop Table If Exists tab_stats \;
SELECT calls, rows, query FROM pg_stat_statements ORDER BY query COLLATE "C";
SELECT pg_stat_statements_reset();
SELECT pg_stat_statements_reset() IS NOT NULL AS t;
-- Partitions
CREATE TABLE pt_stats (a int, b int) PARTITION BY range (a);
@ -83,7 +83,7 @@ CREATE STATISTICS tab_expr_stats_1 (mcv) ON a, (2*a), (3*b) FROM tab_expr_stats;
DROP TABLE tab_expr_stats;
SELECT calls, rows, query FROM pg_stat_statements ORDER BY query COLLATE "C";
SELECT pg_stat_statements_reset();
SELECT pg_stat_statements_reset() IS NOT NULL AS t;
-- Transaction statements
BEGIN;
@ -113,7 +113,7 @@ COMMIT;
BEGIN TRANSACTION NOT DEFERRABLE, READ ONLY, READ WRITE, DEFERRABLE;
COMMIT;
SELECT calls, rows, query FROM pg_stat_statements ORDER BY query COLLATE "C";
SELECT pg_stat_statements_reset();
SELECT pg_stat_statements_reset() IS NOT NULL AS t;
-- Two-phase transactions
BEGIN;
@ -123,7 +123,7 @@ BEGIN;
PREPARE TRANSACTION 'stat_trans2';
ROLLBACK PREPARED 'stat_trans2';
SELECT calls, rows, query FROM pg_stat_statements ORDER BY query COLLATE "C";
SELECT pg_stat_statements_reset();
SELECT pg_stat_statements_reset() IS NOT NULL AS t;
-- Savepoints
BEGIN;
@ -140,7 +140,7 @@ ROLLBACK TO sp1;
RELEASE SAVEPOINT sp1;
COMMIT;
SELECT calls, rows, query FROM pg_stat_statements ORDER BY query COLLATE "C";
SELECT pg_stat_statements_reset();
SELECT pg_stat_statements_reset() IS NOT NULL AS t;
-- EXPLAIN statements
-- A Query is used, normalized by the query jumbling.
@ -185,7 +185,7 @@ BEGIN
i2 := i;
i3 := i3 + i;
END; $$ LANGUAGE plpgsql;
SELECT pg_stat_statements_reset();
SELECT pg_stat_statements_reset() IS NOT NULL AS t;
CALL sum_one(3);
CALL sum_one(199);
CALL sum_two(1,1);
@ -198,7 +198,7 @@ SELECT calls, rows, query FROM pg_stat_statements ORDER BY query COLLATE "C";
-- COPY
CREATE TABLE copy_stats (a int, b int);
SELECT pg_stat_statements_reset();
SELECT pg_stat_statements_reset() IS NOT NULL AS t;
-- Some queries with A_Const nodes.
COPY (SELECT 1) TO STDOUT;
COPY (SELECT 2) TO STDOUT;
@ -210,7 +210,7 @@ COPY (DELETE FROM copy_stats WHERE a = 1 RETURNING *) TO STDOUT;
SELECT calls, rows, query FROM pg_stat_statements ORDER BY query COLLATE "C";
DROP TABLE copy_stats;
SELECT pg_stat_statements_reset();
SELECT pg_stat_statements_reset() IS NOT NULL AS t;
-- CREATE TABLE AS
-- SELECT queries are normalized, creating matching query IDs.
@ -227,7 +227,7 @@ CREATE TABLE ctas_stats_2 AS
FROM generate_series(1, 5) AS tab(a) WHERE a < 4 AND a > 1;
DROP TABLE ctas_stats_2;
SELECT calls, rows, query FROM pg_stat_statements ORDER BY query COLLATE "C";
SELECT pg_stat_statements_reset();
SELECT pg_stat_statements_reset() IS NOT NULL AS t;
-- CREATE MATERIALIZED VIEW
-- SELECT queries are normalized, creating matching query IDs.
@ -240,7 +240,7 @@ CREATE MATERIALIZED VIEW matview_stats_1 AS
FROM generate_series(1, 5) AS tab(a) WHERE a < 4 AND a > 3;
DROP MATERIALIZED VIEW matview_stats_1;
SELECT calls, rows, query FROM pg_stat_statements ORDER BY query COLLATE "C";
SELECT pg_stat_statements_reset();
SELECT pg_stat_statements_reset() IS NOT NULL AS t;
-- CREATE VIEW
CREATE VIEW view_stats_1 AS
@ -252,7 +252,7 @@ CREATE VIEW view_stats_1 AS
FROM generate_series(1, 5) AS tab(a) WHERE a < 4 AND a > 3;
DROP VIEW view_stats_1;
SELECT calls, rows, query FROM pg_stat_statements ORDER BY query COLLATE "C";
SELECT pg_stat_statements_reset();
SELECT pg_stat_statements_reset() IS NOT NULL AS t;
-- Domains
CREATE DOMAIN domain_stats AS int CHECK (VALUE > 0);
@ -260,7 +260,7 @@ ALTER DOMAIN domain_stats SET DEFAULT '3';
ALTER DOMAIN domain_stats ADD CONSTRAINT higher_than_one CHECK (VALUE > 1);
DROP DOMAIN domain_stats;
SELECT calls, rows, query FROM pg_stat_statements ORDER BY query COLLATE "C";
SELECT pg_stat_statements_reset();
SELECT pg_stat_statements_reset() IS NOT NULL AS t;
-- Execution statements
SELECT 1 as a;
@ -273,7 +273,7 @@ DEALLOCATE PREPARE stat_select;
DEALLOCATE ALL;
DEALLOCATE PREPARE ALL;
SELECT calls, rows, query FROM pg_stat_statements ORDER BY query COLLATE "C";
SELECT pg_stat_statements_reset();
SELECT pg_stat_statements_reset() IS NOT NULL AS t;
-- SET statements.
-- These use two different strings, still they count as one entry.
@ -299,7 +299,7 @@ RESET SESSION AUTHORIZATION;
COMMIT;
SELECT calls, rows, query FROM pg_stat_statements ORDER BY query COLLATE "C";
SELECT pg_stat_statements_reset();
SELECT pg_stat_statements_reset() IS NOT NULL AS t;
--
-- Track the total number of rows retrieved or affected by the utility
@ -328,4 +328,4 @@ DROP MATERIALIZED VIEW pgss_matv;
DROP TABLE pgss_ctas;
DROP TABLE pgss_select_into;
SELECT pg_stat_statements_reset();
SELECT pg_stat_statements_reset() IS NOT NULL AS t;

2
contrib/pg_stat_statements/sql/wal.sql
View File

@ -17,4 +17,4 @@ wal_bytes > 0 as wal_bytes_generated,
wal_records > 0 as wal_records_generated,
wal_records >= rows as wal_records_ge_rows
FROM pg_stat_statements ORDER BY query COLLATE "C";
SELECT pg_stat_statements_reset();
SELECT pg_stat_statements_reset() IS NOT NULL AS t;