Update of /cvsroot/monetdb/MonetDB5/src/optimizer/Tests
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv32295/src/optimizer/Tests
Modified Files:
tst4900.stable.out
Log Message:
Merged GDK-2 branch into development branch.
Current changes were mostly started for
fixing the void concurrency problem
As a side action, the bun/bat layout was also changed.
We now have a split head and tail. This means many of the well known
macros are changed (ie BUN{h,t}{loc,var} BUN{head,tail})
BAT iteration now needs a special struct
BATiter which can be correctly created as
BATiter bi = bat_iterator(b);
TODO
1 some modules aren't ported (maybe be dropped as they aren't used)
2 some more bugs to find
Next improvements which are now possible
views based on 2 bats
(or a bat where head is real and the tail a view (or vs))
many more....
For a presentation about the changes, see
http://www.cwi.nl/~niels/download/gdk2.pdf
Index: tst4900.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/Tests/tst4900.stable.out,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- tst4900.stable.out 17 Aug 2007 13:56:58 -0000 1.35
+++ tst4900.stable.out 4 Oct 2007 10:37:42 -0000 1.36
@@ -164,7 +164,7 @@
t81 := array.grid(1,1056000,1,0); # 64 ARRAYgrid_int
(t81:bat[:oid,:int])<-(_93:int)(_94:int)(_93:int)(_95:int)
t82 := aggr.sum(t72,t80,t81); # 65 AX3aggrX3_sum3_dbl_dbl
(t82:bat[:oid,:dbl])<-(t72:bat[:oid,:dbl])(t80:bat[:oid,:oid])(t81:bat[:oid,:int])
t83 := batcalc.*(t41,t82); # 66 CMDcstMULbat_dbl_dbl_dbl
(t83:bat[:oid,:dbl])<-(t41:dbl)(t82:bat[:oid,:dbl])
- t84 := batmath.exp(t83); # 67 CMDsciencevoid_exp
(t84:bat[:oid,:dbl])<-(t83:bat[:oid,:dbl])
+ t84 := batmath.exp(t83); # 67 CMDscience_bat_exp
(t84:bat[:oid,:dbl])<-(t83:bat[:oid,:dbl])
t85 := batcalc.*(t40,t84); # 68 CMDbatMUL_dbl_dbl_dbl
(t85:bat[:oid,:dbl])<-(t40:bat[:oid,:dbl])(t84:bat[:oid,:dbl])
t86 := batcalc.*(t7,t85); # 69 CMDbatMUL_dbl_dbl_dbl
(t86:bat[:oid,:dbl])<-(t7:bat[:oid,:dbl])(t85:bat[:oid,:dbl])
#t87 := array.grid(100,1320,8,0); will save 30% by reuse # 70 (_101:str)
@@ -174,7 +174,7 @@
t91 := batcalc.oid(t90); # 74 CMDconvert_int_oid
(t91:bat[:oid,:oid])<-(t90:bat[:oid,:int])
t92 := array.grid(1,132000,1,0); # 75 ARRAYgrid_int
(t92:bat[:oid,:int])<-(_93:int)(_109:int)(_93:int)(_95:int)
t93 := aggr.sum(t86,t91,t92); # 76 AX3aggrX3_sum3_dbl_dbl
(t93:bat[:oid,:dbl])<-(t86:bat[:oid,:dbl])(t91:bat[:oid,:oid])(t92:bat[:oid,:int])
- t94 := batmath.log(t93); # 77 CMDsciencevoid_log
(t94:bat[:oid,:dbl])<-(t93:bat[:oid,:dbl])
+ t94 := batmath.log(t93); # 77 CMDscience_bat_log
(t94:bat[:oid,:dbl])<-(t93:bat[:oid,:dbl])
t95 := array.grid(1,100,1320,0); # 78 ARRAYgrid_int
(t95:bat[:oid,:int])<-(_93:int)(_103:int)(_104:int)(_95:int)
t96 := batcalc.oid(t95); # 79 CMDconvert_int_oid
(t96:bat[:oid,:oid])<-(t95:bat[:oid,:int])
t97 := array.grid(1,100,1,0); # 80 ARRAYgrid_int
(t97:bat[:oid,:int])<-(_93:int)(_103:int)(_93:int)(_95:int)
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
