MonetDB: default - Fix projectionchain test.

[Sjoerd Mullender]

Changeset: 8405ebc9c780 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8405ebc9c780
Modified Files:
        monetdb5/optimizer/Tests/projectionchain.malC
        monetdb5/optimizer/Tests/projectionchain.stable.err
        monetdb5/optimizer/Tests/projectionchain.stable.out
Branch: default
Log Message:

Fix projectionchain test.
You can't have an empty BAT in the middle: the values to its left
won't match.


diffs (99 lines):

diff --git a/monetdb5/optimizer/Tests/projectionchain.malC 
b/monetdb5/optimizer/Tests/projectionchain.malC
--- a/monetdb5/optimizer/Tests/projectionchain.malC
+++ b/monetdb5/optimizer/Tests/projectionchain.malC
@@ -48,20 +48,18 @@ l := algebra.projection(f,k);
 io.print(g);
 io.print(l);
 
-h := algebra.projectionPath(c,d);
+h := algebra.projectionpath(c,d);
 io.print(h);
 
-i := algebra.projectionPath(b,c,d);
+i := algebra.projectionpath(b,c,d);
 io.print(i);
 
-j := algebra.projectionPath(a,b,c,d);
+j := algebra.projectionpath(a,b,c,d);
 io.print(j);
 
 io.print("empty sequences");
 w :=algebra.projectionpath(empty,c,d);
 io.print(w);
-w :=algebra.projectionpath(c,empty,d);
-io.print(w);
 
 end qry;
 
diff --git a/monetdb5/optimizer/Tests/projectionchain.stable.err 
b/monetdb5/optimizer/Tests/projectionchain.stable.err
--- a/monetdb5/optimizer/Tests/projectionchain.stable.err
+++ b/monetdb5/optimizer/Tests/projectionchain.stable.err
@@ -1,4 +1,4 @@
-stderr of test 'joinchain` in directory 'monetdb5/optimizer` itself:
+stderr of test 'projectionchain` in directory 'monetdb5/optimizer` itself:
 
 
 # 11:09:37 >  
diff --git a/monetdb5/optimizer/Tests/projectionchain.stable.out 
b/monetdb5/optimizer/Tests/projectionchain.stable.out
--- a/monetdb5/optimizer/Tests/projectionchain.stable.out
+++ b/monetdb5/optimizer/Tests/projectionchain.stable.out
@@ -1,4 +1,4 @@
-stdout of test 'joinchain` in directory 'monetdb5/optimizer` itself:
+stdout of test 'projectionchain` in directory 'monetdb5/optimizer` itself:
 
 
 # 11:09:37 >  
@@ -64,21 +64,19 @@ function user.qry():void;
     bat.append(k,8);
     bat.append(k,9);
     e := algebra.projection(a,b);
-    f:bat[:oid] := algebra.projectionPath(a,b,c);
+    f:bat[:oid] := algebra.projectionpath(a,b,c);
     g := algebra.projection(f,d);
     l := algebra.projection(f,k);
     io.print(g);
     io.print(l);
-    h := algebra.projectionPath(c,d);
+    h := algebra.projectionpath(c,d);
     io.print(h);
-    i := algebra.projectionPath(b,c,d);
+    i := algebra.projectionpath(b,c,d);
     io.print(i);
-    j := algebra.projectionPath(a,b,c,d);
+    j := algebra.projectionpath(a,b,c,d);
     io.print(j);
     io.print("empty sequences");
-    w := algebra.projectionPath(empty,c,d);
-    io.print(w);
-    w := algebra.projectionPath(c,empty,d);
+    w := algebra.projectionpath(empty,c,d);
     io.print(w);
 end user.qry;
 #mdb.list("user","qry");
@@ -120,21 +118,19 @@ function user.qry():void;
     bat.append(k,8);
     bat.append(k,9);
     e := algebra.projection(a,b);
-    f:bat[:oid] := algebra.projectionPath(a,b,c);
+    f:bat[:oid] := algebra.projectionpath(a,b,c);
     g := algebra.projection(f,d);
     l := algebra.projection(f,k);
     io.print(g);
     io.print(l);
-    h := algebra.projectionPath(c,d);
+    h := algebra.projectionpath(c,d);
     io.print(h);
-    i := algebra.projectionPath(b,c,d);
+    i := algebra.projectionpath(b,c,d);
     io.print(i);
-    j := algebra.projectionPath(a,b,c,d);
+    j := algebra.projectionpath(a,b,c,d);
     io.print(j);
     io.print("empty sequences");
-    w := algebra.projectionPath(empty,c,d);
-    io.print(w);
-    w := algebra.projectionPath(c,empty,d);
+    w := algebra.projectionpath(empty,c,d);
     io.print(w);
 end user.qry;
 #--------------------------#
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list