Changeset: 3f7e91551044 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3f7e91551044
Modified Files:
        monetdb5/mal/Tests/recycle00.stable.out
        monetdb5/mal/Tests/tst661.stable.out
        monetdb5/mal/Tests/tst662.stable.out
        monetdb5/mal/Tests/tst903.stable.out
        monetdb5/modules/mal/Tests/partition.stable.out
        monetdb5/modules/mal/Tests/remote03.stable.out.int128
        monetdb5/modules/mal/Tests/remote04.stable.out
        monetdb5/optimizer/Tests/CMexample.stable.out
        monetdb5/optimizer/Tests/CXexample.stable.out
        monetdb5/optimizer/Tests/DCexample.stable.out
        monetdb5/optimizer/Tests/DCexample2.stable.out
        monetdb5/optimizer/Tests/FTexample.stable.out
        monetdb5/optimizer/Tests/GCexample01.stable.out
        monetdb5/optimizer/Tests/JPexample.stable.out
        monetdb5/optimizer/Tests/Mexample.stable.out
        monetdb5/optimizer/Tests/cst00.stable.out
        monetdb5/optimizer/Tests/cst01.stable.out
        monetdb5/optimizer/Tests/cst02.stable.out
        monetdb5/optimizer/Tests/dataflow.stable.out
        monetdb5/optimizer/Tests/dataflow3.stable.out
        monetdb5/optimizer/Tests/garbage.stable.out
        monetdb5/optimizer/Tests/inline00.stable.out
        monetdb5/optimizer/Tests/inline01.stable.out
        monetdb5/optimizer/Tests/inline02.stable.out
        monetdb5/optimizer/Tests/inline03.stable.out
        monetdb5/optimizer/Tests/inline04.stable.out
        monetdb5/optimizer/Tests/inline05.stable.out
        monetdb5/optimizer/Tests/inline06.stable.out
        monetdb5/optimizer/Tests/inline07.stable.out
        monetdb5/optimizer/Tests/inline08.stable.out
        monetdb5/optimizer/Tests/inline09.stable.out
        monetdb5/optimizer/Tests/inline10.stable.out
        monetdb5/optimizer/Tests/inlineCst.stable.out
        monetdb5/optimizer/Tests/inlineIfthen.stable.out
        monetdb5/optimizer/Tests/manifold2.stable.out
        monetdb5/optimizer/Tests/remap.stable.out
        monetdb5/optimizer/Tests/tst4005.stable.out
        monetdb5/optimizer/Tests/tst4600.stable.out
        monetdb5/optimizer/Tests/tst4601.stable.out
        monetdb5/scheduler/Tests/sched00.stable.out
        sql/backends/monet5/UDF/Tests/udf-reverse.stable.out
        sql/benchmarks/ssbm/Tests/01-explain.stable.out.int128
        sql/benchmarks/ssbm/Tests/02-explain.stable.out.int128
        sql/benchmarks/ssbm/Tests/03-explain.stable.out.int128
        sql/benchmarks/ssbm/Tests/04-explain.stable.out.int128
        sql/benchmarks/ssbm/Tests/05-explain.stable.out.int128
        sql/benchmarks/ssbm/Tests/06-explain.stable.out.int128
        sql/benchmarks/ssbm/Tests/07-explain.stable.out.int128
        sql/benchmarks/ssbm/Tests/08-explain.stable.out.int128
        sql/benchmarks/ssbm/Tests/09-explain.stable.out.int128
        sql/benchmarks/ssbm/Tests/10-explain.stable.out.int128
        sql/benchmarks/ssbm/Tests/11-explain.stable.out.int128
        sql/benchmarks/ssbm/Tests/12-explain.stable.out.int128
        sql/benchmarks/ssbm/Tests/13-explain.stable.out.int128
        sql/benchmarks/tpch/Tests/01-explain.stable.out.int128
        sql/benchmarks/tpch/Tests/02-explain.stable.out
        sql/benchmarks/tpch/Tests/03-explain.stable.out.int128
        sql/benchmarks/tpch/Tests/04-explain.stable.out
        sql/benchmarks/tpch/Tests/05-explain.stable.out.int128
        sql/benchmarks/tpch/Tests/06-explain.stable.out.int128
        sql/benchmarks/tpch/Tests/07-explain.stable.out.int128
        sql/benchmarks/tpch/Tests/08-explain.stable.out.int128
        sql/benchmarks/tpch/Tests/09-explain.stable.out.int128
        sql/benchmarks/tpch/Tests/10-explain.stable.out.int128
        sql/benchmarks/tpch/Tests/11-explain.stable.out
        sql/benchmarks/tpch/Tests/11-explain.stable.out.int128
        sql/benchmarks/tpch/Tests/12-explain.stable.out.int128
        sql/benchmarks/tpch/Tests/13-explain.stable.out
        sql/benchmarks/tpch/Tests/13-explain.stable.out.32bit
        sql/benchmarks/tpch/Tests/14-explain.stable.out.int128
        sql/benchmarks/tpch/Tests/15-explain.stable.out.int128
        sql/benchmarks/tpch/Tests/16-explain.stable.out
        sql/benchmarks/tpch/Tests/17-explain.stable.out
        sql/benchmarks/tpch/Tests/17-explain.stable.out.int128
        sql/benchmarks/tpch/Tests/18-explain.stable.out.int128
        sql/benchmarks/tpch/Tests/19-explain.stable.out.int128
        sql/benchmarks/tpch/Tests/20-explain.stable.out
        sql/benchmarks/tpch/Tests/20-explain.stable.out.32bit
        sql/benchmarks/tpch/Tests/20-explain.stable.out.int128
        sql/benchmarks/tpch/Tests/21-explain.stable.out
        sql/benchmarks/tpch/Tests/22-explain.stable.out.int128
        
sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out
        sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out.int128
        sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out
        
sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
        sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.int128
        sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out
        sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
        sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
        sql/test/mergetables/Tests/mergequery.stable.out
Branch: default
Log Message:

Approve new debugging output


diffs (truncated from 9320 to 300 lines):

diff --git a/monetdb5/mal/Tests/recycle00.stable.out 
b/monetdb5/mal/Tests/recycle00.stable.out
--- a/monetdb5/mal/Tests/recycle00.stable.out
+++ b/monetdb5/mal/Tests/recycle00.stable.out
@@ -40,7 +40,7 @@ function user.qry():void;
     j := calc.*(i,i);
     io.print(j);
 end user.qry;
-function user.qry():void;                      #[0]  0 <- 
+function user.qry():void;                      #[0]  0 
     i:int := 23:int;                           #[1]  1 <- 2 
     j:int := calc.*(i:int,i:int);              #[2] CMDvarMULsignal 3 <- 1 1 
     io.print(j:int);                           #[3] IOprint_val 4 <- 3 
diff --git a/monetdb5/mal/Tests/tst661.stable.out 
b/monetdb5/mal/Tests/tst661.stable.out
--- a/monetdb5/mal/Tests/tst661.stable.out
+++ b/monetdb5/mal/Tests/tst661.stable.out
@@ -37,7 +37,7 @@ function user.tst():void;
     z := user.fs(1);
     (y,z) := user.fs(1);
 end user.tst;
-function user.tst():void;                      #[0]  0 <- 
+function user.tst():void;                      #[0]  0 
     a:int := user.fi(1:int);                   #[1] MDBdummy 1 <- 2 
     (a:int,b:int) := user.fi(1:int);           #[2] MDBdummy 1 3 <- 2 
     (a:int,b:int,c:int) := user.fi(1:int);     #[3] MDBdummy 1 3 4 <- 2 
diff --git a/monetdb5/mal/Tests/tst662.stable.out 
b/monetdb5/mal/Tests/tst662.stable.out
--- a/monetdb5/mal/Tests/tst662.stable.out
+++ b/monetdb5/mal/Tests/tst662.stable.out
@@ -34,7 +34,7 @@ function user.main():void;
 #Testing variable return lists 
     mdb.List("user","tst");
 end user.main;
-function user.tst():void;                      #[0]  0 <- 
+function user.tst():void;                      #[0]  0 
     X100:lng := -1:lng;                        #[1]  1 <- 2 
     X102:lng := -1:lng;                        #[2]  3 <- 2 
     X103:lng := -1:lng;                        #[3]  4 <- 2 
diff --git a/monetdb5/mal/Tests/tst903.stable.out 
b/monetdb5/mal/Tests/tst903.stable.out
--- a/monetdb5/mal/Tests/tst903.stable.out
+++ b/monetdb5/mal/Tests/tst903.stable.out
@@ -137,14 +137,14 @@ exit i;
     cnt := aggr.count(z9);
     mdb.setDebug(dbgmsk_set);
     t0 := alarm.usec();
