Changeset: 951dcb8bcde7 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=951dcb8bcde7
Modified Files:
        monetdb5/optimizer/Tests/manifold2.stable.out.single
Branch: default
Log Message:

Approved after changeset 7b049bcc94fd.


diffs (82 lines):

diff --git a/monetdb5/optimizer/Tests/manifold2.stable.out.single 
b/monetdb5/optimizer/Tests/manifold2.stable.out.single
--- a/monetdb5/optimizer/Tests/manifold2.stable.out.single
+++ b/monetdb5/optimizer/Tests/manifold2.stable.out.single
@@ -32,45 +32,44 @@ function user.main():void;
     mdb.var("user","tst");
     mdb.List("user","tst");
 end user.main;
-function user.tst(b:bat[:oid,:dbl],b2:bat[:oid,:dbl]):void;
-    c:wrd := aggr.count(b:bat[:oid,:dbl]);
-    c2:wrd := aggr.count(b2:bat[:oid,:dbl]);
-    X_9:bat[:oid,:dbl] := bat.new(nil:oid,nil:dbl);
-barrier (X_13:oid,X_14:dbl) := iterator.new(b:bat[:oid,:dbl]);
-    X_16:dbl := algebra.fetch(b2:bat[:oid,:dbl],X_13:oid);
-    X_18:dbl := calc.max(X_14:dbl,X_16:dbl);
-    bat.append(X_9:bat[:oid,:dbl],X_18:dbl);
-    redo (X_13:oid,X_14:dbl) := iterator.next(b:bat[:oid,:dbl]);
-exit (X_13:oid,X_14:dbl);
-    z:bat[:oid,:dbl] := X_9:bat[:oid,:dbl];
-    io.print(z:bat[:oid,:dbl],b:bat[:oid,:dbl],b2:bat[:oid,:dbl]);
-end user.tst;
+function user.tst(b:bat[:oid,:dbl],b2:bat[:oid,:dbl]):void;    # 
+    c:wrd := aggr.count(b:bat[:oid,:dbl]);     # ALGcount_bat
+    c2:wrd := aggr.count(b2:bat[:oid,:dbl]);   # ALGcount_bat
+    X_9:bat[:oid,:dbl] := bat.new(nil:oid,nil:dbl);    # CMDBATnew
+barrier (X_13:oid,X_14:dbl) := iterator.new(b:bat[:oid,:dbl]); # ITRbunIterator
+    X_16:dbl := algebra.fetch(b2:bat[:oid,:dbl],X_13:oid);     # ALGfetchoid
+    X_18:dbl := calc.max(X_14:dbl,X_16:dbl);   # CALCmax
+    bat.append(X_9:bat[:oid,:dbl],X_18:dbl);   # BKCappend_val_wrap
+    redo (X_13:oid,X_14:dbl) := iterator.next(b:bat[:oid,:dbl]);       # 
ITRbunNext
+exit (X_13:oid,X_14:dbl);                      # 
+    z:bat[:oid,:dbl] := X_9:bat[:oid,:dbl];    # 
+    io.print(z:bat[:oid,:dbl],b:bat[:oid,:dbl],b2:bat[:oid,:dbl]);     # 
IOtable
+end user.tst;                                  # 
 #[1]     b =  :bat[:oid,:dbl]  
 #[2]    b2 =  :bat[:oid,:dbl]  
 #[5]     z =  :bat[:oid,:dbl]  
 #[6]    _6 = "calc" :str  constant 
 #[7]    _7 = "max" :str  constant 
-#[9]    _9 =  :bit  {transparent}
-#[12]   _12 =  :bat[:oid,:dbl]  
-#[13]   _13 = nil :oid  constant 
-#[14]   _14 = nil :dbl  constant 
-#[16]   _16 =  :oid  
-#[17]   _17 =  :dbl  
-#[19]   _19 =  :dbl  
-#[21]   _21 =  :dbl  
-function user.tst(b:bat[:oid,:dbl],b2:bat[:oid,:dbl]):void;
-    c:wrd := aggr.count(b:bat[:oid,:dbl]);
-    c2:wrd := aggr.count(b2:bat[:oid,:dbl]);
-    X_9:bat[:oid,:dbl] := bat.new(nil:oid,nil:dbl);
-barrier (X_13:oid,X_14:dbl) := iterator.new(b:bat[:oid,:dbl]);
-    X_16:dbl := algebra.fetch(b2:bat[:oid,:dbl],X_13:oid);
-    X_18:dbl := calc.max(X_14:dbl,X_16:dbl);
-    bat.append(X_9:bat[:oid,:dbl],X_18:dbl);
-    redo (X_13:oid,X_14:dbl) := iterator.next(b:bat[:oid,:dbl]);
-exit (X_13:oid,X_14:dbl);
-    z:bat[:oid,:dbl] := X_9:bat[:oid,:dbl];
-    io.print(z:bat[:oid,:dbl],b:bat[:oid,:dbl],b2:bat[:oid,:dbl]);
-end user.tst;
+#[9]    _9 =  :bat[:oid,:dbl]  
+#[10]   _10 = nil :oid  constant 
+#[11]   _11 = nil :dbl  constant 
+#[13]   _13 =  :oid  
+#[14]   _14 =  :dbl  
+#[16]   _16 =  :dbl  
+#[18]   _18 =  :dbl  
+function user.tst(b:bat[:oid,:dbl],b2:bat[:oid,:dbl]):void;    # 
+    c:wrd := aggr.count(b:bat[:oid,:dbl]);     # ALGcount_bat
+    c2:wrd := aggr.count(b2:bat[:oid,:dbl]);   # ALGcount_bat
+    X_9:bat[:oid,:dbl] := bat.new(nil:oid,nil:dbl);    # CMDBATnew
+barrier (X_13:oid,X_14:dbl) := iterator.new(b:bat[:oid,:dbl]); # ITRbunIterator
+    X_16:dbl := algebra.fetch(b2:bat[:oid,:dbl],X_13:oid);     # ALGfetchoid
+    X_18:dbl := calc.max(X_14:dbl,X_16:dbl);   # CALCmax
+    bat.append(X_9:bat[:oid,:dbl],X_18:dbl);   # BKCappend_val_wrap
+    redo (X_13:oid,X_14:dbl) := iterator.next(b:bat[:oid,:dbl]);       # 
ITRbunNext
+exit (X_13:oid,X_14:dbl);                      # 
+    z:bat[:oid,:dbl] := X_9:bat[:oid,:dbl];    # 
+    io.print(z:bat[:oid,:dbl],b:bat[:oid,:dbl],b2:bat[:oid,:dbl]);     # 
IOtable
+end user.tst;                                  # 
 
 # 09:02:36 >  
 # 09:02:36 >  "Done."
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to