Changeset: db3fa10c2c18 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=db3fa10c2c18 Added Files: monetdb5/mal/Tests/dataflow01.maltest monetdb5/mal/Tests/dataflow03.maltest monetdb5/mal/Tests/dynamicload.maltest monetdb5/mal/Tests/flowchk.maltest monetdb5/mal/Tests/malids.maltest monetdb5/mal/Tests/pithole.maltest monetdb5/mal/Tests/tst280.maltest monetdb5/mal/Tests/tst281.maltest monetdb5/mal/Tests/tst285.maltest monetdb5/mal/Tests/tst292.maltest monetdb5/mal/Tests/tst300.maltest monetdb5/mal/Tests/tst301.maltest monetdb5/mal/Tests/tst302.maltest monetdb5/mal/Tests/tst303.maltest monetdb5/mal/Tests/tst304.maltest monetdb5/mal/Tests/tst305.maltest monetdb5/mal/Tests/tst307.maltest monetdb5/mal/Tests/tst308.maltest monetdb5/mal/Tests/tst400.maltest monetdb5/mal/Tests/tst401.maltest monetdb5/mal/Tests/tst500.maltest monetdb5/mal/Tests/tst501.maltest monetdb5/mal/Tests/tst560.maltest monetdb5/mal/Tests/tst611.maltest monetdb5/mal/Tests/tst620.maltest monetdb5/mal/Tests/tst660.maltest monetdb5/mal/Tests/tst661.maltest monetdb5/mal/Tests/tst662.maltest monetdb5/mal/Tests/tst670.maltest monetdb5/mal/Tests/tst700.maltest monetdb5/mal/Tests/tst710.maltest monetdb5/mal/Tests/tst750.maltest monetdb5/mal/Tests/tst755.maltest monetdb5/mal/Tests/tst760.maltest monetdb5/mal/Tests/tst770.maltest monetdb5/mal/Tests/tst780.maltest monetdb5/mal/Tests/tst802.maltest monetdb5/mal/Tests/tst804.maltest monetdb5/mal/Tests/tst810.maltest monetdb5/mal/Tests/tst819.maltest monetdb5/mal/Tests/tst830.maltest monetdb5/mal/Tests/tst840.maltest monetdb5/mal/Tests/tst866.maltest monetdb5/mal/Tests/tst880.maltest monetdb5/mal/Tests/tst890.maltest monetdb5/mal/Tests/tst900.maltest monetdb5/mal/Tests/tst901.maltest monetdb5/mal/Tests/tst902.maltest monetdb5/mal/Tests/tst904.maltest monetdb5/mal/Tests/tst905.maltest monetdb5/mal/Tests/tst906.maltest monetdb5/mal/Tests/tst908.maltest monetdb5/mal/Tests/tst912.maltest monetdb5/mal/Tests/tst913.maltest monetdb5/mal/Tests/tst914.maltest monetdb5/mal/Tests/tst920.maltest monetdb5/mal/Tests/tst960.maltest Removed Files: monetdb5/mal/Tests/tst3050.malC monetdb5/mal/Tests/tst3050.stable.err monetdb5/mal/Tests/tst3050.stable.out monetdb5/mal/Tests/tst903.malC monetdb5/mal/Tests/tst903.stable.err monetdb5/mal/Tests/tst903.stable.out Modified Files: monetdb5/mal/Tests/All monetdb5/mal/Tests/tst280.malC monetdb5/mal/Tests/tst305.malC monetdb5/mal/Tests/tst850.malC monetdb5/mal/Tests/tst870.malC monetdb5/mal/Tests/tst907.malC monetdb5/mal/Tests/tst960.malC Branch: mtest Log Message:
The final batch,still a few Mconvert issues diffs (truncated from 2464 to 300 lines): diff --git a/monetdb5/mal/Tests/All b/monetdb5/mal/Tests/All --- a/monetdb5/mal/Tests/All +++ b/monetdb5/mal/Tests/All @@ -135,79 +135,69 @@ tst2550 tst256 tst2570 tst272 -tst275 # incorrect hash -# tst280 -# tst281 -# tst292 -# tst285 -# tst300 -# tst301 -# tst302 -# tst303 -# tst304 -# tst305 -# #tst3050 -# tst307 -# tst308 -# tst400 -# tst401 -# tst500 -# tst501 -# tst560 -# tst611 -# tst620 -# tst660 -# tst661 -# tst662 -# tst670 -# tst700 -# tst710 -# tst750 -# tst755 -# tst760 -# tst770 -# tst780 -# tst802 -# tst804 -# tst810 -# tst819 -# tst830 -# tst840 -# tst850 -# tst866 -# tst870 -# tst880 -# tst890 -# tst900 -# tst901 -# tst902 -# #tst903 old test to study the overhead in MAL interpretation, see also mal/Tests/performance -# tst904 -# tst905 -# tst906 -# tst907 -# tst908 -# -# tst911 -# tst912 -# tst913 -# tst914 -# tst960 -# -# #tests for garbage collection of strings -# tst920 -# tst901a +#tst275 # incorrect hash +tst280 +tst281 +tst292 +tst285 +tst300 +tst301 +tst302 +tst303 +tst304 +tst305 +tst307 +tst308 +tst400 +tst401 +tst500 +tst501 +tst560 +tst611 +tst620 +tst660 +tst661 +tst662 +tst670 +tst700 +tst710 +tst750 +tst755 +tst760 +tst770 +tst780 +tst802 +tst804 +tst810 +tst819 +tst830 +tst840 +#tst850 # spurious error +tst866 +#tst870 io.print in functions +tst880 +tst890 +tst900 +tst901 +tst902 +tst904 +tst905 +tst906 +#tst907 crash Mconvert +#tst908 crash Mconvert +# tst911 handle comment in MAL result set +tst912 +tst913 +# tst914 Mconvert parsing error, non-finished function block +tst960 +tst920 +#tst901a improper compilation # #tst901b -# -# parseErrors -# -# dataflow01 -# dataflow03 -# flowchk -# -# dynamicload -# pithole -# malids -# +# dataflow01 Incorrect compilation +dataflow03 +flowchk +dynamicload +pithole +malids # # Tracer # # tracer00 Output is call dependent diff --git a/monetdb5/mal/Tests/dataflow01.maltest b/monetdb5/mal/Tests/dataflow01.maltest new file mode 100644 --- /dev/null +++ b/monetdb5/mal/Tests/dataflow01.maltest @@ -0,0 +1,48 @@ +statement ok +function load():bat[:lng]; +b:= bat.new(:lng); +k:=0; +INT_MAX := 2147483647; +dbgmsk_restore := mdb.getDebug(); +dbgmsk_unset := 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:= k+1; + l:= calc.lng(k); + bat.append(b,l); + redo i:= iterator.next(1:lng,100000:lng); +exit i; +mdb.setDebug(dbgmsk_restore); + return b; +end load; + +statement ok +function qry(z:bat[:lng],low:int,hgh:int):lng; + l:= calc.lng(low); + h:= calc.lng(hgh); + s:= algebra.select(z,nil:bat[:oid],l,h,true,true,false); + c:= aggr.count(s); + return qry:= c; +end qry; + +statement ok +s:= load(); + +statement ok +t1:= 0:lng; + +statement ok +t2:= 0:lng; + +statement ok +t3:= 0:lng; + +statement ok +t4:= 0:lng; + +statement ok +c := 0:lng; + + diff --git a/monetdb5/mal/Tests/dataflow03.maltest b/monetdb5/mal/Tests/dataflow03.maltest new file mode 100644 --- /dev/null +++ b/monetdb5/mal/Tests/dataflow03.maltest @@ -0,0 +1,55 @@ +statement ok +function f(b:int):int; +return f:= b; +end f; + +statement ok +function f(a:int,b:int):int; +return f:= a+b; +end f; + +statement ok +function sequential(); + A0:=1; + z:= -1; + x0:= f(A0); + x1:= f(x0); + y:= f(x1,x0); + w:= f(1,x0); + a:= f(x1,x1); #wakeup only once + z:= f(y,x0); + y:= f(z); + z:= f(y); + z:= f(z); + io.print(z); +end sequential; + +statement ok +function qry(); + A0:=1; + z:= -1; +barrier x:= language.dataflow(); + x0:= f(A0); + x1:= f(x0); + y:= f(x1,x0); + w:= f(1,x0); + a:= f(x1,x1); + z:= f(y,x0); + y:= f(z); + z:= f(y); + z:= f(z); +exit x; + io.print(z); +end qry; + +query T rowsort +sequential(); +---- +3 + +query T rowsort +qry(); +---- +3 + + diff --git a/monetdb5/mal/Tests/dynamicload.maltest b/monetdb5/mal/Tests/dynamicload.maltest new file mode 100644 --- /dev/null +++ b/monetdb5/mal/Tests/dynamicload.maltest @@ -0,0 +1,12 @@ +statement ok +include UNKNOWlib; + +statement ok +command wrong() +address UNKOWNaddress +comment "Should not be callable"; + +statement error +wrong(); + + diff --git a/monetdb5/mal/Tests/flowchk.maltest b/monetdb5/mal/Tests/flowchk.maltest new file mode 100644 --- /dev/null +++ b/monetdb5/mal/Tests/flowchk.maltest @@ -0,0 +1,10 @@ +statement error +function tst(); +barrier go:=true; + a:=bat.new(:int); + io.print(a); +exit go; + c:=a; +end tst; + + diff --git a/monetdb5/mal/Tests/malids.maltest b/monetdb5/mal/Tests/malids.maltest new file mode 100644 --- /dev/null +++ b/monetdb5/mal/Tests/malids.maltest @@ -0,0 +1,22 @@ +statement ok +module cip_chop; + +statement ok _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
