PG-286: Update regression tests.
As the query normalization and query cleaning is always done in the right place (pgss_store), no more parsed queries have a trailling comma ';' at the end. Also, on error regression test, after fixing some problems with utility related queries, we now have two entries for the RAISE WARNING case, the first entry is the utility query itself, the second entry is the error message logged by emit_log_hook. Some queries have the order adjusted due to the fix introduced by the previous commits.pull/184/head
Diego Fronza
Hamid Akhtar
parent
4ed0b7cf3e
commit
82031ed52c
|
|
@ -12,11 +12,11 @@ SELECT 1 AS num;
|
||||||
(1 row)
|
(1 row)
|
||||||
|
|
||||||
SELECT query,application_name FROM pg_stat_monitor ORDER BY query COLLATE "C";
|
SELECT query,application_name FROM pg_stat_monitor ORDER BY query COLLATE "C";
|
||||||
query | application_name
|
query | application_name
|
||||||
--------------------------------------------------------------------------------+-----------------------------
|
-------------------------------------------------------------------------------+-----------------------------
|
||||||
SELECT $1 AS num | pg_regress/application_name
|
SELECT $1 AS num | pg_regress/application_name
|
||||||
SELECT pg_stat_monitor_reset(); | pg_regress/application_name
|
SELECT pg_stat_monitor_reset() | pg_regress/application_name
|
||||||
SELECT query,application_name FROM pg_stat_monitor ORDER BY query COLLATE "C"; | pg_regress/application_name
|
SELECT query,application_name FROM pg_stat_monitor ORDER BY query COLLATE "C" | pg_regress/application_name
|
||||||
(3 rows)
|
(3 rows)
|
||||||
|
|
||||||
SELECT pg_stat_monitor_reset();
|
SELECT pg_stat_monitor_reset();
|
||||||
|
|
|
||||||
|
|
@ -12,11 +12,11 @@ SELECT 1 AS num;
|
||||||
(1 row)
|
(1 row)
|
||||||
|
|
||||||
SELECT query FROM pg_stat_monitor ORDER BY query COLLATE "C";
|
SELECT query FROM pg_stat_monitor ORDER BY query COLLATE "C";
|
||||||
query
|
query
|
||||||
---------------------------------------------------------------
|
--------------------------------------------------------------
|
||||||
SELECT $1 AS num
|
SELECT $1 AS num
|
||||||
SELECT pg_stat_monitor_reset();
|
SELECT pg_stat_monitor_reset()
|
||||||
SELECT query FROM pg_stat_monitor ORDER BY query COLLATE "C";
|
SELECT query FROM pg_stat_monitor ORDER BY query COLLATE "C"
|
||||||
(3 rows)
|
(3 rows)
|
||||||
|
|
||||||
SELECT pg_stat_monitor_reset();
|
SELECT pg_stat_monitor_reset();
|
||||||
|
|
|
||||||
|
|
@ -24,19 +24,19 @@ SELECT b FROM t2 FOR UPDATE;
|
||||||
TRUNCATE t1;
|
TRUNCATE t1;
|
||||||
DROP TABLE t1;
|
DROP TABLE t1;
|
||||||
SELECT query, cmd_type, cmd_type_text FROM pg_stat_monitor ORDER BY query COLLATE "C";
|
SELECT query, cmd_type, cmd_type_text FROM pg_stat_monitor ORDER BY query COLLATE "C";
|
||||||
query | cmd_type | cmd_type_text
|
query | cmd_type | cmd_type_text
|
||||||
-----------------------------------------------------------------------------------------+----------+---------------
|
----------------------------------------------------------------------------------------+----------+---------------
|
||||||
CREATE TABLE t1 (a INTEGER); | 0 |
|
CREATE TABLE t1 (a INTEGER) | 0 |
|
||||||
CREATE TABLE t2 (b INTEGER); | 0 |
|
CREATE TABLE t2 (b INTEGER) | 0 |
|
||||||
DELETE FROM t1; | 4 | DELETE
|
DELETE FROM t1 | 4 | DELETE
|
||||||
DROP TABLE t1; | 0 |
|
DROP TABLE t1 | 0 |
|
||||||
INSERT INTO t1 VALUES($1) | 3 | INSERT
|
INSERT INTO t1 VALUES($1) | 3 | INSERT
|
||||||
SELECT a FROM t1; | 1 | SELECT
|
SELECT a FROM t1 | 1 | SELECT
|
||||||
SELECT b FROM t2 FOR UPDATE; | 1 | SELECT
|
SELECT b FROM t2 FOR UPDATE | 1 | SELECT
|
||||||
SELECT pg_stat_monitor_reset(); | 1 | SELECT
|
SELECT pg_stat_monitor_reset() | 1 | SELECT
|
||||||
SELECT query, cmd_type, cmd_type_text FROM pg_stat_monitor ORDER BY query COLLATE "C"; | 1 | SELECT
|
SELECT query, cmd_type, cmd_type_text FROM pg_stat_monitor ORDER BY query COLLATE "C" | 1 | SELECT
|
||||||
TRUNCATE t1; | 0 |
|
TRUNCATE t1 | 0 |
|
||||||
UPDATE t1 SET a = $1 | 2 | UPDATE
|
UPDATE t1 SET a = $1 | 2 | UPDATE
|
||||||
(11 rows)
|
(11 rows)
|
||||||
|
|
||||||
SELECT pg_stat_monitor_reset();
|
SELECT pg_stat_monitor_reset();
|
||||||
|
|
|
||||||
|
|
@ -36,11 +36,11 @@ SELECT a,b,c,d FROM t1, t2, t3, t4 WHERE t1.a = t2.b AND t3.c = t4.d ORDER BY a;
|
||||||
(0 rows)
|
(0 rows)
|
||||||
|
|
||||||
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; | 4
|
SELECT a,b,c,d FROM t1, t2, t3, t4 WHERE t1.a = t2.b AND t3.c = t4.d ORDER BY a | 4
|
||||||
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
|
||||||
(3 rows)
|
(3 rows)
|
||||||
|
|
||||||
SELECT pg_stat_monitor_reset();
|
SELECT pg_stat_monitor_reset();
|
||||||
|
|
@ -69,8 +69,8 @@ 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
|
||||||
declare +|
|
declare +|
|
||||||
n integer:= 1; +|
|
n integer:= 1; +|
|
||||||
|
|
@ -80,7 +80,7 @@ SELECT query,calls FROM pg_stat_monitor ORDER BY query COLLATE "C";
|
||||||
exit when n = 1000; +|
|
exit when n = 1000; +|
|
||||||
n := n + 1; +|
|
n := n + 1; +|
|
||||||
end loop; +|
|
end loop; +|
|
||||||
end $$; |
|
end $$ |
|
||||||
(4 rows)
|
(4 rows)
|
||||||
|
|
||||||
SELECT pg_stat_monitor_reset();
|
SELECT pg_stat_monitor_reset();
|
||||||
|
|
|
||||||
|
|
@ -29,11 +29,11 @@ SELECT * FROM t3,t4 WHERE t3.c = t4.d;
|
||||||
\c contrib_regression
|
\c contrib_regression
|
||||||
SELECT datname, query FROM pg_stat_monitor ORDER BY query COLLATE "C";
|
SELECT datname, query FROM pg_stat_monitor ORDER BY query COLLATE "C";
|
||||||
datname | query
|
datname | query
|
||||||
--------------------+------------------------------------------------------------------------
|
--------------------+-----------------------------------------------------------------------
|
||||||
db1 | SELECT * FROM t1,t2 WHERE t1.a = t2.b;
|
db1 | SELECT * FROM t1,t2 WHERE t1.a = t2.b
|
||||||
db2 | SELECT * FROM t3,t4 WHERE t3.c = t4.d;
|
db2 | SELECT * FROM t3,t4 WHERE t3.c = t4.d
|
||||||
contrib_regression | SELECT datname, query FROM pg_stat_monitor ORDER BY query COLLATE "C";
|
contrib_regression | SELECT datname, query FROM pg_stat_monitor ORDER BY query COLLATE "C"
|
||||||
contrib_regression | SELECT pg_stat_monitor_reset();
|
contrib_regression | SELECT pg_stat_monitor_reset()
|
||||||
(4 rows)
|
(4 rows)
|
||||||
|
|
||||||
SELECT pg_stat_monitor_reset();
|
SELECT pg_stat_monitor_reset();
|
||||||
|
|
|
||||||
|
|
@ -21,18 +21,22 @@ RAISE WARNING 'warning message';
|
||||||
END $$;
|
END $$;
|
||||||
WARNING: warning message
|
WARNING: warning message
|
||||||
SELECT query, elevel, sqlcode, message FROM pg_stat_monitor ORDER BY query COLLATE "C",elevel;
|
SELECT query, elevel, sqlcode, message FROM pg_stat_monitor ORDER BY query COLLATE "C",elevel;
|
||||||
query | elevel | sqlcode | message
|
query | elevel | sqlcode | message
|
||||||
------------------------------------------------------------------------------------------------+--------+---------+-----------------------------------
|
-----------------------------------------------------------------------------------------------+--------+---------+-----------------------------------
|
||||||
ELECET * FROM unknown; | 20 | 42601 | syntax error at or near "ELECET"
|
ELECET * FROM unknown; | 20 | 42601 | syntax error at or near "ELECET"
|
||||||
SELECT * FROM unknown; | 20 | 42P01 | relation "unknown" does not exist
|
SELECT * FROM unknown; | 20 | 42P01 | relation "unknown" does not exist
|
||||||
SELECT 1/0; | 20 | 22012 | division by zero
|
SELECT 1/0; | 20 | 22012 | division by zero
|
||||||
SELECT pg_stat_monitor_reset(); | 0 | |
|
SELECT pg_stat_monitor_reset() | 0 | |
|
||||||
SELECT query, elevel, sqlcode, message FROM pg_stat_monitor ORDER BY query COLLATE "C",elevel; | 0 | |
|
SELECT query, elevel, sqlcode, message FROM pg_stat_monitor ORDER BY query COLLATE "C",elevel | 0 | |
|
||||||
do $$ +| 19 | 01000 | warning message
|
do $$ +| 0 | |
|
||||||
BEGIN +| | |
|
BEGIN +| | |
|
||||||
RAISE WARNING 'warning message'; +| | |
|
RAISE WARNING 'warning message'; +| | |
|
||||||
END $$; | | |
|
END $$ | | |
|
||||||
(6 rows)
|
do $$ +| 19 | 01000 | warning message
|
||||||
|
BEGIN +| | |
|
||||||
|
RAISE WARNING 'warning message'; +| | |
|
||||||
|
END $$; | | |
|
||||||
|
(7 rows)
|
||||||
|
|
||||||
SELECT pg_stat_monitor_reset();
|
SELECT pg_stat_monitor_reset();
|
||||||
pg_stat_monitor_reset
|
pg_stat_monitor_reset
|
||||||
|
|
|
||||||
|
|
@ -21,18 +21,22 @@ RAISE WARNING 'warning message';
|
||||||
END $$;
|
END $$;
|
||||||
WARNING: warning message
|
WARNING: warning message
|
||||||
SELECT query, elevel, sqlcode, message FROM pg_stat_monitor ORDER BY query COLLATE "C",elevel;
|
SELECT query, elevel, sqlcode, message FROM pg_stat_monitor ORDER BY query COLLATE "C",elevel;
|
||||||
query | elevel | sqlcode | message
|
query | elevel | sqlcode | message
|
||||||
------------------------------------------------------------------------------------------------+--------+---------+-----------------------------------
|
-----------------------------------------------------------------------------------------------+--------+---------+-----------------------------------
|
||||||
ELECET * FROM unknown; | 21 | 42601 | syntax error at or near "ELECET"
|
ELECET * FROM unknown; | 21 | 42601 | syntax error at or near "ELECET"
|
||||||
SELECT * FROM unknown; | 21 | 42P01 | relation "unknown" does not exist
|
SELECT * FROM unknown; | 21 | 42P01 | relation "unknown" does not exist
|
||||||
SELECT 1/0; | 21 | 22012 | division by zero
|
SELECT 1/0; | 21 | 22012 | division by zero
|
||||||
SELECT pg_stat_monitor_reset(); | 0 | |
|
SELECT pg_stat_monitor_reset() | 0 | |
|
||||||
SELECT query, elevel, sqlcode, message FROM pg_stat_monitor ORDER BY query COLLATE "C",elevel; | 0 | |
|
SELECT query, elevel, sqlcode, message FROM pg_stat_monitor ORDER BY query COLLATE "C",elevel | 0 | |
|
||||||
do $$ +| 19 | 01000 | warning message
|
do $$ +| 0 | |
|
||||||
BEGIN +| | |
|
BEGIN +| | |
|
||||||
RAISE WARNING 'warning message'; +| | |
|
RAISE WARNING 'warning message'; +| | |
|
||||||
END $$; | | |
|
END $$ | | |
|
||||||
(6 rows)
|
do $$ +| 19 | 01000 | warning message
|
||||||
|
BEGIN +| | |
|
||||||
|
RAISE WARNING 'warning message'; +| | |
|
||||||
|
END $$; | | |
|
||||||
|
(7 rows)
|
||||||
|
|
||||||
SELECT pg_stat_monitor_reset();
|
SELECT pg_stat_monitor_reset();
|
||||||
pg_stat_monitor_reset
|
pg_stat_monitor_reset
|
||||||
|
|
|
||||||
|
|
@ -37,14 +37,14 @@ SELECT * FROM foo1, foo2, foo3, foo4;
|
||||||
(0 rows)
|
(0 rows)
|
||||||
|
|
||||||
SELECT query, relations from pg_stat_monitor ORDER BY query collate "C";
|
SELECT query, relations from pg_stat_monitor ORDER BY query collate "C";
|
||||||
query | relations
|
query | relations
|
||||||
--------------------------------------------------------------------------+---------------------------------------------------
|
-------------------------------------------------------------------------+---------------------------------------------------
|
||||||
SELECT * FROM foo1, foo2, foo3, foo4; | {public.foo1,public.foo2,public.foo3,public.foo4}
|
SELECT * FROM foo1 | {public.foo1}
|
||||||
SELECT * FROM foo1, foo2, foo3; | {public.foo1,public.foo2,public.foo3}
|
SELECT * FROM foo1, foo2 | {public.foo1,public.foo2}
|
||||||
SELECT * FROM foo1, foo2; | {public.foo1,public.foo2}
|
SELECT * FROM foo1, foo2, foo3 | {public.foo1,public.foo2,public.foo3}
|
||||||
SELECT * FROM foo1; | {public.foo1}
|
SELECT * FROM foo1, foo2, foo3, foo4 | {public.foo1,public.foo2,public.foo3,public.foo4}
|
||||||
SELECT pg_stat_monitor_reset(); |
|
SELECT pg_stat_monitor_reset() |
|
||||||
SELECT query, relations from pg_stat_monitor ORDER BY query collate "C"; | {public.pg_stat_monitor*,pg_catalog.pg_database}
|
SELECT query, relations from pg_stat_monitor ORDER BY query collate "C" | {public.pg_stat_monitor*,pg_catalog.pg_database}
|
||||||
(6 rows)
|
(6 rows)
|
||||||
|
|
||||||
SELECT pg_stat_monitor_reset();
|
SELECT pg_stat_monitor_reset();
|
||||||
|
|
@ -89,14 +89,14 @@ SELECT * FROM sch1.foo1, sch2.foo2, sch3.foo3, sch4.foo4;
|
||||||
(0 rows)
|
(0 rows)
|
||||||
|
|
||||||
SELECT query, relations from pg_stat_monitor ORDER BY query collate "C";
|
SELECT query, relations from pg_stat_monitor ORDER BY query collate "C";
|
||||||
query | relations
|
query | relations
|
||||||
--------------------------------------------------------------------------+--------------------------------------------------
|
-------------------------------------------------------------------------+--------------------------------------------------
|
||||||
SELECT * FROM sch1.foo1, sch2.foo2, sch3.foo3, sch4.foo4; | {sch1.foo1,sch2.foo2,sch3.foo3,sch4.foo4}
|
SELECT * FROM sch1.foo1 | {sch1.foo1}
|
||||||
SELECT * FROM sch1.foo1, sch2.foo2, sch3.foo3; | {sch1.foo1,sch2.foo2,sch3.foo3}
|
SELECT * FROM sch1.foo1, sch2.foo2 | {sch1.foo1,sch2.foo2}
|
||||||
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; | {sch1.foo1}
|
SELECT * FROM sch1.foo1, sch2.foo2, sch3.foo3, sch4.foo4 | {sch1.foo1,sch2.foo2,sch3.foo3,sch4.foo4}
|
||||||
SELECT pg_stat_monitor_reset(); |
|
SELECT pg_stat_monitor_reset() |
|
||||||
SELECT query, relations from pg_stat_monitor ORDER BY query collate "C"; | {public.pg_stat_monitor*,pg_catalog.pg_database}
|
SELECT query, relations from pg_stat_monitor ORDER BY query collate "C" | {public.pg_stat_monitor*,pg_catalog.pg_database}
|
||||||
(6 rows)
|
(6 rows)
|
||||||
|
|
||||||
SELECT pg_stat_monitor_reset();
|
SELECT pg_stat_monitor_reset();
|
||||||
|
|
@ -122,12 +122,12 @@ SELECT * FROM sch1.foo1, sch2.foo2, foo1, foo2;
|
||||||
(0 rows)
|
(0 rows)
|
||||||
|
|
||||||
SELECT query, relations from pg_stat_monitor ORDER BY query;
|
SELECT query, relations from pg_stat_monitor ORDER BY query;
|
||||||
query | relations
|
query | relations
|
||||||
--------------------------------------------------------------+--------------------------------------------------
|
-------------------------------------------------------------+--------------------------------------------------
|
||||||
SELECT * FROM sch1.foo1, foo1; | {sch1.foo1,public.foo1}
|
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 * FROM sch1.foo1, sch2.foo2, foo1, foo2 | {sch1.foo1,sch2.foo2,public.foo1,public.foo2}
|
||||||
SELECT pg_stat_monitor_reset(); |
|
SELECT pg_stat_monitor_reset() |
|
||||||
SELECT query, relations from pg_stat_monitor ORDER BY query; | {public.pg_stat_monitor*,pg_catalog.pg_database}
|
SELECT query, relations from pg_stat_monitor ORDER BY query | {public.pg_stat_monitor*,pg_catalog.pg_database}
|
||||||
(4 rows)
|
(4 rows)
|
||||||
|
|
||||||
SELECT pg_stat_monitor_reset();
|
SELECT pg_stat_monitor_reset();
|
||||||
|
|
@ -168,14 +168,14 @@ SELECT * FROM v1,v2,v3,v4;
|
||||||
(0 rows)
|
(0 rows)
|
||||||
|
|
||||||
SELECT query, relations from pg_stat_monitor ORDER BY query collate "C";
|
SELECT query, relations from pg_stat_monitor ORDER BY query collate "C";
|
||||||
query | relations
|
query | relations
|
||||||
--------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------
|
-------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------
|
||||||
SELECT * FROM v1,v2,v3,v4; | {public.v1*,public.foo1,public.v2*,public.foo2,public.v3*,public.foo3,public.v4*,public.foo4}
|
SELECT * FROM v1 | {public.v1*,public.foo1}
|
||||||
SELECT * FROM v1,v2,v3; | {public.v1*,public.foo1,public.v2*,public.foo2,public.v3*,public.foo3}
|
SELECT * FROM v1,v2 | {public.v1*,public.foo1,public.v2*,public.foo2}
|
||||||
SELECT * FROM v1,v2; | {public.v1*,public.foo1,public.v2*,public.foo2}
|
SELECT * FROM v1,v2,v3 | {public.v1*,public.foo1,public.v2*,public.foo2,public.v3*,public.foo3}
|
||||||
SELECT * FROM v1; | {public.v1*,public.foo1}
|
SELECT * FROM v1,v2,v3,v4 | {public.v1*,public.foo1,public.v2*,public.foo2,public.v3*,public.foo3,public.v4*,public.foo4}
|
||||||
SELECT pg_stat_monitor_reset(); |
|
SELECT pg_stat_monitor_reset() |
|
||||||
SELECT query, relations from pg_stat_monitor ORDER BY query collate "C"; | {public.pg_stat_monitor*,pg_catalog.pg_database}
|
SELECT query, relations from pg_stat_monitor ORDER BY query collate "C" | {public.pg_stat_monitor*,pg_catalog.pg_database}
|
||||||
(6 rows)
|
(6 rows)
|
||||||
|
|
||||||
SELECT pg_stat_monitor_reset();
|
SELECT pg_stat_monitor_reset();
|
||||||
|
|
|
||||||
|
|
@ -8541,14 +8541,14 @@ SELECt * FROM t2 WHERE b % 2 = 0;
|
||||||
(2500 rows)
|
(2500 rows)
|
||||||
|
|
||||||
SELECT query, rows_retrieved FROM pg_stat_monitor ORDER BY query COLLATE "C";
|
SELECT query, rows_retrieved FROM pg_stat_monitor ORDER BY query COLLATE "C";
|
||||||
query | rows_retrieved
|
query | rows_retrieved
|
||||||
-------------------------------------------------------------------------------+----------------
|
------------------------------------------------------------------------------+----------------
|
||||||
SELECT * FROM t1 LIMIT $1 | 10
|
SELECT * FROM t1 | 1000
|
||||||
SELECT * FROM t1; | 1000
|
SELECT * FROM t1 LIMIT $1 | 10
|
||||||
SELECT * FROM t2; | 5000
|
SELECT * FROM t2 | 5000
|
||||||
SELECT pg_stat_monitor_reset(); | 1
|
SELECT pg_stat_monitor_reset() | 1
|
||||||
SELECT query, rows_retrieved FROM pg_stat_monitor ORDER BY query COLLATE "C"; | 0
|
SELECT query, rows_retrieved FROM pg_stat_monitor ORDER BY query COLLATE "C" | 0
|
||||||
SELECt * FROM t2 WHERE b % $1 = $2 | 2500
|
SELECt * FROM t2 WHERE b % $1 = $2 | 2500
|
||||||
(6 rows)
|
(6 rows)
|
||||||
|
|
||||||
SELECT pg_stat_monitor_reset();
|
SELECT pg_stat_monitor_reset();
|
||||||
|
|
|
||||||
|
|
@ -8541,14 +8541,14 @@ SELECt * FROM t2 WHERE b % 2 = 0;
|
||||||
(2500 rows)
|
(2500 rows)
|
||||||
|
|
||||||
SELECT query, rows_retrieved FROM pg_stat_monitor ORDER BY query COLLATE "C";
|
SELECT query, rows_retrieved FROM pg_stat_monitor ORDER BY query COLLATE "C";
|
||||||
query | rows_retrieved
|
query | rows_retrieved
|
||||||
-------------------------------------------------------------------------------+----------------
|
------------------------------------------------------------------------------+----------------
|
||||||
SELECT * FROM t1 LIMIT $1 | 10
|
SELECT * FROM t1 | 1000
|
||||||
SELECT * FROM t1; | 1000
|
SELECT * FROM t1 LIMIT $1 | 10
|
||||||
SELECT b FROM t2 FOR UPDATE; | 5000
|
SELECT b FROM t2 FOR UPDATE | 5000
|
||||||
SELECT pg_stat_monitor_reset(); | 1
|
SELECT pg_stat_monitor_reset() | 1
|
||||||
SELECT query, rows_retrieved FROM pg_stat_monitor ORDER BY query COLLATE "C"; | 0
|
SELECT query, rows_retrieved FROM pg_stat_monitor ORDER BY query COLLATE "C" | 0
|
||||||
SELECt * FROM t2 WHERE b % $1 = $2 | 2500
|
SELECt * FROM t2 WHERE b % $1 = $2 | 2500
|
||||||
(6 rows)
|
(6 rows)
|
||||||
|
|
||||||
SELECT pg_stat_monitor_reset();
|
SELECT pg_stat_monitor_reset();
|
||||||
|
|
|
||||||
|
|
@ -14,12 +14,12 @@ SELECT 1;
|
||||||
SELECT 1/0; -- divide by zero
|
SELECT 1/0; -- divide by zero
|
||||||
ERROR: division by zero
|
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 | 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 rows)
|
(4 rows)
|
||||||
|
|
||||||
SELECT pg_stat_monitor_reset();
|
SELECT pg_stat_monitor_reset();
|
||||||
|
|
|
||||||
|
|
@ -15,8 +15,8 @@ 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) */ | /* { "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)
|
||||||
|
|
||||||
SELECT pg_stat_monitor_reset();
|
SELECT pg_stat_monitor_reset();
|
||||||
|
|
|
||||||
|
|
@ -23,23 +23,23 @@ SELECT add2(1,2);
|
||||||
(1 row)
|
(1 row)
|
||||||
|
|
||||||
SELECT query, top_query FROM pg_stat_monitor ORDER BY query COLLATE "C";
|
SELECT query, top_query FROM pg_stat_monitor ORDER BY query COLLATE "C";
|
||||||
query | top_query
|
query | top_query
|
||||||
--------------------------------------------------------------------------+--------------------
|
-------------------------------------------------------------------------+--------------------
|
||||||
CREATE OR REPLACE FUNCTION add(int, int) RETURNS INTEGER AS +|
|
CREATE OR REPLACE FUNCTION add(int, int) RETURNS INTEGER AS +|
|
||||||
$$ +|
|
$$ +|
|
||||||
BEGIN +|
|
BEGIN +|
|
||||||
return (select $1 + $2); +|
|
return (select $1 + $2); +|
|
||||||
END; $$ language plpgsql; |
|
END; $$ language plpgsql |
|
||||||
CREATE OR REPLACE function add2(int, int) RETURNS int as +|
|
CREATE OR REPLACE function add2(int, int) RETURNS int as +|
|
||||||
$$ +|
|
$$ +|
|
||||||
BEGIN +|
|
BEGIN +|
|
||||||
return add($1,$2); +|
|
return add($1,$2); +|
|
||||||
END; +|
|
END; +|
|
||||||
$$ language plpgsql; |
|
$$ language plpgsql |
|
||||||
SELECT (select $1 + $2) | SELECT add2($1,$2)
|
SELECT (select $1 + $2) | SELECT add2($1,$2)
|
||||||
SELECT add2($1,$2) |
|
SELECT add2($1,$2) |
|
||||||
SELECT pg_stat_monitor_reset(); |
|
SELECT pg_stat_monitor_reset() |
|
||||||
SELECT query, top_query FROM pg_stat_monitor ORDER BY query COLLATE "C"; |
|
SELECT query, top_query FROM pg_stat_monitor ORDER BY query COLLATE "C" |
|
||||||
(6 rows)
|
(6 rows)
|
||||||
|
|
||||||
SELECT pg_stat_monitor_reset();
|
SELECT pg_stat_monitor_reset();
|
||||||
|
|
|
||||||
|
|
@ -23,23 +23,23 @@ SELECT add2(1,2);
|
||||||
(1 row)
|
(1 row)
|
||||||
|
|
||||||
SELECT query, top_query FROM pg_stat_monitor ORDER BY query COLLATE "C";
|
SELECT query, top_query FROM pg_stat_monitor ORDER BY query COLLATE "C";
|
||||||
query | top_query
|
query | top_query
|
||||||
--------------------------------------------------------------------------+--------------------
|
-------------------------------------------------------------------------+--------------------
|
||||||
(select $1 + $2) | SELECT add2($1,$2)
|
(select $1 + $2) | SELECT add2($1,$2)
|
||||||
CREATE OR REPLACE FUNCTION add(int, int) RETURNS INTEGER AS +|
|
CREATE OR REPLACE FUNCTION add(int, int) RETURNS INTEGER AS +|
|
||||||
$$ +|
|
$$ +|
|
||||||
BEGIN +|
|
BEGIN +|
|
||||||
return (select $1 + $2); +|
|
return (select $1 + $2); +|
|
||||||
END; $$ language plpgsql; |
|
END; $$ language plpgsql |
|
||||||
CREATE OR REPLACE function add2(int, int) RETURNS int as +|
|
CREATE OR REPLACE function add2(int, int) RETURNS int as +|
|
||||||
$$ +|
|
$$ +|
|
||||||
BEGIN +|
|
BEGIN +|
|
||||||
return add($1,$2); +|
|
return add($1,$2); +|
|
||||||
END; +|
|
END; +|
|
||||||
$$ language plpgsql; |
|
$$ language plpgsql |
|
||||||
SELECT add2($1,$2) |
|
SELECT add2($1,$2) |
|
||||||
SELECT pg_stat_monitor_reset(); |
|
SELECT pg_stat_monitor_reset() |
|
||||||
SELECT query, top_query FROM pg_stat_monitor ORDER BY query COLLATE "C"; |
|
SELECT query, top_query FROM pg_stat_monitor ORDER BY query COLLATE "C" |
|
||||||
(6 rows)
|
(6 rows)
|
||||||
|
|
||||||
SELECT pg_stat_monitor_reset();
|
SELECT pg_stat_monitor_reset();
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue