Changeset: 7a4588da7bb5 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7a4588da7bb5
Modified Files:
        monetdb5/optimizer/Tests/CMexample.malC
        monetdb5/optimizer/Tests/CRexample.malC
        monetdb5/optimizer/Tests/CXerror1.malC
        monetdb5/optimizer/Tests/CXexample.malC
        monetdb5/optimizer/Tests/CXexample.stable.out
        monetdb5/optimizer/Tests/DCexample.malC
        monetdb5/optimizer/Tests/DCexample2.malC
        monetdb5/optimizer/Tests/DCexample2.stable.out
        monetdb5/optimizer/Tests/FTexample.malC
        monetdb5/optimizer/Tests/GCexample01.malC
        monetdb5/optimizer/Tests/GCexample01.stable.out
        monetdb5/optimizer/Tests/JPexample.malC
        monetdb5/optimizer/Tests/JPexample.stable.out
        monetdb5/optimizer/Tests/Mexample.malC
        monetdb5/optimizer/Tests/Mexample.stable.out
        monetdb5/optimizer/Tests/dataflow3.malC
        monetdb5/optimizer/Tests/dataflow3.stable.out
        monetdb5/optimizer/Tests/dataflow4.malC
        monetdb5/optimizer/Tests/dataflow4.stable.out
        monetdb5/optimizer/Tests/dataflow5.malC
        monetdb5/optimizer/Tests/dataflow5.stable.out
        monetdb5/optimizer/Tests/inline00.malC
        monetdb5/optimizer/Tests/inline00.stable.out
        monetdb5/optimizer/Tests/inline01.malC
        monetdb5/optimizer/Tests/inline01.stable.out
        monetdb5/optimizer/Tests/inline02.malC
        monetdb5/optimizer/Tests/inline02.stable.out
        monetdb5/optimizer/Tests/inline03.malC
        monetdb5/optimizer/Tests/inline03.stable.out
        monetdb5/optimizer/Tests/inline04.malC
        monetdb5/optimizer/Tests/inline04.stable.out
        monetdb5/optimizer/Tests/inline05.malC
        monetdb5/optimizer/Tests/inline05.stable.out
        monetdb5/optimizer/Tests/inline06.malC
        monetdb5/optimizer/Tests/inline06.stable.out
        monetdb5/optimizer/Tests/inline07.malC
        monetdb5/optimizer/Tests/inline07.stable.out
        monetdb5/optimizer/Tests/inline08.malC
        monetdb5/optimizer/Tests/inline08.stable.out
        monetdb5/optimizer/Tests/inline09.malC
        monetdb5/optimizer/Tests/inline09.stable.out
        monetdb5/optimizer/Tests/inline10.malC
        monetdb5/optimizer/Tests/inline10.stable.out
        monetdb5/optimizer/Tests/inline11.malC
        monetdb5/optimizer/Tests/inline12.malC
        monetdb5/optimizer/Tests/inline12.stable.out
        monetdb5/optimizer/Tests/inlineCst.malC
        monetdb5/optimizer/Tests/inlineCst.stable.out
        monetdb5/optimizer/Tests/inlineFunction2.malC
        monetdb5/optimizer/Tests/inlineFunction2.stable.out
        monetdb5/optimizer/Tests/inlineIfthen.malC
        monetdb5/optimizer/Tests/inlineIfthen.stable.out
        monetdb5/optimizer/Tests/joinpath.malC
        monetdb5/optimizer/Tests/leftjoinpath.malC
        monetdb5/optimizer/Tests/manifold2.malC
        monetdb5/optimizer/Tests/mat00.malC
        monetdb5/optimizer/Tests/mat01.malC
        monetdb5/optimizer/Tests/mitosis00.malC
        monetdb5/optimizer/Tests/projectionchain.malC
        monetdb5/optimizer/Tests/projectionchain.stable.out
        monetdb5/optimizer/Tests/qep00.malC
        monetdb5/optimizer/Tests/qep01.malC
        monetdb5/optimizer/Tests/qep02.malC
        monetdb5/optimizer/Tests/remap.malC
        monetdb5/optimizer/Tests/remap.stable.out
        monetdb5/optimizer/Tests/reorder00.malC
        monetdb5/optimizer/Tests/reorder00.stable.out
        monetdb5/optimizer/Tests/replicator00.malC
        monetdb5/optimizer/Tests/tst4000.malC
        monetdb5/optimizer/Tests/tst4000.stable.out
        monetdb5/optimizer/Tests/tst4003.malC
        monetdb5/optimizer/Tests/tst4003.stable.out
        monetdb5/optimizer/Tests/tst4010.malC
        monetdb5/optimizer/Tests/tst4010.stable.out
        monetdb5/optimizer/Tests/tst4030.malC
        monetdb5/optimizer/Tests/tst4030.stable.out
        monetdb5/optimizer/Tests/tst4700.malC
