Changeset: 155474477127 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=155474477127 Removed Files: sql/test/sysmon/Tests/sysqueue.stable.err sql/test/sysmon/Tests/sysqueue.stable.out Modified Files: sql/test/sysmon/Tests/sysqueue.sql sql/test/sysmon/Tests/sysqueue.test Branch: mtest Log Message:
Cleaned up sysqueue test diffs (158 lines): 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,8 +1,13 @@ --- check if we have a increasing queue table --- the case expression is used to make sure the test is timezone agnostic -select username, status, case when query ilike 'set time%' then 'set time...' else query end from sys.queue(); -select count(*) from sys.queue(); -select count(*) from sys.queue(); -select count(*) from sys.queue(); -select count(*) from sys.queue(); -select count(*) from sys.queue() where query = 'select count(*) from sys.queue();'; +-- check if we have an increasing 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 +select 1; +select 2; +select 3; +select 4; +-- 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 +-- Have to rely on query text to get determinable results +select username, query from sys.queue() order by query; diff --git a/sql/test/sysmon/Tests/sysqueue.stable.err b/sql/test/sysmon/Tests/sysqueue.stable.err deleted file mode 100644 --- a/sql/test/sysmon/Tests/sysqueue.stable.err +++ /dev/null @@ -1,12 +0,0 @@ -stderr of test 'sysqueue` in directory 'sql/test/sysmon` itself: - - -# 16:51:46 > -# 16:51:46 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-1061" "--port=34490" -# 16:51:46 > - - -# 16:51:46 > -# 16:51:46 > "Done." -# 16:51:46 > - diff --git a/sql/test/sysmon/Tests/sysqueue.stable.out b/sql/test/sysmon/Tests/sysqueue.stable.out deleted file mode 100644 --- a/sql/test/sysmon/Tests/sysqueue.stable.out +++ /dev/null @@ -1,50 +0,0 @@ -stdout of test 'sysqueue` in directory 'sql/test/sysmon` itself: - - -# 16:51:46 > -# 16:51:46 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-1061" "--port=34490" -# 16:51:46 > - -#select username, status, case when query ilike 'set time%' then 'set time...' else query end from sys.queue(); -% .%1, .%1, .%2 # table_name -% username, status, %2 # name -% clob, clob, clob # type -% 7, 8, 114 # length -[ "monetdb", "finished", "create procedure sleep(i int) external name alarm.sleep;" ] -[ "monetdb", "finished", "set time..." ] -[ "monetdb", "running", "select username, status, case when query ilike \\'set time%\\' then \\'set time...\\' else query end from sys.queue();" ] -#select count(*) from sys.queue(); -% .%2 # table_name -% %2 # name -% bigint # type -% 1 # length -[ 3 ] -#select count(*) from sys.queue(); -% .%2 # table_name -% %2 # name -% bigint # type -% 1 # length -[ 3 ] -#select count(*) from sys.queue(); -% .%2 # table_name -% %2 # name -% bigint # type -% 1 # length -[ 3 ] -#select count(*) from sys.queue(); -% .%2 # table_name -% %2 # name -% bigint # type -% 1 # length -[ 3 ] -#select count(*) from sys.queue() where query = 'select count(*) from sys.queue();'; -% .%2 # table_name -% %2 # name -% bigint # type -% 1 # length -[ 2 ] - -# 16:51:46 > -# 16:51:46 > "Done." -# 16:51:46 > - 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 @@ -1,38 +1,31 @@ -query TTT rowsort -select username, status, case when query ilike 'set time%' then 'set time...' else query end from sys.queue() +query I rowsort +select 1 ---- -monetdb -finished -select name from sys.schemas where not system@; -monetdb -finished -select name from sys.users where name not in (\'monetdb\', \'.snapshot\')@; -monetdb -running -select username, status, case when query ilike \'set time%\' then \'set time...\' else query end from sys.queue()@; +1 query I rowsort -select count(*) from sys.queue(); +select 2 +---- +2 + +query I rowsort +select 3 ---- 3 query I rowsort -select count(*) from sys.queue(); +select 4 ---- -3 - -query I rowsort -select count(*) from sys.queue(); ----- -3 +4 -query I rowsort -select count(*) from sys.queue(); +query TT rowsort +select username, query from sys.queue() order by query ---- -3 +monetdb +select 3@; +monetdb +select 4@; +monetdb +select username, query from sys.queue() order by query@; -query I rowsort -select count(*) from sys.queue() where query = 'select count(*) from sys.queue();'; ----- -2 _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