-    X_99 := bat.new(nil:oid,nil:lng);
-barrier (X_103,X_104) := iterator.new(b);
-    X_106 := algebra.fetch(c,X_103);
-    X_108 := calc.+(X_104,X_106);
-    bat.append(X_99,X_108);
-    redo (X_103,X_104) := iterator.next(b);
-exit (X_103,X_104);
-    x:bat[:oid,:lng]  := X_99;
+    X_101 := bat.new(nil:oid,nil:lng);
+barrier (X_105,X_106) := iterator.new(b);
+    X_108 := algebra.fetch(c,X_105);
+    X_110 := calc.+(X_106,X_108);
+    bat.append(X_101,X_110);
+    redo (X_105,X_106) := iterator.next(b);
+exit (X_105,X_106);
+    x:bat[:oid,:lng] := X_101;
     t1 := alarm.usec();
     mdb.setDebug(dbgmsk_restore);
     d0 := calc.-(t1,t0);
diff --git a/monetdb5/modules/mal/Tests/partition.stable.out 
b/monetdb5/modules/mal/Tests/partition.stable.out
--- a/monetdb5/modules/mal/Tests/partition.stable.out
+++ b/monetdb5/modules/mal/Tests/partition.stable.out
@@ -35,7 +35,7 @@ function user.main():void;
     mdb.List("user","tst");
     user.tst();
 end user.main;
-function user.tst():void;                      #[0]  0 <- 
+function user.tst():void;                      #[0]  0 
     b:bat[:oid,:int] := bat.new(:oid,:int);    #[1] CMDBATnew 1 <- 2 3 
     bat.append(b:bat[:oid,:int],1:int);        #[2] BKCappend_val_wrap 4 <- 1 
5 
     bat.append(b:bat[:oid,:int],2:int);        #[3] BKCappend_val_wrap 6 <- 1 
7 
diff --git a/monetdb5/modules/mal/Tests/remote03.stable.out.int128 
b/monetdb5/modules/mal/Tests/remote03.stable.out.int128
--- a/monetdb5/modules/mal/Tests/remote03.stable.out.int128
+++ b/monetdb5/modules/mal/Tests/remote03.stable.out.int128
@@ -69,7 +69,7 @@ exit MALException:str;
     remote.disconnect(conn);
 end user.main;
 [ "Received first error from the remote site" ]
