mirror of
https://github.com/hanzoai/postgres.git
synced 2026-10-30 18:33:07 +00:00
Michael Paquier
f5cad085c1
pgss_ProcessUtility() included a reference to a portion of a PlannedStmt after the point where this data's structure could have been freed, causing an incorrect memory access. There was a comment documenting this requirement, missed in3966309d21. This commit includes a test able to make valgrind complain with a PlannedStmt freed by an internal ROLLBACK query. Similarly to what is mentioned in2b113e43a5, this can be triggered by using the extended query protocol, something that can be now tested thanks to the recent meta-command additions in psql. This commit mentions potential other cases, but as far as I can see the extended protocol case with an internal ROLLBACK is the only problematic pattern reachable in practice. Issue introduced by3966309d21, gone unnoticed due to a lack of test coverage. The fix is authored by Chao, my contribution being the new test. Author: Chao Li <[email protected]> Co-authored-by: Michael Paquier <[email protected]> Discussion: https://postgr.es/m/[email protected]
261 lines
7.7 KiB
Plaintext
261 lines
7.7 KiB
Plaintext
--
|
|
-- Tests with plan cache
|
|
--
|
|
-- Setup
|
|
CREATE OR REPLACE FUNCTION select_one_func(int) RETURNS VOID AS $$
|
|
DECLARE
|
|
ret INT;
|
|
BEGIN
|
|
SELECT $1 INTO ret;
|
|
END;
|
|
$$ LANGUAGE plpgsql;
|
|
CREATE OR REPLACE PROCEDURE select_one_proc(int) AS $$
|
|
DECLARE
|
|
ret INT;
|
|
BEGIN
|
|
SELECT $1 INTO ret;
|
|
END;
|
|
$$ LANGUAGE plpgsql;
|
|
-- Prepared statements
|
|
SELECT pg_stat_statements_reset() IS NOT NULL AS t;
|
|
t
|
|
---
|
|
t
|
|
(1 row)
|
|
|
|
PREPARE p1 AS SELECT $1 AS a;
|
|
SET plan_cache_mode TO force_generic_plan;
|
|
EXECUTE p1(1);
|
|
a
|
|
---
|
|
1
|
|
(1 row)
|
|
|
|
SET plan_cache_mode TO force_custom_plan;
|
|
EXECUTE p1(1);
|
|
a
|
|
---
|
|
1
|
|
(1 row)
|
|
|
|
SELECT calls, generic_plan_calls, custom_plan_calls, query FROM pg_stat_statements
|
|
ORDER BY query COLLATE "C";
|
|
calls | generic_plan_calls | custom_plan_calls | query
|
|
-------+--------------------+-------------------+----------------------------------------------------
|
|
2 | 1 | 1 | PREPARE p1 AS SELECT $1 AS a
|
|
1 | 0 | 0 | SELECT pg_stat_statements_reset() IS NOT NULL AS t
|
|
2 | 0 | 0 | SET plan_cache_mode TO $1
|
|
(3 rows)
|
|
|
|
DEALLOCATE p1;
|
|
-- Extended query protocol
|
|
SELECT pg_stat_statements_reset() IS NOT NULL AS t;
|
|
t
|
|
---
|
|
t
|
|
(1 row)
|
|
|
|
SELECT $1 AS a \parse p1
|
|
SET plan_cache_mode TO force_generic_plan;
|
|
\bind_named p1 1
|
|
;
|
|
a
|
|
---
|
|
1
|
|
(1 row)
|
|
|
|
SET plan_cache_mode TO force_custom_plan;
|
|
\bind_named p1 1
|
|
;
|
|
a
|
|
---
|
|
1
|
|
(1 row)
|
|
|
|
SELECT calls, generic_plan_calls, custom_plan_calls, query FROM pg_stat_statements
|
|
ORDER BY query COLLATE "C";
|
|
calls | generic_plan_calls | custom_plan_calls | query
|
|
-------+--------------------+-------------------+----------------------------------------------------
|
|
2 | 1 | 1 | SELECT $1 AS a
|
|
1 | 0 | 0 | SELECT pg_stat_statements_reset() IS NOT NULL AS t
|
|
2 | 0 | 0 | SET plan_cache_mode TO $1
|
|
(3 rows)
|
|
|
|
\close_prepared p1
|
|
-- EXPLAIN [ANALYZE] EXECUTE
|
|
SET pg_stat_statements.track = 'all';
|
|
SELECT pg_stat_statements_reset() IS NOT NULL AS t;
|
|
t
|
|
---
|
|
t
|
|
(1 row)
|
|
|
|
PREPARE p1 AS SELECT $1;
|
|
SET plan_cache_mode TO force_generic_plan;
|
|
EXPLAIN (COSTS OFF) EXECUTE p1(1);
|
|
QUERY PLAN
|
|
------------
|
|
Result
|
|
(1 row)
|
|
|
|
EXPLAIN (ANALYZE, COSTS OFF, SUMMARY OFF, TIMING OFF, BUFFERS OFF) EXECUTE p1(1);
|
|
QUERY PLAN
|
|
-----------------------------------
|
|
Result (actual rows=1.00 loops=1)
|
|
(1 row)
|
|
|
|
SET plan_cache_mode TO force_custom_plan;
|
|
EXPLAIN (COSTS OFF) EXECUTE p1(1);
|
|
QUERY PLAN
|
|
------------
|
|
Result
|
|
(1 row)
|
|
|
|
EXPLAIN (ANALYZE, COSTS OFF, SUMMARY OFF, TIMING OFF, BUFFERS OFF) EXECUTE p1(1);
|
|
QUERY PLAN
|
|
-----------------------------------
|
|
Result (actual rows=1.00 loops=1)
|
|
(1 row)
|
|
|
|
SELECT calls, generic_plan_calls, custom_plan_calls, toplevel, query FROM pg_stat_statements
|
|
ORDER BY query COLLATE "C";
|
|
calls | generic_plan_calls | custom_plan_calls | toplevel | query
|
|
-------+--------------------+-------------------+----------+----------------------------------------------------------------------------------
|
|
2 | 0 | 0 | t | EXPLAIN (ANALYZE, COSTS OFF, SUMMARY OFF, TIMING OFF, BUFFERS OFF) EXECUTE p1(1)
|
|
2 | 0 | 0 | t | EXPLAIN (COSTS OFF) EXECUTE p1(1)
|
|
4 | 2 | 2 | f | PREPARE p1 AS SELECT $1
|
|
1 | 0 | 0 | t | SELECT pg_stat_statements_reset() IS NOT NULL AS t
|
|
2 | 0 | 0 | t | SET plan_cache_mode TO $1
|
|
(5 rows)
|
|
|
|
RESET pg_stat_statements.track;
|
|
DEALLOCATE p1;
|
|
-- Functions/procedures
|
|
SET pg_stat_statements.track = 'all';
|
|
SELECT pg_stat_statements_reset() IS NOT NULL AS t;
|
|
t
|
|
---
|
|
t
|
|
(1 row)
|
|
|
|
SET plan_cache_mode TO force_generic_plan;
|
|
SELECT select_one_func(1);
|
|
select_one_func
|
|
-----------------
|
|
|
|
(1 row)
|
|
|
|
CALL select_one_proc(1);
|
|
SET plan_cache_mode TO force_custom_plan;
|
|
SELECT select_one_func(1);
|
|
select_one_func
|
|
-----------------
|
|
|
|
(1 row)
|
|
|
|
CALL select_one_proc(1);
|
|
SELECT calls, generic_plan_calls, custom_plan_calls, toplevel, query FROM pg_stat_statements
|
|
ORDER BY query COLLATE "C";
|
|
calls | generic_plan_calls | custom_plan_calls | toplevel | query
|
|
-------+--------------------+-------------------+----------+----------------------------------------------------
|
|
2 | 0 | 0 | t | CALL select_one_proc($1)
|
|
1 | 0 | 0 | t | SELECT pg_stat_statements_reset() IS NOT NULL AS t
|
|
2 | 0 | 0 | t | SELECT select_one_func($1)
|
|
2 | 0 | 0 | t | SET plan_cache_mode TO $1
|
|
(4 rows)
|
|
|
|
--
|
|
-- EXPLAIN [ANALYZE] EXECUTE + functions/procedures
|
|
--
|
|
SET pg_stat_statements.track = 'all';
|
|
SELECT pg_stat_statements_reset() IS NOT NULL AS t;
|
|
t
|
|
---
|
|
t
|
|
(1 row)
|
|
|
|
SET plan_cache_mode TO force_generic_plan;
|
|
EXPLAIN (ANALYZE, COSTS OFF, SUMMARY OFF, TIMING OFF, BUFFERS OFF) SELECT select_one_func(1);
|
|
QUERY PLAN
|
|
-----------------------------------
|
|
Result (actual rows=1.00 loops=1)
|
|
(1 row)
|
|
|
|
EXPLAIN (COSTS OFF) SELECT select_one_func(1);
|
|
QUERY PLAN
|
|
------------
|
|
Result
|
|
(1 row)
|
|
|
|
CALL select_one_proc(1);
|
|
SET plan_cache_mode TO force_custom_plan;
|
|
EXPLAIN (ANALYZE, COSTS OFF, SUMMARY OFF, TIMING OFF, BUFFERS OFF) SELECT select_one_func(1);
|
|
QUERY PLAN
|
|
-----------------------------------
|
|
Result (actual rows=1.00 loops=1)
|
|
(1 row)
|
|
|
|
EXPLAIN (COSTS OFF) SELECT select_one_func(1);
|
|
QUERY PLAN
|
|
------------
|
|
Result
|
|
(1 row)
|
|
|
|
CALL select_one_proc(1);
|
|
SELECT calls, generic_plan_calls, custom_plan_calls, toplevel, query FROM pg_stat_statements
|
|
ORDER BY query COLLATE "C", toplevel;
|
|
calls | generic_plan_calls | custom_plan_calls | toplevel | query
|
|
-------+--------------------+-------------------+----------+------------------------------------------------------------------------------------------------
|
|
2 | 0 | 0 | t | CALL select_one_proc($1)
|
|
2 | 0 | 0 | t | EXPLAIN (ANALYZE, COSTS OFF, SUMMARY OFF, TIMING OFF, BUFFERS OFF) SELECT select_one_func($1)
|
|
4 | 0 | 0 | f | EXPLAIN (ANALYZE, COSTS OFF, SUMMARY OFF, TIMING OFF, BUFFERS OFF) SELECT select_one_func($1);
|
|
2 | 0 | 0 | t | EXPLAIN (COSTS OFF) SELECT select_one_func($1)
|
|
1 | 0 | 0 | t | SELECT pg_stat_statements_reset() IS NOT NULL AS t
|
|
2 | 0 | 0 | t | SET plan_cache_mode TO $1
|
|
(6 rows)
|
|
|
|
RESET pg_stat_statements.track;
|
|
--
|
|
-- Procedure with internal ROLLBACK and the extended query protocol.
|
|
-- The PlannedStmt used in pgss_ProcessUtility() is freed by the internal
|
|
-- ROLLBACK.
|
|
--
|
|
CREATE OR REPLACE PROCEDURE rollback_proc(a INOUT int) AS $$
|
|
BEGIN
|
|
ROLLBACK;
|
|
END;
|
|
$$ LANGUAGE plpgsql;
|
|
SELECT pg_stat_statements_reset() IS NOT NULL AS t;
|
|
t
|
|
---
|
|
t
|
|
(1 row)
|
|
|
|
CALL rollback_proc($1) \parse stmt_rollback
|
|
\bind_named stmt_rollback 1 \g
|
|
a
|
|
---
|
|
1
|
|
(1 row)
|
|
|
|
\bind_named stmt_rollback 2 \g
|
|
a
|
|
---
|
|
2
|
|
(1 row)
|
|
|
|
SELECT calls, query FROM pg_stat_statements
|
|
WHERE query LIKE '%rollback_proc%'
|
|
ORDER BY query COLLATE "C";
|
|
calls | query
|
|
-------+------------------------
|
|
2 | CALL rollback_proc($1)
|
|
(1 row)
|
|
|
|
DROP PROCEDURE rollback_proc;
|
|
--
|
|
-- Cleanup
|
|
--
|
|
DROP FUNCTION select_one_func(int);
|
|
DROP PROCEDURE select_one_proc(int);
|