Changeset: 225ab6ac8dbc for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=225ab6ac8dbc Modified Files: testing/Mtest.py.in Branch: default Log Message:
Merged from Aug2011 diffs (150 lines): diff --git a/sql/test/BugTracker-2011/Tests/All b/sql/test/BugTracker-2011/Tests/All --- a/sql/test/BugTracker-2011/Tests/All +++ b/sql/test/BugTracker-2011/Tests/All @@ -41,3 +41,4 @@ multiple-joins.Bug-2879 delete-large-table.Bug-2882 HAVE_PERL?perl-table_info.Bug-2885 div_by_zero.Bug-2887 +cast-crash.Bug-2678 diff --git a/sql/test/BugTracker-2011/Tests/cast-crash.Bug-2678.sql b/sql/test/BugTracker-2011/Tests/cast-crash.Bug-2678.sql new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2011/Tests/cast-crash.Bug-2678.sql @@ -0,0 +1,17 @@ +CREATE TABLE "sensor_readings_2678" ( + "src_ip" VARCHAR(15), + "recv_time" TIMESTAMP, + "emit_time" TIMESTAMP, + "location" VARCHAR(30), + "type" VARCHAR(30), + "value" VARCHAR(30) +); + +SELECT + CAST(emit_time AS date) AS "date", + CAST(avg(CAST(value AS numeric(5,2))) AS numeric(5,2)) AS avgtemperature +FROM sensor_readings_2678 +WHERE "type" LIKE 'temperature' + AND location LIKE 'L318' +GROUP BY "date" +ORDER BY "date"; diff --git a/sql/test/BugTracker-2011/Tests/cast-crash.Bug-2678.stable.err b/sql/test/BugTracker-2011/Tests/cast-crash.Bug-2678.stable.err new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2011/Tests/cast-crash.Bug-2678.stable.err @@ -0,0 +1,37 @@ +stderr of test 'cast-crash.Bug-2678` in directory 'test/BugTracker-2011` itself: + + +# 12:29:59 > +# 12:29:59 > mserver5 --debug=10 --set gdk_nr_threads=0 --set "gdk_dbfarm=/net/volund.ins.cwi.nl/export/scratch0/fabian/vtmp/mtest-Aug2011-volund.ins.cwi.nl/sql/dbfarm" --set mapi_open=true --set mapi_port=36981 --set monet_prompt= --trace --forcemito --set mal_listing=2 "--dbname=mTests_test_BugTracker-2011" --set mal_listing=0 ; echo ; echo Over.. +# 12:29:59 > + +# builtin opt gdk_dbname = demo +# builtin opt gdk_dbfarm = /ufs/fabian/scratch/monetdb/Aug2011/program-x86_64/var/lib/monetdb5/dbfarm +# builtin opt gdk_debug = 0 +# builtin opt gdk_alloc_map = no +# builtin opt gdk_vmtrim = yes +# 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 gdk_dbfarm = /net/volund.ins.cwi.nl/export/scratch0/fabian/vtmp/mtest-Aug2011-volund.ins.cwi.nl/sql/dbfarm +# cmdline opt mapi_open = true +# cmdline opt mapi_port = 36981 +# cmdline opt monet_prompt = +# cmdline opt mal_listing = 2 +# cmdline opt gdk_dbname = mTests_test_BugTracker-2011 +# cmdline opt mal_listing = 0 + +# 12:29:59 > +# 12:29:59 > mclient -lsql -ftest -i -e --host=volund --port=36981 +# 12:29:59 > + + +# 12:29:59 > +# 12:29:59 > Done. +# 12:29:59 > + diff --git a/sql/test/BugTracker-2011/Tests/cast-crash.Bug-2678.stable.out b/sql/test/BugTracker-2011/Tests/cast-crash.Bug-2678.stable.out new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2011/Tests/cast-crash.Bug-2678.stable.out @@ -0,0 +1,49 @@ +stdout of test 'cast-crash.Bug-2678` in directory 'test/BugTracker-2011` itself: + + +# 12:29:59 > +# 12:29:59 > mserver5 --debug=10 --set gdk_nr_threads=0 --set "gdk_dbfarm=/net/volund.ins.cwi.nl/export/scratch0/fabian/vtmp/mtest-Aug2011-volund.ins.cwi.nl/sql/dbfarm" --set mapi_open=true --set mapi_port=36981 --set monet_prompt= --trace --forcemito --set mal_listing=2 "--dbname=mTests_test_BugTracker-2011" --set mal_listing=0 ; echo ; echo Over.. +# 12:29:59 > + +# MonetDB 5 server v11.5.4 "Aug2011-58ba9e3940e6" +# Serving database 'mTests_test_BugTracker-2011', using 4 threads +# Compiled for x86_64-pc-linux-gnu/64bit with 64bit OIDs dynamically linked +# Found 7.749 GiB available main-memory. +# Copyright (c) 1993-July 2008 CWI. +# Copyright (c) August 2008-2011 MonetDB B.V., all rights reserved +# Visit http://www.monetdb.org/ for further information +# Listening for connection requests on mapi:monetdb://volund.ins.cwi.nl:36981/ + +Ready. + +Over.. + +# 12:29:59 > +# 12:29:59 > mclient -lsql -ftest -i -e --host=volund --port=36981 +# 12:29:59 > + +#CREATE TABLE "sensor_readings_2678" ( +# "src_ip" VARCHAR(15), +# "recv_time" TIMESTAMP, +# "emit_time" TIMESTAMP, +# "location" VARCHAR(30), +# "type" VARCHAR(30), +# "value" VARCHAR(30) +#); +#SELECT +# CAST(emit_time AS date) AS "date", +# CAST(avg(CAST(value AS numeric(5,2))) AS numeric(5,2)) AS avgtemperature +#FROM sensor_readings_2678 +#WHERE "type" LIKE 'temperature' +# AND location LIKE 'L318' +#GROUP BY "date" +#ORDER BY "date"; +% sys.sensor_readings_2678, sys. # table_name +% date, avgtemperature # name +% date, decimal # type +% 10, 7 # length + +# 12:29:59 > +# 12:29:59 > Done. +# 12:29:59 > + diff --git a/testing/Mfilter.py.in b/testing/Mfilter.py.in --- a/testing/Mfilter.py.in +++ b/testing/Mfilter.py.in @@ -87,7 +87,7 @@ norm_in = re.compile('(?:'+')|(?:'.join r"^([Uu]sage: )(/.*/\.libs/|/.*/lt-|)([A-Za-z0-9_]+:?[ \t].*)\n", # 22: 3 r'^(!.*Exception:remote\.[^:]*:\(mapi:monetdb://monetdb@)([^/]*)(/mTests_.*\).*)\n', # 25: 3 r"^(DBD::monetdb::db table_info warning: Catalog parameter '' ignored at )([\./].+|[A-Z]:\\.+[/\\])([^/\\]+\.pl line [0-9]+\.)\n", # 27: 3 - r'^(ERROR REPORTED: DBD:|SyntaxException:parseError)(:.+ at )([\./].+|[A-Z]:\\.+[/\\])([^/\\]+\.pm line [0-9]+\.)\n', # 28: 4 + r'^(ERROR REPORTED: DBD:|SyntaxException:parseError)(:.+ at )([\./].+/|[A-Z]:\\.+[/\\])([^/\\]+\.pm line [0-9]+\.)\n', # 28: 3 # filter for geos 3.3 vs. geos 3.2, can be removed if we have 3.3 everywhere r"^(ERROR = !MALException:wkb.FromText:ParseException: Expected )('EMPTY' or '\(')( but encountered : '\)')\n", # 29: 3 ])+')', re.MULTILINE) diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in --- a/testing/Mtest.py.in +++ b/testing/Mtest.py.in @@ -2503,7 +2503,7 @@ def DoIt(env, SERVER, CALL, TST, EXT, PR segfaulted = False # Try to detect segfaults and the like - TO = re.compile("((^|^[^#]*[\t ])(Memory [Ff]ault|Segmentation [Ff]ault|Bus [Ee]rror|Abort(|ed)|Assertion failed:|!FATAL: BATSIGabort:)([ \t]|$)|(^ERROR = !Connection terminated$))", re.MULTILINE) + TO = re.compile("((^|^[^#]*[\t ])(Memory [Ff]ault|Segmentation [Ff]ault|Bus [Ee]rror|Abort(|ed)|Assertion failed:|!FATAL: BATSIGabort:)([ \t]|$))", re.MULTILINE) # FIXME: this begs for a much nicer solution (100% copy of below) if os.path.isfile(TestErrFile): for l in open(TestErrFile): _______________________________________________ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
