Update of /cvsroot/monetdb/MonetDB5/src/scheduler/Tests
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv5567/scheduler/Tests

Modified Files:
        memo01.mal memo01.stable.out 
Log Message:
Approvals of the changes due to major code patch.


Index: memo01.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/scheduler/Tests/memo01.stable.out,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- memo01.stable.out   14 Mar 2007 06:49:10 -0000      1.1
+++ memo01.stable.out   2 Jan 2008 08:23:32 -0000       1.2
@@ -102,44 +102,52 @@
     T1cost := calc.+(Acost,Bcost);     # 19 CALCbinaryADDintint 
(T1cost:int)<-(Acost:int)(Bcost:int)
     T2cost := calc.+(Bcost,Ccost);     # 20 CALCbinaryADDintint 
(T2cost:int)<-(Bcost:int)(Ccost:int)
     T3cost := calc.+(Ccost,Dcost);     # 21 CALCbinaryADDintint 
(T3cost:int)<-(Ccost:int)(Dcost:int)
-    scheduler.choice();        # 22 RUNchoice (_26:void)
-    T1 := algebra.join(A,B);   # 23 ALGjoin 
(T1:bat[:int,:int])<-(A:bat[:int,:int])(B:bat[:int,:int])
-    T1cost := aggr.count(T1);  # 24 ALGcount_bat 
(T1cost:int)<-(T1:bat[:int,:int])
-    T2 := algebra.join(B,C);   # 25 ALGjoin 
(T2:bat[:int,:int])<-(B:bat[:int,:int])(C:bat[:int,:int])
-    T2cost := aggr.count(T2);  # 26 ALGcount_bat 
(T2cost:int)<-(T2:bat[:int,:int])
-    T3 := algebra.join(C,D);   # 27 ALGjoin 
(T3:bat[:int,:int])<-(C:bat[:int,:int])(D:bat[:int,:int])
-    T3cost := aggr.count(T3);  # 28 ALGcount_bat 
(T3cost:int)<-(T3:bat[:int,:int])
-    scheduler.choice(T1cost,T1,T2cost,T2,T3cost,T3);   # 29 RUNchoice 
(_30:void)<-(T1cost:int)(T1:bat[:int,:int])(T2cost:int)(T2:bat[:int,:int])(T3cost:int)(T3:bat[:int,:int])
-    T4cost := calc.+(T1cost,Ccost);    # 30 CALCbinaryADDintint 
(T4cost:int)<-(T1cost:int)(Ccost:int)
-    T5cost := calc.+(Acost,T2cost);    # 31 CALCbinaryADDintint 
(T5cost:int)<-(Acost:int)(T2cost:int)
-    T6cost := calc.+(T2cost,Dcost);    # 32 CALCbinaryADDintint 
(T6cost:int)<-(T2cost:int)(Dcost:int)
-    T7cost := calc.+(Bcost,T3cost);    # 33 CALCbinaryADDintint 
(T7cost:int)<-(Bcost:int)(T3cost:int)
-    T8cost := calc.+(Ccost,Dcost);     # 34 CALCbinaryADDintint 
(T8cost:int)<-(Ccost:int)(Dcost:int)
-    T4 := algebra.join(T1,C);  # 35 ALGjoin 
(T4:bat[:int,:int])<-(T1:bat[:int,:int])(C:bat[:int,:int])
-    T4cost := aggr.count(T4);  # 36 ALGcount_bat 
(T4cost:int)<-(T4:bat[:int,:int])
-    T5 := algebra.join(A,T2);  # 37 ALGjoin 
(T5:bat[:int,:int])<-(A:bat[:int,:int])(T2:bat[:int,:int])
-    T5cost := aggr.count(T5);  # 38 ALGcount_bat 
(T5cost:int)<-(T5:bat[:int,:int])
-    T6 := algebra.join(T2,D);  # 39 ALGjoin 
(T6:bat[:int,:int])<-(T2:bat[:int,:int])(D:bat[:int,:int])
-    T6cost := aggr.count(T6);  # 40 ALGcount_bat 
(T6cost:int)<-(T6:bat[:int,:int])
-    T7 := algebra.join(B,T3);  # 41 ALGjoin 
(T7:bat[:int,:int])<-(B:bat[:int,:int])(T3:bat[:int,:int])
-    T7cost := aggr.count(T7);  # 42 ALGcount_bat 
(T7cost:int)<-(T7:bat[:int,:int])
-    T8 := algebra.join(C,D);   # 43 ALGjoin 
(T8:bat[:int,:int])<-(C:bat[:int,:int])(D:bat[:int,:int])
-    T8cost := aggr.count(T8);  # 44 ALGcount_bat 
(T8cost:int)<-(T8:bat[:int,:int])
-    scheduler.choice(T4cost,T4,T5cost,T5,T6cost,T6,T7cost,T7,T8cost,T8);       
# 45 RUNchoice 
(_41:void)<-(T4cost:int)(T4:bat[:int,:int])(T5cost:int)(T5:bat[:int,:int])(T6cost:int)(T6:bat[:int,:int])(T7cost:int)(T7:bat[:int,:int])(T8cost:int)(T8:bat[:int,:int])
-    T9cost := calc.+(T2cost,Dcost);    # 46 CALCbinaryADDintint 
(T9cost:int)<-(T2cost:int)(Dcost:int)
-    T10cost := calc.+(T5cost,Dcost);   # 47 CALCbinaryADDintint 
(T10cost:int)<-(T5cost:int)(Dcost:int)
-    T11cost := calc.+(Acost,T6cost);   # 48 CALCbinaryADDintint 
(T11cost:int)<-(Acost:int)(T6cost:int)
-    T12cost := calc.+(Acost,T7cost);   # 49 CALCbinaryADDintint 
(T12cost:int)<-(Acost:int)(T7cost:int)
-    T13cost := calc.+(T1cost,T8cost);  # 50 CALCbinaryADDintint 
(T13cost:int)<-(T1cost:int)(T8cost:int)
-    T9 := algebra.join(T4,D);  # 51 ALGjoin 
(T9:bat[:int,:int])<-(T4:bat[:int,:int])(D:bat[:int,:int])
-    T10 := algebra.join(T5,D); # 52 ALGjoin 
(T10:bat[:int,:int])<-(T5:bat[:int,:int])(D:bat[:int,:int])
-    T11 := algebra.join(A,T6); # 53 ALGjoin 
(T11:bat[:int,:int])<-(A:bat[:int,:int])(T6:bat[:int,:int])
-    T12 := algebra.join(A,T7); # 54 ALGjoin 
(T12:bat[:int,:int])<-(A:bat[:int,:int])(T7:bat[:int,:int])
-    T13 := algebra.join(T1,T8);        # 55 ALGjoin 
(T13:bat[:int,:int])<-(T1:bat[:int,:int])(T8:bat[:int,:int])
-    
scheduler.choice(T9cost,T9,T10cost,T10,T11cost,T11,T12cost,T12,T13cost,T13);    
   # 56 RUNchoice 
