Changeset: c7a1259b8ae5 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c7a1259b8ae5 Removed Files: monetdb5/optimizer/Tests/tst4602.malC monetdb5/optimizer/Tests/tst4602.stable.err monetdb5/optimizer/Tests/tst4602.stable.out Modified Files: monetdb5/optimizer/Tests/All monetdb5/optimizer/Tests/DCexample2.stable.out monetdb5/optimizer/Tests/FTexample.malC monetdb5/optimizer/Tests/GCexample01.stable.out monetdb5/optimizer/Tests/JPexample.stable.out monetdb5/optimizer/Tests/inline07.stable.out monetdb5/optimizer/Tests/inline09.stable.out monetdb5/optimizer/Tests/inline10.stable.out monetdb5/optimizer/Tests/inlineFunction.malC monetdb5/optimizer/Tests/inlineFunction1.stable.out monetdb5/optimizer/Tests/joinchain.stable.out monetdb5/optimizer/Tests/remap.malC monetdb5/optimizer/Tests/tst4000.malC monetdb5/optimizer/Tests/tst4000.stable.out monetdb5/optimizer/Tests/tst4003.malC monetdb5/optimizer/Tests/tst4003.stable.out monetdb5/optimizer/Tests/tst4004.stable.out monetdb5/optimizer/Tests/tst4010.malC monetdb5/optimizer/Tests/tst4010.stable.out monetdb5/optimizer/Tests/tst4030.malC monetdb5/optimizer/Tests/tst4030.stable.out monetdb5/optimizer/Tests/tst4601.stable.out Branch: default Log Message:
Approve output diffs (truncated from 974 to 300 lines): diff --git a/monetdb5/optimizer/Tests/All b/monetdb5/optimizer/Tests/All --- a/monetdb5/optimizer/Tests/All +++ b/monetdb5/optimizer/Tests/All @@ -7,7 +7,6 @@ tst4005 tst4010 tst4030 tst4601 -tst4602 tst4630 #tst4700 no compiler #tst4701 diff --git a/monetdb5/optimizer/Tests/DCexample2.stable.out b/monetdb5/optimizer/Tests/DCexample2.stable.out --- a/monetdb5/optimizer/Tests/DCexample2.stable.out +++ b/monetdb5/optimizer/Tests/DCexample2.stable.out @@ -5,30 +5,48 @@ stdout of test 'DCexample2` in directory # 22:31:27 > Mtimeout -timeout 60 mserver5 "--config=/ufs/mk/monet5/Linux/etc/monetdb5.conf" --debug=10 --set "monet_mod_path=/ufs/mk/monet5//Linux/lib/MonetDB5:/ufs/mk/monet5//Linux/lib/MonetDB5/lib:/ufs/mk/monet5//Linux/lib/MonetDB5/bin" --set "gdk_dbfarm=/ufs/mk/monet5//Linux/var/MonetDB5/dbfarm" --set "sql_logdir=/ufs/mk/monet5//Linux/var/MonetDB5/sql_logs" --set "xquery_logdir=/ufs/mk/monet5//Linux/var/MonetDB5/xquery_logs" --set mapi_port=34030 --set xrpc_port=44388 --set monet_prompt= --trace --dbname=mTests_src_optimizer DCexample2.mal < /dev/null # 22:31:27 > -# MonetDB Server v5.0.0_beta2_1 -# Copyright (c) 1993-2007 CWI, all rights reserved -# Compiled for x86_64-redhat-linux-gnu/64bit with 64bit OIDs dynamically linked -# dbname:mTests_src_optimizer -# Visit http://monetdb.cwi.nl/ for further information -# Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:32348/ -function user.main():void; - b := bat.new(:oid,:int); - bat.append(b,2); - bat.append(b,5); - bat.append(b,3); - b := algebra.subsort(b,false,false); - mdb.List(); -end user.main; -function user.main():void; #[0] 0 - b:bat[:oid,:int] := bat.new(:oid,:int); #[1] CMDBATnew 2 <- 3 4 - bat.append(b:bat[:oid,:int],2:int); #[2] BKCappend_val_wrap 5 <- 2 6 - bat.append(b:bat[:oid,:int],5:int); #[3] BKCappend_val_wrap 7 <- 2 8 - bat.append(b:bat[:oid,:int],3:int); #[4] BKCappend_val_wrap 9 <- 2 10 - b:bat[:oid,:int] := algebra.subsort(b:bat[:oid,:int],false:bit,false:bit); #[5] ALGsubsort11 2 <- 2 11 12 - mdb.List(); #[6] MDBlistDetail 15 -end user.main; #[7] +# MonetDB 5 server v11.22.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 and 128bit integers dynamically linked +# Found 15.589 GiB available main-memory. +# Copyright (c) 1993-July 2008 CWI. +# 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:33343/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-8837/.s.monetdb.33343 +# 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 -# 22:31:27 > -# 22:31:27 > Done. -# 22:31:27 > +Ready. +# 06:41:04 > +# 06:41:04 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-8837" "--port=33343" +# 06:41:04 > + +#mdb.List("user","foo"); +function user.foo():void; #[0] 0 + b:bat[:oid,:int] := bat.new(:oid,:int); #[1] CMDBATnew 1 <- 2 3 + bat.append(b:bat[:oid,:int],2:int); #[2] BKCappend_val_wrap 4 <- 1 5 + bat.append(b:bat[:oid,:int],5:int); #[3] BKCappend_val_wrap 6 <- 1 7 + bat.append(b:bat[:oid,:int],3:int); #[4] BKCappend_val_wrap 8 <- 1 9 + b:bat[:oid,:int] := algebra.subsort(b:bat[:oid,:int],false:bit,false:bit); #[5] ALGsubsort11 1 <- 1 10 11 +end user.foo; #[6] +#mdb.List("user","foo"); +function user.foo():void; #[0] 0 + b:bat[:oid,:int] := bat.new(:oid,:int); #[1] CMDBATnew 1 <- 2 3 + bat.append(b:bat[:oid,:int],2:int); #[2] BKCappend_val_wrap 4 <- 1 5 + bat.append(b:bat[:oid,:int],5:int); #[3] BKCappend_val_wrap 6 <- 1 7 + bat.append(b:bat[:oid,:int],3:int); #[4] BKCappend_val_wrap 8 <- 1 9 + b:bat[:oid,:int] := algebra.subsort(b:bat[:oid,:int],false:bit,false:bit); #[5] ALGsubsort11 1 <- 1 10 11 +end user.foo; #[6] + +# 06:41:05 > +# 06:41:05 > "Done." +# 06:41:05 > + diff --git a/monetdb5/optimizer/Tests/FTexample.malC b/monetdb5/optimizer/Tests/FTexample.malC --- a/monetdb5/optimizer/Tests/FTexample.malC +++ b/monetdb5/optimizer/Tests/FTexample.malC @@ -8,5 +8,4 @@ function test(s:str):wrd; end test; mdb.List("user","test"); optimizer.factorize("user","test"); -mdb.List("user","qry"); mdb.List("user","test"); diff --git a/monetdb5/optimizer/Tests/GCexample01.stable.out b/monetdb5/optimizer/Tests/GCexample01.stable.out --- a/monetdb5/optimizer/Tests/GCexample01.stable.out +++ b/monetdb5/optimizer/Tests/GCexample01.stable.out @@ -5,34 +5,50 @@ stdout of test 'GCexample01` in director # 23:17:49 > Mtimeout -timeout 60 mserver5 "--config=/ufs/mk/monet5/Linux/etc/monetdb5.conf" --debug=10 --set "monet_mod_path=/ufs/mk/monet5//Linux/lib/MonetDB5:/ufs/mk/monet5//Linux/lib/MonetDB5/lib:/ufs/mk/monet5//Linux/lib/MonetDB5/bin" --set "gdk_dbfarm=/ufs/mk/monet5//Linux/var/MonetDB5/dbfarm" --set "sql_logdir=/ufs/mk/monet5//Linux/var/MonetDB5/sql_logs" --set "xquery_logdir=/ufs/mk/monet5//Linux/var/MonetDB5/xquery_logs" --set mapi_port=33385 --set xrpc_port=42531 --set monet_prompt= --trace --dbname=mTests_src_optimizer GCexample01.mal # 23:17:49 > -# MonetDB Server v5.0.0_beta2_1 -# Copyright (c) 1993-2007 CWI, all rights reserved -# Compiled for x86_64-redhat-linux-gnu/64bit with 64bit OIDs dynamically linked -# dbname:mTests_src_optimizer -# Visit http://monetdb.cwi.nl/ for further information -# Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:32348/ -function user.qry():void; - b := bat.new(:oid,:int); - c := bat.new(:oid,:int); - d := bat.new(:oid,:int); - bat.append(b,1); -barrier (x,z) := iterator.new(b); - io.print(x); -exit (x,z); -barrier (x,z) := iterator.new(c); - io.print(x); - redo (x,z) := iterator.next(c); -exit (x,z); +# MonetDB 5 server v11.22.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 and 128bit integers dynamically linked +# Found 15.589 GiB available main-memory. +# Copyright (c) 1993-July 2008 CWI. +# 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:33343/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-8837/.s.monetdb.33343 +# 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 + +Ready. + +# 06:41:05 > +# 06:41:05 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-8837" "--port=33343" +# 06:41:05 > + +#mdb.List("user","qry"); +function user.qry():void; #[0] 0 + b:bat[:oid,:int] := bat.new(:oid,:int); #[1] CMDBATnew 1 <- 2 3 + c:bat[:oid,:int] := bat.new(:oid,:int); #[2] CMDBATnew 4 <- 2 3 + d:bat[:oid,:int] := bat.new(:oid,:int); #[3] CMDBATnew 5 <- 2 3 + bat.append(b:bat[:oid,:int],1:int); #[4] BKCappend_val_wrap 6 <- 1 7 +barrier (x:oid,z:int) := iterator.new(b:bat[:oid,:int]); #[5] ITRbunIterator 8 9 <- 1 + io.print(x:oid); #[6] IOprint_val 10 <- 8 +exit (x:oid,z:int); #[7] 8 9 +barrier (x:oid,z:int) := iterator.new(c:bat[:oid,:int]); #[8] ITRbunIterator 8 9 <- 4 + io.print(x:oid); #[9] IOprint_val 11 <- 8 + redo (x:oid,z:int) := iterator.next(c:bat[:oid,:int]); #[10] ITRbunNext 8 9 <- 4 +exit (x:oid,z:int); #[11] 8 9 # do not close d, it may be reused -barrier go := true; - io.print(d); - redo go := true; -exit go; -end user.qry; -function user.main():void; -#checking proper handling of scopes for the garbage collector - mdb.List("user","qry"); -end user.main; +barrier go:bit := true:bit; #[13] 13 <- 14 + io.print(d:bat[:oid,:int]); #[14] IOprint_val 15 <- 5 + redo go:bit := true:bit; #[15] 13 <- 14 +exit go:bit; #[16] 13 +end user.qry; #[17] +#mdb.List("user","qry"); function user.qry():void; #[0] 0 b:bat[:oid,:int] := bat.new(:oid,:int); #[1] CMDBATnew 1 <- 2 3 c:bat[:oid,:int] := bat.new(:oid,:int); #[2] CMDBATnew 4 <- 2 3 diff --git a/monetdb5/optimizer/Tests/JPexample.stable.out b/monetdb5/optimizer/Tests/JPexample.stable.out --- a/monetdb5/optimizer/Tests/JPexample.stable.out +++ b/monetdb5/optimizer/Tests/JPexample.stable.out @@ -5,38 +5,52 @@ stdout of test 'JPexample` in directory # 20:30:05 > Mtimeout -timeout 60 mserver5 "--config=/ufs/mk/monet5/Linux/etc/MonetDB5.conf" --debug=10 --set "monet_mod_path=/ufs/mk/monet5/Linux/lib64/MonetDB5:/ufs/mk/opensource/MonetDB/Linux/lib64/MonetDB" --set "gdk_dbfarm=/ufs/mk/monet5/Linux/var/MonetDB5/dbfarm" --set "sql_logdir=/ufs/mk/monet5/Linux/var/MonetDB5/dblogs" --set mapi_port=34010 --set monet_prompt= --trace --dbname=mTests_src_optimizer JPexample.mal < /dev/null # 20:30:05 > -# MonetDB Server v4.99.19 -# Copyright (c) 1993-2006 CWI, all rights reserved -# Compiled for x86_64-redhat-linux-gnu/64bit with 64bit OIDs dynamically linked -# config:/ufs/mk/monet5/Linux/etc/MonetDB5.conf -# dbfarm:/ufs/mk/monet5/Linux/var/MonetDB5/dbfarm -# dbname:mTests_src_optimizer -# Visit http://monetdb.cwi.nl/ for further information -# Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:32348/ -function user.main():void; -# test the joinpath expander - a := bat.new(:oid,:oid); - b := bat.new(:oid,:oid); - c := bat.new(:oid,:str); - j1 := algebra.projection(a,b); - j2:bat[:oid,:str] := algebra.projectionPath(a,b,c); - j3 := algebra.projection(b,b); - j4:bat[:oid,:oid] := algebra.projectionPath(b,b,b); - mdb.List(); -end user.main; -function user.main():void; #[0] 0 -# test the joinpath expander - a:bat[:oid,:oid] := bat.new(:oid,:oid); #[2] CMDBATnew 2 <- 3 3 - b:bat[:oid,:oid] := bat.new(:oid,:oid); #[3] CMDBATnew 4 <- 3 3 - c:bat[:oid,:str] := bat.new(:oid,:str); #[4] CMDBATnew 5 <- 3 6 - j1:bat[:oid,:oid] := algebra.projection(a:bat[:oid,:oid],b:bat[:oid,:oid]); #[5] ALGprojection 7 <- 2 4 - j2:bat[:oid,:str] := algebra.projectionPath(a:bat[:oid,:oid],b:bat[:oid,:oid],c:bat[:oid,:str]); #[6] ALGjoinPath 8 <- 2 4 5 - j3:bat[:oid,:oid] := algebra.projection(b:bat[:oid,:oid],b:bat[:oid,:oid]); #[7] ALGprojection 9 <- 4 4 - j4:bat[:oid,:oid] := algebra.projectionPath(b:bat[:oid,:oid],b:bat[:oid,:oid],b:bat[:oid,:oid]); #[8] ALGjoinPath 10 <- 4 4 4 - mdb.List(); #[9] MDBlistDetail 12 -end user.main; #[10] +# MonetDB 5 server v11.22.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 and 128bit integers dynamically linked +# Found 15.589 GiB available main-memory. +# Copyright (c) 1993-July 2008 CWI. +# 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:33343/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-8837/.s.monetdb.33343 +# 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:30:05 > -# 20:30:05 > Done. -# 20:30:05 > +Ready. +# 06:41:06 > +# 06:41:06 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-8837" "--port=33343" +# 06:41:06 > + +#mdb.List("user","foo"); +function user.foo():void; #[0] 0 + a:bat[:oid,:oid] := bat.new(:oid,:oid); #[1] CMDBATnew 1 <- 2 2 + b:bat[:oid,:oid] := bat.new(:oid,:oid); #[2] CMDBATnew 3 <- 2 2 + c:bat[:oid,:str] := bat.new(:oid,:str); #[3] CMDBATnew 4 <- 2 5 + j1:bat[:oid,:oid] := algebra.projection(a:bat[:oid,:oid],b:bat[:oid,:oid]); #[4] ALGprojection 6 <- 1 3 + j2:bat[:oid,:str] := algebra.projection(j1:bat[:oid,:oid],c:bat[:oid,:str]); #[5] ALGprojection 7 <- 6 4 + j3:bat[:oid,:oid] := algebra.projection(b:bat[:oid,:oid],b:bat[:oid,:oid]); #[6] ALGprojection 8 <- 3 3 + j4:bat[:oid,:oid] := algebra.projection(b:bat[:oid,:oid],j3:bat[:oid,:oid]); #[7] ALGprojection 9 <- 3 8 +end user.foo; #[8] +#mdb.List("user","foo"); +function user.foo():void; #[0] 0 + a:bat[:oid,:oid] := bat.new(:oid,:oid); #[1] CMDBATnew 1 <- 2 2 + b:bat[:oid,:oid] := bat.new(:oid,:oid); #[2] CMDBATnew 3 <- 2 2 + c:bat[:oid,:str] := bat.new(:oid,:str); #[3] CMDBATnew 4 <- 2 5 + j1:bat[:oid,:oid] := algebra.projection(a:bat[:oid,:oid],b:bat[:oid,:oid]); #[4] ALGprojection 6 <- 1 3 + j2:bat[:oid,:str] := algebra.projectionPath(a:bat[:oid,:oid],b:bat[:oid,:oid],c:bat[:oid,:str]); #[5] ALGjoinPath 7 <- 1 3 4 + j3:bat[:oid,:oid] := algebra.projection(b:bat[:oid,:oid],b:bat[:oid,:oid]); #[6] ALGprojection 8 <- 3 3 + j4:bat[:oid,:oid] := algebra.projectionPath(b:bat[:oid,:oid],b:bat[:oid,:oid],b:bat[:oid,:oid]); #[7] ALGjoinPath 9 <- 3 3 3 +end user.foo; #[8] + +# 06:41:06 > +# 06:41:06 > "Done." +# 06:41:06 > + diff --git a/monetdb5/optimizer/Tests/inline07.stable.out b/monetdb5/optimizer/Tests/inline07.stable.out --- a/monetdb5/optimizer/Tests/inline07.stable.out +++ b/monetdb5/optimizer/Tests/inline07.stable.out @@ -21,20 +21,17 @@ stdout of test 'inline07` in directory ' # Finished reading the write-ahead log 'sql_logs/sql/log.4' # Finished processing logs sql/sql_logs # MonetDB/SQL module loaded -inline function user.foo(a:int,b:bat[:oid,:int]):dbl; - s := aggr.sum(b); - c := calc.+(a,s); - return foo := c; -end user.foo; -function user.qry():void; - b := bat.new(:oid,:int); - bat.append(b,1); - z:bat[:oid,:dbl] := mal.multiplex("user","foo",b,b); -end user.qry; -function user.main():void; -# remapping inline functions - mdb.List("user","qry"); -end user.main; +# MonetDB/R module loaded + +Ready. +#WARNING To speedup user.foo a bulk operator implementation is needed +# z:bat[:oid,:dbl] := mal.multiplex("user":str,"foo":str,b:any,b:any); + +# 06:41:00 > +# 06:41:00 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-8837" "--port=33343" +# 06:41:00 > + +# mdb.List("user","qry"); inline function user.qry():void; #[0] 0 _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
