PG-2623 Utility statement normalization

CHANGELOG.md

@@ -40,6 +40,7 @@
 - Do not acquire LWLock under spinlock
 - Race condition where we could leak memory for the parent query
 - `plans` now counts only actual planner invocations instead of every execution: utility statements and executions that reuse a cached plan no longer bump the counter
+- Normalize the query text of utility statements ([PG-2623](https://perconadev.atlassian.net/browse/PG-2623))
 
 ## [2.3.2] - 2026-03-02
 

regression/expected/cursors.out

@@ -18,10 +18,10 @@ CLOSE cursor_stats_1;
 DECLARE cursor_stats_1 CURSOR WITH HOLD FOR SELECT 2;
 CLOSE cursor_stats_1;
 SELECT calls, rows, query FROM pg_stat_monitor ORDER BY query COLLATE "C";
- calls | rows |                        query                         
--------+------+------------------------------------------------------
+ calls | rows |                         query                         
+-------+------+-------------------------------------------------------
      2 |    0 | CLOSE cursor_stats_1
-     2 |    0 | DECLARE cursor_stats_1 CURSOR WITH HOLD FOR SELECT 1
+     2 |    0 | DECLARE cursor_stats_1 CURSOR WITH HOLD FOR SELECT $1
      1 |    1 | SELECT pg_stat_monitor_reset() IS NOT NULL AS t
 (3 rows)
 
@@ -51,16 +51,16 @@ CLOSE cursor_stats_1;
 CLOSE cursor_stats_2;
 COMMIT;
 SELECT calls, rows, query FROM pg_stat_monitor ORDER BY query COLLATE "C";
- calls | rows |                        query                         
--------+------+------------------------------------------------------
+ calls | rows |                         query                         
+-------+------+-------------------------------------------------------
      1 |    0 | BEGIN
      1 |    0 | CLOSE cursor_stats_1
      1 |    0 | CLOSE cursor_stats_2
      1 |    0 | COMMIT
-     1 |    0 | DECLARE cursor_stats_1 CURSOR WITH HOLD FOR SELECT 2
-     1 |    0 | DECLARE cursor_stats_2 CURSOR WITH HOLD FOR SELECT 3
-     1 |    1 | FETCH 1 IN cursor_stats_1
-     1 |    1 | FETCH 1 IN cursor_stats_2
+     1 |    0 | DECLARE cursor_stats_1 CURSOR WITH HOLD FOR SELECT $1
+     1 |    0 | DECLARE cursor_stats_2 CURSOR WITH HOLD FOR SELECT $1
+     1 |    1 | FETCH $1 IN cursor_stats_1
+     1 |    1 | FETCH $1 IN cursor_stats_2
      1 |    1 | SELECT pg_stat_monitor_reset() IS NOT NULL AS t
 (9 rows)
 
@@ -187,12 +187,12 @@ FETCH BACKWARD ALL pgsm_cursor;
 
 COMMIT;
 SELECT calls, query FROM pg_stat_monitor ORDER BY query COLLATE "C";
- calls |                               query                               
--------+-------------------------------------------------------------------
+ calls |                               query                                
+-------+--------------------------------------------------------------------
      1 | BEGIN
      1 | COMMIT
-     1 | DECLARE pgsm_cursor CURSOR FOR SELECT FROM generate_series(1, 10)
-     3 | FETCH ABSOLUTE 1 pgsm_cursor
+     1 | DECLARE pgsm_cursor CURSOR FOR SELECT FROM generate_series($1, $2)
+     3 | FETCH ABSOLUTE $1 pgsm_cursor
      1 | FETCH ALL pgsm_cursor
      1 | FETCH BACKWARD ALL pgsm_cursor
      4 | FETCH BACKWARD pgsm_cursor
@@ -202,7 +202,7 @@ SELECT calls, query FROM pg_stat_monitor ORDER BY query COLLATE "C";
      1 | FETCH LAST pgsm_cursor
      1 | FETCH NEXT pgsm_cursor
      1 | FETCH PRIOR pgsm_cursor
-     3 | FETCH RELATIVE 1 pgsm_cursor
+     3 | FETCH RELATIVE $1 pgsm_cursor
      4 | FETCH pgsm_cursor
      1 | SELECT pg_stat_monitor_reset() IS NOT NULL AS t
 (16 rows)

regression/expected/cursors_1.out

@@ -18,10 +18,10 @@ CLOSE cursor_stats_1;
 DECLARE cursor_stats_1 CURSOR WITH HOLD FOR SELECT 2;
 CLOSE cursor_stats_1;
 SELECT calls, rows, query FROM pg_stat_monitor ORDER BY query COLLATE "C";
- calls | rows |                        query                         
--------+------+------------------------------------------------------
+ calls | rows |                         query                         
+-------+------+-------------------------------------------------------
      2 |    0 | CLOSE cursor_stats_1
-     2 |    0 | DECLARE cursor_stats_1 CURSOR WITH HOLD FOR SELECT 1
+     2 |    0 | DECLARE cursor_stats_1 CURSOR WITH HOLD FOR SELECT $1
      1 |    1 | SELECT pg_stat_monitor_reset() IS NOT NULL AS t
 (3 rows)
 
@@ -51,14 +51,14 @@ CLOSE cursor_stats_1;
 CLOSE cursor_stats_2;
 COMMIT;
 SELECT calls, rows, query FROM pg_stat_monitor ORDER BY query COLLATE "C";
- calls | rows |                        query                         
--------+------+------------------------------------------------------
+ calls | rows |                         query                         
+-------+------+-------------------------------------------------------
      1 |    0 | BEGIN
      1 |    0 | CLOSE cursor_stats_1
      1 |    0 | CLOSE cursor_stats_2
      1 |    0 | COMMIT
-     1 |    0 | DECLARE cursor_stats_1 CURSOR WITH HOLD FOR SELECT 2
-     1 |    0 | DECLARE cursor_stats_2 CURSOR WITH HOLD FOR SELECT 3
+     1 |    0 | DECLARE cursor_stats_1 CURSOR WITH HOLD FOR SELECT $1
+     1 |    0 | DECLARE cursor_stats_2 CURSOR WITH HOLD FOR SELECT $1
      1 |    1 | FETCH 1 IN cursor_stats_1
      1 |    1 | FETCH 1 IN cursor_stats_2
      1 |    1 | SELECT pg_stat_monitor_reset() IS NOT NULL AS t
@@ -187,11 +187,11 @@ FETCH BACKWARD ALL pgsm_cursor;
 
 COMMIT;
 SELECT calls, query FROM pg_stat_monitor ORDER BY query COLLATE "C";
- calls |                               query                               
--------+-------------------------------------------------------------------
+ calls |                               query                                
+-------+--------------------------------------------------------------------
      1 | BEGIN
      1 | COMMIT
-     1 | DECLARE pgsm_cursor CURSOR FOR SELECT FROM generate_series(1, 10)
+     1 | DECLARE pgsm_cursor CURSOR FOR SELECT FROM generate_series($1, $2)
      2 | FETCH -1 pgsm_cursor
      2 | FETCH 2 pgsm_cursor
      1 | FETCH ABSOLUTE 2 pgsm_cursor