Branch: default
Log Message:

Approve test output


diffs (truncated from 1608 to 300 lines):

diff --git a/monetdb5/optimizer/Tests/CMexample.malC 
b/monetdb5/optimizer/Tests/CMexample.malC
--- a/monetdb5/optimizer/Tests/CMexample.malC
+++ b/monetdb5/optimizer/Tests/CMexample.malC
@@ -1,10 +1,10 @@
 # Cost model example
 function q();
-       r{rows=100} := bat.new(:oid,:int);
-       s{rows=1000}:= bat.new(:oid,:int);
-    r{rows=100} := bat.new(:oid,:int);
-    s{rows=1000}:= bat.new(:oid,:int);
-    x{rows=300} := bat.new(:oid,:oid);
+       r{rows=100} := bat.new(:int);
+       s{rows=1000}:= bat.new(:int);
+    r{rows=100} := bat.new(:int);
+    s{rows=1000}:= bat.new(:int);
+    x{rows=300} := bat.new(:oid);
     rs:= algebra.subselect(s,x,1,1,true,true,false);
     j:= algebra.projection(rs,r);
 end q;
diff --git a/monetdb5/optimizer/Tests/CRexample.malC 
b/monetdb5/optimizer/Tests/CRexample.malC
--- a/monetdb5/optimizer/Tests/CRexample.malC
+++ b/monetdb5/optimizer/Tests/CRexample.malC
@@ -1,6 +1,6 @@
-b := bat.new(:oid,:int);
-x:= bat.new(:oid,:oid);
-y:= bat.new(:oid,:oid);
+b := bat.new(:int);
+x:= bat.new(:oid);
+y:= bat.new(:oid);
 s1:= algebra.subselect(b,1,80,true,true,false);
 s2:= algebra.subselect(b,s1,5,95,true,true,false);
 s3:= algebra.subselect(b,s2,50,nil:int,true,true,false);
diff --git a/monetdb5/optimizer/Tests/CXerror1.malC 
b/monetdb5/optimizer/Tests/CXerror1.malC
--- a/monetdb5/optimizer/Tests/CXerror1.malC
+++ b/monetdb5/optimizer/Tests/CXerror1.malC
@@ -1,7 +1,7 @@
 #provided by roberto
 function user.f1();
   # create bat
-  xxx := bat.new(:oid, :dbl);
+  xxx := bat.new( :dbl);
   bat.setName(xxx,"xxx");
   bat.setPersistent(xxx,true);
   transaction.commit();
diff --git a/monetdb5/optimizer/Tests/CXexample.malC 
b/monetdb5/optimizer/Tests/CXexample.malC
--- a/monetdb5/optimizer/Tests/CXexample.malC
+++ b/monetdb5/optimizer/Tests/CXexample.malC
@@ -1,8 +1,8 @@
 # The 4000 series deals with strategic optimizer constructs
 # common subexpression evaluation
 function foo();
-b:= bat.new(:oid,:int);
-c:= bat.new(:oid,:int);       
+b:= bat.new(:int);
+c:= bat.new(:int);       
 d:= algebra.subselect(b,0,100,true,true,false);
 e:= algebra.subselect(b,0,100,true,true,false);    
 k1:= 24;
