Changeset: 73f3c2ad21cd for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=73f3c2ad21cd
Modified Files:
monetdb5/optimizer/Tests/dataflow.stable.out
sql/test/remote/Tests/partition_elim.stable.out
Branch: default
Log Message:
Approve output
diffs (271 lines):
diff --git a/monetdb5/optimizer/Tests/dataflow.stable.out
b/monetdb5/optimizer/Tests/dataflow.stable.out
--- a/monetdb5/optimizer/Tests/dataflow.stable.out
+++ b/monetdb5/optimizer/Tests/dataflow.stable.out
@@ -40,17 +40,18 @@ barrier X_27:bit := language.dataflow();
t6:bat[:oid] := algebra.select(s:bat[:int], l:int, h:int, true:bit,
true:bit, false:bit); #[13] (0) ALGselect1 19 <- 1 5 6 12 12 14
t7:bat[:oid] := algebra.select(s:bat[:int], l:int, h:int, true:bit,
true:bit, false:bit); #[14] (0) ALGselect1 20 <- 1 5 6 12 12 14
t8:bat[:oid] := algebra.select(s:bat[:int], l:int, h:int, true:bit,
true:bit, false:bit); #[15] (0) ALGselect1 21 <- 1 5 6 12 12 14
-exit X_27:bit; #[16] (0) 27
- z:bat[:oid] := mat.pack(t1:bat[:oid], t2:bat[:oid], t3:bat[:oid],
t4:bat[:oid], t5:bat[:oid], t6:bat[:oid], t7:bat[:oid], t8:bat[:oid]); #[17]
(0) MATpack 9 <- 11 15 16 17 18 19 20 21
- mdb.var(); #[18] (0) MDBvar 22
- c:lng := aggr.count(z:bat[:oid]); #[19] (0) ALGcount_bat 23 <- 9
- io.print(c:lng); #[20] (0) IOprint_val 24 <- 23
- io.print("done":str); #[21] (0) IOprint_val 25 <- 26
-end user.tst; #[22] (0)
-#dataflow actions= 1 time=19 usec
-#garbagecollector actions= 1 time=19 usec
-#Stack 'tst' size=40 top=32
-#[ 1] s (2,2,15) = <tmp_65> :bat[:int] rows=100000
+ language.pass(s:bat[:int]); #[16] (0) MALpass 29 <- 1
+exit X_27:bit; #[17] (0) 27
+ z:bat[:oid] := mat.pack(t1:bat[:oid], t2:bat[:oid], t3:bat[:oid],
t4:bat[:oid], t5:bat[:oid], t6:bat[:oid], t7:bat[:oid], t8:bat[:oid]); #[18]
(0) MATpack 9 <- 11 15 16 17 18 19 20 21
+ mdb.var(); #[19] (0) MDBvar 22
+ c:lng := aggr.count(z:bat[:oid]); #[20] (0) ALGcount_bat 23 <- 9
+ io.print(c:lng); #[21] (0) IOprint_val 24 <- 23
+ io.print("done":str); #[22] (0) IOprint_val 25 <- 26
+end user.tst; #[23] (0)
+#dataflow actions= 1 time=22 usec
+#garbagecollector actions= 1 time=18 usec
+#Stack 'tst' size=40 top=33
+#[ 1] s (2,2,16) = <tmp_106> :bat[:int] rows=100000
#[ 2] X_2 (2,2,2) = 0@0 :oid constant
#[ 3] X_3 (2,2,2) = 100000 :lng constant
#[ 4] X_4 (2,2,2) = 100000 :int constant
diff --git a/sql/test/remote/Tests/partition_elim.stable.out
b/sql/test/remote/Tests/partition_elim.stable.out
--- a/sql/test/remote/Tests/partition_elim.stable.out
+++ b/sql/test/remote/Tests/partition_elim.stable.out
@@ -137,7 +137,7 @@ Ready.
% 117 # length
function user.main():void;
X_5:void := querylog.define("explain select x,y from test where x between
4.0 and 6.0;", "default_pipe", 49:int);
-barrier X_149 := language.dataflow();
+barrier X_143 := language.dataflow();
X_40:bat[:dbl] := bat.new(nil:dbl);
X_8 := sql.mvc();
X_119:bat[:dbl] := sql.bind(X_8, "sys", "test2", "x", 0:int, 0:int, 2:int);
@@ -160,29 +160,18 @@ barrier X_149 := language.dataflow();
X_129 := algebra.projection(C_125, X_122);
X_121:bat[:dbl] := sql.bind(X_8, "sys", "test2", "y", 0:int, 0:int, 2:int);
X_128 := algebra.projection(C_124, X_121);
- language.pass(X_119);
- language.pass(X_120);
- language.pass(C_36);
- language.pass(X_30);
- language.pass(C_125);
- language.pass(C_124);
-exit X_149;
X_42 := bat.append(X_40, X_25, true);
X_43 := bat.append(X_42, X_37, true);
-barrier X_152 := language.dataflow();
X_44:bat[:dbl] := bat.new(nil:dbl);
X_140 := mat.packIncrement(X_128, 2:int);
X_26 := mat.packIncrement(X_140, X_129);
-exit X_152;
X_45 := bat.append(X_44, X_26, true);
X_46 := bat.append(X_45, X_38, true);
-barrier X_155 := language.dataflow();
X_48 := bat.new(nil:str);
X_54 := bat.new(nil:int);
X_52 := bat.new(nil:int);
X_51 := bat.new(nil:str);
X_50 := bat.new(nil:str);
-exit X_155;
X_55 := bat.append(X_48, ".test");
X_57 := bat.append(X_50, "x");
X_59 := bat.append(X_51, "double");
@@ -193,6 +182,13 @@ exit X_155;
X_68 := bat.append(X_59, "double");
X_69 := bat.append(X_61, 53:int);
X_70 := bat.append(X_63, 0:int);
+ language.pass(X_119);
+ language.pass(X_120);
+ language.pass(C_36);
+ language.pass(X_30);
+ language.pass(C_125);
+ language.pass(C_124);
+exit X_143;
sql.resultSet(X_65, X_66, X_68, X_69, X_70, X_43, X_46);
end user.main;
#inline actions= 0 time=3 usec
@@ -226,7 +222,7 @@ end user.main;
% 121 # length
function user.main():void;
X_8:void := querylog.define("explain select x,y from test where x between
(7-3) and (7-1);", "default_pipe", 63:int);
-barrier X_169 := language.dataflow();
+barrier X_163 := language.dataflow();
X_55:bat[:dbl] := bat.new(nil:dbl);
X_11 := sql.mvc();
X_139:bat[:dbl] := sql.bind(X_11, "sys", "test2", "x", 0:int, 0:int,
2:int);
@@ -249,29 +245,18 @@ barrier X_169 := language.dataflow();
X_149 := algebra.projection(C_145, X_142);
X_141:bat[:dbl] := sql.bind(X_11, "sys", "test2", "y", 0:int, 0:int,
2:int);
X_148 := algebra.projection(C_144, X_141);
- language.pass(X_139);
- language.pass(X_140);
- language.pass(C_51);
- language.pass(X_39);
- language.pass(C_145);
- language.pass(C_144);
-exit X_169;
X_57 := bat.append(X_55, X_34, true);
X_58 := bat.append(X_57, X_52, true);
-barrier X_172 := language.dataflow();
X_59:bat[:dbl] := bat.new(nil:dbl);
X_160 := mat.packIncrement(X_148, 2:int);
X_35 := mat.packIncrement(X_160, X_149);
-exit X_172;
X_60 := bat.append(X_59, X_35, true);
X_61 := bat.append(X_60, X_53, true);
-barrier X_175 := language.dataflow();
X_63 := bat.new(nil:str);
X_69 := bat.new(nil:int);
X_67 := bat.new(nil:int);
X_66 := bat.new(nil:str);
X_65 := bat.new(nil:str);
-exit X_175;
X_70 := bat.append(X_63, ".test");
X_72 := bat.append(X_65, "x");
X_74 := bat.append(X_66, "double");
@@ -282,6 +267,13 @@ exit X_175;
X_83 := bat.append(X_74, "double");
X_84 := bat.append(X_76, 53:int);
X_85 := bat.append(X_78, 0:int);
+ language.pass(X_139);
+ language.pass(X_140);
+ language.pass(C_51);
+ language.pass(X_39);
+ language.pass(C_145);
+ language.pass(C_144);
+exit X_163;
sql.resultSet(X_80, X_81, X_83, X_84, X_85, X_58, X_61);
end user.main;
#inline actions= 0 time=3 usec
@@ -315,7 +307,7 @@ end user.main;
% 143 # length
function user.main():void;
X_9:void := querylog.define("explain select x,y from test where x between
4.0 and 6.0 and y between 0.0 and 2.0;", "default_pipe", 37:int);
-barrier X_137 := language.dataflow();
+barrier X_131 := language.dataflow();
X_36 := bat.new(nil:str);
X_42 := bat.new(nil:int);
X_40 := bat.new(nil:int);
@@ -336,13 +328,6 @@ barrier X_137 := language.dataflow();
X_116 := algebra.projection(C_112, X_107);
X_115 := algebra.projection(C_113, X_106);
X_114 := algebra.projection(C_112, X_105);
- language.pass(X_108);
- language.pass(X_107);
- language.pass(C_113);
- language.pass(X_106);
- language.pass(C_112);
- language.pass(X_105);
-exit X_137;
X_43 := bat.append(X_36, "sys.test");
X_45 := bat.append(X_38, "x");
X_46 := bat.append(X_39, "double");
@@ -353,12 +338,17 @@ exit X_137;
X_55 := bat.append(X_46, "double");
X_56 := bat.append(X_48, 53:int);
X_57 := bat.append(X_50, 0:int);
-barrier X_140 := language.dataflow();
X_126 := mat.packIncrement(X_114, 2:int);
X_32 := mat.packIncrement(X_126, X_115);
X_128 := mat.packIncrement(X_116, 2:int);
X_33 := mat.packIncrement(X_128, X_117);
-exit X_140;
+ language.pass(X_108);
+ language.pass(X_107);
+ language.pass(C_113);
+ language.pass(X_106);
+ language.pass(C_112);
+ language.pass(X_105);
+exit X_131;
sql.resultSet(X_52, X_53, X_55, X_56, X_57, X_32, X_33);
end user.main;
#inline actions= 0 time=2 usec
@@ -392,7 +382,7 @@ end user.main;
% 156 # length
function user.main():void;
X_12:void := querylog.define("explain select x,y from test where x between
4.0 and 6.0 and y between (1.0-1.0) and (4.0-2.0);", "default_pipe", 45:int);
-barrier X_152 := language.dataflow();
+barrier X_146 := language.dataflow();
X_46 := bat.new(nil:str);
X_52 := bat.new(nil:int);
X_50 := bat.new(nil:int);
@@ -413,13 +403,6 @@ barrier X_152 := language.dataflow();
X_131 := algebra.projection(C_127, X_122);
X_130 := algebra.projection(C_128, X_121);
X_129 := algebra.projection(C_127, X_120);
- language.pass(X_123);
- language.pass(X_122);
- language.pass(C_128);
- language.pass(X_121);
- language.pass(C_127);
- language.pass(X_120);
-exit X_152;
X_53 := bat.append(X_46, "sys.test");
X_55 := bat.append(X_48, "x");
X_57 := bat.append(X_49, "double");
@@ -430,12 +413,17 @@ exit X_152;
X_66 := bat.append(X_57, "double");
X_67 := bat.append(X_59, 53:int);
X_68 := bat.append(X_61, 0:int);
-barrier X_155 := language.dataflow();
X_141 := mat.packIncrement(X_129, 2:int);
X_42 := mat.packIncrement(X_141, X_130);
X_143 := mat.packIncrement(X_131, 2:int);
X_43 := mat.packIncrement(X_143, X_132);
-exit X_155;
+ language.pass(X_123);
+ language.pass(X_122);
+ language.pass(C_128);
+ language.pass(X_121);
+ language.pass(C_127);
+ language.pass(X_120);
+exit X_146;
sql.resultSet(X_63, X_64, X_66, X_67, X_68, X_42, X_43);
end user.main;
#inline actions= 0 time=2 usec
@@ -469,7 +457,7 @@ end user.main;
% 160 # length
function user.main():void;
X_15:void := querylog.define("explain select x,y from test where x between
(7-3) and (7-1) and y between (1.0-1.0) and (4.0-2.0);", "default_pipe",
53:int);
-barrier X_165 := language.dataflow();
+barrier X_159 := language.dataflow();
X_55 := bat.new(nil:str);
X_61 := bat.new(nil:int);
X_59 := bat.new(nil:int);
@@ -490,13 +478,6 @@ barrier X_165 := language.dataflow();
X_144 := algebra.projection(C_140, X_135);
X_143 := algebra.projection(C_141, X_134);
X_142 := algebra.projection(C_140, X_133);
- language.pass(X_136);
- language.pass(X_135);
- language.pass(C_141);
- language.pass(X_134);
- language.pass(C_140);
- language.pass(X_133);
-exit X_165;
X_62 := bat.append(X_55, "sys.test");
X_64 := bat.append(X_57, "x");
X_66 := bat.append(X_58, "double");
@@ -507,12 +488,17 @@ exit X_165;
X_75 := bat.append(X_66, "double");
X_76 := bat.append(X_68, 53:int);
X_77 := bat.append(X_70, 0:int);
-barrier X_168 := language.dataflow();
X_154 := mat.packIncrement(X_142, 2:int);
X_51 := mat.packIncrement(X_154, X_143);
X_156 := mat.packIncrement(X_144, 2:int);
X_52 := mat.packIncrement(X_156, X_145);
-exit X_168;
+ language.pass(X_136);
+ language.pass(X_135);
+ language.pass(C_141);
+ language.pass(X_134);
+ language.pass(C_140);
+ language.pass(X_133);
+exit X_159;
sql.resultSet(X_72, X_73, X_75, X_76, X_77, X_51, X_52);
end user.main;
#inline actions= 0 time=2 usec
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
