Changeset: 94d6f5d00f28 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=94d6f5d00f28
Modified Files:
        monetdb5/optimizer/Tests/joinchain.mal
        monetdb5/optimizer/Tests/joinchain.stable.out
Branch: default
Log Message:

Extended the joinpath test case with empty intermediates


diffs (106 lines):

diff --git a/monetdb5/optimizer/Tests/joinchain.mal 
b/monetdb5/optimizer/Tests/joinchain.mal
--- a/monetdb5/optimizer/Tests/joinchain.mal
+++ b/monetdb5/optimizer/Tests/joinchain.mal
@@ -1,10 +1,10 @@
 function qry();
+empty:= bat.new(:oid,:oid);
 a:= bat.new(:oid,:oid);
 b:= bat.new(:oid,:oid);
 c:= bat.new(:oid,:oid);
 d:= bat.new(:oid,:str);
 k:= bat.new(:oid,:int);
-z:= bat.new(:oid,:oid);
 
 bat.append(a,0@0);
 bat.append(a,3@0);
@@ -57,8 +57,12 @@ io.print(i);
 j := algebra.leftfetchjoinPath(a,b,c,d);
 io.print(j);
 
-zz := algebra.leftfetchjoinPath(a,z,d);
-io.print(zz);
+io.print("empty sequences");
+w :=algebra.leftfetchjoinPath(empty,c,d);
+io.print(w);
+w :=algebra.leftfetchjoinPath(c,empty,d);
+io.print(w);
+
 end qry;
 
 optimizer.joinPath("user","qry");
diff --git a/monetdb5/optimizer/Tests/joinchain.stable.out 
b/monetdb5/optimizer/Tests/joinchain.stable.out
--- a/monetdb5/optimizer/Tests/joinchain.stable.out
+++ b/monetdb5/optimizer/Tests/joinchain.stable.out
@@ -18,12 +18,12 @@ stdout of test 'joinchain` in directory 
 # MonetDB/GIS module loaded
 # MonetDB/SQL module loaded
 function user.qry():void;
+    empty := bat.new(:oid,:oid);
     a := bat.new(:oid,:oid);
     b := bat.new(:oid,:oid);
     c := bat.new(:oid,:oid);
     d := bat.new(:oid,:str);
     k := bat.new(:oid,:int);
-    z := bat.new(:oid,:oid);
     bat.append(a,0@0);
     bat.append(a,3@0);
     bat.append(b,0@0);
@@ -66,20 +66,23 @@ function user.qry():void;
     io.print(i);
     j := algebra.leftfetchjoinPath(a,b,c,d);
     io.print(j);
-    zz := algebra.leftfetchjoinPath(a,z,d);
-    io.print(zz);
+    io.print("empty sequences");
+    w := algebra.leftfetchjoinPath(empty,c,d);
+    io.print(w);
+    w := algebra.leftfetchjoinPath(c,empty,d);
+    io.print(w);
 end user.qry;
 function user.main():void;
     mdb.list("user","qry");
     user.qry();
 end user.main;
 function user.qry():void;
+    empty := bat.new(:oid,:oid);
     a := bat.new(:oid,:oid);
     b := bat.new(:oid,:oid);
     c := bat.new(:oid,:oid);
     d := bat.new(:oid,:str);
     k := bat.new(:oid,:int);
-    z := bat.new(:oid,:oid);
     bat.append(a,0@0);
     bat.append(a,3@0);
     bat.append(b,0@0);
@@ -122,8 +125,11 @@ function user.qry():void;
     io.print(i);
     j := algebra.leftfetchjoinPath(a,b,c,d);
     io.print(j);
-    zz := algebra.leftfetchjoinPath(a,z,d);
-    io.print(zz);
+    io.print("empty sequences");
+    w := algebra.leftfetchjoinPath(empty,c,d);
+    io.print(w);
+    w := algebra.leftfetchjoinPath(c,empty,d);
+    io.print(w);
 end user.qry;
 #--------------------------#
 # h    t  # name
@@ -161,8 +167,15 @@ end user.qry;
 #--------------------------#
 [ 0@0, "The"  ]
 [ 1@0, "jumps"  ]
-!MALException:algebra.joinPath:Can not create object
-!ERROR: BATproject: does not match always
+[ "empty sequences" ]
+#--------------------------#
+# h    t  # name
+# void str  # type
+#--------------------------#
+#--------------------------#
+# h    t  # name
+# void str  # type
+#--------------------------#
 
 # 11:09:37 >  
 # 11:09:37 >  "Done."
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to