diff --git a/monetdb5/optimizer/Tests/CXexample.stable.out 
b/monetdb5/optimizer/Tests/CXexample.stable.out
--- a/monetdb5/optimizer/Tests/CXexample.stable.out
+++ b/monetdb5/optimizer/Tests/CXexample.stable.out
@@ -28,18 +28,18 @@ Ready.
 # 15:36:19 >  
 
 function user.foo():void;                      #[0] (0)  0 
-    b:bat[:int] := bat.new(:oid,:int);         #[1] (0) CMDBATnew 1 <- 2 3 
-    c:bat[:int] := bat.new(:oid,:int);         #[2] (0) CMDBATnew 4 <- 2 3 
-    d:bat[:oid] := 
algebra.subselect(b:bat[:int],0:int,100:int,true:bit,true:bit,false:bit);   
#[3] (0) ALGsubselect1 5 <- 1 6 7 8 9 10 
-    l:int := calc.+(24:int,27:int);            #[4] (0) CMDvarADDsignal 16 <- 
13 15 
-    l3:int := calc.+(l:int,24:int);            #[5] (0) CMDvarADDsignal 18 <- 
16 13 
+    b:bat[:int] := bat.new(:int);              #[1] (0) CMDBATnewColumn 1 <- 2 
+    c:bat[:int] := bat.new(:int);              #[2] (0) CMDBATnewColumn 3 <- 2 
+    d:bat[:oid] := 
algebra.subselect(b:bat[:int],0:int,100:int,true:bit,true:bit,false:bit);   
#[3] (0) ALGsubselect1 4 <- 1 5 6 7 8 9 
+    l:int := calc.+(24:int,27:int);            #[4] (0) CMDvarADDsignal 15 <- 
12 14 
+    l3:int := calc.+(l:int,24:int);            #[5] (0) CMDvarADDsignal 17 <- 
15 12 
 end user.foo;                                  #[6] (0)  
 function user.foo():void;                      #[0] (0)  0 
-    b:bat[:int] := bat.new(:oid,:int);         #[1] (0) CMDBATnew 1 <- 2 3 
-    c:bat[:int] := bat.new(:oid,:int);         #[2] (0) CMDBATnew 4 <- 2 3 
-    d:bat[:oid] := 
algebra.subselect(b:bat[:int],0:int,100:int,true:bit,true:bit,false:bit);   
#[3] (0) ALGsubselect1 5 <- 1 6 7 8 9 10 
-    l:int := calc.+(24:int,27:int);            #[4] (0) CMDvarADDsignal 16 <- 
13 15 
-    l3:int := calc.+(l:int,24:int);            #[5] (0) CMDvarADDsignal 18 <- 
16 13 
+    b:bat[:int] := bat.new(:int);              #[1] (0) CMDBATnewColumn 1 <- 2 
+    c:bat[:int] := bat.new(:int);              #[2] (0) CMDBATnewColumn 3 <- 2 
+    d:bat[:oid] := 
algebra.subselect(b:bat[:int],0:int,100:int,true:bit,true:bit,false:bit);   
#[3] (0) ALGsubselect1 4 <- 1 5 6 7 8 9 
+    l:int := calc.+(24:int,27:int);            #[4] (0) CMDvarADDsignal 15 <- 
12 14 
+    l3:int := calc.+(l:int,24:int);            #[5] (0) CMDvarADDsignal 17 <- 
15 12 
 end user.foo;                                  #[6] (0)  
 
 # 15:36:19 >  
diff --git a/monetdb5/optimizer/Tests/DCexample.malC 
b/monetdb5/optimizer/Tests/DCexample.malC
--- a/monetdb5/optimizer/Tests/DCexample.malC
+++ b/monetdb5/optimizer/Tests/DCexample.malC
@@ -1,11 +1,11 @@
 function foo();
-    V7 := bat.new(:oid,:oid);
-    V10 := bat.new(:oid,:oid);
+    V7 := bat.new(:oid);
+    V10 := bat.new(:oid);
     V16 := V7;
 
     (V17,V17b) := 
algebra.subjoin(V16,V7,nil:bat[:oid,:oid],nil:bat[:oid,:oid],true, 0:lng);
-    V19 := bat.new(:oid,:oid);
-    V22 := bat.new(:oid,:oid);
+    V19 := bat.new(:oid);
+    V22 := bat.new(:oid);
     (V17,V17b) := 
