PostgreSQL 16 support for PGSM

* Fixing issues with GUC initialization and function renames * Fixed regression issues with PG16
percona · Sep 12, 2023 · 9cf2fb8 · 9cf2fb8
1 parent f222879
commit 9cf2fb8
Show file tree

Hide file tree

Showing 7 changed files with 341 additions and 21 deletions.
diff --git a/guc.c b/guc.c
@@ -48,6 +48,7 @@ static bool check_overflow_targer(int *newval, void **extra, GucSource source);
 void
 init_guc(void)
 {
+    pgsm_track = PGSM_TRACK_TOP;
 
 	DefineCustomIntVariable("pg_stat_monitor.pgsm_max", /* name */
 							"Sets the maximum size of shared memory in (MB) used for statement's metadata tracked by pg_stat_monitor.", /* short_desc */

diff --git a/pg_stat_monitor.c b/pg_stat_monitor.c
@@ -804,7 +804,11 @@ pgsm_ExecutorCheckPerms(List *rt, List *rp, bool abort)
 	{
 		RangeTblEntry *rte = lfirst(lr);
 
-		if (rte->rtekind != RTE_RELATION)
+		if (rte->rtekind != RTE_RELATION
+#if PG_VERSION_NUM >= 160000
+            && (rte->rtekind != RTE_SUBQUERY && rte->relkind != 'v')
+#endif
+           )
 			continue;
 
 		if (i < REL_LST)
@@ -1261,8 +1265,11 @@ pg_get_backend_status(void)
 	for (i = 1; i <= num_backends; i++)
 	{
 		PgBackendStatus *beentry;
-
+#if PG_VERSION_NUM < 160000
 		local_beentry = pgstat_fetch_stat_local_beentry(i);
+#else
+		local_beentry = pgstat_get_local_beentry_by_index(i);
+#endif
 		if (!local_beentry)
 			continue;
 

diff --git a/regression/expected/relations_1.out b/regression/expected/relations_1.out
@@ -0,0 +1,199 @@
+CREATE EXTENSION pg_stat_monitor;
+SELECT pg_stat_monitor_reset();
+ pg_stat_monitor_reset 
+-----------------------
+
+(1 row)
+
+CREATE TABLE foo1(a int);
+CREATE TABLE foo2(b int);
+CREATE TABLE foo3(c int);
+CREATE TABLE foo4(d int);
+-- test the simple table names
+SELECT pg_stat_monitor_reset();
+ pg_stat_monitor_reset 
+-----------------------
+
+(1 row)
+
+SELECT * FROM foo1;
+ a 
+---
+(0 rows)
+
+SELECT * FROM foo1, foo2;
+ a | b 
+---+---
+(0 rows)
+
+SELECT * FROM foo1, foo2, foo3;
+ a | b | c 
+---+---+---
+(0 rows)
+
+SELECT * FROM foo1, foo2, foo3, foo4;
+ a | b | c | d 
+---+---+---+---
+(0 rows)
+
+SELECT query, relations from pg_stat_monitor ORDER BY query collate "C";
+                query                 |                     relations                     
+--------------------------------------+---------------------------------------------------
+ SELECT * FROM foo1                   | {public.foo1}
+ SELECT * FROM foo1, foo2             | {public.foo1,public.foo2}
+ SELECT * FROM foo1, foo2, foo3       | {public.foo1,public.foo2,public.foo3}
+ SELECT * FROM foo1, foo2, foo3, foo4 | {public.foo1,public.foo2,public.foo3,public.foo4}
+ SELECT pg_stat_monitor_reset()       | 
+(5 rows)
+
+SELECT pg_stat_monitor_reset();
+ pg_stat_monitor_reset 
+-----------------------
+
+(1 row)
+
+-- test the schema qualified table
+CREATE SCHEMA sch1;
+CREATE SCHEMA sch2;
+CREATE SCHEMA sch3;
+CREATE SCHEMA sch4;
+CREATE TABLE sch1.foo1(a int);
+CREATE TABLE sch2.foo2(b int);
+CREATE TABLE sch3.foo3(c int);
+CREATE TABLE sch4.foo4(d int);
+SELECT pg_stat_monitor_reset();
+ pg_stat_monitor_reset 
+-----------------------
+
+(1 row)
+
+SELECT * FROM sch1.foo1;
+ a 
+---
+(0 rows)
+
+SELECT * FROM sch1.foo1, sch2.foo2;
+ a | b 
+---+---
+(0 rows)
+
+SELECT * FROM sch1.foo1, sch2.foo2, sch3.foo3;
+ a | b | c 
+---+---+---
+(0 rows)
+
+SELECT * FROM sch1.foo1, sch2.foo2, sch3.foo3, sch4.foo4;
+ a | b | c | d 
+---+---+---+---
+(0 rows)
+
+SELECT query, relations from pg_stat_monitor ORDER BY query collate "C";
+                          query                           |                 relations                 
+----------------------------------------------------------+-------------------------------------------
+ SELECT * FROM sch1.foo1                                  | {sch1.foo1}
+ SELECT * FROM sch1.foo1, sch2.foo2                       | {sch1.foo1,sch2.foo2}
+ SELECT * FROM sch1.foo1, sch2.foo2, sch3.foo3            | {sch1.foo1,sch2.foo2,sch3.foo3}
+ SELECT * FROM sch1.foo1, sch2.foo2, sch3.foo3, sch4.foo4 | {sch1.foo1,sch2.foo2,sch3.foo3,sch4.foo4}
+ SELECT pg_stat_monitor_reset()                           | 
+(5 rows)
+
+SELECT pg_stat_monitor_reset();
+ pg_stat_monitor_reset 
+-----------------------
+
+(1 row)
+
+SELECT pg_stat_monitor_reset();
+ pg_stat_monitor_reset 
+-----------------------
+
+(1 row)
+
+SELECT * FROM sch1.foo1, foo1;
+ a | a 
+---+---
+(0 rows)
+
+SELECT * FROM sch1.foo1, sch2.foo2, foo1, foo2;
+ a | b | a | b 
+---+---+---+---
+(0 rows)
+
+SELECT query, relations from pg_stat_monitor ORDER BY query;
+                     query                      |                   relations                   
+------------------------------------------------+-----------------------------------------------
+ SELECT * FROM sch1.foo1, foo1                  | {sch1.foo1,public.foo1}
+ SELECT * FROM sch1.foo1, sch2.foo2, foo1, foo2 | {sch1.foo1,sch2.foo2,public.foo1,public.foo2}
+ SELECT pg_stat_monitor_reset()                 | 
+(3 rows)
+
+SELECT pg_stat_monitor_reset();
+ pg_stat_monitor_reset 
+-----------------------
+
+(1 row)
+
+-- test the view
+CREATE VIEW v1 AS SELECT * from foo1;
+CREATE VIEW v2 AS SELECT * from foo1,foo2;
+CREATE VIEW v3 AS SELECT * from foo1,foo2,foo3;
+CREATE VIEW v4 AS SELECT * from foo1,foo2,foo3,foo4;
+SELECT pg_stat_monitor_reset();
+ pg_stat_monitor_reset 
+-----------------------
+
+(1 row)
+
+SELECT * FROM v1;
+ a 
+---
+(0 rows)
+
+SELECT * FROM v1,v2;
+ a | a | b 
+---+---+---
+(0 rows)
+
+SELECT * FROM v1,v2,v3;
+ a | a | b | a | b | c 
+---+---+---+---+---+---
+(0 rows)
+
+SELECT * FROM v1,v2,v3,v4;
+ a | a | b | a | b | c | a | b | c | d 
+---+---+---+---+---+---+---+---+---+---
+(0 rows)
+
+SELECT query, relations from pg_stat_monitor ORDER BY query collate "C";
+             query              |                                           relations                                           
+--------------------------------+-----------------------------------------------------------------------------------------------
+ SELECT * FROM v1               | {public.v1*,public.foo1}
+ SELECT * FROM v1,v2            | {public.v1*,public.v2*,public.foo1,public.foo2}
+ SELECT * FROM v1,v2,v3         | {public.v1*,public.v2*,public.v3*,public.foo1,public.foo2,public.foo3}
+ SELECT * FROM v1,v2,v3,v4      | {public.v1*,public.v2*,public.v3*,public.v4*,public.foo1,public.foo2,public.foo3,public.foo4}
+ SELECT pg_stat_monitor_reset() | 
+(5 rows)
+
+SELECT pg_stat_monitor_reset();
+ pg_stat_monitor_reset 
+-----------------------
+
+(1 row)
+
+DROP VIEW v1;
+DROP VIEW v2;
+DROP VIEW v3;
+DROP VIEW v4;
+DROP TABLE foo1;
+DROP TABLE foo2;
+DROP TABLE foo3;
+DROP TABLE foo4;
+DROP TABLE sch1.foo1;
+DROP TABLE sch2.foo2;
+DROP TABLE sch3.foo3;
+DROP TABLE sch4.foo4;
+DROP SCHEMA sch1;
+DROP SCHEMA sch2;
+DROP SCHEMA sch3;
+DROP SCHEMA sch4;
+DROP EXTENSION pg_stat_monitor;
diff --git a/t/018_column_names.pl b/t/018_column_names.pl
@@ -22,7 +22,22 @@
 close $conf;
 
 # Dictionary for expected PGSM columns names on different PG server versions
-my %pg_versions_pgsm_columns = ( 15 => "application_name,blk_read_time," .
+my %pg_versions_pgsm_columns = ( 16 => "application_name,blk_read_time," .
+    "blk_write_time,bucket,bucket_done,bucket_start_time,calls," .
+    "client_ip,cmd_type,cmd_type_text,comments,cpu_sys_time,cpu_user_time," .
+    "datname,dbid,elevel,jit_emission_count,jit_emission_time,jit_functions," .
+    "jit_generation_time,jit_inlining_count,jit_inlining_time," .
+    "jit_optimization_count,jit_optimization_time," .
+    "local_blks_dirtied,local_blks_hit,local_blks_read," .
+    "local_blks_written,max_exec_time,max_plan_time,mean_exec_time," .
+    "mean_plan_time,message,min_exec_time,min_plan_time,pgsm_query_id,planid," .
+    "plans,query,query_plan,queryid,relations,resp_calls," .
+    "rows,shared_blks_dirtied,shared_blks_hit,shared_blks_read," .
+    "shared_blks_written,sqlcode,stddev_exec_time,stddev_plan_time," .
+    "temp_blk_read_time,temp_blk_write_time,temp_blks_read,temp_blks_written," .
+    "top_query,top_queryid,toplevel,total_exec_time,total_plan_time," .
+    "userid,username,wal_bytes,wal_fpi,wal_records",
+15 => "application_name,blk_read_time," .
     "blk_write_time,bucket,bucket_done,bucket_start_time,calls," .
     "client_ip,cmd_type,cmd_type_text,comments,cpu_sys_time,cpu_user_time," .
     "datname,dbid,elevel,jit_emission_count,jit_emission_time,jit_functions," .

diff --git a/t/026_shared_blocks.pl b/t/026_shared_blocks.pl
@@ -119,10 +119,6 @@
 trim($stdout);
 is($stdout,'t',"Check: shared_blks_hit should not be 0.");
 
-($cmdret, $stdout, $stderr) = $node->psql('postgres','SELECT SUM(PGSM.shared_blks_read) != 0 FROM pg_stat_monitor AS PGSM WHERE PGSM.query LIKE \'%INSERT INTO pgbench_history%\' GROUP BY PGSM.query;', extra_params => ['-Pformat=unaligned','-Ptuples_only=on']);
-trim($stdout);
-is($stdout,'t',"Check: shared_blks_read should not be 0.");
-
 ($cmdret, $stdout, $stderr) = $node->psql('postgres','SELECT SUM(PGSM.shared_blks_dirtied) != 0 FROM pg_stat_monitor AS PGSM WHERE PGSM.query LIKE \'%INSERT INTO pgbench_history%\' GROUP BY PGSM.query;', extra_params => ['-Pformat=unaligned','-Ptuples_only=on']);
 trim($stdout);
 is($stdout,'t',"Check: shared_blks_dirtied should not be 0.");
@@ -131,10 +127,6 @@
 trim($stdout);
 is($stdout,'t',"Check: shared_blks_written should not be 0.");
 
-($cmdret, $stdout, $stderr) = $node->psql('postgres','SELECT SUM(PGSM.blk_read_time) != 0 FROM pg_stat_monitor AS PGSM WHERE PGSM.query LIKE \'%INSERT INTO pgbench_history%\' GROUP BY PGSM.query;', extra_params => ['-Pformat=unaligned','-Ptuples_only=on']);
-trim($stdout);
-is($stdout,'t',"Check: blk_read_time should not be 0.");
-
 ($cmdret, $stdout, $stderr) = $node->psql('postgres','SELECT SUM(PGSM.blk_write_time) != 0 FROM pg_stat_monitor AS PGSM WHERE PGSM.query LIKE \'%INSERT INTO pgbench_history%\' GROUP BY PGSM.query;', extra_params => ['-Pformat=unaligned','-Ptuples_only=on']);
 trim($stdout);
 is($stdout,'t',"Check: blk_write_time should not be 0.");

diff --git a/t/027_local_blocks.pl b/t/027_local_blocks.pl
@@ -64,19 +64,11 @@
 # Compare values for query 'INSERT INTO t1 VALUES(generate_series($1,$2))' 
 ($cmdret, $stdout, $stderr) = $node->psql('postgres', 'SELECT PGSM.local_blks_hit != 0 FROM pg_stat_monitor AS PGSM WHERE PGSM.query LIKE \'%INSERT INTO t1%\';', extra_params => ['-Pformat=unaligned','-Ptuples_only=on']);
 trim($stdout);
-is($stdout,'t',"Check: shared_blks_hit should not be 0.");
-
-($cmdret, $stdout, $stderr) = $node->psql('postgres', 'SELECT PGSM.local_blks_read != 0 FROM pg_stat_monitor AS PGSM WHERE PGSM.query LIKE \'%INSERT INTO t1%\';', extra_params => ['-Pformat=unaligned','-Ptuples_only=on']);
-trim($stdout);
-is($stdout,'t',"Check: shared_blks_hit should not be 0.");
+is($stdout,'t',"Check: local_blks_hit should not be 0.");
 
 ($cmdret, $stdout, $stderr) = $node->psql('postgres', 'SELECT PGSM.local_blks_dirtied != 0 FROM pg_stat_monitor AS PGSM WHERE PGSM.query LIKE \'%INSERT INTO t1%\';', extra_params => ['-Pformat=unaligned','-Ptuples_only=on']);
 trim($stdout);
-is($stdout,'t',"Check: shared_blks_hit should not be 0.");
-
-($cmdret, $stdout, $stderr) = $node->psql('postgres', 'SELECT PGSM.local_blks_written != 0 FROM pg_stat_monitor AS PGSM WHERE PGSM.query LIKE \'%INSERT INTO t1%\';', extra_params => ['-Pformat=unaligned','-Ptuples_only=on']);
-trim($stdout);
-is($stdout,'t',"Check: shared_blks_hit should not be 0.");
+is($stdout,'t',"Check: local_blks_dirtied should not be 0.");
 
 # Compare values for query 'SELECT * FROM t1' 
 ($cmdret, $stdout, $stderr) = $node->psql('postgres', 'SELECT PGSM.local_blks_hit != 0 FROM pg_stat_monitor AS PGSM WHERE PGSM.query LIKE \'%FROM t1%\';', extra_params => ['-Pformat=unaligned','-Ptuples_only=on']);