MonetDB: malerrors - approved output

[Niels Nes]

Changeset: 7fb8b02ad2f9 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7fb8b02ad2f9
Modified Files:
        sql/test/mergetables/Tests/mergequery.stable.out
Branch: malerrors
Log Message:

approved output


diffs (51 lines):

diff --git a/sql/test/mergetables/Tests/mergequery.stable.out 
b/sql/test/mergetables/Tests/mergequery.stable.out
--- a/sql/test/mergetables/Tests/mergequery.stable.out
+++ b/sql/test/mergetables/Tests/mergequery.stable.out
@@ -118,16 +118,17 @@ barrier X_154 := language.dataflow();
     X_79:bat[:dbl] := bat.new(nil:dbl);
     X_80 := bat.append(X_79, X_42, true);
     X_81 := bat.append(X_80, X_69, true);
-    X_83 := sql.append(X_6, "sys", "answ", "x", X_75);
-    X_87 := sql.append(X_83, "sys", "answ", "y", X_78);
-    X_90 := sql.append(X_87, "sys", "answ", "z", X_81);
-    X_92 := aggr.count(X_81);
     language.pass(X_10);
     language.pass(C_66);
     language.pass(X_46);
     language.pass(C_36);
-    language.pass(X_81);
 exit X_154;
+    X_83 := sql.append(X_6, "sys", "answ", "x", X_75);
+barrier X_161 := language.dataflow();
+    X_87 := sql.append(X_83, "sys", "answ", "y", X_78);
+    X_90 := sql.append(X_87, "sys", "answ", "z", X_81);
+    X_92 := aggr.count(X_81);
+exit X_161;
     sql.affectedRows(X_90, X_92);
 end user.s26_1;
 #inline               actions= 0 time=2 usec 
@@ -198,18 +199,19 @@ barrier X_164 := language.dataflow();
     X_89:bat[:dbl] := bat.new(nil:dbl);
     X_90 := bat.append(X_89, X_47, true);
     X_91 := bat.append(X_90, X_80, true);
-    X_93 := sql.append(X_8, "sys", "answ", "x", X_85);
-    X_97 := sql.append(X_93, "sys", "answ", "y", X_88);
-    X_100 := sql.append(X_97, "sys", "answ", "z", X_91);
-    X_102 := aggr.count(X_91);
     language.pass(X_12);
     language.pass(X_57);
     language.pass(C_74);
     language.pass(X_51);
     language.pass(C_44);
     language.pass(X_22);
-    language.pass(X_91);
 exit X_164;
+    X_93 := sql.append(X_8, "sys", "answ", "x", X_85);
+barrier X_173 := language.dataflow();
+    X_97 := sql.append(X_93, "sys", "answ", "y", X_88);
+    X_100 := sql.append(X_97, "sys", "answ", "z", X_91);
+    X_102 := aggr.count(X_91);
+exit X_173;
     sql.affectedRows(X_100, X_102);
 end user.s28_1;
 #inline               actions= 0 time=3 usec 
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list