Changeset: c34884af025d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c34884af025d
Modified Files:
monetdb5/mal/Tests/tst201.mal
monetdb5/mal/Tests/tst201.stable.out
monetdb5/mal/mal_builder.c
Branch: default
Log Message:
Adjust test
and use void-head.
diffs (204 lines):
diff --git a/monetdb5/mal/Tests/tst201.mal b/monetdb5/mal/Tests/tst201.mal
--- a/monetdb5/mal/Tests/tst201.mal
+++ b/monetdb5/mal/Tests/tst201.mal
@@ -98,49 +98,6 @@ exit MALException;
v46:= io.print(v45);
#b.select(int(nil),int(nil)).print;
#
-## A 2-dimensional cut
- v47:= algebra.fragment(b,1@0,5@0,"fox","quick");
- bns := v47;
- v48:= io.print(bns);
-#bns:=b.fragment("fox","quick",1,5);bns.print;
- v49:= calc.str(nil);
- v50:= algebra.fragment(b,1@0,5@0,"fox",v49);
- v51:= io.print(v50);
-#b.fragment("fox",str(nil),1,5).print;
- v52:= calc.str(nil);
- v53:= calc.oid(nil);
- v54:= calc.oid(nil);
- v55:= algebra.fragment(b,v53,v54,"fox",v52);
- v56:= io.print(v55);
-#b.fragment("fox",str(nil),int(nil),int(nil)).print;
- v57:= calc.str(nil);
- v58:= calc.oid(nil);
- v59:= calc.oid(nil);
- v60:= algebra.fragment(b,v58,v59,v57,"f");
- v61:= io.print(v60);
-#b.fragment(str(nil),"f",int(nil),int(nil)).print;
- v62:= bat.reverse(b);
- v63:= calc.oid(nil);
- v64:= calc.oid(nil);
- v65:= calc.str(nil);
- v66:= algebra.fragment(b,v63,v64,v65,"f");
- v67:= io.print(v66);
-#b.reverse.fragment(int(nil),int(nil),str(nil),"f").print;
-#
- brr:= bat.reverse(br);
- bnsr:= bat.reverse(bns);
- v69:= algebra.join(brr,bnsr);
- bnj := v69;
-#bnj:= b.join(bns.reverse);
- v70:= io.print(bnj);
-#bnj.print;
-#
- v71:= bat.reverse(bnj);
- v72:= algebra.semijoin(brr,v71);
- bnk := v72;
-#bnk:= b.semijoin(bnj.reverse);
- v73:= io.print(bnk);
-#bnk.print;
#
## testing the algebra.like command
v75:= algebra.like(b,"ox");
diff --git a/monetdb5/mal/Tests/tst201.stable.out
b/monetdb5/mal/Tests/tst201.stable.out
--- a/monetdb5/mal/Tests/tst201.stable.out
+++ b/monetdb5/mal/Tests/tst201.stable.out
@@ -268,47 +268,6 @@ exit MALException:str ;
v45 := algebra.slice(b,v43,v44);
v46 := io.print(v45);
#b.select(int(nil),int(nil)).print;
-## A 2-dimensional cut
- v47 := algebra.fragment(b,1@0,5@0,"fox","quick");
- bns := v47;
- v48 := io.print(bns);
-#bns:=b.fragment("fox","quick",1,5);bns.print;
- v49 := calc.str(nil);
- v50 := algebra.fragment(b,1@0,5@0,"fox",v49);
- v51 := io.print(v50);
-#b.fragment("fox",str(nil),1,5).print;
- v52 := calc.str(nil);
- v53 := calc.oid(nil);
- v54 := calc.oid(nil);
- v55 := algebra.fragment(b,v53,v54,"fox",v52);
- v56 := io.print(v55);
-#b.fragment("fox",str(nil),int(nil),int(nil)).print;
- v57 := calc.str(nil);
- v58 := calc.oid(nil);
- v59 := calc.oid(nil);
- v60 := algebra.fragment(b,v58,v59,v57,"f");
- v61 := io.print(v60);
-#b.fragment(str(nil),"f",int(nil),int(nil)).print;
- v62 := bat.reverse(b);
- v63 := calc.oid(nil);
- v64 := calc.oid(nil);
- v65 := calc.str(nil);
- v66 := algebra.fragment(b,v63,v64,v65,"f");
- v67 := io.print(v66);
-#b.reverse.fragment(int(nil),int(nil),str(nil),"f").print;
- brr := bat.reverse(br);
- bnsr := bat.reverse(bns);
- v69 := algebra.join(brr,bnsr);
- bnj := v69;
-#bnj:= b.join(bns.reverse);
- v70 := io.print(bnj);
-#bnj.print;
- v71 := bat.reverse(bnj);
- v72 := algebra.semijoin(brr,v71);
- bnk := v72;
-#bnk:= b.semijoin(bnj.reverse);
- v73 := io.print(bnk);
-#bnk.print;
## testing the algebra.like command
v75 := algebra.like(b,"ox");
v76 := io.print(v75);
@@ -390,78 +349,20 @@ end main;
[ 12@0, "fox" ]
[ 13@0, "the" ]
[ 14@0, "." ]
-#-------------------------#
+#--------------------------#
# h t # name
-# str oid # type
-#-------------------------#
-[ 1@0, "quick" ]
-[ 4@0, "jumps" ]
-[ 5@0, "over" ]
-#-------------------------#
-# h t # name
-# str oid # type
-#-------------------------#
-[ 1@0, "quick" ]
-[ 4@0, "jumps" ]
-[ 5@0, "over" ]
-#-------------------------#
-# h t # name
-# str oid # type
-#-------------------------#
-[ 1@0, "quick" ]
-[ 4@0, "jumps" ]
-[ 5@0, "over" ]
-[ 6@0, "lazy" ]
+# oid str # type
+#--------------------------#
[ 12@0, "fox" ]
-[ 13@0, "the" ]
-#-------------------------#
-# h t # name
-# str oid # type
-#-------------------------#
-[ 10@0, "" ]
-[ 2@0, "brown" ]
-[ 11@0, nil ]
-[ 7@0, "dog" ]
-[ 8@0, nil ]
-[ 14@0, "." ]
-#-------------------------#
+#--------------------------#
# h t # name
# oid str # type
-#-------------------------#
-[ 10@0, "" ]
-[ 2@0, "brown" ]
-[ 11@0, nil ]
-[ 7@0, "dog" ]
-[ 8@0, nil ]
-[ 14@0, "." ]
-#-----------------#
-# h t # name
-# oid oid # type
-#-----------------#
-[ 1@0, 1@0 ]
-[ 4@0, 4@0 ]
-[ 5@0, 5@0 ]
-#-------------------------#
-# h tmp_14 # name
-# str int # type
-#-------------------------#
-[ 1@0, "quick" ]
-[ 4@0, "jumps" ]
-[ 5@0, "over" ]
-#-----------------#
-# h tmp_15 # name
-# int str # type
-#-----------------#
+#--------------------------#
[ 12@0, "fox" ]
-#-----------------#
-# h tmp_16 # name
-# int str # type
-#-----------------#
-[ 12@0, "fox" ]
-#-----------------#
-# h tmp_17 # name
-# int str # type
-#-----------------#
+#--------------------------#
+# h t # name
+# oid str # type
+#--------------------------#
[ 12@0, "fox" ]
#-----------------#
# h tmp_18 # name
diff --git a/monetdb5/mal/mal_builder.c b/monetdb5/mal/mal_builder.c
--- a/monetdb5/mal/mal_builder.c
+++ b/monetdb5/mal/mal_builder.c
@@ -364,7 +364,7 @@ pushEmptyBAT(MalBlkPtr mb, InstrPtr q, i
getModuleId(q) = getName("bat",3);
getFunctionId(q) = getName("new",3);
- q = pushArgument(mb, q, newTypeVariable(mb,getHeadType(tpe)));
+ q = pushArgument(mb, q, newTypeVariable(mb,TYPE_void));
q = pushArgument(mb, q, newTypeVariable(mb,getTailType(tpe)));
q = pushZero(mb,q,TYPE_lng);
return q;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