algebra.subjoin(V16,V22,nil:bat[:oid,:oid],nil:bat[:oid,:oid],true, 0:lng);
        io.print("done");
 end;
diff --git a/monetdb5/optimizer/Tests/DCexample2.malC 
b/monetdb5/optimizer/Tests/DCexample2.malC
--- a/monetdb5/optimizer/Tests/DCexample2.malC
+++ b/monetdb5/optimizer/Tests/DCexample2.malC
@@ -1,5 +1,5 @@
 function foo();
-b:= bat.new(:oid,:int);
+b:= bat.new(:int);
 bat.append(b,2);
 bat.append(b,5);
 bat.append(b,3);
diff --git a/monetdb5/optimizer/Tests/DCexample2.stable.out 
b/monetdb5/optimizer/Tests/DCexample2.stable.out
--- a/monetdb5/optimizer/Tests/DCexample2.stable.out
+++ b/monetdb5/optimizer/Tests/DCexample2.stable.out
@@ -30,18 +30,18 @@ Ready.
 # 06:41:04 >  
 
 function user.foo():void;                      #[0] (0)  0 
-    b:bat[:int] := bat.new(:oid,:int);         #[1] (0) CMDBATnew 1 <- 2 3 
-    bat.append(b:bat[:int],2:int);             #[2] (0) BKCappend_val_wrap 4 
<- 1 5 
-    bat.append(b:bat[:int],5:int);             #[3] (0) BKCappend_val_wrap 6 
<- 1 7 
-    bat.append(b:bat[:int],3:int);             #[4] (0) BKCappend_val_wrap 8 
<- 1 9 
-    b:bat[:int] := algebra.subsort(b:bat[:int],false:bit,false:bit);   #[5] 
(0) ALGsubsort11 1 <- 1 10 11 
+    b:bat[:int] := bat.new(:int);              #[1] (0) CMDBATnewColumn 1 <- 2 
+    bat.append(b:bat[:int],2:int);             #[2] (0) BKCappend_val_wrap 3 
<- 1 4 
+    bat.append(b:bat[:int],5:int);             #[3] (0) BKCappend_val_wrap 5 
<- 1 6 
+    bat.append(b:bat[:int],3:int);             #[4] (0) BKCappend_val_wrap 7 
<- 1 8 
+    b:bat[:int] := algebra.subsort(b:bat[:int],false:bit,false:bit);   #[5] 
(0) ALGsubsort11 1 <- 1 9 10 
 end user.foo;                                  #[6] (0)  
 function user.foo():void;                      #[0] (0)  0 
-    b:bat[:int] := bat.new(:oid,:int);         #[1] (0) CMDBATnew 1 <- 2 3 
-    bat.append(b:bat[:int],2:int);             #[2] (0) BKCappend_val_wrap 4 
<- 1 5 
-    bat.append(b:bat[:int],5:int);             #[3] (0) BKCappend_val_wrap 6 
<- 1 7 
-    bat.append(b:bat[:int],3:int);             #[4] (0) BKCappend_val_wrap 8 
<- 1 9 
-    b:bat[:int] := algebra.subsort(b:bat[:int],false:bit,false:bit);   #[5] 
(0) ALGsubsort11 1 <- 1 10 11 
+    b:bat[:int] := bat.new(:int);              #[1] (0) CMDBATnewColumn 1 <- 2 
+    bat.append(b:bat[:int],2:int);             #[2] (0) BKCappend_val_wrap 3 
<- 1 4 
+    bat.append(b:bat[:int],5:int);             #[3] (0) BKCappend_val_wrap 5 
<- 1 6 
+    bat.append(b:bat[:int],3:int);             #[4] (0) BKCappend_val_wrap 7 
<- 1 8 
+    b:bat[:int] := algebra.subsort(b:bat[:int],false:bit,false:bit);   #[5] 
(0) ALGsubsort11 1 <- 1 9 10 
 end user.foo;                                  #[6] (0)  
 
 # 06:41:05 >  