(_52:void)<-(T9cost:int)(T9:bat[:int,:int])(T10cost:int)(T10:bat[:int,:int])(T11cost:int)(T11:bat[:int,:int])(T12cost:int)(T12:bat[:int,:int])(T13cost:int)(T13:bat[:int,:int])
-    answer := scheduler.pick(T9,T10,T11,T12,T13);      # 57 RUNpickResult 
(answer:bat[:int,:int])<-(T9:bat[:int,:int])(T10:bat[:int,:int])(T11:bat[:int,:int])(T12:bat[:int,:int])(T13:bat[:int,:int])
-    io.print(answer);  # 58 IOprint_val (_54:void)<-(answer:bat[:int,:int])
-end main;      # 59  
+    io.printf("choicepoint 1\n");      # 22 IOprint_str (_26:void)<-(_27:str)
+    scheduler.choice();        # 23 RUNchoice (_28:void)
+    T1 := algebra.join(A,B);   # 24 ALGjoin 
(T1:bat[:int,:int])<-(A:bat[:int,:int])(B:bat[:int,:int])
+    T1cost := aggr.count(T1);  # 25 ALGcount_bat 
(T1cost:int)<-(T1:bat[:int,:int])
+    T2 := algebra.join(B,C);   # 26 ALGjoin 
(T2:bat[:int,:int])<-(B:bat[:int,:int])(C:bat[:int,:int])
+    T2cost := aggr.count(T2);  # 27 ALGcount_bat 
(T2cost:int)<-(T2:bat[:int,:int])
+    T3 := algebra.join(C,D);   # 28 ALGjoin 
(T3:bat[:int,:int])<-(C:bat[:int,:int])(D:bat[:int,:int])
+    T3cost := aggr.count(T3);  # 29 ALGcount_bat 
(T3cost:int)<-(T3:bat[:int,:int])
+    io.printf("choicepoint 2\n");      # 30 IOprint_str (_32:void)<-(_33:str)
+    scheduler.choice(T1cost,T1,T2cost,T2,T3cost,T3);   # 31 RUNchoice 
(_34:void)<-(T1cost:int)(T1:bat[:int,:int])(T2cost:int)(T2:bat[:int,:int])(T3cost:int)(T3:bat[:int,:int])
+    T4cost := calc.+(T1cost,Ccost);    # 32 CALCbinaryADDintint 
(T4cost:int)<-(T1cost:int)(Ccost:int)
+    T5cost := calc.+(Acost,T2cost);    # 33 CALCbinaryADDintint 
(T5cost:int)<-(Acost:int)(T2cost:int)
+    T6cost := calc.+(T2cost,Dcost);    # 34 CALCbinaryADDintint 
(T6cost:int)<-(T2cost:int)(Dcost:int)
+    T7cost := calc.+(Bcost,T3cost);    # 35 CALCbinaryADDintint 
(T7cost:int)<-(Bcost:int)(T3cost:int)
+    T8cost := calc.+(Ccost,Dcost);     # 36 CALCbinaryADDintint 
(T8cost:int)<-(Ccost:int)(Dcost:int)
+    T4 := algebra.join(T1,C);  # 37 ALGjoin 
(T4:bat[:int,:int])<-(T1:bat[:int,:int])(C:bat[:int,:int])
+    T4cost := aggr.count(T4);  # 38 ALGcount_bat 
(T4cost:int)<-(T4:bat[:int,:int])
+    T5 := algebra.join(A,T2);  # 39 ALGjoin 
(T5:bat[:int,:int])<-(A:bat[:int,:int])(T2:bat[:int,:int])
+    T5cost := aggr.count(T5);  # 40 ALGcount_bat 
(T5cost:int)<-(T5:bat[:int,:int])
+    T6 := algebra.join(T2,D);  # 41 ALGjoin 
(T6:bat[:int,:int])<-(T2:bat[:int,:int])(D:bat[:int,:int])
+    T6cost := aggr.count(T6);  # 42 ALGcount_bat 
(T6cost:int)<-(T6:bat[:int,:int])
+    T7 := algebra.join(B,T3);  # 43 ALGjoin 
(T7:bat[:int,:int])<-(B:bat[:int,:int])(T3:bat[:int,:int])
+    T7cost := aggr.count(T7);  # 44 ALGcount_bat 
(T7cost:int)<-(T7:bat[:int,:int])
+    T8 := algebra.join(C,D);   # 45 ALGjoin 
(T8:bat[:int,:int])<-(C:bat[:int,:int])(D:bat[:int,:int])
+    T8cost := aggr.count(T8);  # 46 ALGcount_bat 
(T8cost:int)<-(T8:bat[:int,:int])
+    io.printf("choicepoint 3\n");      # 47 IOprint_str (_45:void)<-(_46:str)
+    scheduler.choice(T4cost,T4,T5cost,T5,T6cost,T6,T7cost,T7,T8cost,T8);       
# 48 RUNchoice 
(_47:void)<-(T4cost:int)(T4:bat[:int,:int])(T5cost:int)(T5:bat[:int,:int])(T6cost:int)(T6:bat[:int,:int])(T7cost:int)(T7:bat[:int,:int])(T8cost:int)(T8:bat[:int,:int])
+    T9cost := calc.+(T2cost,Dcost);    # 49 CALCbinaryADDintint 
(T9cost:int)<-(T2cost:int)(Dcost:int)
+    T10cost := calc.+(T5cost,Dcost);   # 50 CALCbinaryADDintint 
(T10cost:int)<-(T5cost:int)(Dcost:int)
+    T11cost := calc.+(Acost,T6cost);   # 51 CALCbinaryADDintint 
(T11cost:int)<-(Acost:int)(T6cost:int)
+    T12cost := calc.+(Acost,T7cost);   # 52 CALCbinaryADDintint 
(T12cost:int)<-(Acost:int)(T7cost:int)
+    T13cost := calc.+(T1cost,T8cost);  # 53 CALCbinaryADDintint 
(T13cost:int)<-(T1cost:int)(T8cost:int)
+    T9 := algebra.join(T4,D);  # 54 ALGjoin 
(T9:bat[:int,:int])<-(T4:bat[:int,:int])(D:bat[:int,:int])
+    T10 := algebra.join(T5,D); # 55 ALGjoin 
(T10:bat[:int,:int])<-(T5:bat[:int,:int])(D:bat[:int,:int])
+    T11 := algebra.join(A,T6); # 56 ALGjoin 
(T11:bat[:int,:int])<-(A:bat[:int,:int])(T6:bat[:int,:int])
+    T12 := algebra.join(A,T7); # 57 ALGjoin 
(T12:bat[:int,:int])<-(A:bat[:int,:int])(T7:bat[:int,:int])
+    T13 := algebra.join(T1,T8);        # 58 ALGjoin 
(T13:bat[:int,:int])<-(T1:bat[:int,:int])(T8:bat[:int,:int])
+    io.printf("choicepoint 4\n");      # 59 IOprint_str (_58:void)<-(_59:str)
+    
scheduler.choice(T9cost,T9,T10cost,T10,T11cost,T11,T12cost,T12,T13cost,T13);    
   # 60 RUNchoice 
