MonetDB: default - Approve output

[Martin Kersten]

Changeset: d0a79eb0c1c5 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d0a79eb0c1c5
Modified Files:
        monetdb5/mal/Tests/tst049.mal
        monetdb5/mal/Tests/tst049.stable.out
        monetdb5/mal/Tests/tst285.mal
        monetdb5/mal/Tests/tst285.stable.out
        monetdb5/mal/Tests/tst960.mal
        monetdb5/mal/Tests/tst960.stable.out
Branch: default
Log Message:

Approve output


diffs (89 lines):

diff --git a/monetdb5/mal/Tests/tst049.mal b/monetdb5/mal/Tests/tst049.mal
--- a/monetdb5/mal/Tests/tst049.mal
+++ b/monetdb5/mal/Tests/tst049.mal
@@ -30,7 +30,7 @@ io.print(i);
 i:= str.like("trx","t_");
 io.print(i);
 
-z:= batstr.like(b,"t_");
+z:= batalgebra.like(b,"t_");
 io.print(z);
 z:= mal.manifold("str","like",b,"%math%");
 io.print(z);
diff --git a/monetdb5/mal/Tests/tst049.stable.out 
b/monetdb5/mal/Tests/tst049.stable.out
--- a/monetdb5/mal/Tests/tst049.stable.out
+++ b/monetdb5/mal/Tests/tst049.stable.out
@@ -123,7 +123,7 @@ function user.main():void;
     io.print(i);
     i := str.like("trx","t_");
     io.print(i);
-    z := batstr.like(b,"t_");
+    z := batalgebra.like(b,"t_");
     io.print(z);
     z := mal.manifold("str","like",b,"%math%");
     io.print(z);
diff --git a/monetdb5/mal/Tests/tst285.mal b/monetdb5/mal/Tests/tst285.mal
--- a/monetdb5/mal/Tests/tst285.mal
+++ b/monetdb5/mal/Tests/tst285.mal
@@ -1,11 +1,8 @@
 b:= bat.new(:oid,:str);
 bat.append(b,"hello");
 bat.append(b,"goodbye");
-o:=bat.new(:oid,:oid);
 
-p:= bat.new(:oid,:str);
-bat.append(p,"%hel%");
+z0:= algebra.likesubselect(b,nil:bat,"%hel%",false);
+io.print(z0);
 
-(z0,z1):= algebra.likesubselect(b,p,"");
-io.print(z0,z1);
 
diff --git a/monetdb5/mal/Tests/tst285.stable.out 
b/monetdb5/mal/Tests/tst285.stable.out
--- a/monetdb5/mal/Tests/tst285.stable.out
+++ b/monetdb5/mal/Tests/tst285.stable.out
@@ -26,17 +26,14 @@ function user.main():void;
     b := bat.new(:oid,:str);
     bat.append(b,"hello");
     bat.append(b,"goodbye");
-    o := bat.new(:oid,:oid);
-    p := bat.new(:oid,:str);
-    bat.append(p,"%hel%");
-    (z0,z1) := algebra.likesubselect(b,p,"");
-    io.print(z0,z1);
+    z0 := algebra.likesubselect(b,nil:BAT,"%hel%",false);
+    io.print(z0);
 end main;
 #--------------------------#
 # t    h       h  # name
 # void oid     oid  # type
 #--------------------------#
-[ 0@0, 0@0,    0@0  ]
+[ 0@0, 0@0  ]
 
 # 08:01:12 >  
 # 08:01:12 >  Done.
diff --git a/monetdb5/mal/Tests/tst960.mal b/monetdb5/mal/Tests/tst960.mal
--- a/monetdb5/mal/Tests/tst960.mal
+++ b/monetdb5/mal/Tests/tst960.mal
@@ -15,7 +15,7 @@ io.print(L);
 B:= batcalc.==(S,"hello");
 io.print(B);
 
-C:= batstr.like(S,"hello");
+C:= batalgebra.like(S,"hello");
 io.print(C);
 
 U:= batstr.toUpper(S);
diff --git a/monetdb5/mal/Tests/tst960.stable.out 
b/monetdb5/mal/Tests/tst960.stable.out
--- a/monetdb5/mal/Tests/tst960.stable.out
+++ b/monetdb5/mal/Tests/tst960.stable.out
@@ -65,7 +65,7 @@ function user.main():void;
     io.print(L);
     B := batcalc.==(S,"hello");
     io.print(B);
-    C := batstr.like(S,"hello");
+    C := batalgebra.like(S,"hello");
     io.print(C);
     U := batstr.toUpper(S);
     io.print(U);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list