Changeset: c9e68cf0a3dc for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c9e68cf0a3dc Removed Files: sql/test/pg_regress/Tests/float8.stable.err.Windows Modified Files: sql/test/pg_regress/Tests/float8.stable.err sql/test/pg_regress/Tests/float8.stable.err.int128 Branch: Jul2017 Log Message:
Approve output, remove Windows-specific error output. The message "decimal (1e200) doesn't have format (38.0)" (or with 18.0) does get produced, but gets removed by the evaluate optimizer, so we get a different error message. diffs (162 lines): diff --git a/sql/test/pg_regress/Tests/float8.stable.err b/sql/test/pg_regress/Tests/float8.stable.err --- a/sql/test/pg_regress/Tests/float8.stable.err +++ b/sql/test/pg_regress/Tests/float8.stable.err @@ -112,8 +112,8 @@ QUERY = SELECT '' AS bad, f.f1 * '1e200' ERROR = !overflow in calculation -1.2345678901234e+200*9.9999999999999997e+199. MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 QUERY = SELECT '' AS bad, f.f1 ^ '1e200' from FLOAT8_TBL f; -ERROR = !decimal (1e200) doesn't have format (18.0) -MAPI = (monetdb) /var/tmp/mtest-19622/.s.monetdb.32578 +ERROR = !too many digits (201 > 18) +MAPI = (monetdb) /var/tmp/mtest-8253/.s.monetdb.30231 QUERY = SELECT '' AS bad, f.f1 / '0.0' from FLOAT8_TBL f; ERROR = !division by zero. MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 diff --git a/sql/test/pg_regress/Tests/float8.stable.err.Windows b/sql/test/pg_regress/Tests/float8.stable.err.Windows deleted file mode 100644 --- a/sql/test/pg_regress/Tests/float8.stable.err.Windows +++ /dev/null @@ -1,129 +0,0 @@ -stderr of test 'float8` in directory 'sql/test/pg_regress` itself: - - -# 17:11:18 > -# 17:11:18 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=38959" "--set" "mapi_usock=/var/tmp/mtest-1142/.s.monetdb.38959" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/ufs/dinther/INSTALL/var/MonetDB/mTests_sql_test_pg_regress" "--set" "mal_listing=0" -# 17:11:18 > - -# builtin opt gdk_dbpath = /ufs/dinther/INSTALL/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 = 38959 -# cmdline opt mapi_usock = /var/tmp/mtest-1142/.s.monetdb.38959 -# cmdline opt monet_prompt = -# cmdline opt mal_listing = 2 -# cmdline opt gdk_dbpath = /ufs/dinther/INSTALL/var/MonetDB/mTests_sql_test_pg_regress -# cmdline opt mal_listing = 0 -# cmdline opt gdk_debug = 536870922 - -# 17:11:19 > -# 17:11:19 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-1142" "--port=38959" -# 17:11:19 > - -MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 -QUERY = SELECT cast('10e400' as double); -ERROR = !conversion of string '10e400' to type dbl failed. -MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 -QUERY = SELECT cast('-10e400' as double); -ERROR = !conversion of string '-10e400' to type dbl failed. -MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 -QUERY = INSERT INTO FLOAT8_TBL(f1) VALUES (' '); -ERROR = !conversion of string ' ' to type dbl failed. -MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 -QUERY = INSERT INTO FLOAT8_TBL(f1) VALUES ('xyz'); -ERROR = !conversion of string 'xyz' to type dbl failed. -MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 -QUERY = INSERT INTO FLOAT8_TBL(f1) VALUES ('5.0.0'); -ERROR = !conversion of string '5.0.0' to type dbl failed. -MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 -QUERY = INSERT INTO FLOAT8_TBL(f1) VALUES ('5 . 0'); -ERROR = !conversion of string '5 . 0' to type dbl failed. -MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 -QUERY = INSERT INTO FLOAT8_TBL(f1) VALUES ('5. 0'); -ERROR = !conversion of string '5. 0' to type dbl failed. -MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 -QUERY = INSERT INTO FLOAT8_TBL(f1) VALUES (' - 3'); -ERROR = !conversion of string ' - 3' to type dbl failed. -MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 -QUERY = INSERT INTO FLOAT8_TBL(f1) VALUES ('123 5'); -ERROR = !conversion of string '123 5' to type dbl failed. -MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 -QUERY = SELECT cast('NaN' as double); -ERROR = !conversion of string 'NaN' to type dbl failed. -MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 -QUERY = SELECT cast('nan' as double); -ERROR = !conversion of string 'nan' to type dbl failed. -MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 -QUERY = SELECT cast(' NAN ' as double); -ERROR = !conversion of string ' NAN ' to type dbl failed. -MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 -QUERY = SELECT cast('infinity' as double); -ERROR = !conversion of string 'infinity' to type dbl failed. -MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 -QUERY = SELECT cast(' -INFINiTY ' as double); -ERROR = !conversion of string ' -INFINiTY ' to type dbl failed. -MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 -QUERY = SELECT cast('N A N' as double); -ERROR = !conversion of string 'N A N' to type dbl failed. -MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 -QUERY = SELECT cast('NaN x' as double); -ERROR = !conversion of string 'NaN x' to type dbl failed. -MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 -QUERY = SELECT cast(' INFINITY x' as double); -ERROR = !conversion of string ' INFINITY x' to type dbl failed. -MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 -QUERY = SELECT cast('Infinity' as double) + 100.0; -ERROR = !conversion of string 'Infinity' to type dbl failed. -MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 -QUERY = SELECT cast('Infinity' as double) / cast('Infinity' as double); -ERROR = !conversion of string 'Infinity' to type dbl failed. -MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 -QUERY = SELECT cast('nan' as double) / cast('nan' as double); -ERROR = !conversion of string 'nan' to type dbl failed. -MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 -QUERY = SELECT '' AS five, f.f1, truncate(f1) AS trunc_f1 - FROM FLOAT8_TBL f; -ERROR = !SELECT: no such unary operator 'truncate(double)' -MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 -QUERY = SELECT |/ cast('64' as double) AS eight; -ERROR = !syntax error, unexpected '|' in: "select |" -MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 -QUERY = SELECT '' AS three, f.f1, |/f.f1 AS sqrt_f1 - FROM FLOAT8_TBL f - WHERE f.f1 > '0.0'; -ERROR = !syntax error, unexpected '|' in: "select '' as three, f.f1, |" -MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 -QUERY = SELECT ||/ cast('27' as double) AS three; -ERROR = !syntax error, unexpected CONCATSTRING in: "select ||" -MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 -QUERY = SELECT '' AS five, f.f1, ||/f.f1 AS cbrt_f1 FROM FLOAT8_TBL f; -ERROR = !syntax error, unexpected CONCATSTRING in: "select '' as five, f.f1, ||" -MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 -QUERY = SELECT '' AS bad, f.f1 * '1e200' from FLOAT8_TBL f; -ERROR = !overflow in calculation -1.2345678901234e+200*9.9999999999999997e+199. -MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 -QUERY = SELECT '' AS bad, f.f1 ^ '1e200' from FLOAT8_TBL f; -ERROR = !decimal (1e200) doesn't have format (18.0) -MAPI = (monetdb) /var/tmp/mtest-4855/.s.monetdb.34828 -QUERY = SELECT '' AS bad, f.f1 / '0.0' from FLOAT8_TBL f; -ERROR = !division by zero. -MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 -QUERY = INSERT INTO FLOAT8_TBL(f1) VALUES ('10e400'); -ERROR = !conversion of string '10e400' to type dbl failed. -MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 -QUERY = INSERT INTO FLOAT8_TBL(f1) VALUES ('-10e400'); -ERROR = !conversion of string '-10e400' to type dbl failed. - -# 17:11:19 > -# 17:11:19 > "Done." -# 17:11:19 > - diff --git a/sql/test/pg_regress/Tests/float8.stable.err.int128 b/sql/test/pg_regress/Tests/float8.stable.err.int128 --- a/sql/test/pg_regress/Tests/float8.stable.err.int128 +++ b/sql/test/pg_regress/Tests/float8.stable.err.int128 @@ -112,8 +112,8 @@ QUERY = SELECT '' AS bad, f.f1 * '1e200' ERROR = !overflow in calculation -1.2345678901234e+200*9.9999999999999997e+199. MAPI = (monetdb) /var/tmp/mtest-27483/.s.monetdb.35395 QUERY = SELECT '' AS bad, f.f1 ^ '1e200' from FLOAT8_TBL f; -ERROR = !decimal (1e200) doesn't have format (38.0) -MAPI = (monetdb) /var/tmp/mtest-32375/.s.monetdb.35252 +ERROR = !too many digits (201 > 38) +MAPI = (monetdb) /var/tmp/mtest-2099/.s.monetdb.39647 QUERY = SELECT '' AS bad, f.f1 / '0.0' from FLOAT8_TBL f; ERROR = !division by zero. MAPI = (monetdb) /var/tmp/mtest-27483/.s.monetdb.35395 _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list