-!SyntaxException:remote.exec:(mapi:monetdb://mone...@vienna.ins.cwi.nl/mTests_monetdb5_modules_mal)
 rmt0_X_8_void := io.print.bla();
+!SyntaxException:remote.exec:(mapi:monetdb://mone...@vienna.ins.cwi.nl/mTests_monetdb5_modules_mal)
 rmt0_X_9_void := io.print.bla();
 SyntaxException:parseError:                       ^'(' expected
 
 [ "rmt1_bn_bat_oid_str" ]
@@ -111,7 +111,7 @@ SyntaxException:parseError:             
 [ 30@0,        "pcre"  ]
 [ 31@0,        "mbr"  ]
 [ 32@0,        "wkb"  ]
-[ "rmt2_X_8_void" ]
+[ "rmt2_X_9_void" ]
 [ nil ]
 
 # 22:17:31 >  
diff --git a/monetdb5/modules/mal/Tests/remote04.stable.out 
b/monetdb5/modules/mal/Tests/remote04.stable.out
--- a/monetdb5/modules/mal/Tests/remote04.stable.out
+++ b/monetdb5/modules/mal/Tests/remote04.stable.out
@@ -46,8 +46,8 @@ function user.main():void;
 end user.main;
 [ "mTests_monetdb5_modules_mal_monetdb_0" ]
 [ "rmt1_b_bat_oid_str" ]
-[ "rmt2_X_16_str" ]
-[ "rmt3_X_12_str" ]
+[ "rmt2_X_17_str" ]
+[ "rmt3_X_13_str" ]
 #--------------------------#
 # h    t         # name
 # void oid  # type
diff --git a/monetdb5/optimizer/Tests/CMexample.stable.out 
b/monetdb5/optimizer/Tests/CMexample.stable.out
--- a/monetdb5/optimizer/Tests/CMexample.stable.out
+++ b/monetdb5/optimizer/Tests/CMexample.stable.out
@@ -30,14 +30,14 @@ function user.main():void;
 # Cost model example 
     mdb.List("user","q");
 end user.main;
-function user.q():void;                        #[0]  0 <- 
+function user.q():void;                        #[0]  0 
     r:bat[:oid,:int]{rows=100} := bat.new(:oid,:int);  #[1] CMDBATnew 1 <- 3 4 
     s:bat[:oid,:int]{rows=1000} := bat.new(:oid,:int); #[2] CMDBATnew 5 <- 3 7 
     r:bat[:oid,:int]{rows=100} := bat.new(:oid,:int);  #[3] CMDBATnew 1 <- 3 8 
     s:bat[:oid,:int]{rows=1000} := bat.new(:oid,:int); #[4] CMDBATnew 5 <- 3 9 
     x:bat[:oid,:oid]{rows=300} := bat.new(:oid,:oid);  #[5] CMDBATnew 10 <- 3 
3 
-    rs:bat[:oid,:oid]{rows=151} := 
algebra.subselect(s:bat[:oid,:int],x:bat[:oid,:oid],1:int,1:int,true:bit,true:bit,false:bit);
       #[6] ALGsubselect2 12 <- 5 10 13 13 14 14 15 
-    j:bat[:oid,:int]{rows=100} := 
algebra.leftfetchjoin(rs:bat[:oid,:oid],r:bat[:oid,:int]);   #[7] 
ALGleftfetchjoin 16 <- 12 1 
+    rs:bat[:oid,:oid]{rows=151} := 
algebra.subselect(s:bat[:oid,:int],x:bat[:oid,:oid],1:int,1:int,true:bit,true:bit,false:bit);
       #[6] ALGsubselect2 12 <- 5 10 13 14 15 16 17 
+    j:bat[:oid,:int]{rows=100} := 
algebra.leftfetchjoin(rs:bat[:oid,:oid],r:bat[:oid,:int]);   #[7] 
ALGleftfetchjoin 18 <- 12 1 
 end user.q;                                    #[8]  
 
 # 08:55:26 >  
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
@@ -22,15 +22,15 @@ function user.main():void;
     l3 := calc.+(l,24);
     mdb.List();
 end user.main;
-function user.main():void;                     #[0]  0 <- 
-# The 4000 series deals with strategic optimizer constructs    #[1]  1 <- 
-# common subexpression evaluation              #[2]  2 <- 
+function user.main():void;                     #[0]  0 
+# The 4000 series deals with strategic optimizer constructs 
+# common subexpression evaluation       
     b:bat[:oid,:int] := bat.new(:oid,:int);    #[3] CMDBATnew 5 <- 6 7 
     c:bat[:oid,:int] := bat.new(:oid,:int);    #[4] CMDBATnew 8 <- 6 7 
     d:bat[:oid,:int] := algebra.select(b:bat[:oid,:int],0:int,100:int);        
#[5] ALGselect 9 <- 5 10 11 
     l:int := calc.+(24:int,27:int);            #[6] CMDvarADDsignal 17 <- 14 
16 
     l3:int := calc.+(l:int,24:int);            #[7] CMDvarADDsignal 19 <- 17 
14 
-    mdb.List();                                #[8] MDBlistDetail 20 <- 
+    mdb.List();                                #[8] MDBlistDetail 20 
 end user.main;                                 #[9]  
 
 # 23:53:03 >  
diff --git a/monetdb5/optimizer/Tests/DCexample.stable.out 
b/monetdb5/optimizer/Tests/DCexample.stable.out
--- a/monetdb5/optimizer/Tests/DCexample.stable.out
+++ b/monetdb5/optimizer/Tests/DCexample.stable.out
@@ -17,9 +17,9 @@ function user.main():void;
     mdb.List();
 end user.main;
 [ "done" ]
-function user.main():void;                     #[0]  0 <- 
+function user.main():void;                     #[0]  0 
     io.print("done":str);                      #[1] IOprint_val 15 <- 16 
-    mdb.List();                                #[2] MDBlistDetail 18 <- 
+    mdb.List();                                #[2] MDBlistDetail 18 
 end user.main;                                 #[3]  
 
 # 23:53:03 >  
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
@@ -19,13 +19,13 @@ function user.main():void;
     b := algebra.subsort(b,false,false);
     mdb.List();
 end user.main;
-function user.main():void;                     #[0]  0 <- 
+function user.main():void;                     #[0]  0 
     b:bat[:oid,:int] := bat.new(:oid,:int);    #[1] CMDBATnew 2 <- 3 4 
     bat.append(b:bat[:oid,:int],2:int);        #[2] BKCappend_val_wrap 5 <- 2 
6 
     bat.append(b:bat[:oid,:int],5:int);        #[3] BKCappend_val_wrap 7 <- 2 
8 
     bat.append(b:bat[:oid,:int],3:int);        #[4] BKCappend_val_wrap 9 <- 2 
10 
-    b:bat[:oid,:int] := algebra.subsort(b:bat[:oid,:int],false:bit,false:bit); 
#[5] ALGsubsort11 2 <- 2 11 11 
-    mdb.List();                                #[6] MDBlistDetail 14 <- 
+    b:bat[:oid,:int] := algebra.subsort(b:bat[:oid,:int],false:bit,false:bit); 
#[5] ALGsubsort11 2 <- 2 11 12 
+    mdb.List();                                #[6] MDBlistDetail 15 
 end user.main;                                 #[7]  
 
 # 22:31:27 >  
diff --git a/monetdb5/optimizer/Tests/FTexample.stable.out 
b/monetdb5/optimizer/Tests/FTexample.stable.out
--- a/monetdb5/optimizer/Tests/FTexample.stable.out
+++ b/monetdb5/optimizer/Tests/FTexample.stable.out
@@ -29,8 +29,8 @@ barrier always:bit := true:bit;         
     z:bat[:oid,:str] := algebra.select(b:bat[:oid,:str],s:str,s:str);  #[4] 
ALGselect 7 <- 2 1 1 
     i:wrd := aggr.count(z:bat[:oid,:str]);     #[5] ALGcount_bat 8 <- 7 
     yield test:wrd := i:wrd;                   #[6]  0 <- 8 
-    redo always:bit;                           #[7]  9 <- 
-exit always:bit;                               #[8]  9 <- 
+    redo always:bit;                           #[7]  9 
+exit always:bit;                               #[8]  9 
     return test:wrd := test:wrd;               #[9]  0 <- 0 
 end user.test;                                 #[10]  
 
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
@@ -33,25 +33,25 @@ function user.main():void;
 #checking proper handling of scopes for the garbage collector 
     mdb.List("user","qry");
 end user.main;
-function user.qry():void;                      #[0]  0 <- 
+function user.qry():void;                      #[0]  0 
     b:bat[:oid,:int] := bat.new(:oid,:int);    #[1] CMDBATnew 1 <- 2 3 
     c:bat[:oid,:int] := bat.new(:oid,:int);    #[2] CMDBATnew 4 <- 2 3 
     d:bat[:oid,:int] := bat.new(:oid,:int);    #[3] CMDBATnew 5 <- 2 3 
     bat.append(b:bat[:oid,:int],1:int);        #[4] BKCappend_val_wrap 6 <- 1 
7 
 barrier (x:oid,z:int) := iterator.new(b:bat[:oid,:int]);       #[5] 
ITRbunIterator 8 9 <- 1 
     io.print(x:oid);                           #[6] IOprint_val 10 <- 8 
-exit (x:oid,z:int);                            #[7]  8 9 <- 
+exit (x:oid,z:int);                            #[7]  8 9 
     b:bat[:oid,:int] := nil:bat[:oid,:int];    #[8]  1 <- 17 
 barrier (x:oid,z:int) := iterator.new(c:bat[:oid,:int]);       #[9] 
ITRbunIterator 8 9 <- 4 
     io.print(x:oid);                           #[10] IOprint_val 11 <- 8 
     redo (x:oid,z:int) := iterator.next(c:bat[:oid,:int]);     #[11] 
ITRbunNext 8 9 <- 4 
-exit (x:oid,z:int);                            #[12]  8 9 <- 
+exit (x:oid,z:int);                            #[12]  8 9 
     c:bat[:oid,:int] := nil:bat[:oid,:int];    #[13]  4 <- 19 
 # do not close d, it may be reused             #[14]  12 <- 
 barrier go:bit := true:bit;                    #[15]  13 <- 14 
     io.print(d:bat[:oid,:int]);                #[16] IOprint_val 15 <- 5 
     redo go:bit := true:bit;                   #[17]  13 <- 14 
-exit go:bit;                                   #[18]  13 <- 
+exit go:bit;                                   #[18]  13 
     d:bat[:oid,:int] := nil:bat[:oid,:int];    #[19]  5 <- 21 
 end user.qry;                                  #[20]  
 
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
@@ -24,8 +24,8 @@ function user.main():void;
     j4:bat[:oid,:oid] := algebra.leftfetchjoinPath(b,b,b);
     mdb.List();
 end user.main;
-function user.main():void;                     #[0]  0 <- 
-# test the joinpath expander                   #[1]  1 <- 
+function user.main():void;                     #[0]  0 
+# test the joinpath expander            
     a:bat[:oid,:oid] := bat.new(:oid,:oid);    #[2] CMDBATnew 2 <- 3 3 
     b:bat[:oid,:oid] := bat.new(:oid,:oid);    #[3] CMDBATnew 4 <- 3 3 
     c:bat[:oid,:str] := bat.new(:oid,:str);    #[4] CMDBATnew 5 <- 3 6 
@@ -33,7 +33,7 @@ function user.main():void;              
     j2:bat[:oid,:str] := 
algebra.leftfetchjoinPath(a:bat[:oid,:oid],b:bat[:oid,:oid],c:bat[:oid,:str]);  
      #[6] ALGjoinPath 8 <- 2 4 5 
     j3:bat[:oid,:oid] := 
algebra.leftfetchjoin(b:bat[:oid,:oid],b:bat[:oid,:oid]);     #[7] 
ALGleftfetchjoin 9 <- 4 4 
     j4:bat[:oid,:oid] := 
algebra.leftfetchjoinPath(b:bat[:oid,:oid],b:bat[:oid,:oid],b:bat[:oid,:oid]);  
      #[8] ALGjoinPath 10 <- 4 4 4 
-    mdb.List();                                #[9] MDBlistDetail 12 <- 
+    mdb.List();                                #[9] MDBlistDetail 12 
 end user.main;                                 #[10]  
 
 # 20:30:05 >  
diff --git a/monetdb5/optimizer/Tests/Mexample.stable.out 
b/monetdb5/optimizer/Tests/Mexample.stable.out
--- a/monetdb5/optimizer/Tests/Mexample.stable.out
+++ b/monetdb5/optimizer/Tests/Mexample.stable.out
@@ -24,7 +24,7 @@ exit (X_15,X_16);
     c:bat[:oid,:int]  := X_11;
     mdb.List();
 end user.main;
-function user.main():void;                     #[0]  0 <- 
+function user.main():void;                     #[0]  0 
     b:bat[:oid,:int] := bat.new(:oid,:int);    #[1] CMDBATnew 1 <- 2 3 
     bat.append(b:bat[:oid,:int],1:int);        #[2] BKCappend_val_wrap 4 <- 1 
5 
     X_11:bat[:oid,:int] := bat.new(nil:oid,nil:int);   #[3] CMDBATnew 11 <- 12 
13 
@@ -32,9 +32,9 @@ barrier (X_15:oid,X_16:int) := iterator.
     X_18:int := calc.+(X_16:int,1:int);        #[5] CMDvarADDsignal 18 <- 16 5 
     bat.append(X_11:bat[:oid,:int],X_18:int);  #[6] BKCappend_val_wrap 19 <- 
11 18 
     redo (X_15:oid,X_16:int) := iterator.next(b:bat[:oid,:int]);       #[7] 
ITRbunNext 15 16 <- 1 
-exit (X_15:oid,X_16:int);                      #[8]  15 16 <- 
+exit (X_15:oid,X_16:int);                      #[8]  15 16 
     c:bat[:oid,:int] := X_11:bat[:oid,:int];   #[9]  6 <- 11 
-    mdb.List();                                #[10] MDBlistDetail 10 <- 
+    mdb.List();                                #[10] MDBlistDetail 10 
 end user.main;                                 #[11]  
 
 # 23:53:03 >  
diff --git a/monetdb5/optimizer/Tests/cst00.stable.out 
b/monetdb5/optimizer/Tests/cst00.stable.out
--- a/monetdb5/optimizer/Tests/cst00.stable.out
+++ b/monetdb5/optimizer/Tests/cst00.stable.out
@@ -29,17 +29,17 @@ function user.main():void;
 # testing simple constant expression optimizations 
     mdb.List("user","tst");
 end user.main;
-function user.tst():void;                      #[0]  0 <- 
-    a:int := 2:int;                            #[1]  1 <- 5 
-    io.print(2:int);                           #[2] IOprint_val 3 <- 5 
-    b:int := 2:int;                            #[3]  4 <- 5 
-    io.print(2:int);                           #[4] IOprint_val 6 <- 5 
-    c:int := 6:int;                            #[5]  7 <- 14 
-    io.print(6:int);                           #[6] IOprint_val 9 <- 14 
-    d:flt := 6:flt;                            #[7]  10 <- 15 
-    io.print(6:flt);                           #[8] IOprint_val 11 <- 15 
-    e:flt := -0.2794155:flt;                   #[9]  12 <- 16 
-    io.print(-0.2794155:flt);                  #[10] IOprint_val 13 <- 16 
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to