diff --git a/monetdb5/optimizer/Tests/FTexample.malC 
b/monetdb5/optimizer/Tests/FTexample.malC
--- a/monetdb5/optimizer/Tests/FTexample.malC
+++ b/monetdb5/optimizer/Tests/FTexample.malC
@@ -1,6 +1,6 @@
 #Code factorization
 function test(s:str):lng;
-       b:= bat.new(:oid,:str);
+       b:= bat.new(:str);
        bat.append(b,"hello");
        z:= algebra.subselect(b,s,s,true,true,false);
        i:= aggr.count(z);
diff --git a/monetdb5/optimizer/Tests/GCexample01.malC 
b/monetdb5/optimizer/Tests/GCexample01.malC
--- a/monetdb5/optimizer/Tests/GCexample01.malC
+++ b/monetdb5/optimizer/Tests/GCexample01.malC
@@ -1,8 +1,8 @@
 #checking proper handling of scopes for the garbage collector
 function qry();
-b:= bat.new(:oid,:int);
-c:= bat.new(:oid,:int);
-d:= bat.new(:oid,:int);
+b:= bat.new(:int);
+c:= bat.new(:int);
+d:= bat.new(:int);
 bat.append(b,1);
 
 barrier (x,z):= iterator.new(b);
diff --git a/monetdb5/optimizer/Tests/GCexample01.stable.out 
b/monetdb5/optimizer/Tests/GCexample01.stable.out
--- a/monetdb5/optimizer/Tests/GCexample01.stable.out
+++ b/monetdb5/optimizer/Tests/GCexample01.stable.out
@@ -30,46 +30,46 @@ Ready.
 # 06:41:05 >  
 
 function user.qry():void;                      #[0] (0)  0 
-    b:bat[:int] := bat.new(:oid,:int);         #[1] (0) CMDBATnew 1 <- 2 3 
-    c:bat[:int] := bat.new(:oid,:int);         #[2] (0) CMDBATnew 4 <- 2 3 
-    d:bat[:int] := bat.new(:oid,:int);         #[3] (0) CMDBATnew 5 <- 2 3 
-    bat.append(b:bat[:int],1:int);             #[4] (0) BKCappend_val_wrap 6 
<- 1 7 
-barrier (x:oid,z:int) := iterator.new(b:bat[:int]);    #[5] (0) ITRbunIterator 
8 9 <- 1 
-    io.print(x:oid);                           #[6] (0) IOprint_val 10 <- 8 
-exit (x:oid,z:int);                            #[7] (0)  8 9 
-    b:bat[:int] := nil:bat[:int];              #[8] (0)  1 <- 17 
-barrier (x:oid,z:int) := iterator.new(c:bat[:int]);    #[9] (0) ITRbunIterator 
8 9 <- 4 
-    io.print(x:oid);                           #[10] (0) IOprint_val 11 <- 8 
-    redo (x:oid,z:int) := iterator.next(c:bat[:int]);  #[11] (0) ITRbunNext 8 
9 <- 4 
-exit (x:oid,z:int);                            #[12] (0)  8 9 
-    c:bat[:int] := nil:bat[:int];              #[13] (0)  4 <- 19 
+    b:bat[:int] := bat.new(:int);              #[1] (0) CMDBATnewColumn 1 <- 2 
+    c:bat[:int] := bat.new(:int);              #[2] (0) CMDBATnewColumn 3 <- 2 
+    d:bat[:int] := bat.new(:int);              #[3] (0) CMDBATnewColumn 4 <- 2 
+    bat.append(b:bat[:int],1:int);             #[4] (0) BKCappend_val_wrap 5 
<- 1 6 
+barrier (x:oid,z:int) := iterator.new(b:bat[:int]);    #[5] (0) ITRbunIterator 
7 8 <- 1 
+    io.print(x:oid);                           #[6] (0) IOprint_val 9 <- 7 
+exit (x:oid,z:int);                            #[7] (0)  7 8 
+    b:bat[:int] := nil:bat[:int];              #[8] (0)  1 <- 16 
+barrier (x:oid,z:int) := iterator.new(c:bat[:int]);    #[9] (0) ITRbunIterator 
7 8 <- 3 
+    io.print(x:oid);                           #[10] (0) IOprint_val 10 <- 7 
+    redo (x:oid,z:int) := iterator.next(c:bat[:int]);  #[11] (0) ITRbunNext 7 
8 <- 3 
+exit (x:oid,z:int);                            #[12] (0)  7 8 
+    c:bat[:int] := nil:bat[:int];              #[13] (0)  3 <- 18 
 # do not close d, it may be reused 
