Changeset: bda1db999997 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bda1db999997 Added Files: sql/test/BugTracker-2014/Tests/round.Bug-3542.py Removed Files: sql/test/BugTracker-2014/Tests/hexadecimal_literals.Bug-3621.stable.err.int128 sql/test/BugTracker-2014/Tests/hexadecimal_literals.Bug-3621.stable.out.int128 sql/test/BugTracker-2014/Tests/round.Bug-3542.sql sql/test/BugTracker-2014/Tests/round.Bug-3542.stable.err.int128 sql/test/BugTracker-2014/Tests/round.Bug-3542.stable.out.int128 sql/test/BugTracker-2014/Tests/round.Bug-3542.test Modified Files: sql/test/BugTracker-2014/Tests/All sql/test/BugTracker-2014/Tests/hexadecimal_literals.Bug-3621.stable.err sql/test/BugTracker-2014/Tests/hexadecimal_literals.Bug-3621.stable.out sql/test/BugTracker-2014/Tests/round.Bug-3542.stable.err sql/test/BugTracker-2014/Tests/round.Bug-3542.stable.out Branch: mtest Log Message:
Merging more 128 and no-int128 outputs diffs (truncated from 1904 to 300 lines): diff --git a/sql/test/BugTracker-2014/Tests/All b/sql/test/BugTracker-2014/Tests/All --- a/sql/test/BugTracker-2014/Tests/All +++ b/sql/test/BugTracker-2014/Tests/All @@ -52,7 +52,7 @@ insert_into_temp_table.Bug-3600 too_general_errmsg.Bug-3605 querylog.Bug-3607 fk-property-assert.Bug-3612 -hexadecimal_literals.Bug-3621 +HAVE_HGE?hexadecimal_literals.Bug-3621 orderby_column_exp.Bug-3620 typecast_error.Bug-3622 case-sqrt.Bug-3627 diff --git a/sql/test/BugTracker-2014/Tests/hexadecimal_literals.Bug-3621.stable.err b/sql/test/BugTracker-2014/Tests/hexadecimal_literals.Bug-3621.stable.err --- a/sql/test/BugTracker-2014/Tests/hexadecimal_literals.Bug-3621.stable.err +++ b/sql/test/BugTracker-2014/Tests/hexadecimal_literals.Bug-3621.stable.err @@ -30,107 +30,35 @@ stderr of test 'hexadecimal_literals.Bug # 17:24:30 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-30147" "--port=33525" # 17:24:30 > -MAPI = (monetdb) /var/tmp/mtest-30147/.s.monetdb.33525 -QUERY = select 0x8000000000000000; -ERROR = !Invalid hexadecimal number or hexadecimal too large (0x8000000000000000) in: "select 0x8000000000000000" -CODE = 22003 -MAPI = (monetdb) /var/tmp/mtest-25092/.s.monetdb.31020 -QUERY = select 0x00000000000000008000000000000000; -ERROR = !Invalid hexadecimal number or hexadecimal too large (0x00000000000000008000000000000000) in: "select 0x00000000000000008000000000000000" -CODE = 22003 -MAPI = (monetdb) /var/tmp/mtest-25092/.s.monetdb.31020 -QUERY = select 0x8000000000000001; -ERROR = !Invalid hexadecimal number or hexadecimal too large (0x8000000000000001) in: "select 0x8000000000000001" -CODE = 22003 -MAPI = (monetdb) /var/tmp/mtest-25092/.s.monetdb.31020 -QUERY = select 0x00000000000000008000000000000001; -ERROR = !Invalid hexadecimal number or hexadecimal too large (0x00000000000000008000000000000001) in: "select 0x00000000000000008000000000000001" -CODE = 22003 -MAPI = (monetdb) /var/tmp/mtest-25092/.s.monetdb.31020 -QUERY = select 0xffffffffffffffff; -ERROR = !Invalid hexadecimal number or hexadecimal too large (0xffffffffffffffff) in: "select 0xffffffffffffffff" -CODE = 22003 -MAPI = (monetdb) /var/tmp/mtest-25092/.s.monetdb.31020 -QUERY = select 0x0000000000000000ffffffffffffffff; -ERROR = !Invalid hexadecimal number or hexadecimal too large (0x0000000000000000ffffffffffffffff) in: "select 0x0000000000000000ffffffffffffffff" -CODE = 22003 -MAPI = (monetdb) /var/tmp/mtest-25092/.s.monetdb.31020 -QUERY = select 0x7fffffffffffffffffffffffffffffff; -ERROR = !Invalid hexadecimal number or hexadecimal too large (0x7fffffffffffffffffffffffffffffff) in: "select 0x7fffffffffffffffffffffffffffffff" -CODE = 22003 -MAPI = (monetdb) /var/tmp/mtest-25092/.s.monetdb.31020 +MAPI = (monetdb) /var/tmp/mtest-19106/.s.monetdb.36358 QUERY = select 0x80000000000000000000000000000000; ERROR = !Invalid hexadecimal number or hexadecimal too large (0x80000000000000000000000000000000) in: "select 0x80000000000000000000000000000000" CODE = 22003 -MAPI = (monetdb) /var/tmp/mtest-25092/.s.monetdb.31020 +MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685 QUERY = select 0x80000000000000000000000000000001; ERROR = !Invalid hexadecimal number or hexadecimal too large (0x80000000000000000000000000000001) in: "select 0x80000000000000000000000000000001" CODE = 22003 -MAPI = (monetdb) /var/tmp/mtest-25092/.s.monetdb.31020 +MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685 QUERY = select 0xffffffffffffffffffffffffffffffff; ERROR = !Invalid hexadecimal number or hexadecimal too large (0xffffffffffffffffffffffffffffffff) in: "select 0xffffffffffffffffffffffffffffffff" CODE = 22003 -MAPI = (monetdb) /var/tmp/mtest-25092/.s.monetdb.31020 -QUERY = select 0x123456789abcdef01; -ERROR = !Invalid hexadecimal number or hexadecimal too large (0x123456789abcdef01) in: "select 0x123456789abcdef01" -CODE = 22003 -MAPI = (monetdb) /var/tmp/mtest-25092/.s.monetdb.31020 -QUERY = select 0x123456789abcdef0123456789abcdef0; -ERROR = !Invalid hexadecimal number or hexadecimal too large (0x123456789abcdef0123456789abcdef0) in: "select 0x123456789abcdef0123456789abcdef0" -CODE = 22003 -MAPI = (monetdb) /var/tmp/mtest-25092/.s.monetdb.31020 +MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685 QUERY = select 0x123456789abcdef0123456789abcdef01; ERROR = !Invalid hexadecimal number or hexadecimal too large (0x123456789abcdef0123456789abcdef01) in: "select 0x123456789abcdef0123456789abcdef01" CODE = 22003 -MAPI = (monetdb) /var/tmp/mtest-5399/.s.monetdb.32319 -QUERY = select -0x8000000000000000; -ERROR = !Invalid hexadecimal number or hexadecimal too large (0x8000000000000000) in: "select -0x8000000000000000" -CODE = 22003 -MAPI = (monetdb) /var/tmp/mtest-25092/.s.monetdb.31020 -QUERY = select -0x00000000000000008000000000000000; -ERROR = !Invalid hexadecimal number or hexadecimal too large (0x00000000000000008000000000000000) in: "select -0x00000000000000008000000000000000" -CODE = 22003 -MAPI = (monetdb) /var/tmp/mtest-25092/.s.monetdb.31020 -QUERY = select -0x8000000000000001; -ERROR = !Invalid hexadecimal number or hexadecimal too large (0x8000000000000001) in: "select -0x8000000000000001" -CODE = 22003 -MAPI = (monetdb) /var/tmp/mtest-25092/.s.monetdb.31020 -QUERY = select -0x00000000000000008000000000000001; -ERROR = !Invalid hexadecimal number or hexadecimal too large (0x00000000000000008000000000000001) in: "select -0x00000000000000008000000000000001" -CODE = 22003 -MAPI = (monetdb) /var/tmp/mtest-25092/.s.monetdb.31020 -QUERY = select -0xffffffffffffffff; -ERROR = !Invalid hexadecimal number or hexadecimal too large (0xffffffffffffffff) in: "select -0xffffffffffffffff" -CODE = 22003 -MAPI = (monetdb) /var/tmp/mtest-25092/.s.monetdb.31020 -QUERY = select -0x0000000000000000ffffffffffffffff; -ERROR = !Invalid hexadecimal number or hexadecimal too large (0x0000000000000000ffffffffffffffff) in: "select -0x0000000000000000ffffffffffffffff" -CODE = 22003 -MAPI = (monetdb) /var/tmp/mtest-25092/.s.monetdb.31020 -QUERY = select -0x7fffffffffffffffffffffffffffffff; -ERROR = !Invalid hexadecimal number or hexadecimal too large (0x7fffffffffffffffffffffffffffffff) in: "select -0x7fffffffffffffffffffffffffffffff" -CODE = 22003 -MAPI = (monetdb) /var/tmp/mtest-25092/.s.monetdb.31020 +MAPI = (monetdb) /var/tmp/mtest-19106/.s.monetdb.36358 QUERY = select -0x80000000000000000000000000000000; ERROR = !Invalid hexadecimal number or hexadecimal too large (0x80000000000000000000000000000000) in: "select -0x80000000000000000000000000000000" CODE = 22003 -MAPI = (monetdb) /var/tmp/mtest-25092/.s.monetdb.31020 +MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685 QUERY = select -0x80000000000000000000000000000001; ERROR = !Invalid hexadecimal number or hexadecimal too large (0x80000000000000000000000000000001) in: "select -0x80000000000000000000000000000001" CODE = 22003 -MAPI = (monetdb) /var/tmp/mtest-25092/.s.monetdb.31020 +MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685 QUERY = select -0xffffffffffffffffffffffffffffffff; ERROR = !Invalid hexadecimal number or hexadecimal too large (0xffffffffffffffffffffffffffffffff) in: "select -0xffffffffffffffffffffffffffffffff" CODE = 22003 -MAPI = (monetdb) /var/tmp/mtest-25092/.s.monetdb.31020 -QUERY = select -0x123456789abcdef01; -ERROR = !Invalid hexadecimal number or hexadecimal too large (0x123456789abcdef01) in: "select -0x123456789abcdef01" -CODE = 22003 -MAPI = (monetdb) /var/tmp/mtest-25092/.s.monetdb.31020 -QUERY = select -0x123456789abcdef0123456789abcdef0; -ERROR = !Invalid hexadecimal number or hexadecimal too large (0x123456789abcdef0123456789abcdef0) in: "select -0x123456789abcdef0123456789abcdef0" -CODE = 22003 -MAPI = (monetdb) /var/tmp/mtest-25092/.s.monetdb.31020 +MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685 QUERY = select -0x123456789abcdef0123456789abcdef01; ERROR = !Invalid hexadecimal number or hexadecimal too large (0x123456789abcdef0123456789abcdef01) in: "select -0x123456789abcdef0123456789abcdef01" CODE = 22003 diff --git a/sql/test/BugTracker-2014/Tests/hexadecimal_literals.Bug-3621.stable.err.int128 b/sql/test/BugTracker-2014/Tests/hexadecimal_literals.Bug-3621.stable.err.int128 deleted file mode 100644 --- a/sql/test/BugTracker-2014/Tests/hexadecimal_literals.Bug-3621.stable.err.int128 +++ /dev/null @@ -1,69 +0,0 @@ -stderr of test 'hexadecimal_literals.Bug-3621` in directory 'sql/test/BugTracker-2014` itself: - - -# 17:24:30 > -# 17:24:30 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=33525" "--set" "mapi_usock=/var/tmp/mtest-30147/.s.monetdb.33525" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/ufs/manegold/_/Monet/HG/Oct2014/prefix/_/var/MonetDB/mTests_sql_test_BugTracker-2014" "--set" "mal_listing=0" "--set" "embedded_r=yes" -# 17:24:30 > - -# builtin opt gdk_dbpath = /ufs/manegold/_/Monet/HG/Oct2014/prefix/_/var/monetdb5/dbfarm/demo -# builtin opt gdk_debug = 0 -# builtin opt gdk_vmtrim = no -# builtin opt monet_prompt = > -# builtin opt monet_daemon = no -# builtin opt mapi_port = 50000 -# builtin opt mapi_open = false -# builtin opt mapi_autosense = false -# builtin opt sql_optimizer = default_pipe -# builtin opt sql_debug = 0 -# cmdline opt gdk_nr_threads = 0 -# cmdline opt mapi_open = true -# cmdline opt mapi_port = 33525 -# cmdline opt mapi_usock = /var/tmp/mtest-30147/.s.monetdb.33525 -# cmdline opt monet_prompt = -# cmdline opt mal_listing = 2 -# cmdline opt gdk_dbpath = /ufs/manegold/_/Monet/HG/Oct2014/prefix/_/var/MonetDB/mTests_sql_test_BugTracker-2014 -# cmdline opt mal_listing = 0 -# cmdline opt embedded_r = yes -# cmdline opt gdk_debug = 536870922 - -# 17:24:30 > -# 17:24:30 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-30147" "--port=33525" -# 17:24:30 > - -MAPI = (monetdb) /var/tmp/mtest-19106/.s.monetdb.36358 -QUERY = select 0x80000000000000000000000000000000; -ERROR = !Invalid hexadecimal number or hexadecimal too large (0x80000000000000000000000000000000) in: "select 0x80000000000000000000000000000000" -CODE = 22003 -MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685 -QUERY = select 0x80000000000000000000000000000001; -ERROR = !Invalid hexadecimal number or hexadecimal too large (0x80000000000000000000000000000001) in: "select 0x80000000000000000000000000000001" -CODE = 22003 -MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685 -QUERY = select 0xffffffffffffffffffffffffffffffff; -ERROR = !Invalid hexadecimal number or hexadecimal too large (0xffffffffffffffffffffffffffffffff) in: "select 0xffffffffffffffffffffffffffffffff" -CODE = 22003 -MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685 -QUERY = select 0x123456789abcdef0123456789abcdef01; -ERROR = !Invalid hexadecimal number or hexadecimal too large (0x123456789abcdef0123456789abcdef01) in: "select 0x123456789abcdef0123456789abcdef01" -CODE = 22003 -MAPI = (monetdb) /var/tmp/mtest-19106/.s.monetdb.36358 -QUERY = select -0x80000000000000000000000000000000; -ERROR = !Invalid hexadecimal number or hexadecimal too large (0x80000000000000000000000000000000) in: "select -0x80000000000000000000000000000000" -CODE = 22003 -MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685 -QUERY = select -0x80000000000000000000000000000001; -ERROR = !Invalid hexadecimal number or hexadecimal too large (0x80000000000000000000000000000001) in: "select -0x80000000000000000000000000000001" -CODE = 22003 -MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685 -QUERY = select -0xffffffffffffffffffffffffffffffff; -ERROR = !Invalid hexadecimal number or hexadecimal too large (0xffffffffffffffffffffffffffffffff) in: "select -0xffffffffffffffffffffffffffffffff" -CODE = 22003 -MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685 -QUERY = select -0x123456789abcdef0123456789abcdef01; -ERROR = !Invalid hexadecimal number or hexadecimal too large (0x123456789abcdef0123456789abcdef01) in: "select -0x123456789abcdef0123456789abcdef01" -CODE = 22003 - -# 17:24:30 > -# 17:24:30 > "Done." -# 17:24:30 > - diff --git a/sql/test/BugTracker-2014/Tests/hexadecimal_literals.Bug-3621.stable.out b/sql/test/BugTracker-2014/Tests/hexadecimal_literals.Bug-3621.stable.out --- a/sql/test/BugTracker-2014/Tests/hexadecimal_literals.Bug-3621.stable.out +++ b/sql/test/BugTracker-2014/Tests/hexadecimal_literals.Bug-3621.stable.out @@ -557,6 +557,48 @@ stdout of test 'hexadecimal_literals.Bug % bigint # type % 19 # length [ 9223372036854775807 ] +#select 0x8000000000000000; +% .%2 # table_name +% %2 # name +% hugeint # type +% 19 # length +[ 9223372036854775808 ] +#select 0x00000000000000008000000000000000; +% .%2 # table_name +% %2 # name +% hugeint # type +% 19 # length +[ 9223372036854775808 ] +#select 0x8000000000000001; +% .%2 # table_name +% %2 # name +% hugeint # type +% 19 # length +[ 9223372036854775809 ] +#select 0x00000000000000008000000000000001; +% .%2 # table_name +% %2 # name +% hugeint # type +% 19 # length +[ 9223372036854775809 ] +#select 0xffffffffffffffff; +% .%2 # table_name +% %2 # name +% hugeint # type +% 20 # length +[ 18446744073709551615 ] +#select 0x0000000000000000ffffffffffffffff; +% .%2 # table_name +% %2 # name +% hugeint # type +% 20 # length +[ 18446744073709551615 ] +#select 0x7fffffffffffffffffffffffffffffff; +% .%2 # table_name +% %2 # name +% hugeint # type +% 39 # length +[ 170141183460469231731687303715884105727 ] #select 0x12; % .%2 # table_name % %2 # name @@ -599,7 +641,18 @@ stdout of test 'hexadecimal_literals.Bug % bigint # type % 19 # length [ 1311768467463790320 ] - +#select 0x123456789abcdef01; +% .%2 # table_name +% %2 # name +% hugeint # type +% 20 # length +[ 20988295479420645121 ] +#select 0x123456789abcdef0123456789abcdef0; +% .%2 # table_name +% %2 # name +% hugeint # type +% 38 # length +[ 24197857203266734864793317670504947440 ] #select -0x0; % .%2 # table_name % %2 # name @@ -1104,6 +1157,48 @@ stdout of test 'hexadecimal_literals.Bug % bigint # type % 20 # length [ -9223372036854775807 ] +#select -0x8000000000000000; +% .%2 # table_name +% %2 # name +% hugeint # type +% 20 # length +[ -9223372036854775808 ] +#select -0x00000000000000008000000000000000; +% .%2 # table_name +% %2 # name +% hugeint # type +% 20 # length +[ -9223372036854775808 ] +#select -0x8000000000000001; +% .%2 # table_name +% %2 # name +% hugeint # type +% 20 # length +[ -9223372036854775809 ] +#select -0x00000000000000008000000000000001; _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
