Changeset: df373e304894 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=df373e304894 Removed Files: sql/test/BugTracker-2008/Tests/extract_bug.SF-2075266.stable.out.int128 sql/test/BugTracker-2008/Tests/groupby_with_NULL.SF-2155606.stable.out.int128 sql/test/BugTracker-2008/Tests/mul_div_bug.SF-2075135.stable.out.int128 sql/test/BugTracker-2009/Tests/TribooleanFailureWithSubquery.SF-2679434.stable.out.int128 sql/test/BugTracker-2009/Tests/arithmetic-small-values-null.SF-2921310.stable.out.int128 sql/test/BugTracker-2009/Tests/avg-bug.SF-2132666.stable.out.int128 sql/test/BugTracker-2009/Tests/case_evaluates_all_branches.SF-2893484.stable.out.int128 sql/test/BugTracker-2009/Tests/count_bug.SF-2604583.stable.out.int128 sql/test/Tests/outerref_in_selection.sql.src Modified Files: sql/test/BugTracker-2008/Tests/extract_bug.SF-2075266.sql sql/test/BugTracker-2008/Tests/extract_bug.SF-2075266.stable.out sql/test/BugTracker-2008/Tests/groupby_with_NULL.SF-2155606.sql sql/test/BugTracker-2008/Tests/groupby_with_NULL.SF-2155606.stable.out sql/test/BugTracker-2008/Tests/mul_div_bug.SF-2075135.sql sql/test/BugTracker-2009/Tests/TribooleanFailureWithSubquery.SF-2679434.sql sql/test/BugTracker-2009/Tests/TribooleanFailureWithSubquery.SF-2679434.stable.out sql/test/BugTracker-2009/Tests/avg-bug.SF-2132666.sql sql/test/BugTracker-2009/Tests/avg-bug.SF-2132666.stable.out sql/test/BugTracker-2009/Tests/bit_and.SF-2850341.stable.out.int128 sql/test/BugTracker-2009/Tests/case_evaluates_all_branches.SF-2893484.sql sql/test/BugTracker-2009/Tests/case_evaluates_all_branches.SF-2893484.stable.out sql/test/BugTracker-2009/Tests/count_bug.SF-2604583.sql sql/test/BugTracker-2009/Tests/count_bug.SF-2604583.stable.out sql/test/Tests/outerref_in_selection.stable.out Branch: default Log Message:
Eliminated *.int128 output files (by adding cast(... as bigint)) diffs (truncated from 1076 to 300 lines): diff --git a/sql/test/BugTracker-2008/Tests/extract_bug.SF-2075266.sql b/sql/test/BugTracker-2008/Tests/extract_bug.SF-2075266.sql --- a/sql/test/BugTracker-2008/Tests/extract_bug.SF-2075266.sql +++ b/sql/test/BugTracker-2008/Tests/extract_bug.SF-2075266.sql @@ -4,8 +4,8 @@ CREATE TABLE A (FIPS2 TIMESTAMP); INSERT INTO A VALUES ( TIMESTAMP '1996-08-24 16:03:00.999999'); -SELECT EXTRACT (SECOND FROM FIPS2) -* 1000000 - 999990 FROM A; +SELECT CAST( EXTRACT (SECOND FROM FIPS2) +* 1000000 - 999990 as decimal(18,6)) FROM A; select EXTRACT (SECOND FROM FIPS2) FROM A; diff --git a/sql/test/BugTracker-2008/Tests/extract_bug.SF-2075266.stable.out b/sql/test/BugTracker-2008/Tests/extract_bug.SF-2075266.stable.out --- a/sql/test/BugTracker-2008/Tests/extract_bug.SF-2075266.stable.out +++ b/sql/test/BugTracker-2008/Tests/extract_bug.SF-2075266.stable.out @@ -26,8 +26,8 @@ stdout of test 'extract_bug.SF-2075266` # 13:27:40 > [ 1 ] -#SELECT EXTRACT (SECOND FROM FIPS2) -#* 1000000 - 999990 FROM A; +#SELECT CAST( EXTRACT (SECOND FROM FIPS2) +#* 1000000 - 999990 as decimal(18,6)) FROM A; % sys.L2 # table_name % L2 # name % decimal # type diff --git a/sql/test/BugTracker-2008/Tests/extract_bug.SF-2075266.stable.out.int128 b/sql/test/BugTracker-2008/Tests/extract_bug.SF-2075266.stable.out.int128 deleted file mode 100644 --- a/sql/test/BugTracker-2008/Tests/extract_bug.SF-2075266.stable.out.int128 +++ /dev/null @@ -1,47 +0,0 @@ -stdout of test 'extract_bug.SF-2075266` in directory 'sql/test/BugTracker-2008` itself: - - -# 13:27:40 > -# 13:27:40 > mserver5 "--config=/ufs/niels/scratch/rc/Linux-x86_64/etc/monetdb5.conf" --debug=10 --set "monet_mod_path=/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5:/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5/lib:/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5/bin" --set "gdk_dbfarm=/ufs/niels/scratch/rc/Linux-x86_64/var/MonetDB5/dbfarm" --set "sql_logdir=/ufs/niels/scratch/rc/Linux-x86_64/var/MonetDB5/sql_logs" --set mapi_open=true --set xrpc_open=true --set mapi_port=36215 --set xrpc_port=40937 --set monet_prompt= --trace "--dbname=mTests_src_test_BugTracker-2008" --set sql_debug=16384 --set xquery_backend=algebra --set mal_listing=0 "--dbinit= include sql;" ; echo ; echo Over.. -# 13:27:40 > - -# MonetDB server v5.6.0, based on kernel v1.24.1 -# Serving database 'mTests_src_test_BugTracker-2008' -# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically linked -# Copyright (c) 1993-2008 CWI, all rights reserved -# Visit http://monetdb.cwi.nl/ for further information -# Listening for connection requests on mapi:monetdb://alf.ins.cwi.nl:36215/ -# MonetDB/SQL module v2.24.1 loaded - -# falling back to direct mode -# falling back to direct mode -# falling back to direct mode -#function user.main():void; -# clients.quit(); -#end main; - - -# 13:27:40 > -# 13:27:40 > mclient -lsql -umonetdb -Pmonetdb --host=alf --port=36215 -G -# 13:27:40 > - -[ 1 ] -#SELECT EXTRACT (SECOND FROM FIPS2) -#* 1000000 - 999990 FROM A; -% sys.L2 # table_name -% L2 # name -% decimal # type -% 40 # length -[ 10.000000 ] -#select EXTRACT (SECOND FROM FIPS2) FROM A; -% sys.L2 # table_name -% L2 # name -% decimal # type -% 11 # length -[ 1.000 ] -#drop table A; - -# 14:08:04 > -# 14:08:04 > Done. -# 14:08:04 > - diff --git a/sql/test/BugTracker-2008/Tests/groupby_with_NULL.SF-2155606.sql b/sql/test/BugTracker-2008/Tests/groupby_with_NULL.SF-2155606.sql --- a/sql/test/BugTracker-2008/Tests/groupby_with_NULL.SF-2155606.sql +++ b/sql/test/BugTracker-2008/Tests/groupby_with_NULL.SF-2155606.sql @@ -3,6 +3,6 @@ create table testola (color varchar(128) insert into testola values ('blue', 12); insert into testola values ('red', 2); -select color, null, sum(count) from testola group by color; +select color, null, cast( sum(count) as bigint) from testola group by color; drop table testola; diff --git a/sql/test/BugTracker-2008/Tests/groupby_with_NULL.SF-2155606.stable.out b/sql/test/BugTracker-2008/Tests/groupby_with_NULL.SF-2155606.stable.out --- a/sql/test/BugTracker-2008/Tests/groupby_with_NULL.SF-2155606.stable.out +++ b/sql/test/BugTracker-2008/Tests/groupby_with_NULL.SF-2155606.stable.out @@ -24,7 +24,7 @@ stdout of test 'groupby_with_NULL.SF-215 [ 1 ] [ 1 ] -#select color, null, sum(count) from testola group by color; +#select color, null, cast( sum(count) as bigint) from testola group by color; % sys.testola, .L1, sys.L3 # table_name % color, L1, L2 # name % varchar, char, bigint # type diff --git a/sql/test/BugTracker-2008/Tests/groupby_with_NULL.SF-2155606.stable.out.int128 b/sql/test/BugTracker-2008/Tests/groupby_with_NULL.SF-2155606.stable.out.int128 deleted file mode 100644 --- a/sql/test/BugTracker-2008/Tests/groupby_with_NULL.SF-2155606.stable.out.int128 +++ /dev/null @@ -1,38 +0,0 @@ -stdout of test 'groupby_with_NULL.SF-2155606` in directory 'sql/test/BugTracker-2008` itself: - - -# 21:42:11 > -# 21:42:11 > mserver5 "--config=/ufs/niels/scratch/rc/Linux-x86_64/etc/monetdb5.conf" --debug=10 --set "monet_mod_path=/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5:/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5/lib:/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5/bin" --set "gdk_dbfarm=/ufs/niels/scratch/rc/Linux-x86_64/var/MonetDB5/dbfarm" --set "sql_logdir=/ufs/niels/scratch/rc/Linux-x86_64/var/MonetDB5/sql_logs" --set mapi_open=true --set xrpc_open=true --set mapi_port=30906 --set xrpc_port=43227 --set monet_prompt= --trace "--dbname=mTests_src_test_BugTracker-2008" --set mal_listing=0 "--dbinit= include sql;" ; echo ; echo Over.. -# 21:42:11 > - -# MonetDB server v5.6.1, based on kernel v1.24.1 -# Serving database 'mTests_src_test_BugTracker-2008' -# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically linked -# Copyright (c) 1993-2008 CWI, all rights reserved -# Visit http://monetdb.cwi.nl/ for further information -# Listening for connection requests on mapi:monetdb://alf.ins.cwi.nl:30906/ -# MonetDB/SQL module v2.24.1 loaded - -#function user.main():void; -# clients.quit(); -#end main; - - -# 21:42:11 > -# 21:42:11 > mclient -lsql -umonetdb -Pmonetdb --host=alf --port=30906 -# 21:42:11 > - -[ 1 ] -[ 1 ] -#select color, null, sum(count) from testola group by color; -% sys.testola, .L3, sys.L6 # table_name -% color, L3, L5 # name -% varchar, char, hugeint # type -% 4, 0, 2 # length -[ "blue", NULL, 12 ] -[ "red", NULL, 2 ] - -# 21:42:11 > -# 21:42:11 > Done. -# 21:42:11 > - diff --git a/sql/test/BugTracker-2008/Tests/mul_div_bug.SF-2075135.sql b/sql/test/BugTracker-2008/Tests/mul_div_bug.SF-2075135.sql --- a/sql/test/BugTracker-2008/Tests/mul_div_bug.SF-2075135.sql +++ b/sql/test/BugTracker-2008/Tests/mul_div_bug.SF-2075135.sql @@ -8,7 +8,7 @@ CREATE TABLE B POUND_EQUIV NUMERIC(8,2)); CREATE VIEW C (UNIT_PRICE, PRICE, UNITS) -AS SELECT (TOT_PRICE * DOLLAR_EQUIV) / (UNITS * POUND_EQUIV), TOT_PRICE * DOLLAR_EQUIV, UNITS * POUND_EQUIV FROM A, B; +AS SELECT cast( (TOT_PRICE * DOLLAR_EQUIV) / (UNITS * POUND_EQUIV) as decimal(18,4)), TOT_PRICE * DOLLAR_EQUIV, cast( UNITS * POUND_EQUIV as decimal(18,4)) FROM A, B; INSERT INTO A VALUES (1411.5, 4000); INSERT INTO B VALUES (1.00, 2.20); diff --git a/sql/test/BugTracker-2008/Tests/mul_div_bug.SF-2075135.stable.out.int128 b/sql/test/BugTracker-2008/Tests/mul_div_bug.SF-2075135.stable.out.int128 deleted file mode 100644 --- a/sql/test/BugTracker-2008/Tests/mul_div_bug.SF-2075135.stable.out.int128 +++ /dev/null @@ -1,36 +0,0 @@ -stdout of test 'mul_div_bug.SF-2075135` in directory 'sql/test/BugTracker-2008` itself: - - -# 13:00:43 > -# 13:00:43 > mserver5 "--config=/ufs/niels/scratch/rc/Linux-x86_64/etc/monetdb5.conf" --debug=10 --set "monet_mod_path=/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5:/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5/lib:/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5/bin" --set "gdk_dbfarm=/ufs/niels/scratch/rc/Linux-x86_64/var/MonetDB5/dbfarm" --set "sql_logdir=/ufs/niels/scratch/rc/Linux-x86_64/var/MonetDB5/sql_logs" --set mapi_open=true --set xrpc_open=true --set mapi_port=37919 --set xrpc_port=45857 --set monet_prompt= --trace "--dbname=mTests_src_test_BugTracker-2008" --set mal_listing=0 "--dbinit= include sql;" ; echo ; echo Over.. -# 13:00:43 > - -# MonetDB server v5.6.1, based on kernel v1.24.1 -# Serving database 'mTests_src_test_BugTracker-2008' -# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically linked -# Copyright (c) 1993-2008 CWI, all rights reserved -# Visit http://monetdb.cwi.nl/ for further information -# Listening for connection requests on mapi:monetdb://alf.ins.cwi.nl:37919/ -# MonetDB/SQL module v2.24.1 loaded - -#function user.main():void; -# clients.quit(); -#end main; - - -# 13:00:43 > -# 13:00:43 > mclient -lsql -umonetdb -Pmonetdb --host=alf --port=37919 -# 13:00:43 > - -[ 1 ] -[ 1 ] -% sys.c, sys.c, sys.c # table_name -% unit_price, price, units # name -% decimal, decimal, decimal # type -% 30, 19, 26 # length -[ 0.1603, 1411.5000, 8800.0000 ] - -# 13:00:43 > -# 13:00:43 > Done. -# 13:00:43 > - diff --git a/sql/test/BugTracker-2009/Tests/TribooleanFailureWithSubquery.SF-2679434.sql b/sql/test/BugTracker-2009/Tests/TribooleanFailureWithSubquery.SF-2679434.sql --- a/sql/test/BugTracker-2009/Tests/TribooleanFailureWithSubquery.SF-2679434.sql +++ b/sql/test/BugTracker-2009/Tests/TribooleanFailureWithSubquery.SF-2679434.sql @@ -9,7 +9,7 @@ ------------------------------- -- correct -SELECT SUM(a) AS suma +SELECT cast( SUM(a) as bigint) AS suma FROM ( SELECT * FROM ( @@ -20,7 +20,7 @@ FROM ( ; -- correct -SELECT SUM(a) AS suma +SELECT cast( SUM(a) as bigint) AS suma FROM ( SELECT * FROM ( @@ -32,7 +32,7 @@ HAVING SUM(a) IS NULL ; -- correct -SELECT SUM(a) AS suma +SELECT cast( SUM(a) as bigint) AS suma FROM ( SELECT * FROM ( @@ -44,7 +44,7 @@ HAVING SUM(a) IS NOT NULL ; -- WRONG -SELECT SUM(a) AS suma +SELECT cast( SUM(a) as bigint) AS suma FROM ( SELECT * FROM ( @@ -58,7 +58,7 @@ HAVING SUM(a) > 0 -- STILL WRONG SELECT * FROM ( - SELECT SUM(a) AS suma, NULL AS mynull + SELECT cast( SUM(a) as bigint) AS suma, NULL AS mynull FROM ( SELECT * FROM ( @@ -73,7 +73,7 @@ WHERE suma > 0 -- although this works SELECT * FROM ( - SELECT SUM(a) AS suma, NULL AS mynull + SELECT cast( SUM(a) as bigint) AS suma, NULL AS mynull FROM ( SELECT * FROM ( diff --git a/sql/test/BugTracker-2009/Tests/TribooleanFailureWithSubquery.SF-2679434.stable.out b/sql/test/BugTracker-2009/Tests/TribooleanFailureWithSubquery.SF-2679434.stable.out --- a/sql/test/BugTracker-2009/Tests/TribooleanFailureWithSubquery.SF-2679434.stable.out +++ b/sql/test/BugTracker-2009/Tests/TribooleanFailureWithSubquery.SF-2679434.stable.out @@ -23,7 +23,7 @@ stdout of test 'TribooleanFailureWithSub # 11:47:36 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-23209" "--port=33225" # 11:47:36 > -#SELECT SUM(a) AS suma +#SELECT cast( SUM(a) as bigint) AS suma #FROM ( # SELECT * # FROM ( @@ -32,12 +32,13 @@ stdout of test 'TribooleanFailureWithSub # WHERE b IN ('y') #) sub2 #; -% .L12 # table_name +% . # table_name +# .L13 # table_name % suma # name % bigint # type % 1 # length -[ NULL ] -#SELECT SUM(a) AS suma +[ NULL ] +#SELECT cast( SUM(a) as bigint) AS suma #FROM ( # SELECT * # FROM ( @@ -47,12 +48,13 @@ stdout of test 'TribooleanFailureWithSub #) sub2 #HAVING SUM(a) IS NULL #; -% .L11 # table_name +% . # table_name +# .L12 # table_name % suma # name % bigint # type % 1 # length -[ NULL ] -#SELECT SUM(a) AS suma +[ NULL ] +#SELECT cast( SUM(a) as bigint) AS suma #FROM ( _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
