external
/
pg_stat_monitor
mirror of https://github.com/percona/pg_stat_monitor.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #120 from darkfronza/PG-260_fix_regression_tests 

PG-260 fix regression tests
pull/121/head
Ibrar Ahmed 2021-10-14 23:09:30 +05:00 committed by GitHub
parent 0495909820 9e76f6f961
commit 52ea543275
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pg_stat_monitor.c
View File

@ -1712,6 +1712,11 @@ pg_stat_monitor_internal(FunctionCallInfo fcinfo,
if (tmp.state == PGSS_FINISHED) if (tmp.state == PGSS_FINISHED)
continue; continue;
} }
/* Skip queries such as, $1, $2 := $3, etc. */
if (tmp.state == PGSS_PARSE || tmp.state == PGSS_PLAN)
continue;
if (tmp.info.parentid != UINT64CONST(0)) if (tmp.info.parentid != UINT64CONST(0))
{ {
int len = 0; int len = 0;

2
regression/expected/counters.out
View File

@ -68,7 +68,7 @@ end $$;
SELECT query,calls FROM pg_stat_monitor ORDER BY query COLLATE "C"; SELECT query,calls FROM pg_stat_monitor ORDER BY query COLLATE "C";
query | calls query | calls
---------------------------------------------------------------------------------------------------+------- ---------------------------------------------------------------------------------------------------+-------
SELECT a,b,c,d FROM t1, t2, t3, t4 WHERE t1.a = t2.b AND t3.c = t4.d ORDER BY a; | 1000 SELECT a,b,c,d FROM t1, t2, t3, t4 WHERE t1.a = t2.b AND t3.c = t4.d ORDER BY a | 1000
SELECT pg_stat_monitor_reset(); | 1 SELECT pg_stat_monitor_reset(); | 1
SELECT query,calls FROM pg_stat_monitor ORDER BY query COLLATE "C"; | 1 SELECT query,calls FROM pg_stat_monitor ORDER BY query COLLATE "C"; | 1
do $$ +| 1 do $$ +| 1

2
regression/expected/state.out
View File

@ -16,7 +16,7 @@ ERROR: division by zero
SELECT query, state_code, state FROM pg_stat_monitor ORDER BY query COLLATE "C"; SELECT query, state_code, state FROM pg_stat_monitor ORDER BY query COLLATE "C";
query | state_code | state query | state_code | state
----------------------------------------------------------------------------------+------------+--------------------- ----------------------------------------------------------------------------------+------------+---------------------
SELECT $1 AS num | 3 | FINISHED SELECT $1 | 3 | FINISHED
SELECT 1/0; | 4 | FINISHED WITH ERROR SELECT 1/0; | 4 | FINISHED WITH ERROR
SELECT pg_stat_monitor_reset(); | 3 | FINISHED SELECT pg_stat_monitor_reset(); | 3 | FINISHED
SELECT query, state_code, state FROM pg_stat_monitor ORDER BY query COLLATE "C"; | 2 | ACTIVE SELECT query, state_code, state FROM pg_stat_monitor ORDER BY query COLLATE "C"; | 2 | ACTIVE

4
regression/expected/tags.out
View File

@ -13,8 +13,8 @@ SELECT 1 AS num /* { "application", psql_app, "real_ip", 192.168.1.3) */;
SELECT query, comments FROM pg_stat_monitor ORDER BY query COLLATE "C"; SELECT query, comments FROM pg_stat_monitor ORDER BY query COLLATE "C";
query | comments query | comments
-------------------------------------------------------------------------+------------------------------------------------------ ---------------------------------------------------------------------------+------------------------------------------------------
SELECT $1 AS num | { "application", psql_app, "real_ip", 192.168.1.3) SELECT $1 AS num /* { "application", psql_app, "real_ip", 192.168.1.3) */ | { "application", psql_app, "real_ip", 192.168.1.3)
SELECT pg_stat_monitor_reset(); | SELECT pg_stat_monitor_reset(); |
SELECT query, comments FROM pg_stat_monitor ORDER BY query COLLATE "C"; | SELECT query, comments FROM pg_stat_monitor ORDER BY query COLLATE "C"; |
(3 rows) (3 rows)