(_60:void)<-(T9cost:int)(T9:bat[:int,:int])(T10cost:int)(T10:bat[:int,:int])(T11cost:int)(T11:bat[:int,:int])(T12cost:int)(T12:bat[:int,:int])(T13cost:int)(T13:bat[:int,:int])
+    answer := scheduler.pick(T9,T10,T11,T12,T13);      # 61 RUNpickResult 
(answer:bat[:int,:int])<-(T9:bat[:int,:int])(T10:bat[:int,:int])(T11:bat[:int,:int])(T12:bat[:int,:int])(T13:bat[:int,:int])
+    io.print(answer);  # 62 IOprint_val (_62:void)<-(answer:bat[:int,:int])
+end main;      # 63  
+choicepoint 1
+choicepoint 2
+choicepoint 3
+choicepoint 4
 #-----------------#
 # h    t         # name
 # int  int       # type

Index: memo01.mal
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/scheduler/Tests/memo01.mal,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- memo01.mal  13 Mar 2007 22:27:51 -0000      1.2
+++ memo01.mal  2 Jan 2008 08:23:32 -0000       1.3
@@ -22,6 +22,7 @@
        T2cost:= Bcost+Ccost;
        T3cost:= Ccost+Dcost;
 
+       io.printf("choicepoint 1\n");
        scheduler.choice();
 
        T1:= algebra.join(A,B);
@@ -31,6 +32,7 @@
        T3:= algebra.join(C,D);
        T3cost:= aggr.count(T3);
 
+       io.printf("choicepoint 2\n");
        scheduler.choice(T1cost,T1, T2cost,T2, T3cost,T3);
 
        T4cost:=T1cost+Ccost; 
@@ -50,6 +52,7 @@
        T8:= algebra.join(C,D);
        T8cost:= aggr.count(T8);
 
+       io.printf("choicepoint 3\n");
        scheduler.choice(T4cost,T4,T5cost,T5,T6cost,T6,T7cost,T7,T8cost,T8);
 
        T9cost:=T2cost+Dcost;  
@@ -64,6 +67,7 @@
        T12:= algebra.join(A,T7);
        T13:= algebra.join(T1,T8);
 
+       io.printf("choicepoint 4\n");
        
scheduler.choice(T9cost,T9,T10cost,T10,T11cost,T11,T12cost,T12,T13cost,T13);
        answer:= scheduler.pick(T9,T10,T11,T12,T13);
        io.print(answer);


-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins

Reply via email to