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

Approve output


diffs (102 lines):

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
@@ -37,20 +37,17 @@ function user.qry():void;               
 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 
+barrier (x:oid, z:int) := iterator.new(c:bat[:int]);   #[8] (0) ITRbunIterator 
7 8 <- 3 
+    io.print(x:oid);                           #[9] (0) IOprint_val 10 <- 7 
+    redo (x:oid, z:int) := iterator.next(c:bat[:int]); #[10] (0) ITRbunNext 7 
8 <- 3 
+exit (x:oid, z:int);                           #[11] (0)  7 8 
 # do not close d, it may be reused 
-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)  
-#garbagecollector     actions= 4 time=31 usec 
+barrier go:bit := true:bit;                    #[13] (0)  12 <- 13 
+    io.print(d:bat[:int]);                     #[14] (0) IOprint_val 14 <- 4 
+    redo go:bit := true:bit;                   #[15] (0)  12 <- 13 
+exit go:bit;                                   #[16] (0)  12 
+end user.qry;                                  #[17] (0)  
+#garbagecollector     actions= 1 time=21 usec 
 function user.qry():void;                      #[0] (0)  0 
     b:bat[:int] := bat.new(:int);              #[1] (0) CMDBATnew 1 <- 2 
     c:bat[:int] := bat.new(:int);              #[2] (0) CMDBATnew 3 <- 2 
@@ -59,20 +56,17 @@ function user.qry():void;               
 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 
+barrier (x:oid, z:int) := iterator.new(c:bat[:int]);   #[8] (0) ITRbunIterator 
7 8 <- 3 
+    io.print(x:oid);                           #[9] (0) IOprint_val 10 <- 7 
+    redo (x:oid, z:int) := iterator.next(c:bat[:int]); #[10] (0) ITRbunNext 7 
8 <- 3 
+exit (x:oid, z:int);                           #[11] (0)  7 8 
 # do not close d, it may be reused      
-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)  
-#garbagecollector     actions= 4 time=31 usec 
+barrier go:bit := true:bit;                    #[13] (0)  12 <- 13 
+    io.print(d:bat[:int]);                     #[14] (0) IOprint_val 14 <- 4 
+    redo go:bit := true:bit;                   #[15] (0)  12 <- 13 
+exit go:bit;                                   #[16] (0)  12 
+end user.qry;                                  #[17] (0)  
+#garbagecollector     actions= 1 time=21 usec 
 
 # 23:17:49 >  
 # 23:17:49 >  Done.
diff --git a/monetdb5/optimizer/Tests/tst4006.stable.out 
b/monetdb5/optimizer/Tests/tst4006.stable.out
--- a/monetdb5/optimizer/Tests/tst4006.stable.out
+++ b/monetdb5/optimizer/Tests/tst4006.stable.out
@@ -34,12 +34,10 @@ barrier V12:bit := true:bit;            
     V13:any := algebra.union(x:bat[:int], z:bat[:int]);        #[5] (0)  8 <- 
2 4 
     V30:bat[:int] := V13:any;                  #[6] (0)  5 <- 8 
 exit V12:bit;                                  #[7] (0)  6 
-    z:bat[:int] := nil:bat[:int];              #[8] (0)  4 <- 12 
-    x:bat[:int] := nil:bat[:int];              #[9] (0)  2 <- 14 
-    return V31:bat[:int] := V30:bat[:int];     #[10] (0)  9 <- 5 
-end user.getz;                                 #[11] (0)  
-#aliases              actions= 0 time=6 usec 
-#garbagecollector     actions= 3 time=30 usec 
+    return V31:bat[:int] := V30:bat[:int];     #[8] (0)  9 <- 5 
+end user.getz;                                 #[9] (0)  
+#aliases              actions= 0 time=4 usec 
+#garbagecollector     actions= 1 time=12 usec 
 function user.getz(p:int):bat[:int];           #[0] (0)  0 <- 1 
     x:bat[:int] := bat.new(:int);              #[1] (0) CMDBATnew 2 <- 3 
     z:bat[:int] := bat.new(:int);              #[2] (0) CMDBATnew 4 <- 3 
@@ -48,12 +46,10 @@ barrier V12:bit := true:bit;            
     V13:any := algebra.union(x:bat[:int], z:bat[:int]);        #[5] (0)  8 <- 
2 4 
     V30:bat[:int] := V13:any;                  #[6] (0)  5 <- 8 
 exit V12:bit;                                  #[7] (0)  6 
-    z:bat[:int] := nil:bat[:int];              #[8] (0)  4 <- 12 
-    x:bat[:int] := nil:bat[:int];              #[9] (0)  2 <- 14 
-    return V31:bat[:int] := V30:bat[:int];     #[10] (0)  9 <- 5 
-end user.getz;                                 #[11] (0)  
-#aliases              actions= 0 time=6 usec 
-#garbagecollector     actions= 3 time=30 usec 
+    return V31:bat[:int] := V30:bat[:int];     #[8] (0)  9 <- 5 
+end user.getz;                                 #[9] (0)  
+#aliases              actions= 0 time=4 usec 
+#garbagecollector     actions= 1 time=12 usec 
 
 # 15:27:10 >  
 # 15:27:10 >  "Done."
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to