Changeset: f4f9bf7a10e4 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f4f9bf7a10e4 Added Files: monetdb5/optimizer/Tests/dataflow4.mal monetdb5/optimizer/Tests/dataflow4.stable.err monetdb5/optimizer/Tests/dataflow4.stable.out monetdb5/optimizer/Tests/dataflow5.mal monetdb5/optimizer/Tests/dataflow5.stable.err monetdb5/optimizer/Tests/dataflow5.stable.out Modified Files: monetdb5/optimizer/Tests/All Branch: default Log Message:
Add more dataflow tests diffs (264 lines): diff --git a/monetdb5/optimizer/Tests/All b/monetdb5/optimizer/Tests/All --- a/monetdb5/optimizer/Tests/All +++ b/monetdb5/optimizer/Tests/All @@ -95,6 +95,8 @@ SRexample dataflow dataflow3 +dataflow4 +dataflow5 # common -- uses group.new/group.derive common01 garbage diff --git a/monetdb5/optimizer/Tests/dataflow4.mal b/monetdb5/optimizer/Tests/dataflow4.mal new file mode 100644 --- /dev/null +++ b/monetdb5/optimizer/Tests/dataflow4.mal @@ -0,0 +1,18 @@ +function tst(); + i:= 1; + b:= bat.new(:oid,:int); + a:= bat.new(:oid,:int); + i:= 2; + b:= bat.new(:oid,:int); + c:= bat.new(:oid,:int); + a:= bat.new(:oid,:int); + c:= bat.new(:oid,:int); + a:= bat.new(:oid,:int); + d:= bat.new(:oid,:int); + io.print(a); + io.print(d); +end tst; +mdb.list("user","tst"); +optimizer.dataflow("user","tst"); +mdb.list("user","tst"); + diff --git a/monetdb5/optimizer/Tests/dataflow4.stable.err b/monetdb5/optimizer/Tests/dataflow4.stable.err new file mode 100644 --- /dev/null +++ b/monetdb5/optimizer/Tests/dataflow4.stable.err @@ -0,0 +1,29 @@ +stderr of test 'dataflow4` in directory 'monetdb5/optimizer` itself: + + +# 16:07:30 > +# 16:07:30 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=34474" "--set" "mapi_usock=/var/tmp/mtest-29300/.s.monetdb.34474" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/export/scratch1/mk/current//Linux/var/MonetDB/mTests_monetdb5_optimizer" "dataflow4.mal" +# 16:07:30 > + +# builtin opt gdk_dbpath = /export/scratch1/mk/current//Linux/var/monetdb5/dbfarm/demo +# builtin opt gdk_debug = 0 +# 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 mapi_open = true +# cmdline opt mapi_port = 34474 +# cmdline opt mapi_usock = /var/tmp/mtest-29300/.s.monetdb.34474 +# cmdline opt monet_prompt = +# cmdline opt mal_listing = 2 +# cmdline opt gdk_dbpath = /export/scratch1/mk/current//Linux/var/MonetDB/mTests_monetdb5_optimizer + +# 16:07:31 > +# 16:07:31 > "Done." +# 16:07:31 > + diff --git a/monetdb5/optimizer/Tests/dataflow4.stable.out b/monetdb5/optimizer/Tests/dataflow4.stable.out new file mode 100644 --- /dev/null +++ b/monetdb5/optimizer/Tests/dataflow4.stable.out @@ -0,0 +1,84 @@ +stdout of test 'dataflow4` in directory 'monetdb5/optimizer` itself: + + +# 16:07:30 > +# 16:07:30 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=34474" "--set" "mapi_usock=/var/tmp/mtest-29300/.s.monetdb.34474" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/export/scratch1/mk/current//Linux/var/MonetDB/mTests_monetdb5_optimizer" "dataflow4.mal" +# 16:07:30 > + +# MonetDB 5 server v11.16.0 +# This is an unreleased version +# Serving database 'mTests_monetdb5_optimizer', using 8 threads +# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically linked +# Found 15.629 GiB available main-memory. +# Copyright (c) 1993-July 2008 CWI. +# Copyright (c) August 2008-2013 MonetDB B.V., all rights reserved +# Visit http://www.monetdb.org/ for further information +# Listening for connection requests on mapi:monetdb://vienna.ins.cwi.nl:34474/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-29300/.s.monetdb.34474 +# MonetDB/GIS module loaded +# MonetDB/JAQL module loaded +# MonetDB/SQL module loaded +# MonetDB/DataCell loaded +function user.tst():void; + i := 1; + b := bat.new(:oid,:int); + a := bat.new(:oid,:int); + i := 2; + b := bat.new(:oid,:int); + c := bat.new(:oid,:int); + a := bat.new(:oid,:int); + c := bat.new(:oid,:int); + a := bat.new(:oid,:int); + d := bat.new(:oid,:int); + io.print(a); + io.print(d); +end tst; +function user.main():void; + mdb.list("user","tst"); + mdb.list("user","tst"); +end main; +function user.tst():void; +barrier X_19 := language.dataflow(); + i := 1; + b := bat.new(:oid,:int); + a := bat.new(:oid,:int); +exit X_19; +barrier X_22 := language.dataflow(); + i := 2; + b := bat.new(:oid,:int); + c := bat.new(:oid,:int); + a := bat.new(:oid,:int); +exit X_22; +barrier X_25 := language.dataflow(); + c := bat.new(:oid,:int); + a := bat.new(:oid,:int); + d := bat.new(:oid,:int); +exit X_25; + io.print(a); + io.print(d); +end tst; +function user.tst():void; +barrier X_19 := language.dataflow(); + i := 1; + b := bat.new(:oid,:int); + a := bat.new(:oid,:int); +exit X_19; +barrier X_22 := language.dataflow(); + i := 2; + b := bat.new(:oid,:int); + c := bat.new(:oid,:int); + a := bat.new(:oid,:int); +exit X_22; +barrier X_25 := language.dataflow(); + c := bat.new(:oid,:int); + a := bat.new(:oid,:int); + d := bat.new(:oid,:int); +exit X_25; + io.print(a); + io.print(d); +end tst; + +# 16:07:31 > +# 16:07:31 > "Done." +# 16:07:31 > + diff --git a/monetdb5/optimizer/Tests/dataflow5.mal b/monetdb5/optimizer/Tests/dataflow5.mal new file mode 100644 --- /dev/null +++ b/monetdb5/optimizer/Tests/dataflow5.mal @@ -0,0 +1,12 @@ +# updates on BATs may not run in parallel +function tst(); + b:= bat.new(:oid,:int); + bat.insert(b,0@0,1); + bat.insert(b,1@0,2); + bat.insert(b,2@0, 3); + io.print(b); +end tst; +mdb.list("user","tst"); +optimizer.dataflow("user","tst"); +mdb.list("user","tst"); + diff --git a/monetdb5/optimizer/Tests/dataflow5.stable.err b/monetdb5/optimizer/Tests/dataflow5.stable.err new file mode 100644 --- /dev/null +++ b/monetdb5/optimizer/Tests/dataflow5.stable.err @@ -0,0 +1,29 @@ +stderr of test 'dataflow5` in directory 'monetdb5/optimizer` itself: + + +# 16:07:31 > +# 16:07:31 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=34474" "--set" "mapi_usock=/var/tmp/mtest-29300/.s.monetdb.34474" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/export/scratch1/mk/current//Linux/var/MonetDB/mTests_monetdb5_optimizer" "dataflow5.mal" +# 16:07:31 > + +# builtin opt gdk_dbpath = /export/scratch1/mk/current//Linux/var/monetdb5/dbfarm/demo +# builtin opt gdk_debug = 0 +# 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 mapi_open = true +# cmdline opt mapi_port = 34474 +# cmdline opt mapi_usock = /var/tmp/mtest-29300/.s.monetdb.34474 +# cmdline opt monet_prompt = +# cmdline opt mal_listing = 2 +# cmdline opt gdk_dbpath = /export/scratch1/mk/current//Linux/var/MonetDB/mTests_monetdb5_optimizer + +# 16:07:31 > +# 16:07:31 > "Done." +# 16:07:31 > + diff --git a/monetdb5/optimizer/Tests/dataflow5.stable.out b/monetdb5/optimizer/Tests/dataflow5.stable.out new file mode 100644 --- /dev/null +++ b/monetdb5/optimizer/Tests/dataflow5.stable.out @@ -0,0 +1,50 @@ +stdout of test 'dataflow5` in directory 'monetdb5/optimizer` itself: + + +# 16:07:31 > +# 16:07:31 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=34474" "--set" "mapi_usock=/var/tmp/mtest-29300/.s.monetdb.34474" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/export/scratch1/mk/current//Linux/var/MonetDB/mTests_monetdb5_optimizer" "dataflow5.mal" +# 16:07:31 > + +# MonetDB 5 server v11.16.0 +# This is an unreleased version +# Serving database 'mTests_monetdb5_optimizer', using 8 threads +# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically linked +# Found 15.629 GiB available main-memory. +# Copyright (c) 1993-July 2008 CWI. +# Copyright (c) August 2008-2013 MonetDB B.V., all rights reserved +# Visit http://www.monetdb.org/ for further information +# Listening for connection requests on mapi:monetdb://vienna.ins.cwi.nl:34474/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-29300/.s.monetdb.34474 +# MonetDB/GIS module loaded +# MonetDB/JAQL module loaded +# MonetDB/SQL module loaded +# MonetDB/DataCell loaded +function user.tst():void; + b := bat.new(:oid,:int); + bat.insert(b,0@0,1); + bat.insert(b,1@0,2); + bat.insert(b,2@0,3); + io.print(b); +end tst; +function user.main():void; +# updates on BATs may not run in parallel + mdb.list("user","tst"); + mdb.list("user","tst"); +end main; +function user.tst():void; + b := bat.new(:oid,:int); + bat.insert(b,0@0,1); + bat.insert(b,1@0,2); + bat.insert(b,2@0,3); + io.print(b); +function user.tst():void; + b := bat.new(:oid,:int); + bat.insert(b,0@0,1); + bat.insert(b,1@0,2); + bat.insert(b,2@0,3); + io.print(b); + +# 16:07:31 > +# 16:07:31 > "Done." +# 16:07:31 > + _______________________________________________ checkin-list mailing list checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list