-barrier go:bit := true:bit;                    #[15] (0)  13 <- 14 
-    io.print(d:bat[:int]);                     #[16] (0) IOprint_val 15 <- 5 
-    redo go:bit := true:bit;                   #[17] (0)  13 <- 14 
-exit go:bit;                                   #[18] (0)  13 
-    d:bat[:int] := nil:bat[:int];              #[19] (0)  5 <- 21 
+barrier go:bit := true:bit;                    #[15] (0)  12 <- 13 
+    io.print(d:bat[:int]);                     #[16] (0) IOprint_val 14 <- 4 
+    redo go:bit := true:bit;                   #[17] (0)  12 <- 13 
+exit go:bit;                                   #[18] (0)  12 
+    d:bat[:int] := nil:bat[:int];              #[19] (0)  4 <- 20 
 end user.qry;                                  #[20] (0)  
 function user.qry():void;                      #[0] (0)  0 
-    b:bat[:int] := bat.new(:oid,:int);         #[1] (0) CMDBATnew 1 <- 2 3 
-    c:bat[:int] := bat.new(:oid,:int);         #[2] (0) CMDBATnew 4 <- 2 3 
-    d:bat[:int] := bat.new(:oid,:int);         #[3] (0) CMDBATnew 5 <- 2 3 
-    bat.append(b:bat[:int],1:int);             #[4] (0) BKCappend_val_wrap 6 
<- 1 7 
-barrier (x:oid,z:int) := iterator.new(b:bat[:int]);    #[5] (0) ITRbunIterator 
8 9 <- 1 
-    io.print(x:oid);                           #[6] (0) IOprint_val 10 <- 8 
-exit (x:oid,z:int);                            #[7] (0)  8 9 
-    b:bat[:int] := nil:bat[:int];              #[8] (0)  1 <- 17 
-barrier (x:oid,z:int) := iterator.new(c:bat[:int]);    #[9] (0) ITRbunIterator 
8 9 <- 4 
-    io.print(x:oid);                           #[10] (0) IOprint_val 11 <- 8 
-    redo (x:oid,z:int) := iterator.next(c:bat[:int]);  #[11] (0) ITRbunNext 8 
9 <- 4 
-exit (x:oid,z:int);                            #[12] (0)  8 9 
-    c:bat[:int] := nil:bat[:int];              #[13] (0)  4 <- 19 
+    b:bat[:int] := bat.new(:int);              #[1] (0) CMDBATnewColumn 1 <- 2 
+    c:bat[:int] := bat.new(:int);              #[2] (0) CMDBATnewColumn 3 <- 2 
+    d:bat[:int] := bat.new(:int);              #[3] (0) CMDBATnewColumn 4 <- 2 
+    bat.append(b:bat[:int],1:int);             #[4] (0) BKCappend_val_wrap 5 
<- 1 6 
+barrier (x:oid,z:int) := iterator.new(b:bat[:int]);    #[5] (0) ITRbunIterator 
7 8 <- 1 
+    io.print(x:oid);                           #[6] (0) IOprint_val 9 <- 7 
+exit (x:oid,z:int);                            #[7] (0)  7 8 
+    b:bat[:int] := nil:bat[:int];              #[8] (0)  1 <- 16 
+barrier (x:oid,z:int) := iterator.new(c:bat[:int]);    #[9] (0) ITRbunIterator 
7 8 <- 3 
+    io.print(x:oid);                           #[10] (0) IOprint_val 10 <- 7 
+    redo (x:oid,z:int) := iterator.next(c:bat[:int]);  #[11] (0) ITRbunNext 7 
8 <- 3 
+exit (x:oid,z:int);                            #[12] (0)  7 8 
+    c:bat[:int] := nil:bat[:int];              #[13] (0)  3 <- 18 
 # do not close d, it may be reused      
