Changeset: 9e03420f937a for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9e03420f937a Modified Files: sql/test/BugTracker-2014/Tests/aggregates-intervals.Bug-3533.stable.err sql/test/BugTracker-2014/Tests/aggregates-intervals.Bug-3533.stable.out sql/test/BugTracker-2017/Tests/side-effect.Bug-6397.stable.out sql/test/BugTracker-2018/Tests/sqlitelogictest-having-not-null-not-in.Bug-6557.stable.err sql/test/BugTracker-2018/Tests/sqlitelogictest-having-not-null-not-in.Bug-6557.stable.out sql/test/Tests/fsum.stable.out sql/test/Tests/fsum1.stable.out.src Branch: sq2default Log Message:
approved output diffs (205 lines): diff --git a/sql/test/BugTracker-2014/Tests/aggregates-intervals.Bug-3533.stable.err b/sql/test/BugTracker-2014/Tests/aggregates-intervals.Bug-3533.stable.err --- a/sql/test/BugTracker-2014/Tests/aggregates-intervals.Bug-3533.stable.err +++ b/sql/test/BugTracker-2014/Tests/aggregates-intervals.Bug-3533.stable.err @@ -25,7 +25,7 @@ stderr of test 'aggregates-intervals.Bug MAPI = (monetdb) /var/tmp/mtest-281202/.s.monetdb.31954 QUERY = SELECT median_avg(f1) from INTERVAL_TBL; --error, median_avg is not available yet for sec_interval -ERROR = !SELECT: no such unary operator 'median_avg(sec_interval)' +ERROR = !SELECT: cannot use non GROUP BY column 'f1' in query results without an aggregate function CODE = 42000 # 16:49:01 > diff --git a/sql/test/BugTracker-2014/Tests/aggregates-intervals.Bug-3533.stable.out b/sql/test/BugTracker-2014/Tests/aggregates-intervals.Bug-3533.stable.out --- a/sql/test/BugTracker-2014/Tests/aggregates-intervals.Bug-3533.stable.out +++ b/sql/test/BugTracker-2014/Tests/aggregates-intervals.Bug-3533.stable.out @@ -82,8 +82,8 @@ stdout of test 'aggregates-intervals.Bug % 1, 2, 24, 1, 1, 1 # length [ 4, 10, 2.5, 2, 4, 1 ] #SELECT median_avg(f1) from INTERVAL_TBL2; -% sys.L2 # table_name -% L2 # name +% sys.%1 # table_name +% %1 # name % double # type % 24 # length [ 2.5 ] diff --git a/sql/test/BugTracker-2017/Tests/side-effect.Bug-6397.stable.out b/sql/test/BugTracker-2017/Tests/side-effect.Bug-6397.stable.out --- a/sql/test/BugTracker-2017/Tests/side-effect.Bug-6397.stable.out +++ b/sql/test/BugTracker-2017/Tests/side-effect.Bug-6397.stable.out @@ -43,7 +43,7 @@ stdout of test 'side-effect.Bug-6397` in % 161 # length function user.s4_0():void; X_5:void := querylog.define("explain select count(*) from my_generate_series(1,5) as t1,\nmy_generate_series(1,100) as t2;":str, "default_pipe":str, 28:int); -barrier X_92:bit := language.dataflow(); +barrier X_93:bit := language.dataflow(); X_31:bat[:str] := bat.pack(".%5":str); X_32:bat[:str] := bat.pack("%5":str); X_33:bat[:str] := bat.pack("bigint":str); @@ -61,7 +61,7 @@ barrier X_92:bit := language.dataflow(); X_27:bat[:lng] := batcalc.*(X_25:bat[:lng], X_26:bat[:lng]); language.pass(X_21:bat[:lng]); language.pass(X_22:bat[:lng]); -exit X_92:bit; +exit X_93:bit; sql.resultSet(X_31:bat[:str], X_32:bat[:str], X_33:bat[:str], X_34:bat[:int], X_35:bat[:int], X_27:bat[:lng]); end user.s4_0; #inline actions= 0 time=1 usec diff --git a/sql/test/BugTracker-2018/Tests/sqlitelogictest-having-not-null-not-in.Bug-6557.stable.err b/sql/test/BugTracker-2018/Tests/sqlitelogictest-having-not-null-not-in.Bug-6557.stable.err --- a/sql/test/BugTracker-2018/Tests/sqlitelogictest-having-not-null-not-in.Bug-6557.stable.err +++ b/sql/test/BugTracker-2018/Tests/sqlitelogictest-having-not-null-not-in.Bug-6557.stable.err @@ -27,9 +27,21 @@ stderr of test 'sqlitelogictest-having-n # 12:32:58 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-25333" "--port=30615" # 12:32:58 > -MAPI = (monetdb) /var/tmp/mtest-15894/.s.monetdb.34330 +MAPI = (monetdb) /var/tmp/mtest-10256/.s.monetdb.36560 +QUERY = SELECT 1 FROM tab0 HAVING tab0.col1 IN ( 1 ); --error +ERROR = !SELECT: cannot use non GROUP BY column 'tab0.col1' in query results without an aggregate function +CODE = 42000 +MAPI = (monetdb) /var/tmp/mtest-10256/.s.monetdb.36560 +QUERY = SELECT 1 FROM tab0 HAVING col1 IN ( 1 ); --error +ERROR = !SELECT: cannot use non GROUP BY column 'col1' in query results without an aggregate function +CODE = 42000 +MAPI = (monetdb) /var/tmp/mtest-10256/.s.monetdb.36560 +QUERY = SELECT 1 FROM tab0 HAVING NULL IN ( tab0.col2 ); --error +ERROR = !SELECT: cannot use non GROUP BY column 'tab0.col2' in query results without an aggregate function +CODE = 42000 +MAPI = (monetdb) /var/tmp/mtest-10256/.s.monetdb.36560 QUERY = SELECT DISTINCT tab0.col1 AS col2 FROM tab0 GROUP BY tab0.col1 HAVING NULL NOT IN ( col2 ); --error -ERROR = !SELECT: cannot compare sets with values, probably an aggregate function missing +ERROR = !SELECT: cannot use non GROUP BY column 'col2' in query results without an aggregate function CODE = 42000 # 12:32:58 > diff --git a/sql/test/BugTracker-2018/Tests/sqlitelogictest-having-not-null-not-in.Bug-6557.stable.out b/sql/test/BugTracker-2018/Tests/sqlitelogictest-having-not-null-not-in.Bug-6557.stable.out --- a/sql/test/BugTracker-2018/Tests/sqlitelogictest-having-not-null-not-in.Bug-6557.stable.out +++ b/sql/test/BugTracker-2018/Tests/sqlitelogictest-having-not-null-not-in.Bug-6557.stable.out @@ -31,21 +31,6 @@ stdout of test 'sqlitelogictest-having-n % col2 # name % int # type % 1 # length -#SELECT 1 FROM tab0 HAVING tab0.col1 IN ( 1 ); --error -% . # table_name -% single_value # name -% tinyint # type -% 1 # length -#SELECT 1 FROM tab0 HAVING col1 IN ( 1 ); --error -% . # table_name -% single_value # name -% tinyint # type -% 1 # length -#SELECT 1 FROM tab0 HAVING NULL IN ( tab0.col2 ); --error -% . # table_name -% single_value # name -% tinyint # type -% 1 # length #SELECT DISTINCT * FROM tab0 AS cor0 GROUP BY cor0.col1, cor0.col2, cor0.col0; % sys.cor0, sys.cor0, sys.cor0 # table_name % col1, col2, col0 # name diff --git a/sql/test/Tests/fsum.stable.out b/sql/test/Tests/fsum.stable.out --- a/sql/test/Tests/fsum.stable.out +++ b/sql/test/Tests/fsum.stable.out @@ -49,8 +49,8 @@ stdout of test 'fsum` in directory 'sql/ #8.988465674311579e+307 25 [ 3131 ] #select gid, sum(val) from t where gid in (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 15, 16, 17, 18, 19, 22, 23, 31, 33, 35, 37, 39, 40, 41) group by gid order by gid; -% sys.t, sys.L3 # table_name -% gid, L3 # name +% sys.t, sys.%1 # table_name +% gid, %1 # name % int, double # type % 2, 24 # length [ 1, 0 ] diff --git a/sql/test/Tests/fsum1.stable.out.src b/sql/test/Tests/fsum1.stable.out.src --- a/sql/test/Tests/fsum1.stable.out.src +++ b/sql/test/Tests/fsum1.stable.out.src @@ -1,1 +1,88 @@ +stdout of test 'fsum1` in directory 'sql/test` itself: + + +# 13:04:28 > +# 13:04:28 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=1" "--set" "mapi_open=true" "--set" "mapi_port=37938" "--set" "mapi_usock=/var/tmp/mtest-953/.s.monetdb.37938" "--forcemito" "--dbpath=/home/niels/scratch/monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test" "--set" "embedded_c=true" +# 13:04:28 > + +# MonetDB 5 server v11.36.0 (hg id: 8f43ee7f9545+) +# This is an unreleased version +# Serving database 'mTests_sql_test', using 1 thread +# Compiled for x86_64-unknown-linux-gnu/64bit with 128bit integers +# Found 15.384 GiB available main-memory. +# Copyright (c) 1993 - July 2008 CWI. +# Copyright (c) August 2008 - 2019 MonetDB B.V., all rights reserved +# Visit https://www.monetdb.org/ for further information +# Listening for connection requests on mapi:monetdb://localhost.localdomain:37938/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-953/.s.monetdb.37938 +# MonetDB/GIS module loaded +# MonetDB/SQL module loaded + +# 13:04:29 > +# 13:04:29 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-953" "--port=37938" +# 13:04:29 > + +#create table t (val double, gid int); +#copy 3131 records into t from stdin using delimiters ' ',E'\n' null as 'nan'; +#-1.7976931348623157E+308 23 +#9007199254740992.0 9 +#-5e-324 38 +#-8.98846567431158e+307 35 +#8.988465674311579e+307 12 +#8.98846567431158e+307 26 +#8.98846567431158e+307 40 +#8.98846567431158e+307 7 +#9.076030935533344e+279 39 +#-8.98846567431158e+307 37 +#1.7976931348623157E+308 22 +#8.98846567431158e+307 28 +#-8.98846567431158e+307 36 +#0.7 17 +#8.98846567431158e+307 26 +#1e+308 5 +#-1e+308 5 +#0.0 1 +#9007199254741002.0 10 +#8.98846567431158e+307 29 +#1.0 15 +#8.988465674311579e+307 25 +[ 3131 ] +#select gid, sum(val) from t where gid in (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 15, 16, 17, 18, 19, 22, 23, 31, 33, 35, 37, 39, 40, 41) group by gid order by gid; +% sys.t, sys.%1 # table_name +% gid, %1 # name +% int, double # type +% 2, 24 # length +[ 1, 0 ] +[ 2, 1e-100 ] +[ 3, 1e+308 ] +[ 4, 1e+308 ] +[ 5, 1e+308 ] +[ 6, 1.797693028e+308 ] +[ 7, 8.988465674e+307 ] +[ 8, 9.007199255e+15 ] +[ 9, 9.007199255e+15 ] +[ 10, 9.007199255e+15 ] +[ 11, 9.007199255e+15 ] +[ 12, 1.797693135e+308 ] +[ 13, 1.797693135e+308 ] +[ 15, 7.485470861 ] +[ 16, -0.6926474306 ] +[ 17, -1 ] +[ 18, 0 ] +[ 19, 0 ] +[ 22, 0 ] +[ 23, -1.59538627e+308 ] +[ 31, 1.797693135e+308 ] +[ 33, 1.797693135e+308 ] +[ 35, -1.797693135e+308 ] +[ 37, -1.797693135e+308 ] +[ 39, 1.797693135e+308 ] +[ 40, 1.697693135e+308 ] +[ 41, 1e+16 ] +#drop table t; + +# 13:04:29 > +# 13:04:29 > "Done." +# 13:04:29 > + fsum.stable.out _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list