Changeset: b2ba6f87b0dd for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b2ba6f87b0dd Removed Files: sql/test/sysmon/Tests/sys_queue_rotate.sql sql/test/sysmon/Tests/sys_queue_rotate.stable.err sql/test/sysmon/Tests/sys_queue_rotate.stable.out sql/test/sysmon/Tests/sys_queue_rotate.test Modified Files: sql/test/sysmon/Tests/All sql/test/sysmon/Tests/sysqueue.sql sql/test/sysmon/Tests/sysqueue.test Branch: mtest Log Message:
Merged sys_queue_rotate tests into sysqueue.test diffs (221 lines): diff --git a/sql/test/sysmon/Tests/All b/sql/test/sysmon/Tests/All --- a/sql/test/sysmon/Tests/All +++ b/sql/test/sysmon/Tests/All @@ -1,5 +1,4 @@ sysqueue -sys_queue_rotate create_sleep sys_queue_expand sys_user_statistics diff --git a/sql/test/sysmon/Tests/sys_queue_rotate.sql b/sql/test/sysmon/Tests/sys_queue_rotate.sql deleted file mode 100644 --- a/sql/test/sysmon/Tests/sys_queue_rotate.sql +++ /dev/null @@ -1,8 +0,0 @@ --- test the rotation of the queue --- the case expression is used to make sure the test is timezone agnostic -select 1, username, status, case when query ilike 'set time%' then 'set time...' else query end from sys.queue(); -select 2, username, status, case when query ilike 'set time%' then 'set time...' else query end from sys.queue(); -select 3, username, status, case when query ilike 'set time%' then 'set time...' else query end from sys.queue(); -select 4, username, status, case when query ilike 'set time%' then 'set time...' else query end from sys.queue(); -select 5, username, status, case when query ilike 'set time%' then 'set time...' else query end from sys.queue(); -select 6, username, status, case when query ilike 'set time%' then 'set time...' else query end from sys.queue(); diff --git a/sql/test/sysmon/Tests/sys_queue_rotate.stable.err b/sql/test/sysmon/Tests/sys_queue_rotate.stable.err deleted file mode 100644 --- a/sql/test/sysmon/Tests/sys_queue_rotate.stable.err +++ /dev/null @@ -1,12 +0,0 @@ -stderr of test 'sys_queue_rotate` in directory 'sql/test/sysmon` itself: - - -# 14:43:48 > -# 14:43:48 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-28100" "--port=39321" -# 14:43:48 > - - -# 14:43:48 > -# 14:43:48 > "Done." -# 14:43:48 > - diff --git a/sql/test/sysmon/Tests/sys_queue_rotate.stable.out b/sql/test/sysmon/Tests/sys_queue_rotate.stable.out deleted file mode 100644 --- a/sql/test/sysmon/Tests/sys_queue_rotate.stable.out +++ /dev/null @@ -1,60 +0,0 @@ -stdout of test 'sys_queue_rotate` in directory 'sql/test/sysmon` itself: - - -# 14:46:47 > -# 14:46:47 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-28342" "--port=32595" -# 14:46:47 > - -#select 1, username, status, case when query ilike 'set time%' then 'set time...' else query end from sys.queue(); -% .%2, .%1, .%1, .%3 # table_name -% %2, username, status, %3 # name -% tinyint, clob, clob, clob # type -% 1, 7, 8, 117 # length -[ 1, "monetdb", "finished", "select count(*) from sys.queue() where query = \\'select count(*) from sys.queue();\\';" ] -[ 1, "monetdb", "finished", "set time..." ] -[ 1, "monetdb", "running", "select 1, username, status, case when query ilike \\'set time%\\' then \\'set time...\\' else query end from sys.queue();" ] -#select 2, username, status, case when query ilike 'set time%' then 'set time...' else query end from sys.queue(); -% .%2, .%1, .%1, .%3 # table_name -% %2, username, status, %3 # name -% tinyint, clob, clob, clob # type -% 1, 7, 8, 117 # length -[ 2, "monetdb", "finished", "set time..." ] -[ 2, "monetdb", "finished", "select 1, username, status, case when query ilike \\'set time%\\' then \\'set time...\\' else query end from sys.queue();" ] -[ 2, "monetdb", "running", "select 2, username, status, case when query ilike \\'set time%\\' then \\'set time...\\' else query end from sys.queue();" ] -#select 3, username, status, case when query ilike 'set time%' then 'set time...' else query end from sys.queue(); -% .%2, .%1, .%1, .%3 # table_name -% %2, username, status, %3 # name -% tinyint, clob, clob, clob # type -% 1, 7, 8, 117 # length -[ 3, "monetdb", "finished", "select 1, username, status, case when query ilike \\'set time%\\' then \\'set time...\\' else query end from sys.queue();" ] -[ 3, "monetdb", "finished", "select 2, username, status, case when query ilike \\'set time%\\' then \\'set time...\\' else query end from sys.queue();" ] -[ 3, "monetdb", "running", "select 3, username, status, case when query ilike \\'set time%\\' then \\'set time...\\' else query end from sys.queue();" ] -#select 4, username, status, case when query ilike 'set time%' then 'set time...' else query end from sys.queue(); -% .%2, .%1, .%1, .%3 # table_name -% %2, username, status, %3 # name -% tinyint, clob, clob, clob # type -% 1, 7, 8, 117 # length -[ 4, "monetdb", "finished", "select 2, username, status, case when query ilike \\'set time%\\' then \\'set time...\\' else query end from sys.queue();" ] -[ 4, "monetdb", "finished", "select 3, username, status, case when query ilike \\'set time%\\' then \\'set time...\\' else query end from sys.queue();" ] -[ 4, "monetdb", "running", "select 4, username, status, case when query ilike \\'set time%\\' then \\'set time...\\' else query end from sys.queue();" ] -#select 5, username, status, case when query ilike 'set time%' then 'set time...' else query end from sys.queue(); -% .%2, .%1, .%1, .%3 # table_name -% %2, username, status, %3 # name -% tinyint, clob, clob, clob # type -% 1, 7, 8, 117 # length -[ 5, "monetdb", "finished", "select 3, username, status, case when query ilike \\'set time%\\' then \\'set time...\\' else query end from sys.queue();" ] -[ 5, "monetdb", "finished", "select 4, username, status, case when query ilike \\'set time%\\' then \\'set time...\\' else query end from sys.queue();" ] -[ 5, "monetdb", "running", "select 5, username, status, case when query ilike \\'set time%\\' then \\'set time...\\' else query end from sys.queue();" ] -#select 6, username, status, case when query ilike 'set time%' then 'set time...' else query end from sys.queue(); -% .%2, .%1, .%1, .%3 # table_name -% %2, username, status, %3 # name -% tinyint, clob, clob, clob # type -% 1, 7, 8, 117 # length -[ 6, "monetdb", "finished", "select 4, username, status, case when query ilike \\'set time%\\' then \\'set time...\\' else query end from sys.queue();" ] -[ 6, "monetdb", "finished", "select 5, username, status, case when query ilike \\'set time%\\' then \\'set time...\\' else query end from sys.queue();" ] -[ 6, "monetdb", "running", "select 6, username, status, case when query ilike \\'set time%\\' then \\'set time...\\' else query end from sys.queue();" ] - -# 14:46:47 > -# 14:46:47 > "Done." -# 14:46:47 > - diff --git a/sql/test/sysmon/Tests/sys_queue_rotate.test b/sql/test/sysmon/Tests/sys_queue_rotate.test deleted file mode 100644 --- a/sql/test/sysmon/Tests/sys_queue_rotate.test +++ /dev/null @@ -1,55 +0,0 @@ -query ITTT rowsort -select 1, username, status, case when query ilike 'set time%' then 'set time...' else query end from sys.queue() ----- -1 -monetdb -finished -select name from sys.schemas where not system@; -1 -monetdb -finished -select name from sys.users where name not in (\'monetdb\', \'.snapshot\')@; -1 -monetdb -running -select 1, username, status, case when query ilike \'set time%\' then \'set time...\' else query end from sys.queue()@; - - -query ITTT rowsort -select 2, username, status, case when query ilike 'set time%' then 'set time...' else query end from sys.queue() ----- -2 -monetdb -finished -select 1, username, status, case when query ilike \'set time%\' then \'set time...\' else query end from sys.queue()@; -2 -monetdb -finished -select name from sys.users where name not in (\'monetdb\', \'.snapshot\')@; -2 -monetdb -running -select 2, username, status, case when query ilike \'set time%\' then \'set time...\' else query end from sys.queue()@; - - -query ITTT rowsort -select 3, username, status, case when query ilike 'set time%' then 'set time...' else query end from sys.queue() ----- -12 values hashing to 962bb2096560cc9ff56bdefd0b66ed6c - -query ITTT rowsort -select 4, username, status, case when query ilike 'set time%' then 'set time...' else query end from sys.queue() ----- -12 values hashing to db2a6ae1cb459cefbb3215f294bab458 - -query ITTT rowsort -select 5, username, status, case when query ilike 'set time%' then 'set time...' else query end from sys.queue() ----- -12 values hashing to 8213498f529162d543515bfb42e53b31 - -query ITTT rowsort -select 6, username, status, case when query ilike 'set time%' then 'set time...' else query end from sys.queue() ----- -12 values hashing to 69defb8d21f7e8f1d786832d6b837ce2 - - diff --git a/sql/test/sysmon/Tests/sysqueue.sql b/sql/test/sysmon/Tests/sysqueue.sql --- a/sql/test/sysmon/Tests/sysqueue.sql +++ b/sql/test/sysmon/Tests/sysqueue.sql @@ -1,11 +1,16 @@ --- check if we have an increasing queue table +-- check if we have an increasing and rotating queue table --- Clean up sys.queue(): since we're using max_clients=4, four queries should --- push out all existing queries, which should have all been finished by now +-- Clean up sys.queue(): since we're using max_clients=4, seven queries will +-- push out all queriesl automatically executed during the database start up +-- and force sys.queue to rotate since all queries so far are instantly +-- finished. select 1; select 2; select 3; select 4; +select 5; +select 6; +select 7; -- We expect the last three queries: sys.queue() keeps (MAL_MAXCLIENTS - 1) -- queries in its queue so that there is always an empty slot for the next -- query diff --git a/sql/test/sysmon/Tests/sysqueue.test b/sql/test/sysmon/Tests/sysqueue.test --- a/sql/test/sysmon/Tests/sysqueue.test +++ b/sql/test/sysmon/Tests/sysqueue.test @@ -18,13 +18,28 @@ select 4 ---- 4 +query I rowsort +select 5 +---- +5 + +query I rowsort +select 6 +---- +6 + +query I rowsort +select 7 +---- +7 + query TT rowsort select username, query from sys.queue() order by query ---- monetdb -select 3@; +select 6@; monetdb -select 4@; +select 7@; monetdb select username, query from sys.queue() order by query@; _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
