MonetDB: default - Accept new dataflow output

[Martin Kersten]

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

Accept new dataflow output


diffs (88 lines):

diff --git a/monetdb5/optimizer/Tests/dataflow3.mal 
b/monetdb5/optimizer/Tests/dataflow3.mal
--- a/monetdb5/optimizer/Tests/dataflow3.mal
+++ b/monetdb5/optimizer/Tests/dataflow3.mal
@@ -3,52 +3,47 @@ function mvc():int;
        return mvc:=1;
 end mvc;
 function user.s1_0{autoCommit=true}():void;
-    _2 := user.mvc();
-#distributing work over columns selected for mapreduce
     _17 := bat.new(nil:oid,nil:wrd);
     _54 := bat.new(nil:oid,nil:wrd);
     _55 := bat.new(nil:oid,nil:wrd);
     _56 := bat.new(nil:oid,nil:wrd);
     _57 := bat.new(nil:oid,nil:wrd);
-#barrier _58 := language.dataflow();
+
     _59 := 
remote.connect("mapi:monetdb://volund.ins.cwi.nl:50000/sn4","monetdb","monetdb","msql");
     remote.register(_59,"user","s1_0map");
     _66 := remote.put(_59,_54);
     _66 := remote.exec(_59,"user","s1_0map");
     _54 := remote.get(_59,_66);
     remote.disconnect(_59);
-#exit _58;
-#barrier _69 := language.dataflow();
+
     _70 := 
remote.connect("mapi:monetdb://volund.ins.cwi.nl:50000/sn3","monetdb","monetdb","msql");
     remote.register(_70,"user","s1_0map");
     _73 := remote.put(_70,_55);
     _73 := remote.exec(_70,"user","s1_0map");
     _55 := remote.get(_70,_73);
     remote.disconnect(_70);
-#exit _69;
-#barrier _76 := language.dataflow();
+
     _77 := 
remote.connect("mapi:monetdb://volund.ins.cwi.nl:50000/sn1","monetdb","monetdb","msql");
     remote.register(_77,"user","s1_0map");
     _80 := remote.put(_77,_56);
     _80 := remote.exec(_77,"user","s1_0map");
     _56 := remote.get(_77,_80);
     remote.disconnect(_77);
-#exit _76;
-#barrier _83 := language.dataflow();
+
     _84 := 
remote.connect("mapi:monetdb://volund.ins.cwi.nl:50000/sn2","monetdb","monetdb","msql");
     remote.register(_84,"user","s1_0map");
     _87 := remote.put(_84,_57);
     _87 := remote.exec(_84,"user","s1_0map");
     _57 := remote.get(_84,_87);
     remote.disconnect(_84);
-#exit _83;
+
     bat.insert(_17,_54);
     bat.insert(_17,_55);
     bat.insert(_17,_56);
     bat.insert(_17,_57);
     io.print(_17);
     _17 := algebra.markH(_17);
-#end distribution, optimisations may follow
+
 #COUNT/SUM
     _19 := aggr.sum(_17);
        io.print(_19);
diff --git a/monetdb5/optimizer/Tests/dataflow3.stable.out 
b/monetdb5/optimizer/Tests/dataflow3.stable.out
--- a/monetdb5/optimizer/Tests/dataflow3.stable.out
+++ b/monetdb5/optimizer/Tests/dataflow3.stable.out
@@ -20,8 +20,6 @@ function user.mvc():int;
     return mvc := 1;
 end mvc;
 function user.s1_0{autoCommit=true}():void;
-    X2 := user.mvc();
-#distributing work over columns selected for mapreduce 
     X17 := bat.new(nil:oid,nil:wrd);
     X54 := bat.new(nil:oid,nil:wrd);
     X55 := bat.new(nil:oid,nil:wrd);
@@ -75,11 +73,13 @@ function user.main():void;
     mdb.list("user","s1_0");
 end main;
 function user.s1_0{autoCommit=true}():void;
+barrier X_40 := language.dataflow();
     X17 := bat.new(nil:oid,nil:wrd);
     X54 := bat.new(nil:oid,nil:wrd);
     X55 := bat.new(nil:oid,nil:wrd);
     X56 := bat.new(nil:oid,nil:wrd);
     X57 := bat.new(nil:oid,nil:wrd);
+exit X_40;
     X59 := 
remote.connect("mapi:monetdb://volund.ins.cwi.nl:50000/sn4","monetdb","monetdb","msql");
     remote.register(X59,"user","s1_0map");
     X66 := remote.put(X59,X54);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list