-barrier go:bit := true:bit;                    #[15] (0)  13 <- 14 
-    io.print(d:bat[:int]);                     #[16] (0) IOprint_val 15 <- 5 
-    redo go:bit := true:bit;                   #[17] (0)  13 <- 14 
-exit go:bit;                                   #[18] (0)  13 
-    d:bat[:int] := nil:bat[:int];              #[19] (0)  5 <- 21 
+barrier go:bit := true:bit;                    #[15] (0)  12 <- 13 
+    io.print(d:bat[:int]);                     #[16] (0) IOprint_val 14 <- 4 
+    redo go:bit := true:bit;                   #[17] (0)  12 <- 13 
+exit go:bit;                                   #[18] (0)  12 
+    d:bat[:int] := nil:bat[:int];              #[19] (0)  4 <- 20 
 end user.qry;                                  #[20] (0)  
 
 # 23:17:49 >  
diff --git a/monetdb5/optimizer/Tests/JPexample.malC 
b/monetdb5/optimizer/Tests/JPexample.malC
--- a/monetdb5/optimizer/Tests/JPexample.malC
+++ b/monetdb5/optimizer/Tests/JPexample.malC
@@ -1,9 +1,9 @@
 # test the joinpath expander
 function foo();
-    a:= bat.new(:oid,:oid);
-    b:= bat.new(:oid,:oid);
-    c:= bat.new(:oid,:oid);
-    d:= bat.new(:oid,:oid);
+    a:= bat.new(:oid);
+    b:= bat.new(:oid);
+    c:= bat.new(:oid);
+    d:= bat.new(:oid);
     j1:= algebra.projection(a,b);
     j2:= algebra.projection(j1,c);
     j3:= algebra.projectionpath(a,b,c,d);
diff --git a/monetdb5/optimizer/Tests/JPexample.stable.out 
b/monetdb5/optimizer/Tests/JPexample.stable.out
--- a/monetdb5/optimizer/Tests/JPexample.stable.out
+++ b/monetdb5/optimizer/Tests/JPexample.stable.out
@@ -30,10 +30,10 @@ Ready.
 # 06:41:06 >  
 
 function user.foo():void;                      #[0] (0)  0 
-    a:bat[:oid] := bat.new(:oid,:oid);         #[1] (0) CMDBATnew 1 <- 2 2 
-    b:bat[:oid] := bat.new(:oid,:oid);         #[2] (0) CMDBATnew 3 <- 2 2 
-    c:bat[:oid] := bat.new(:oid,:oid);         #[3] (0) CMDBATnew 4 <- 2 2 
-    d:bat[:oid] := bat.new(:oid,:oid);         #[4] (0) CMDBATnew 5 <- 2 2 
+    a:bat[:oid] := bat.new(:oid);              #[1] (0) CMDBATnewColumn 1 <- 2 
+    b:bat[:oid] := bat.new(:oid);              #[2] (0) CMDBATnewColumn 3 <- 2 
+    c:bat[:oid] := bat.new(:oid);              #[3] (0) CMDBATnewColumn 4 <- 2 
+    d:bat[:oid] := bat.new(:oid);              #[4] (0) CMDBATnewColumn 5 <- 2 
     j1:bat[:oid] := algebra.projection(a:bat[:oid],b:bat[:oid]);       #[5] 
(0) ALGprojection 6 <- 1 3 
     j2:bat[:oid] := 
algebra.projectionpath(a:bat[:oid],b:bat[:oid],c:bat[:oid]);       #[6] (0) 
ALGprojectionpath 7 <- 1 3 4 
     j3:bat[:any] := 
algebra.projectionpath(a:bat[:oid],b:bat[:oid],c:bat[:oid],d:bat[:oid]);   #[7] 
(0) ALGprojectionpath 8 <- 1 3 4 5 
diff --git a/monetdb5/optimizer/Tests/Mexample.malC 
b/monetdb5/optimizer/Tests/Mexample.malC
--- a/monetdb5/optimizer/Tests/Mexample.malC
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to