mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 12:02:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

make perfschema.show_aggregate test more reliable

Browse source
This commit is contained in:
Sergei Golubchik 2023-10-13 13:33:36 +02:00
parent e3e66a575b
commit c378efeeb9
3 changed files with 12 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
mysql-test/suite/perfschema/include/wait_for_pfs_thread_count.inc
View file

@ -4,17 +4,6 @@
# Wait until there is only one session left, this one.
let $wait_condition=
select count(*) = 1 from information_schema.processlist;
--source include/wait_condition.inc
# Threads are removed from information_schema.processlist
# very soon, but continue to execute in the server,
# before finally be removed from performance_schema.threads.
# Because instrumentation is optional, we use "<=" here.
let $wait_condition=
select count(*) <= 2 from performance_schema.threads
where `TYPE`='FOREGROUND';
let $wait_condition= select count(*) = 1 from performance_schema.threads where `type`='foreground';
--source include/wait_condition.inc

6
mysql-test/suite/perfschema/r/show_aggregate.result
View file

@ -83,9 +83,9 @@ ROLLBACK;
connection default;
# Get thread ids for each connection.
USE performance_schema;
SELECT thread_id INTO @con1_id FROM threads WHERE processlist_user IN ('user1');
SELECT thread_id INTO @con2_id FROM threads WHERE processlist_user IN ('user2');
SELECT thread_id INTO @con3_id FROM threads WHERE processlist_user IN ('user3');
SELECT thread_id INTO @con1_id FROM threads WHERE processlist_user IN ('user1') and processlist_id;
SELECT thread_id INTO @con2_id FROM threads WHERE processlist_user IN ('user2') and processlist_id;
SELECT thread_id INTO @con3_id FROM threads WHERE processlist_user IN ('user3') and processlist_id;
#=================
# Global results
#=================

11
mysql-test/suite/perfschema/t/show_aggregate.test
View file

@ -13,6 +13,7 @@
--source include/not_embedded.inc
--source include/no_protocol.inc
--source include/maybe_pool_of_threads.inc
--source include/wait_for_pfs_thread_count.inc
--echo #
--echo # ================================================================================
@ -107,9 +108,9 @@ ROLLBACK;
connection default;
--echo # Get thread ids for each connection.
USE performance_schema;
SELECT thread_id INTO @con1_id FROM threads WHERE processlist_user IN ('user1');
SELECT thread_id INTO @con2_id FROM threads WHERE processlist_user IN ('user2');
SELECT thread_id INTO @con3_id FROM threads WHERE processlist_user IN ('user3');
SELECT thread_id INTO @con1_id FROM threads WHERE processlist_user IN ('user1') and processlist_id;
SELECT thread_id INTO @con2_id FROM threads WHERE processlist_user IN ('user2') and processlist_id;
SELECT thread_id INTO @con3_id FROM threads WHERE processlist_user IN ('user3') and processlist_id;
--source ../include/show_aggregate.inc
@ -201,6 +202,7 @@ ORDER BY variable_name;
disconnect con1;
disconnect con2;
disconnect con3;
--echo #
USE test;
--echo #
@ -212,6 +214,9 @@ UPDATE test.status_results
h1=0, h2=0, h3=0, host=0,
a1=0, a2=0, a3=0, acct=0;
let $wait_condition= select count(*) = 0 from performance_schema.threads where processlist_user like 'user%' and processlist_id;
--source include/wait_condition.inc
#--echo DEBUG
#SELECT * FROM test.status_results;
--echo #