Changeset: 3d3ac44343a9 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3d3ac44343a9 Modified Files: Branch: sciql Log Message:
Merge with default branch. diffs (truncated from 952 to 300 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 @@ -17,3 +17,10 @@ subquery_in_from_clause.Bug-2812 mkey-bulk_rotate_xor_hash.Bug-2825 supertype.Bug-2830 +UNIQUE_Constraint_reference.Bug-2835 +Crash_in_query_analysis.Bug-2831 +CASE_division_exception.Bug-2822 +nested_SELECT_UNIAL_ALL.Bug-2816 +subquery_in_where.Bug-2823 +func_iter_vs_bulk.Bug-2826 +UDF_in_schema.Bug-2817 diff --git a/sql/test/BugTracker-2011/Tests/CASE_division_exception.Bug-2822.sql b/sql/test/BugTracker-2011/Tests/CASE_division_exception.Bug-2822.sql new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2011/Tests/CASE_division_exception.Bug-2822.sql @@ -0,0 +1,4 @@ +CREATE TABLE bug_2822 (c INT); +INSERT INTO bug_2822 VALUES (0); +SELECT CASE WHEN (c = 0) THEN 0 ELSE (c / c + 1) END FROM bug_2822; +DROP TABLE bug_2822; diff --git a/sql/test/BugTracker-2011/Tests/CASE_division_exception.Bug-2822.stable.err b/sql/test/BugTracker-2011/Tests/CASE_division_exception.Bug-2822.stable.err new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2011/Tests/CASE_division_exception.Bug-2822.stable.err @@ -0,0 +1,39 @@ +stderr of test 'CASE_division_exception.Bug-2822` in directory 'test/BugTracker-2011` itself: + + +# 14:59:26 > +# 14:59:26 > mserver5 --debug=10 --set gdk_nr_threads=0 --set "gdk_dbfarm=/ufs/manegold/_/scratch0/Monet/HG/Apr2011/prefix/_/var/MonetDB" --set mapi_open=true --set mapi_port=37988 --set monet_prompt= --trace --forcemito --set mal_listing=2 "--dbname=mTests_test_BugTracker-2011" --set mal_listing=0 ; echo ; echo Over.. +# 14:59:26 > + +# builtin opt gdk_dbname = demo +# builtin opt gdk_dbfarm = /ufs/manegold/_/scratch0/Monet/HG/Apr2011/prefix/_/var/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 default_pipe = inline,remap,evaluate,costModel,coercions,emptySet,aliases,mitosis,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,multiplex,garbageCollector +# builtin opt minimal_pipe = inline,remap,deadcode,multiplex,garbageCollector +# builtin opt sql_optimizer = default_pipe +# builtin opt sql_debug = 0 +# cmdline opt gdk_nr_threads = 0 +# cmdline opt gdk_dbfarm = /ufs/manegold/_/scratch0/Monet/HG/Apr2011/prefix/_/var/MonetDB +# cmdline opt mapi_open = true +# cmdline opt mapi_port = 37988 +# cmdline opt monet_prompt = +# cmdline opt mal_listing = 2 +# cmdline opt gdk_dbname = mTests_test_BugTracker-2011 +# cmdline opt mal_listing = 0 + +# 14:59:27 > +# 14:59:27 > mclient -lsql -ftest -i -e --host=rig --port=37988 +# 14:59:27 > + + +# 14:59:27 > +# 14:59:27 > Done. +# 14:59:27 > + diff --git a/sql/test/BugTracker-2011/Tests/CASE_division_exception.Bug-2822.stable.out b/sql/test/BugTracker-2011/Tests/CASE_division_exception.Bug-2822.stable.out new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2011/Tests/CASE_division_exception.Bug-2822.stable.out @@ -0,0 +1,43 @@ +stdout of test 'CASE_division_exception.Bug-2822` in directory 'test/BugTracker-2011` itself: + + +# 14:59:26 > +# 14:59:26 > mserver5 --debug=10 --set gdk_nr_threads=0 --set "gdk_dbfarm=/ufs/manegold/_/scratch0/Monet/HG/Apr2011/prefix/_/var/MonetDB" --set mapi_open=true --set mapi_port=37988 --set monet_prompt= --trace --forcemito --set mal_listing=2 "--dbname=mTests_test_BugTracker-2011" --set mal_listing=0 ; echo ; echo Over.. +# 14:59:26 > + +# MonetDB 5 server v11.3.4 +# This is an unreleased version +# Serving database 'mTests_test_BugTracker-2011', using 4 threads +# Compiled for x86_64-unknown-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://monetdb.cwi.nl/ for further information +# Listening for connection requests on mapi:monetdb://rig.ins.cwi.nl:37988/ +# MonetDB/GIS module loaded +# MonetDB/SQL module loaded + +Ready. +# SQL catalog created, loading sql scripts once + +Over.. + +# 14:59:27 > +# 14:59:27 > mclient -lsql -ftest -i -e --host=rig --port=37988 +# 14:59:27 > + +#CREATE TABLE bug_2822 (c INT); +#INSERT INTO bug_2822 VALUES (0); +[ 1 ] +#SELECT CASE WHEN (c = 0) THEN 0 ELSE (c / c + 1) END FROM bug_2822; +% sys. # table_name +% ifthenelse_isnull_=_c # name +% int # type +% 1 # length +[ 0 ] +#DROP TABLE bug_2822; + +# 14:59:27 > +# 14:59:27 > Done. +# 14:59:27 > + diff --git a/sql/test/BugTracker-2011/Tests/Crash_in_query_analysis.Bug-2831.sql b/sql/test/BugTracker-2011/Tests/Crash_in_query_analysis.Bug-2831.sql new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2011/Tests/Crash_in_query_analysis.Bug-2831.sql @@ -0,0 +1,32 @@ +create schema lrbm_bug_2831; + +CREATE TABLE lrbm_bug_2831.accident(carid1 integer, carid2 integer, firstMinute integer, +lastMinute integer, dir integer, seg integer, pos integer); +CREATE TABLE lrbm_bug_2831.statistics(dir int,seg int,time_minute int,numvehicles +int,lav float,toll int,accident int,accidentSeg int); +UPDATE lrbm_bug_2831.statistics + SET toll = 0, accident = 1 + WHERE EXISTS( + SELECT acc.seg + FROM lrbm_bug_2831.accident AS acc + WHERE acc.dir = statistics.dir AND + acc.firstMinute + 1 <= statistics.time_minute AND + acc.lastMinute + 1 >= statistics.time_minute AND + ( + ( + (acc.dir = 0) AND + (acc.seg >= statistics.seg) AND + (acc.seg <= statistics.seg + 4) + ) + OR + ( + (acc.dir <> 0) AND + (acc.seg <= statistics.seg) AND + (acc.seg >= statistics.seg - 4) + ) + ) + ); + +drop table lrbm_bug_2831.statistics; +drop table lrbm_bug_2831.accident; +drop schema lrbm_bug_2831; diff --git a/sql/test/BugTracker-2011/Tests/Crash_in_query_analysis.Bug-2831.stable.err b/sql/test/BugTracker-2011/Tests/Crash_in_query_analysis.Bug-2831.stable.err new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2011/Tests/Crash_in_query_analysis.Bug-2831.stable.err @@ -0,0 +1,39 @@ +stderr of test 'Crash_in_query_analysis.Bug-2831` in directory 'test/BugTracker-2011` itself: + + +# 14:49:39 > +# 14:49:39 > mserver5 --debug=10 --set gdk_nr_threads=0 --set "gdk_dbfarm=/ufs/manegold/_/scratch0/Monet/HG/Apr2011/prefix/_/var/MonetDB" --set mapi_open=true --set mapi_port=38367 --set monet_prompt= --trace --forcemito --set mal_listing=2 "--dbname=mTests_test_BugTracker-2011" --set mal_listing=0 ; echo ; echo Over.. +# 14:49:39 > + +# builtin opt gdk_dbname = demo +# builtin opt gdk_dbfarm = /ufs/manegold/_/scratch0/Monet/HG/Apr2011/prefix/_/var/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 default_pipe = inline,remap,evaluate,costModel,coercions,emptySet,aliases,mitosis,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,multiplex,garbageCollector +# builtin opt minimal_pipe = inline,remap,deadcode,multiplex,garbageCollector +# builtin opt sql_optimizer = default_pipe +# builtin opt sql_debug = 0 +# cmdline opt gdk_nr_threads = 0 +# cmdline opt gdk_dbfarm = /ufs/manegold/_/scratch0/Monet/HG/Apr2011/prefix/_/var/MonetDB +# cmdline opt mapi_open = true +# cmdline opt mapi_port = 38367 +# cmdline opt monet_prompt = +# cmdline opt mal_listing = 2 +# cmdline opt gdk_dbname = mTests_test_BugTracker-2011 +# cmdline opt mal_listing = 0 + +# 14:49:39 > +# 14:49:39 > mclient -lsql -ftest -i -e --host=rig --port=38367 +# 14:49:39 > + + +# 14:49:39 > +# 14:49:39 > Done. +# 14:49:39 > + diff --git a/sql/test/BugTracker-2011/Tests/Crash_in_query_analysis.Bug-2831.stable.out b/sql/test/BugTracker-2011/Tests/Crash_in_query_analysis.Bug-2831.stable.out new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2011/Tests/Crash_in_query_analysis.Bug-2831.stable.out @@ -0,0 +1,56 @@ +stdout of test 'Crash_in_query_analysis.Bug-2831` in directory 'test/BugTracker-2011` itself: + + +# 14:49:39 > +# 14:49:39 > mserver5 --debug=10 --set gdk_nr_threads=0 --set "gdk_dbfarm=/ufs/manegold/_/scratch0/Monet/HG/Apr2011/prefix/_/var/MonetDB" --set mapi_open=true --set mapi_port=38367 --set monet_prompt= --trace --forcemito --set mal_listing=2 "--dbname=mTests_test_BugTracker-2011" --set mal_listing=0 ; echo ; echo Over.. +# 14:49:39 > + +# MonetDB 5 server v11.3.4 +# This is an unreleased version +# Serving database 'mTests_test_BugTracker-2011', using 4 threads +# Compiled for x86_64-unknown-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://monetdb.cwi.nl/ for further information +# Listening for connection requests on mapi:monetdb://rig.ins.cwi.nl:38367/ +# MonetDB/GIS module loaded +# MonetDB/SQL module loaded + +Ready. +# SQL catalog created, loading sql scripts once + +Over.. + +# 14:49:39 > +# 14:49:39 > mclient -lsql -ftest -i -e --host=rig --port=38367 +# 14:49:39 > + +#create schema lrbm_bug_2831; +#CREATE TABLE lrbm_bug_2831.accident(carid1 integer, carid2 integer, firstMinute integer, +#lastMinute integer, dir integer, seg integer, pos integer); +#CREATE TABLE lrbm_bug_2831.statistics(dir int,seg int,time_minute int,numvehicles +#int,lav float,toll int,accident int,accidentSeg int); +#UPDATE lrbm_bug_2831.statistics +# SET toll = 0, accident = 1 +# WHERE EXISTS( +# SELECT acc.seg +# FROM lrbm_bug_2831.accident AS acc +# WHERE acc.dir = statistics.dir AND +# acc.firstMinute + 1 <= statistics.time_minute AND +# acc.lastMinute + 1 >= statistics.time_minute AND +# ( +# ( +# (acc.dir = 0) AND +# (acc.seg >= statistics.seg) AND +# (acc.seg <= statistics.seg + 4) +# +[ 0 ] +#drop table lrbm_bug_2831.statistics; +#drop table lrbm_bug_2831.accident; +#drop schema lrbm_bug_2831; + +# 14:49:39 > +# 14:49:39 > Done. +# 14:49:39 > + diff --git a/sql/test/BugTracker-2011/Tests/UDF_in_schema.Bug-2817.sql b/sql/test/BugTracker-2011/Tests/UDF_in_schema.Bug-2817.sql new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2011/Tests/UDF_in_schema.Bug-2817.sql @@ -0,0 +1,33 @@ +create schema datacell; +create table datacell.basket_X( + id integer auto_increment, + tag timestamp default now(), + payload integer +); +create function datacell.basket_X() +returns table (id integer, tag timestamp, payload integer) +begin + return select * from datacell.basket_X; +end; +select * from datacell.basket_X; +select * from datacell.basket_X(); +drop function datacell.basket_X; +drop table datacell.basket_X; +drop schema datacell; + +create schema schema_2817; +create table schema_2817.table_2817( + id integer auto_increment, + tag timestamp default now(), + payload integer +); +create function schema_2817.function_2817() +returns table (id integer, tag timestamp, payload integer) +begin + return select * from schema_2817.table_2817; +end; +select * from schema_2817.table_2817; +select * from schema_2817.function_2817(); +drop function schema_2817.function_2817; +drop table schema_2817.table_2817; +drop schema schema_2817; diff --git a/sql/test/BugTracker-2011/Tests/UDF_in_schema.Bug-2817.stable.err b/sql/test/BugTracker-2011/Tests/UDF_in_schema.Bug-2817.stable.err new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2011/Tests/UDF_in_schema.Bug-2817.stable.err @@ -0,0 +1,39 @@ _______________________________________________ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
