Changeset: af3e4208a03a for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=af3e4208a03a Added Files: monetdb5/modules/mal/Tests/ascii_io2.maltest monetdb5/modules/mal/Tests/batpartition.maltest monetdb5/modules/mal/Tests/bigsum.maltest monetdb5/modules/mal/Tests/call00.maltest monetdb5/modules/mal/Tests/callfunction.maltest monetdb5/modules/mal/Tests/callstring.maltest monetdb5/modules/mal/Tests/clients-getpasswd.maltest monetdb5/modules/mal/Tests/clients-hashes.maltest monetdb5/modules/mal/Tests/clients01.maltest monetdb5/modules/mal/Tests/flags.maltest monetdb5/modules/mal/Tests/groupby00.maltest monetdb5/modules/mal/Tests/imprints.maltest monetdb5/modules/mal/Tests/inspect00.maltest monetdb5/modules/mal/Tests/inspect05.maltest monetdb5/modules/mal/Tests/inspect10.maltest monetdb5/modules/mal/Tests/inspect40.maltest monetdb5/modules/mal/Tests/iterator01.maltest monetdb5/modules/mal/Tests/iterator02.maltest monetdb5/modules/mal/Tests/iterator03.maltest monetdb5/modules/mal/Tests/manifold.maltest monetdb5/modules/mal/Tests/manifoldstr.maltest monetdb5/modules/mal/Tests/mapi01.maltest monetdb5/modules/mal/Tests/mapi02.maltest monetdb5/modules/mal/Tests/mapi04.maltest monetdb5/modules/mal/Tests/mapi05.maltest monetdb5/modules/mal/Tests/mapi06.maltest monetdb5/modules/mal/Tests/mapi07.maltest monetdb5/modules/mal/Tests/mat.maltest monetdb5/modules/mal/Tests/mserver00.maltest monetdb5/modules/mal/Tests/orderidx00.maltest monetdb5/modules/mal/Tests/orderidx01.maltest monetdb5/modules/mal/Tests/orderidx02.maltest monetdb5/modules/mal/Tests/orderidx04.maltest monetdb5/modules/mal/Tests/partition.maltest monetdb5/modules/mal/Tests/pqueue.maltest monetdb5/modules/mal/Tests/pqueue2.maltest monetdb5/modules/mal/Tests/pqueue3.maltest monetdb5/modules/mal/Tests/printf.maltest monetdb5/modules/mal/Tests/qgram.maltest monetdb5/modules/mal/Tests/register00.maltest monetdb5/modules/mal/Tests/remote89.maltest monetdb5/modules/mal/Tests/remoteInit.maltest monetdb5/modules/mal/Tests/tokenizer00.maltest testing/malmapi.py testing/mapicursor.py Modified Files: monetdb5/modules/mal/Tests/mapi01.malC testing/CMakeLists.txt testing/Mz.py.in testing/convert_to_sqllogic.sh testing/helpers.py testing/mktest.py testing/sqllogictest.py Branch: mtest Log Message:
added functionality to sqllogic test (and friend) to handle mal. .maltest files are now run through the sqllogic setup. diffs (truncated from 4968 to 300 lines): diff --git a/monetdb5/modules/mal/Tests/ascii_io2.maltest b/monetdb5/modules/mal/Tests/ascii_io2.maltest new file mode 100644 --- /dev/null +++ b/monetdb5/modules/mal/Tests/ascii_io2.maltest @@ -0,0 +1,31 @@ +statement ok +namebat := bat.new( :str) + +statement ok +bat.append(namebat,"tmpdocs") + +statement ok +bat.append(namebat,"tmpterms") + +query T rowsort +io.printf("#source:%s\n","namebat") +---- +#source:namebat + +statement ok +io.export(namebat, "namebat") + +statement ok +z:= bat.new(:str) + +statement ok +io.import(z,"namebat") + +query TT rowsort +io.print(z) +---- +@ +tmpdocs +@ +tmpterms + diff --git a/monetdb5/modules/mal/Tests/batpartition.maltest b/monetdb5/modules/mal/Tests/batpartition.maltest new file mode 100644 --- /dev/null +++ b/monetdb5/modules/mal/Tests/batpartition.maltest @@ -0,0 +1,69 @@ +statement ok +b := bat.new(:lng) + +statement ok +bat.append(b,0:lng) + +statement ok +bat.append(b,1:lng) + +statement ok +bat.append(b,2:lng) + +statement ok +bat.append(b,3:lng) + +statement ok +bat.append(b,4:lng) + +statement ok +bat.append(b,5:lng) + +statement ok +bat.append(b,6:lng) + +statement ok +bat.append(b,7:lng) + +statement ok +bat.append(b,8:lng) + +statement ok +bat.append(b,9:lng) + +statement ok +b1 := bat.partition(b,2,0) + +statement error +io.print(b1) + +statement ok +b2 := bat.partition(b,2,1) + +statement error +io.print(b2) + +statement ok +c1 := bat.partition(b1,2,0) + +statement error +io.print(c1) + +statement ok +c2 := bat.partition(b1,2,1) + +statement error +io.print(c2) + +statement ok +d1 := bat.partition(b2,2,0) + +statement error +io.print(d1) + +statement ok +d2 := bat.partition(b2,2,1) + +statement error +io.print(d2) + diff --git a/monetdb5/modules/mal/Tests/bigsum.maltest b/monetdb5/modules/mal/Tests/bigsum.maltest new file mode 100644 --- /dev/null +++ b/monetdb5/modules/mal/Tests/bigsum.maltest @@ -0,0 +1,45 @@ +statement ok +b := bat.new(:lng,10000001) + +statement ok +INT_MAX := 2147483647 + +statement ok +dbgmsk_restore := mdb.getDebug() + +statement ok +dbgmsk_unset := 8+8388608 + +statement ok +dbgmsk_keep := calc.xor(INT_MAX,dbgmsk_unset) + +statement ok +dbgmsk_set := calc.and(dbgmsk_restore,dbgmsk_keep) + +statement ok +mdb.setDebug(dbgmsk_set) + +statement ok +bat.append(b,10000000000000000:lng) + +statement ok +barrier i := 0:lng + +statement ok + bat.append(b,1:lng) + +statement ok + redo i := iterator.next(1:lng,10000000:lng) + +statement ok +exit i + +statement ok +mdb.setDebug(dbgmsk_restore) + +statement ok +s:dbl := aggr.sum(b) + +statement error +io.print(s) + diff --git a/monetdb5/modules/mal/Tests/call00.maltest b/monetdb5/modules/mal/Tests/call00.maltest new file mode 100644 --- /dev/null +++ b/monetdb5/modules/mal/Tests/call00.maltest @@ -0,0 +1,53 @@ +statement ok +function tst(i:int,s:str):bit + +statement ok + j:= i+1 + +statement ok + io.print(j) + +statement ok + format:= "hello %s\n" + +statement ok + io.printf(format,s) + +statement ok + return tst:=true + +statement ok +end tst + +statement ok +d:= inspect.getSignature("user","tst") + +query TT rowsort +io.print(d) +---- +@ +(i:int, s:str):bit; + +statement error +user.tst(1,"world") + +statement ok +m:=inspect.getSource("user","tst") + +statement error +io.print(m) + +statement ok +language.call(m) + +statement ok +d:= inspect.getSignature("user","tst") + +query TT rowsort +io.print(d) +---- +@ +(i:int, s:str):bit; +@ +(i:int, s:str):bit; + diff --git a/monetdb5/modules/mal/Tests/callfunction.maltest b/monetdb5/modules/mal/Tests/callfunction.maltest new file mode 100644 --- /dev/null +++ b/monetdb5/modules/mal/Tests/callfunction.maltest @@ -0,0 +1,33 @@ +statement ok +function f1() + +statement ok + io.print("hello") + +statement ok +end f1 + +statement ok +function f2() + +statement ok + io.print("world") + +statement ok +end f2 + +statement ok +function q() + +statement ok + language.call("user","f1") + +statement ok + language.call("user","f2") + +statement ok +end q + +statement error +q() + diff --git a/monetdb5/modules/mal/Tests/callstring.maltest b/monetdb5/modules/mal/Tests/callstring.maltest new file mode 100644 --- /dev/null +++ b/monetdb5/modules/mal/Tests/callstring.maltest @@ -0,0 +1,33 @@ +statement ok +function f1() + +statement ok + io.print("hello") + +statement ok +end f1 + +statement ok +function f2() + +statement ok + io.print("world") + +statement ok +end f2 + +statement ok +function q() + +statement ok + language.call("user.f1();") + +statement ok + language.call("user.f2();") + +statement ok +end q + +statement error +q() + diff --git a/monetdb5/modules/mal/Tests/clients-getpasswd.maltest b/monetdb5/modules/mal/Tests/clients-getpasswd.maltest new file mode 100644 --- /dev/null +++ b/monetdb5/modules/mal/Tests/clients-getpasswd.maltest @@ -0,0 +1,6 @@ +statement ok _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list