Changeset: 74f783a232fb for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=74f783a232fb Modified Files: sql/test/sysmon/Tests/sys_queue_rotate.sql sql/test/sysmon/Tests/sys_queue_rotate.stable.out sql/test/sysmon/Tests/sysqueue.sql sql/test/sysmon/Tests/sysqueue.stable.out Branch: Oct2020 Log Message:
Small hack to make sure sysqueue tests are timezone agnostic diffs (152 lines): diff --git a/sql/test/sysmon/Tests/sys_queue_rotate.sql b/sql/test/sysmon/Tests/sys_queue_rotate.sql --- a/sql/test/sysmon/Tests/sys_queue_rotate.sql +++ b/sql/test/sysmon/Tests/sys_queue_rotate.sql @@ -1,7 +1,8 @@ -- test the rotation of the queue -select 1, username, status, query from sys.queue(); -select 2, username, status, query from sys.queue(); -select 3, username, status, query from sys.queue(); -select 4, username, status, query from sys.queue(); -select 5, username, status, query from sys.queue(); -select 6, username, status, query from sys.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.out b/sql/test/sysmon/Tests/sys_queue_rotate.stable.out --- a/sql/test/sysmon/Tests/sys_queue_rotate.stable.out +++ b/sql/test/sysmon/Tests/sys_queue_rotate.stable.out @@ -5,54 +5,54 @@ stdout of test 'sys_queue_rotate` in dir # 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, query from sys.queue(); -% .%2, .%1, .%1, .%1 # table_name -% %2, username, status, query # name +#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, 85 # length +% 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 zone interval \\'+02:00\\' hour to minute\n;" ] -[ 1, "monetdb", "running", "select 1, username, status, query from sys.queue();" ] -#select 2, username, status, query from sys.queue(); -% .%2, .%1, .%1, .%1 # table_name -% %2, username, status, query # name +[ 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, 51 # length -[ 2, "monetdb", "finished", "set time zone interval \\'+02:00\\' hour to minute\n;" ] -[ 2, "monetdb", "finished", "select 1, username, status, query from sys.queue();" ] -[ 2, "monetdb", "running", "select 2, username, status, query from sys.queue();" ] -#select 3, username, status, query from sys.queue(); -% .%2, .%1, .%1, .%1 # table_name -% %2, username, status, query # name +% 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, 51 # length -[ 3, "monetdb", "finished", "select 1, username, status, query from sys.queue();" ] -[ 3, "monetdb", "finished", "select 2, username, status, query from sys.queue();" ] -[ 3, "monetdb", "running", "select 3, username, status, query from sys.queue();" ] -#select 4, username, status, query from sys.queue(); -% .%2, .%1, .%1, .%1 # table_name -% %2, username, status, query # name +% 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, 51 # length -[ 4, "monetdb", "finished", "select 2, username, status, query from sys.queue();" ] -[ 4, "monetdb", "finished", "select 3, username, status, query from sys.queue();" ] -[ 4, "monetdb", "running", "select 4, username, status, query from sys.queue();" ] -#select 5, username, status, query from sys.queue(); -% .%2, .%1, .%1, .%1 # table_name -% %2, username, status, query # name +% 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, 51 # length -[ 5, "monetdb", "finished", "select 3, username, status, query from sys.queue();" ] -[ 5, "monetdb", "finished", "select 4, username, status, query from sys.queue();" ] -[ 5, "monetdb", "running", "select 5, username, status, query from sys.queue();" ] -#select 6, username, status, query from sys.queue(); -% .%2, .%1, .%1, .%1 # table_name -% %2, username, status, query # name +% 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, 51 # length -[ 6, "monetdb", "finished", "select 4, username, status, query from sys.queue();" ] -[ 6, "monetdb", "finished", "select 5, username, status, query from sys.queue();" ] -[ 6, "monetdb", "running", "select 6, username, status, query from sys.queue();" ] +% 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." 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,5 +1,6 @@ -- check if we have a increasing queue table -select username, status, query from sys.queue(); +-- 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(); diff --git a/sql/test/sysmon/Tests/sysqueue.stable.out b/sql/test/sysmon/Tests/sysqueue.stable.out --- a/sql/test/sysmon/Tests/sysqueue.stable.out +++ b/sql/test/sysmon/Tests/sysqueue.stable.out @@ -5,14 +5,14 @@ stdout of test 'sysqueue` in directory ' # 16:51:46 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-1061" "--port=34490" # 16:51:46 > -#select username, status, query from sys.queue(); -% .%1, .%1, .%1 # table_name -% username, status, query # name +#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, 56 # length +% 7, 8, 114 # length [ "monetdb", "finished", "create procedure sleep(i int) external name alarm.sleep;" ] -[ "monetdb", "finished", "set time zone interval \\'+02:00\\' hour to minute\n;" ] -[ "monetdb", "running", "select username, status, query from sys.queue();" ] +[ "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 _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
