Changeset: 670566f21424 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=670566f21424 Added Files: monetdb5/mal/Tests/dataflow01.malC monetdb5/mal/Tests/dataflow03.malC monetdb5/mal/Tests/dynamicload.malC monetdb5/mal/Tests/flowchk.malC monetdb5/mal/Tests/parseErrors.malC monetdb5/mal/Tests/pithole.malC monetdb5/mal/Tests/recycle00.malC monetdb5/mal/Tests/recycle01.malC monetdb5/mal/Tests/recycle02.malC monetdb5/mal/Tests/recycle03.malC monetdb5/mal/Tests/recycle04.malC monetdb5/mal/Tests/recycle05.malC monetdb5/mal/Tests/recycle07.malC monetdb5/mal/Tests/recycle08.malC monetdb5/mal/Tests/recycle10.malC monetdb5/mal/Tests/recycle11.malC monetdb5/mal/Tests/recycle12.malC monetdb5/mal/Tests/selecttest.malC Removed Files: monetdb5/mal/Tests/dataflow01.mal monetdb5/mal/Tests/dataflow02.mal monetdb5/mal/Tests/dataflow03.mal monetdb5/mal/Tests/dynamicload.mal monetdb5/mal/Tests/flowchk.mal monetdb5/mal/Tests/parseErrors.mal monetdb5/mal/Tests/pithole.mal monetdb5/mal/Tests/recycle00.mal monetdb5/mal/Tests/recycle01.mal monetdb5/mal/Tests/recycle02.mal monetdb5/mal/Tests/recycle03.mal monetdb5/mal/Tests/recycle04.mal monetdb5/mal/Tests/recycle05.mal monetdb5/mal/Tests/recycle07.mal monetdb5/mal/Tests/recycle08.mal monetdb5/mal/Tests/recycle10.mal monetdb5/mal/Tests/recycle11.mal monetdb5/mal/Tests/recycle12.mal monetdb5/mal/Tests/selecttest.mal Modified Files: monetdb5/mal/Tests/dataflow01.stable.out monetdb5/mal/Tests/dataflow03.stable.out monetdb5/mal/Tests/dynamicload.stable.err monetdb5/mal/Tests/dynamicload.stable.out monetdb5/mal/Tests/parseErrors.stable.err monetdb5/mal/Tests/parseErrors.stable.out monetdb5/mal/Tests/pithole.stable.err monetdb5/mal/Tests/pithole.stable.out monetdb5/mal/Tests/recycle00.stable.out monetdb5/mal/Tests/recycle01.stable.out monetdb5/mal/Tests/recycle02.stable.out monetdb5/mal/Tests/recycle03.stable.out monetdb5/mal/Tests/recycle04.stable.out monetdb5/mal/Tests/recycle05.stable.out monetdb5/mal/Tests/recycle07.stable.out monetdb5/mal/Tests/recycle08.stable.out monetdb5/mal/Tests/recycle10.stable.out monetdb5/mal/Tests/recycle11.stable.out monetdb5/mal/Tests/recycle12.stable.out Branch: default Log Message:
MAL revamping tests diffs (truncated from 1365 to 300 lines): diff --git a/monetdb5/mal/Tests/dataflow01.mal b/monetdb5/mal/Tests/dataflow01.malC rename from monetdb5/mal/Tests/dataflow01.mal rename to monetdb5/mal/Tests/dataflow01.malC diff --git a/monetdb5/mal/Tests/dataflow01.stable.out b/monetdb5/mal/Tests/dataflow01.stable.out --- a/monetdb5/mal/Tests/dataflow01.stable.out +++ b/monetdb5/mal/Tests/dataflow01.stable.out @@ -9,57 +9,23 @@ stdout of test 'dataflow01` in directory # Serving database 'mTests_src_mal', using 4 threads # Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically linked # Copyright (c) 1993-July 2008 CWI. -# Copyright (c) August 2008-2009 MonetDB B.V., all rights reserved -# Visit http://monetdb.cwi.nl/ for further information -# Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:39545/ -function user.load():bat[:oid,:lng]; - b := bat.new(:oid,:lng); - k := 0; - INT_MAX := 2147483647; - dbgmsk_restore := mdb.getDebug(); - dbgmsk_unset := calc.+(8,8388608); - dbgmsk_keep := calc.xor(INT_MAX,dbgmsk_unset); - dbgmsk_set := calc.and(dbgmsk_restore,dbgmsk_keep); - mdb.setDebug(dbgmsk_set); -barrier i := 0:lng; - k := calc.+(k,1); - l := calc.lng(k); - bat.append(b,l); - redo i := iterator.next(1:lng,1000000:lng); -exit i; - mdb.setDebug(dbgmsk_restore); - return load := b; -end user.load; -function user.qry(z:bat[:oid,:lng],low:int,hgh:int):wrd; - l := calc.lng(low); - h := calc.lng(hgh); - s := algebra.subselect(z,l,h,true,true,false); - c := aggr.count(s); - return qry := c; -end user.qry; -function user.main():void; -# a simple dataflow test to check call methods. - s := user.load(); - t1 := 0:wrd; - t2 := 0:wrd; - t3 := 0:wrd; - t4 := 0:wrd; - c := 0:wrd; -barrier go := language.dataflow(); - t1 := user.qry(s,1,100); - t2 := user.qry(s,101,1000); - t3 := user.qry(s,1001,10000); - t4 := user.qry(s,10001,100000); - c1 := calc.+(t1,t3); - c2 := calc.+(t2,t4); - c := calc.+(c1,c2); -exit go; - io.print(c); - io.print(t1); - io.print(t2); - io.print(t3); - io.print(t4); -end user.main; +# Copyright (c) August 2008-2015 MonetDB B.V., all rights reserved +# Visit http://www.monetdb.org/ for further information +# Listening for connection requests on mapi:monetdb://vienna.da.cwi.nl:33890/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-22767/.s.monetdb.33890 +# MonetDB/GIS module loaded +# Start processing logs sql/sql_logs version 52200 +# Finished processing logs sql/sql_logs +# MonetDB/SQL module loaded +# MonetDB/R module loaded + +Ready. + +# 20:49:35 > +# 20:49:35 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-22767" "--port=33890" +# 20:49:35 > + +#io.print(c); [ 100000 ] [ 100 ] [ 900 ] diff --git a/monetdb5/mal/Tests/dataflow02.mal b/monetdb5/mal/Tests/dataflow02.mal deleted file mode 100644 --- a/monetdb5/mal/Tests/dataflow02.mal +++ /dev/null @@ -1,34 +0,0 @@ -# a simple dataflow test to check call methods. -# the instructions executed can be see using -include sql; -sql.init(); - -function octopus.qry(hgh:int):int; - conn := remote.connect("demo","monetdb","monetdb"); - r:= remote.put(conn,20); - i:int:= remote.get(conn,r); - hgh:= hgh+i; - return qry:= hgh; -end octopus.qry; - -function octopus.exec0(dbname:str,query:str,version:int):int; - _4 := remote.connect(dbname,"monetdb","monetdb"); - _6 := remote.put(_4,version); - _7 := remote.exec(_4,"octopus",query,_6); - _9:int := remote.get(_4,_7); - io.print(_9); - return exec0 := _9; -end octopus.exec0; - -# run the debugger on the console -#mdb.setTrap("octopus","qry",true); -barrier go:= language.dataflow(); - t1:= octopus.exec0("demo","qry",1); - t2:= octopus.exec0("demo","qry",2); - t3:= octopus.exec0("demo","qry",3); - t4:= octopus.exec0("demo","qry",4); -exit go; -io.print(t1); -io.print(t2); -io.print(t3); -io.print(t4); diff --git a/monetdb5/mal/Tests/dataflow03.mal b/monetdb5/mal/Tests/dataflow03.malC rename from monetdb5/mal/Tests/dataflow03.mal rename to monetdb5/mal/Tests/dataflow03.malC diff --git a/monetdb5/mal/Tests/dataflow03.stable.out b/monetdb5/mal/Tests/dataflow03.stable.out --- a/monetdb5/mal/Tests/dataflow03.stable.out +++ b/monetdb5/mal/Tests/dataflow03.stable.out @@ -16,48 +16,20 @@ stdout of test 'dataflow03` in directory # Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:36857/ # MonetDB/SQL module loaded # MonetDB/GIS module loaded -function user.f(b:int):int; - return f := b; -end user.f; -function user.f(a:int,b:int):int; - return f := calc.+(a,b); -end user.f; -function user.sequential():void; - A0 := 1; - z := -1; - x0 := user.f(A0); - x1 := user.f(x0); - y := user.f(x1,x0); - w := user.f(1,x0); - a := user.f(x1,x1); -#wakeup only once - z := user.f(y,x0); - y := user.f(z); - z := user.f(y); - z := user.f(z); - io.print(z); -end user.sequential; -function user.qry():void; - A0 := 1; - z := -1; -barrier x := language.dataflow(); - x0 := user.f(A0); - x1 := user.f(x0); - y := user.f(x1,x0); - w := user.f(1,x0); - a := user.f(x1,x1); - z := user.f(y,x0); - y := user.f(z); - z := user.f(y); - z := user.f(z); -exit x; - io.print(z); -end user.qry; -function user.main():void; -# simple test for graph admin - user.sequential(); - user.qry(); -end user.main; +# Start processing logs sql/sql_logs version 52200 +# Start reading the write-ahead log 'sql_logs/sql/log.3' +# Finished reading the write-ahead log 'sql_logs/sql/log.3' +# Finished processing logs sql/sql_logs +# MonetDB/SQL module loaded +# MonetDB/R module loaded + +Ready. + +# 20:49:37 > +# 20:49:37 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-22767" "--port=33890" +# 20:49:37 > + +#sequential(); [ 3 ] [ 3 ] diff --git a/monetdb5/mal/Tests/dynamicload.mal b/monetdb5/mal/Tests/dynamicload.malC rename from monetdb5/mal/Tests/dynamicload.mal rename to monetdb5/mal/Tests/dynamicload.malC diff --git a/monetdb5/mal/Tests/dynamicload.stable.err b/monetdb5/mal/Tests/dynamicload.stable.err --- a/monetdb5/mal/Tests/dynamicload.stable.err +++ b/monetdb5/mal/Tests/dynamicload.stable.err @@ -75,7 +75,28 @@ stderr of test 'dynamicload` in director #warning: please don't forget to set your vault key! #(see /ufs/mk/monet5//Linux/etc/monetdb5.conf) -# 20:04:03 > -# 20:04:03 > Done. -# 20:04:03 > +# 21:00:40 > +# 21:00:40 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-23746" "--port=32905" +# 21:00:40 > +MAPI = (monetdb) /var/tmp/mtest-23746/.s.monetdb.32905 +QUERY = command wrong() +ERROR = !SyntaxException:parseError: + !'address' expected +MAPI = (monetdb) /var/tmp/mtest-23746/.s.monetdb.32905 +QUERY = address UNKOWNaddress +ERROR = !SyntaxException:parseError:address UNKOWNaddress + !SyntaxException:parseError: ^';' expected +MAPI = (monetdb) /var/tmp/mtest-23746/.s.monetdb.32905 +QUERY = comment "Should not be callable"; +ERROR = !SyntaxException:parseError:comment "Should not be callable"; + !SyntaxException:parseError: ^';' expected +MAPI = (monetdb) /var/tmp/mtest-23746/.s.monetdb.32905 +QUERY = wrong(); +ERROR = !TypeException:user.main[1]:object code for command user.wrong missing + !TypeException:user.main[1]:'user.wrong' undefined in: user.wrong(); + +# 21:00:41 > +# 21:00:41 > "Done." +# 21:00:41 > + diff --git a/monetdb5/mal/Tests/dynamicload.stable.out b/monetdb5/mal/Tests/dynamicload.stable.out --- a/monetdb5/mal/Tests/dynamicload.stable.out +++ b/monetdb5/mal/Tests/dynamicload.stable.out @@ -9,19 +9,28 @@ stdout of test 'dynamicload` in director # Serving database 'mTests_src_mal', using 4 threads # Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically linked # Copyright (c) 1993-July 2008 CWI. -# Copyright (c) August 2008- MonetDB B.V., all rights reserved -# Visit http://monetdb.cwi.nl/ for further information -# Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:33388/ -command user.wrong():void address UNKOWNaddress; -!TypeException:user.main[2]:object code for command user.wrong missing -!TypeException:user.main[2]:'user.wrong' undefined in: user.wrong(); -function user.main():void; -# examples of non-bindable instructions - user.wrong(); -#load unknown library -end user.main; +# Copyright (c) August 2008-2015 MonetDB B.V., all rights reserved +# Visit http://www.monetdb.org/ for further information +# Listening for connection requests on mapi:monetdb://vienna.da.cwi.nl:32905/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-23746/.s.monetdb.32905 +# MonetDB/GIS module loaded +# Start processing logs sql/sql_logs version 52200 +# Start reading the write-ahead log 'sql_logs/sql/log.4' +# Finished reading the write-ahead log 'sql_logs/sql/log.4' +# Finished processing logs sql/sql_logs +# MonetDB/SQL module loaded +# MonetDB/R module loaded -# 20:04:03 > -# 20:04:03 > Done. -# 20:04:03 > +Ready. +# 21:00:40 > +# 21:00:40 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-23746" "--port=32905" +# 21:00:40 > + +#library UNKNOWlib; +#WARNING: LoaderException:loadLibrary:Loading error could not locate library UNKNOWlib (from within file 'UNKNOWlib') + +# 21:00:41 > +# 21:00:41 > "Done." +# 21:00:41 > + diff --git a/monetdb5/mal/Tests/flowchk.mal b/monetdb5/mal/Tests/flowchk.malC rename from monetdb5/mal/Tests/flowchk.mal rename to monetdb5/mal/Tests/flowchk.malC diff --git a/monetdb5/mal/Tests/parseErrors.mal b/monetdb5/mal/Tests/parseErrors.malC rename from monetdb5/mal/Tests/parseErrors.mal rename to monetdb5/mal/Tests/parseErrors.malC diff --git a/monetdb5/mal/Tests/parseErrors.stable.err b/monetdb5/mal/Tests/parseErrors.stable.err --- a/monetdb5/mal/Tests/parseErrors.stable.err +++ b/monetdb5/mal/Tests/parseErrors.stable.err @@ -8,7 +8,18 @@ stderr of test 'parseErrors` in director #warning: please don't forget to set your vault key! #(see /ufs/mk/monet5/Linux/etc/monetdb5.conf) -# 09:50:19 > -# 09:50:19 > Done. -# 09:50:19 > +# 21:00:37 > +# 21:00:37 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-23746" "--port=32905" +# 21:00:37 > +MAPI = (monetdb) /var/tmp/mtest-23746/.s.monetdb.32905 +QUERY = K := := +ERROR = !SyntaxException:parseError:K := := + !SyntaxException:parseError: ^Type identifier expected + !SyntaxException:parseError:K := := + !SyntaxException:parseError: ^';' expected + _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
