Changeset: 778f508a071f for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=778f508a071f Added Files: sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.out.32bit sql/test/pg_regress/Tests/oid.stable.err.64bit.int128 sql/test/pg_regress/Tests/oid.stable.err.64bit.oid32 Removed Files: sql/test/pg_regress/Tests/oid.stable.err.int128 sql/test/pg_regress/Tests/oid.stable.err.oid32 Branch: Jul2015 Log Message:
Rename outputs so that the correct one is chosen. On a 32 bit system, we could get the oid32 variant instead of the 32bit variant. Now it should be clear that the oid32 variant is only for 64bit systems. diffs (105 lines): diff --git a/sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.out.32bit b/sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.out.32bit new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.out.32bit @@ -0,0 +1,94 @@ +stdout of test 'decimal_vs_integer.Bug-3941` in directory 'sql/test/BugTracker-2016` itself: + + +# 15:01:29 > +# 15:01:29 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=37542" "--set" "mapi_usock=/var/tmp/mtest-23330/.s.monetdb.37542" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2016" "--set" "mal_listing=0" "--set" "embedded_r=yes" +# 15:01:29 > + +# MonetDB 5 server v11.21.12 +# This is an unreleased version +# Serving database 'mTests_sql_test_BugTracker-2016', using 4 threads +# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit integers dynamically linked +# Found 7.332 GiB available main-memory. +# Copyright (c) 1993-July 2008 CWI. +# Copyright (c) August 2008-2015 MonetDB B.V., all rights reserved +# Visit http://www.monetdb.org/ for further information +# Listening for connection requests on mapi:monetdb://localhost.nes.nl:37542/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-23330/.s.monetdb.37542 +# MonetDB/GIS module loaded +# Start processing logs sql/sql_logs version 52200 +# Start reading the write-ahead log 'sql_logs/sql/log.11' +# Finished reading the write-ahead log 'sql_logs/sql/log.11' +# Finished processing logs sql/sql_logs +# MonetDB/SQL module loaded +# MonetDB/R module loaded + +Ready. + +# 15:01:30 > +# 15:01:30 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-23330" "--port=37542" +# 15:01:30 > + +#start transaction; +#create table tmp(i decimal(8)); +#explain select count(*) from tmp where i = 20160222; +% .explain # table_name +% mal # name +% clob # type +% 107 # length +function user.s2_1(A0:int):void; + X_21:void := querylog.define("explain select count(*) from tmp where i = 20160222;","default_pipe",11); + X_2 := sql.mvc(); + X_6:bat[:oid,:int] := sql.bind(X_2,"sys","tmp","i",0); + X_9 := X_6; + X_3:bat[:oid,:oid] := sql.tid(X_2,"sys","tmp"); + X_10 := algebra.subselect(X_9,X_3,A0,A0,true,false,false); + X_13 := algebra.leftfetchjoin(X_10,X_9); + X_14 := aggr.count(X_13); + sql.resultSet("sys.L1","L1","wrd",32,0,7,X_14); +end user.s2_1; +# optimizer.mitosis() +# optimizer.dataflow() +#explain select count(*) from tmp where i = '20160222'; +% .explain # table_name +% mal # name +% clob # type +% 113 # length +function user.s3_1(A0:str):void; + X_23:void := querylog.define("explain select count(*) from tmp where i = \\'20160222\\';","default_pipe",12); + X_2 := sql.mvc(); + X_6:bat[:oid,:int] := sql.bind(X_2,"sys","tmp","i",0); + X_9 := X_6; + X_3:bat[:oid,:oid] := sql.tid(X_2,"sys","tmp"); + X_10 := calc.int(A0,8,0); + X_12 := algebra.subselect(X_9,X_3,X_10,X_10,true,false,false); + X_15 := algebra.leftfetchjoin(X_12,X_9); + X_16 := aggr.count(X_15); + sql.resultSet("sys.L1","L1","wrd",32,0,7,X_16); +end user.s3_1; +# optimizer.mitosis() +# optimizer.dataflow() +#explain select count(*) from tmp where i = 201602221; +% .explain # table_name +% mal # name +% clob # type +% 108 # length +function user.s4_1(A0:lng):void; + X_23:void := querylog.define("explain select count(*) from tmp where i = 201602221;","default_pipe",12); + X_2 := sql.mvc(); + X_6:bat[:oid,:int] := sql.bind(X_2,"sys","tmp","i",0); + X_9 := X_6; + X_10:bat[:oid,:lng] := batcalc.lng(0,X_9,10,0); + X_3:bat[:oid,:oid] := sql.tid(X_2,"sys","tmp"); + X_12 := algebra.subselect(X_10,X_3,A0,A0,true,false,false); + X_15 := algebra.leftfetchjoin(X_12,X_9); + X_16 := aggr.count(X_15); + sql.resultSet("sys.L1","L1","wrd",32,0,7,X_16); +end user.s4_1; +# optimizer.mitosis() +# optimizer.dataflow() + +# 15:01:30 > +# 15:01:30 > "Done." +# 15:01:30 > + diff --git a/sql/test/pg_regress/Tests/oid.stable.err.int128 b/sql/test/pg_regress/Tests/oid.stable.err.64bit.int128 rename from sql/test/pg_regress/Tests/oid.stable.err.int128 rename to sql/test/pg_regress/Tests/oid.stable.err.64bit.int128 diff --git a/sql/test/pg_regress/Tests/oid.stable.err.oid32 b/sql/test/pg_regress/Tests/oid.stable.err.64bit.oid32 rename from sql/test/pg_regress/Tests/oid.stable.err.oid32 rename to sql/test/pg_regress/Tests/oid.stable.err.64bit.oid32 _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
