Changeset: 0d7c7c8ec081 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0d7c7c8ec081 Modified Files: Branch: Aug2011 Log Message:
Merge with Apr2011 branch. diffs (truncated from 605 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 @@ -1,3 +1,4 @@ +count-count-distinct.Bug-2808 copy-into-file-error.Bug-2722 bulk_rotate_xor_hash-error.Bug-2734 aggregate-in-subquery.Bug-2739 @@ -12,7 +13,6 @@ crash_on_alias.Bug-2798 groupby_primary_key.Bug-2807 merge_range_exp.Bug-2806 -count-count-distinct.Bug-2808 crash_in_push_exp_down.Bug-2811 subquery_in_from_clause.Bug-2812 mkey-bulk_rotate_xor_hash.Bug-2825 diff --git a/sql/test/BugTracker-2011/Tests/count-count-distinct.Bug-2808.stable.out b/sql/test/BugTracker-2011/Tests/count-count-distinct.Bug-2808.stable.out --- a/sql/test/BugTracker-2011/Tests/count-count-distinct.Bug-2808.stable.out +++ b/sql/test/BugTracker-2011/Tests/count-count-distinct.Bug-2808.stable.out @@ -30,19 +30,19 @@ % L1 # name % wrd # type % 2 # length -[ 32 ] +[ 30 ] #select count(distinct name) from tables; % .tables # table_name % L2 # name % wrd # type % 2 # length -[ 26 ] +[ 24 ] #select count(name) , count(distinct name) from tables; % .tables, .tables # table_name % L3, L4 # name % wrd, wrd # type % 2, 2 # length -[ 32, 26 ] +[ 30, 24 ] # 10:05:42 > # 10:05:42 > Done. diff --git a/sql/test/BugTracker-2011/Tests/double_erange.Bug-2774.sql b/sql/test/BugTracker-2011/Tests/double_erange.Bug-2774.sql --- a/sql/test/BugTracker-2011/Tests/double_erange.Bug-2774.sql +++ b/sql/test/BugTracker-2011/Tests/double_erange.Bug-2774.sql @@ -1,28 +1,123 @@ -create table f2774 (f float); -create table d2774 (d double); +create table f2774 (i int, f float); +create table d2774 (i int, d double); -insert into f2774 values (1e-310); -insert into d2774 values (1e-310); -insert into f2774 values (1e-312); -insert into d2774 values (1e-312); -insert into f2774 values (1e-314); -insert into d2774 values (1e-314); -insert into f2774 values (1e-316); -insert into d2774 values (1e-316); -insert into f2774 values (1e-318); -insert into d2774 values (1e-318); -insert into f2774 values (1e-320); -insert into d2774 values (1e-320); -insert into f2774 values (1e-322); -insert into d2774 values (1e-322); -insert into f2774 values (1e-324); -insert into d2774 values (1e-324); -insert into f2774 values (1e-326); -insert into d2774 values (1e-326); -insert into f2774 values (1e-328); -insert into d2774 values (1e-328); -insert into f2774 values (1e-330); -insert into d2774 values (1e-330); +select * from f2774; +select * from d2774; + +insert into f2774 values (300,1e-300); +insert into d2774 values (300,1e-300); +insert into f2774 values (302,1e-302); +insert into d2774 values (302,1e-302); +insert into f2774 values (304,1e-304); +insert into d2774 values (304,1e-304); +insert into f2774 values (306,1e-306); +insert into d2774 values (306,1e-306); +insert into f2774 values (307,1e-307); +insert into d2774 values (307,1e-307); +insert into f2774 values (308,1e-308); +insert into d2774 values (308,1e-308); +insert into f2774 values (310,1e-310); +insert into d2774 values (310,1e-310); +insert into f2774 values (312,1e-312); +insert into d2774 values (312,1e-312); +insert into f2774 values (314,1e-314); +insert into d2774 values (314,1e-314); +insert into f2774 values (316,1e-316); +insert into d2774 values (316,1e-316); +insert into f2774 values (318,1e-318); +insert into d2774 values (318,1e-318); +insert into f2774 values (320,1e-320); +insert into d2774 values (320,1e-320); +insert into f2774 values (322,1e-322); +insert into d2774 values (322,1e-322); +insert into f2774 values (323,1e-323); +insert into d2774 values (323,1e-323); +insert into f2774 values (324,1e-324); +insert into d2774 values (324,1e-324); +insert into f2774 values (326,1e-326); +insert into d2774 values (326,1e-326); +insert into f2774 values (328,1e-328); +insert into d2774 values (328,1e-328); +insert into f2774 values (330,1e-330); +insert into d2774 values (330,1e-330); + +select * from f2774; +select * from d2774; + +delete from f2774; +delete from d2774; + +select * from f2774; +select * from d2774; + +copy 18 records into f2774 from stdin using delimiters ',','\n'; +300,1e-300 +302,1e-302 +304,1e-304 +306,1e-306 +307,1e-307 +308,1e-308 +310,1e-310 +312,1e-312 +314,1e-314 +316,1e-316 +318,1e-318 +320,1e-320 +322,1e-322 +323,1e-323 +324,1e-324 +326,1e-326 +328,1e-328 +330,1e-330 +copy 18 records into d2774 from stdin using delimiters ',','\n'; +300,1e-300 +302,1e-302 +304,1e-304 +306,1e-306 +307,1e-307 +308,1e-308 +310,1e-310 +312,1e-312 +314,1e-314 +316,1e-316 +318,1e-318 +320,1e-320 +322,1e-322 +323,1e-323 +324,1e-324 +326,1e-326 +328,1e-328 +330,1e-330 + +select * from f2774; +select * from d2774; + +delete from f2774; +delete from d2774; + +select * from f2774; +select * from d2774; + +copy 9 records into f2774 from stdin using delimiters ',','\n'; +300,1e-300 +302,1e-302 +304,1e-304 +306,1e-306 +307,1e-307 +324,1e-324 +326,1e-326 +328,1e-328 +330,1e-330 +copy 9 records into d2774 from stdin using delimiters ',','\n'; +300,1e-300 +302,1e-302 +304,1e-304 +306,1e-306 +307,1e-307 +324,1e-324 +326,1e-326 +328,1e-328 +330,1e-330 select * from f2774; select * from d2774; diff --git a/sql/test/BugTracker-2011/Tests/double_erange.Bug-2774.stable.err b/sql/test/BugTracker-2011/Tests/double_erange.Bug-2774.stable.err new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2011/Tests/double_erange.Bug-2774.stable.err @@ -0,0 +1,141 @@ +stderr of test 'double_erange.Bug-2774` in directory 'test/BugTracker-2011` itself: + + +# 19:20:46 > +# 19:20:46 > 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=35514 --set monet_prompt= --trace --forcemito --set mal_listing=2 "--dbname=mTests_test_BugTracker-2011" --set mal_listing=0 ; echo ; echo Over.. +# 19:20:46 > + +# 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 = 35514 +# cmdline opt monet_prompt = +# cmdline opt mal_listing = 2 +# cmdline opt gdk_dbname = mTests_test_BugTracker-2011 +# cmdline opt mal_listing = 0 + +# 19:28:55 > +# 19:28:55 > mclient -lsql -ftest -i -e --host=rig --port=32288 +# 19:28:55 > + +MAPI = monetdb@rig:30301 +QUERY = insert into f2774 values (308,1e-308); +ERROR = !Double value too large or not a number (1e-308) in: "insert into f2774 values (308,1e-308" + !syntax error, unexpected ')' in: ")" +MAPI = monetdb@rig:30301 +QUERY = insert into d2774 values (308,1e-308); +ERROR = !Double value too large or not a number (1e-308) in: "insert into d2774 values (308,1e-308" + !syntax error, unexpected ')' in: ")" +MAPI = monetdb@rig:30301 +QUERY = insert into f2774 values (310,1e-310); +ERROR = !Double value too large or not a number (1e-310) in: "insert into f2774 values (310,1e-310" + !syntax error, unexpected ')' in: ")" +MAPI = monetdb@rig:30301 +QUERY = insert into d2774 values (310,1e-310); +ERROR = !Double value too large or not a number (1e-310) in: "insert into d2774 values (310,1e-310" + !syntax error, unexpected ')' in: ")" +MAPI = monetdb@rig:30301 +QUERY = insert into f2774 values (312,1e-312); +ERROR = !Double value too large or not a number (1e-312) in: "insert into f2774 values (312,1e-312" + !syntax error, unexpected ')' in: ")" +MAPI = monetdb@rig:30301 +QUERY = insert into d2774 values (312,1e-312); +ERROR = !Double value too large or not a number (1e-312) in: "insert into d2774 values (312,1e-312" + !syntax error, unexpected ')' in: ")" +MAPI = monetdb@rig:30301 +QUERY = insert into f2774 values (314,1e-314); +ERROR = !Double value too large or not a number (1e-314) in: "insert into f2774 values (314,1e-314" + !syntax error, unexpected ')' in: ")" +MAPI = monetdb@rig:30301 +QUERY = insert into d2774 values (314,1e-314); +ERROR = !Double value too large or not a number (1e-314) in: "insert into d2774 values (314,1e-314" + !syntax error, unexpected ')' in: ")" +MAPI = monetdb@rig:30301 +QUERY = insert into f2774 values (316,1e-316); +ERROR = !Double value too large or not a number (1e-316) in: "insert into f2774 values (316,1e-316" + !syntax error, unexpected ')' in: ")" +MAPI = monetdb@rig:30301 +QUERY = insert into d2774 values (316,1e-316); +ERROR = !Double value too large or not a number (1e-316) in: "insert into d2774 values (316,1e-316" + !syntax error, unexpected ')' in: ")" +MAPI = monetdb@rig:30301 +QUERY = insert into f2774 values (318,1e-318); +ERROR = !Double value too large or not a number (1e-318) in: "insert into f2774 values (318,1e-318" + !syntax error, unexpected ')' in: ")" +MAPI = monetdb@rig:30301 +QUERY = insert into d2774 values (318,1e-318); +ERROR = !Double value too large or not a number (1e-318) in: "insert into d2774 values (318,1e-318" + !syntax error, unexpected ')' in: ")" +MAPI = monetdb@rig:30301 +QUERY = insert into f2774 values (320,1e-320); +ERROR = !Double value too large or not a number (1e-320) in: "insert into f2774 values (320,1e-320" + !syntax error, unexpected ')' in: ")" +MAPI = monetdb@rig:30301 +QUERY = insert into d2774 values (320,1e-320); +ERROR = !Double value too large or not a number (1e-320) in: "insert into d2774 values (320,1e-320" + !syntax error, unexpected ')' in: ")" +MAPI = monetdb@rig:30301 +QUERY = insert into f2774 values (322,1e-322); +ERROR = !Double value too large or not a number (1e-322) in: "insert into f2774 values (322,1e-322" + !syntax error, unexpected ')' in: ")" +MAPI = monetdb@rig:30301 +QUERY = insert into d2774 values (322,1e-322); +ERROR = !Double value too large or not a number (1e-322) in: "insert into d2774 values (322,1e-322" + !syntax error, unexpected ')' in: ")" +MAPI = monetdb@rig:30301 +QUERY = insert into f2774 values (323,1e-323); +ERROR = !Double value too large or not a number (1e-323) in: "insert into f2774 values (323,1e-323" + !syntax error, unexpected ')' in: ")" _______________________________________________ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
