Changeset: f7beb9ffd266 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f7beb9ffd266
Removed Files:
monetdb5/tests/BugsViaSourgeforce/Tests/ID.1024615.mal
monetdb5/tests/BugsViaSourgeforce/Tests/ID.1024615.stable.err
monetdb5/tests/BugsViaSourgeforce/Tests/ID.1024615.stable.out
Modified Files:
monetdb5/mal/Tests/tst047.mal
monetdb5/mal/Tests/tst047.stable.out
monetdb5/mal/Tests/tst1502.mal
monetdb5/mal/Tests/tst1502.stable.out
monetdb5/mal/Tests/tst201.mal
monetdb5/mal/Tests/tst201.stable.out
monetdb5/mal/Tests/tst903.mal
monetdb5/mal/Tests/tst903.stable.out
monetdb5/mal/Tests/venks.mal
monetdb5/mal/Tests/venks.stable.out
monetdb5/optimizer/Tests/CXerror1.mal
monetdb5/optimizer/Tests/CXerror1.stable.out
monetdb5/optimizer/Tests/reorder00.mal
monetdb5/optimizer/Tests/reorder00.stable.out
monetdb5/optimizer/Tests/tst4700.mal
monetdb5/optimizer/Tests/tst4700.stable.out
monetdb5/tests/BugReports/Tests/no.016.mal
monetdb5/tests/BugReports/Tests/no.016.stable.out
monetdb5/tests/BugsViaSourgeforce/Tests/All
monetdb5/tests/gdkTests/Tests/append_dense_tail.mal
monetdb5/tests/gdkTests/Tests/append_dense_tail.stable.out
monetdb5/tests/gdkTests/Tests/cross.mal
monetdb5/tests/gdkTests/Tests/cross.stable.out
monetdb5/tests/gdkTests/Tests/qsort.mal
monetdb5/tests/gdkTests/Tests/qsort.stable.out
monetdb5/tests/gdkTests/Tests/semijoin.mal
monetdb5/tests/gdkTests/Tests/semijoin.stable.out
monetdb5/tests/gdkTests/Tests/void.mal
monetdb5/tests/gdkTests/Tests/void.stable.out
Branch: default
Log Message:
Prepare tests for :oid headed version
These test have been adjusted to work correctly under the new
algebra signatures. (not yet checked in)
diffs (truncated from 1306 to 300 lines):
diff --git a/monetdb5/mal/Tests/tst047.mal b/monetdb5/mal/Tests/tst047.mal
--- a/monetdb5/mal/Tests/tst047.mal
+++ b/monetdb5/mal/Tests/tst047.mal
@@ -11,5 +11,3 @@ io.print(br);
l0:= algebra.copy(b);
io.print(l0);
-l1:= algebra.copy(br);
-io.print(l1);
diff --git a/monetdb5/mal/Tests/tst047.stable.out
b/monetdb5/mal/Tests/tst047.stable.out
--- a/monetdb5/mal/Tests/tst047.stable.out
+++ b/monetdb5/mal/Tests/tst047.stable.out
@@ -40,8 +40,6 @@ function user.main():void;
io.print(br);
l0 := algebra.copy(b);
io.print(l0);
- l1 := algebra.copy(br);
- io.print(l1);
end main;
#-----------------#
# h tmp_4 # name
@@ -64,13 +62,6 @@ end main;
[ 0@0, 1 ]
[ 1@0, 4 ]
[ 2@0, 9 ]
-#-----------------#
-# h tmp_6 # name
-# int int # type
-#-----------------#
-[ 1, 0@0 ]
-[ 4, 1@0 ]
-[ 9, 2@0 ]
# 07:58:46 >
# 07:58:46 > Done.
diff --git a/monetdb5/mal/Tests/tst1502.mal b/monetdb5/mal/Tests/tst1502.mal
--- a/monetdb5/mal/Tests/tst1502.mal
+++ b/monetdb5/mal/Tests/tst1502.mal
@@ -40,6 +40,4 @@
io.print(xs);
io.print("hsort xrev");
xrev:=bat.reverse(x);
- xsrev:= algebra.sort(xrev);
- io.print(xsrev);
diff --git a/monetdb5/mal/Tests/tst1502.stable.out
b/monetdb5/mal/Tests/tst1502.stable.out
--- a/monetdb5/mal/Tests/tst1502.stable.out
+++ b/monetdb5/mal/Tests/tst1502.stable.out
@@ -99,8 +99,6 @@ function user.main():void;
io.print(xs);
io.print("hsort xrev");
xrev := bat.reverse(x);
- xsrev := algebra.sort(xrev);
- io.print(xsrev);
end main;
[ "sort x" ]
#-----------------#
@@ -116,18 +114,6 @@ end main;
[ 7@0, 3 ]
[ 8@0, 3 ]
[ "hsort xrev" ]
-#-----------------#
-# h tmp_8 # name
-# chr void # type
-#-----------------#
-[ 1, 1@0 ]
-[ 1, 2@0 ]
-[ 2, 3@0 ]
-[ 2, 4@0 ]
-[ 2, 5@0 ]
-[ 2, 6@0 ]
-[ 3, 7@0 ]
-[ 3, 8@0 ]
# 07:59:07 >
# 07:59:07 > Done.
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
@@ -85,38 +85,38 @@ exit MALException;
#
## Lets cut out a few sections
br:= bat.reverse(b);
- v38:= algebra.select(br,2@0,4@0);
+ v38:= algebra.slice(b,2@0,4@0);
v39:= io.print(v38);
#b.select(2,4).print;
v40:= calc.oid(nil);
- v41:= algebra.select(br,7@0,v40);
+ v41:= algebra.slice(b,7@0,v40);
v42:= io.print(v41);
#b.select(7,int(nil)).print;
v43:= calc.oid(nil);
v44:= calc.oid(nil);
- v45:= algebra.select(br,v43,v44);
+ v45:= algebra.slice(b,v43,v44);
v46:= io.print(v45);
#b.select(int(nil),int(nil)).print;
#
## A 2-dimensional cut
- v47:= algebra.fragment(br,"fox","quick",1@0,5@0);
+ 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(br,"fox",v49,1@0,5@0);
+ 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(br,"fox",v52,v53,v54);
+ 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(br,v57,"f",v58,v59);
+ 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);
@@ -127,15 +127,16 @@ exit MALException;
v67:= io.print(v66);
#b.reverse.fragment(int(nil),int(nil),str(nil),"f").print;
#
- v68:= bat.reverse(bns);
- v69:= algebra.join(br,v68);
+ 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(br,v71);
+ v72:= algebra.semijoin(brr,v71);
bnk := v72;
#bnk:= b.semijoin(bnj.reverse);
v73:= io.print(bnk);
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
@@ -256,37 +256,37 @@ exit MALException:str ;
#b.count.print;
## Lets cut out a few sections
br := bat.reverse(b);
- v38 := algebra.select(br,2@0,4@0);
+ v38 := algebra.slice(b,2@0,4@0);
v39 := io.print(v38);
#b.select(2,4).print;
v40 := calc.oid(nil);
- v41 := algebra.select(br,7@0,v40);
+ v41 := algebra.slice(b,7@0,v40);
v42 := io.print(v41);
#b.select(7,int(nil)).print;
v43 := calc.oid(nil);
v44 := calc.oid(nil);
- v45 := algebra.select(br,v43,v44);
+ v45 := algebra.slice(b,v43,v44);
v46 := io.print(v45);
#b.select(int(nil),int(nil)).print;
## A 2-dimensional cut
- v47 := algebra.fragment(br,"fox","quick",1@0,5@0);
+ 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(br,"fox",v49,1@0,5@0);
+ 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(br,"fox",v52,v53,v54);
+ 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(br,v57,"f",v58,v59);
+ 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);
@@ -296,14 +296,15 @@ exit MALException:str ;
v66 := algebra.fragment(b,v63,v64,v65,"f");
v67 := io.print(v66);
#b.reverse.fragment(int(nil),int(nil),str(nil),"f").print;
- v68 := bat.reverse(bns);
- v69 := algebra.join(br,v68);
+ 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(br,v71);
+ v72 := algebra.semijoin(brr,v71);
bnk := v72;
#bnk:= b.semijoin(bnj.reverse);
v73 := io.print(bnk);
@@ -361,69 +362,68 @@ end main;
# h tmp_5 # name
# str int # type
#-------------------------#
-[ "brown", 2@0 ]
-[ "jumps", 4@0 ]
+[ 2@0, "brown" ]
#-----------------#
# h tmp_6 # name
# str int # type
#-----------------#
-[ "", 10@0 ]
-[ nil, 11@0 ]
-[ "dog", 7@0 ]
-[ nil, 8@0 ]
-[ "fox", 12@0 ]
-[ "the", 13@0 ]
-[ ".", 14@0 ]
+[ 10@0, "" ]
+[ 11@0, nil ]
+[ 7@0, "dog" ]
+[ 8@0, nil ]
+[ 12@0, "fox" ]
+[ 13@0, "the" ]
+[ 14@0, "." ]
#-------------------------#
# h t # name
# str oid # type
#-------------------------#
-[ "", 10@0 ]
-[ "quick", 1@0 ]
-[ "brown", 2@0 ]
-[ nil, 11@0 ]
-[ "jumps", 4@0 ]
-[ "over", 5@0 ]
-[ "lazy", 6@0 ]
-[ "dog", 7@0 ]
-[ nil, 8@0 ]
-[ "fox", 12@0 ]
-[ "the", 13@0 ]
-[ ".", 14@0 ]
+[ 10@0, "" ]
+[ 1@0, "quick" ]
+[ 2@0, "brown" ]
+[ 11@0, nil ]
+[ 4@0, "jumps" ]
+[ 5@0, "over" ]
+[ 6@0, "lazy" ]
+[ 7@0, "dog" ]
+[ 8@0, nil ]
+[ 12@0, "fox" ]
+[ 13@0, "the" ]
+[ 14@0, "." ]
#-------------------------#
# h t # name
# str oid # type
#-------------------------#
-[ "quick", 1@0 ]
-[ "jumps", 4@0 ]
-[ "over", 5@0 ]
+[ 1@0, "quick" ]
+[ 4@0, "jumps" ]
+[ 5@0, "over" ]
#-------------------------#
# h t # name
# str oid # type
#-------------------------#
-[ "quick", 1@0 ]
-[ "jumps", 4@0 ]
-[ "over", 5@0 ]
+[ 1@0, "quick" ]
+[ 4@0, "jumps" ]
+[ 5@0, "over" ]
#-------------------------#
# h t # name
# str oid # type
#-------------------------#
-[ "quick", 1@0 ]
-[ "jumps", 4@0 ]
-[ "over", 5@0 ]
-[ "lazy", 6@0 ]
-[ "fox", 12@0 ]
-[ "the", 13@0 ]
+[ 1@0, "quick" ]
+[ 4@0, "jumps" ]
+[ 5@0, "over" ]
+[ 6@0, "lazy" ]
+[ 12@0, "fox" ]
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
