Changeset: 313ae887af7f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=313ae887af7f
Modified Files:
sql/benchmarks/tpch/Tests/01-explain.stable.out.int128
sql/benchmarks/tpch/Tests/08-explain.stable.out.int128
sql/benchmarks/tpch/Tests/12-explain.stable.out.int128
sql/benchmarks/tpch/Tests/14-explain.stable.out.int128
sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out
Branch: jit
Log Message:
Approve output
diffs (truncated from 398 to 300 lines):
diff --git a/sql/benchmarks/tpch/Tests/01-explain.stable.out.int128
b/sql/benchmarks/tpch/Tests/01-explain.stable.out.int128
--- a/sql/benchmarks/tpch/Tests/01-explain.stable.out.int128
+++ b/sql/benchmarks/tpch/Tests/01-explain.stable.out.int128
@@ -52,62 +52,62 @@ Ready.
% clob # type
% 607 # length
function user.s4_1():void;
- X_226:void := querylog.define("explain select\n l_returnflag,\n
l_linestatus,\n sum(l_quantity) as sum_qty,\n sum(l_extendedprice) as
sum_base_price,\n sum(l_extendedprice * (1 - l_discount)) as sum_disc_price,\n
sum(l_extendedprice * (1 - l_discount) * (1 + l_tax)) as sum_charge,\n
avg(l_quantity) as avg_qty,\n avg(l_extendedprice) as avg_price,\n
avg(l_discount) as avg_disc,\n count(*) as count_order\nfrom\n
lineitem\nwhere\n l_shipdate <= date \\'1998-12-01\\' - interval \\'90\\' day
(3)\ngroup by\n l_returnflag,\n l_linestatus\norder by\n l_returnflag,\n
l_linestatus;","sequential_pipe",107);
+ X_223:void := querylog.define("explain select\n l_returnflag,\n
l_linestatus,\n sum(l_quantity) as sum_qty,\n sum(l_extendedprice) as
sum_base_price,\n sum(l_extendedprice * (1 - l_discount)) as sum_disc_price,\n
sum(l_extendedprice * (1 - l_discount) * (1 + l_tax)) as sum_charge,\n
avg(l_quantity) as avg_qty,\n avg(l_extendedprice) as avg_price,\n
avg(l_discount) as avg_disc,\n count(*) as count_order\nfrom\n
lineitem\nwhere\n l_shipdate <= date \\'1998-12-01\\' - interval \\'90\\' day
(3)\ngroup by\n l_returnflag,\n l_linestatus\norder by\n l_returnflag,\n
l_linestatus;","sequential_pipe",107);
+ X_134 := bat.new(nil:str);
+ X_141 := bat.append(X_134,"sys.lineitem");
+ X_151 := bat.append(X_141,"sys.lineitem");
+ X_157 := bat.append(X_151,"sys.L1");
+ X_167 := bat.append(X_157,"sys.L2");
+ X_174 := bat.append(X_167,"sys.L3");
+ X_182 := bat.append(X_174,"sys.L4");
+ X_190 := bat.append(X_182,"sys.L5");
+ X_200 := bat.append(X_190,"sys.L6");
+ X_207 := bat.append(X_200,"sys.L7");
+ X_214 := bat.append(X_207,"sys.L10");
+ X_136 := bat.new(nil:str);
+ X_143 := bat.append(X_136,"l_returnflag");
+ X_152 := bat.append(X_143,"l_linestatus");
+ X_159 := bat.append(X_152,"sum_qty");
+ X_169 := bat.append(X_159,"sum_base_price");
+ X_176 := bat.append(X_169,"sum_disc_price");
+ X_184 := bat.append(X_176,"sum_charge");
+ X_192 := bat.append(X_184,"avg_qty");
+ X_202 := bat.append(X_192,"avg_price");
+ X_209 := bat.append(X_202,"avg_disc");
+ X_216 := bat.append(X_209,"count_order");
X_137 := bat.new(nil:str);
- X_144 := bat.append(X_137,"sys.lineitem");
- X_154 := bat.append(X_144,"sys.lineitem");
- X_160 := bat.append(X_154,"sys.L1");
- X_170 := bat.append(X_160,"sys.L2");
- X_177 := bat.append(X_170,"sys.L3");
- X_185 := bat.append(X_177,"sys.L4");
- X_193 := bat.append(X_185,"sys.L5");
- X_203 := bat.append(X_193,"sys.L6");
- X_210 := bat.append(X_203,"sys.L7");
- X_217 := bat.append(X_210,"sys.L10");
- X_139 := bat.new(nil:str);
- X_146 := bat.append(X_139,"l_returnflag");
- X_155 := bat.append(X_146,"l_linestatus");
- X_162 := bat.append(X_155,"sum_qty");
- X_172 := bat.append(X_162,"sum_base_price");
- X_179 := bat.append(X_172,"sum_disc_price");
- X_187 := bat.append(X_179,"sum_charge");
- X_195 := bat.append(X_187,"avg_qty");
- X_205 := bat.append(X_195,"avg_price");
- X_212 := bat.append(X_205,"avg_disc");
- X_219 := bat.append(X_212,"count_order");
- X_140 := bat.new(nil:str);
- X_148 := bat.append(X_140,"char");
- X_157 := bat.append(X_148,"char");
- X_164 := bat.append(X_157,"decimal");
- X_174 := bat.append(X_164,"decimal");
- X_181 := bat.append(X_174,"decimal");
- X_189 := bat.append(X_181,"decimal");
- X_197 := bat.append(X_189,"double");
- X_207 := bat.append(X_197,"double");
- X_214 := bat.append(X_207,"double");
- X_221 := bat.append(X_214,"bigint");
- X_141 := bat.new(nil:int);
- X_150 := bat.append(X_141,1);
- X_158 := bat.append(X_150,1);
- X_166 := bat.append(X_158,39);
- X_175 := bat.append(X_166,39);
- X_182 := bat.append(X_175,39);
- X_190 := bat.append(X_182,39);
- X_199 := bat.append(X_190,53);
- X_208 := bat.append(X_199,53);
- X_215 := bat.append(X_208,53);
- X_223 := bat.append(X_215,64);
- X_143 := bat.new(nil:int);
- X_152 := bat.append(X_143,0);
- X_159 := bat.append(X_152,0);
- X_168 := bat.append(X_159,2);
- X_176 := bat.append(X_168,2);
- X_183 := bat.append(X_176,4);
- X_191 := bat.append(X_183,6);
- X_201 := bat.append(X_191,0);
- X_209 := bat.append(X_201,0);
- X_216 := bat.append(X_209,0);
- X_225 := bat.append(X_216,0);
+ X_145 := bat.append(X_137,"char");
+ X_154 := bat.append(X_145,"char");
+ X_161 := bat.append(X_154,"decimal");
+ X_171 := bat.append(X_161,"decimal");
+ X_178 := bat.append(X_171,"decimal");
+ X_186 := bat.append(X_178,"decimal");
+ X_194 := bat.append(X_186,"double");
+ X_204 := bat.append(X_194,"double");
+ X_211 := bat.append(X_204,"double");
+ X_218 := bat.append(X_211,"bigint");
+ X_138 := bat.new(nil:int);
+ X_147 := bat.append(X_138,1);
+ X_155 := bat.append(X_147,1);
+ X_163 := bat.append(X_155,39);
+ X_172 := bat.append(X_163,39);
+ X_179 := bat.append(X_172,39);
+ X_187 := bat.append(X_179,39);
+ X_196 := bat.append(X_187,53);
+ X_205 := bat.append(X_196,53);
+ X_212 := bat.append(X_205,53);
+ X_220 := bat.append(X_212,64);
+ X_140 := bat.new(nil:int);
+ X_149 := bat.append(X_140,0);
+ X_156 := bat.append(X_149,0);
+ X_165 := bat.append(X_156,2);
+ X_173 := bat.append(X_165,2);
+ X_180 := bat.append(X_173,4);
+ X_188 := bat.append(X_180,6);
+ X_198 := bat.append(X_188,0);
+ X_206 := bat.append(X_198,0);
+ X_213 := bat.append(X_206,0);
+ X_222 := bat.append(X_213,0);
X_0 := sql.mvc();
X_4:bat[:date] := sql.bind(X_0,"sys","lineitem","l_shipdate",0);
C_1:bat[:oid] := sql.tid(X_0,"sys","lineitem");
@@ -132,18 +132,18 @@ function user.s4_1():void;
X_91:bat[:lng] := batcalc.-(100:lng,X_90);
X_93:bat[:hge] := batcalc.*(X_72,X_91);
X_95:bat[:hge] := aggr.subsum(X_93,X_38,r1_44,true,true);
- X_106:bat[:lng] := sql.bind(X_0,"sys","lineitem","l_tax",0);
- X_113 := algebra.projection(C_17,X_106);
- X_114:bat[:lng] := batcalc.+(100:lng,X_113);
- X_117:bat[:hge] := batcalc.*(X_93,X_114);
- X_118:bat[:hge] := aggr.subsum(X_117,X_38,r1_44,true,true);
- X_120:bat[:dbl] := batcalc.dbl(2,X_60);
- X_123:bat[:dbl] := aggr.subavg(X_120,X_38,r1_44,true,true);
- X_125:bat[:dbl] := batcalc.dbl(2,X_72);
- X_126:bat[:dbl] := aggr.subavg(X_125,X_38,r1_44,true,true);
- X_128:bat[:dbl] := batcalc.dbl(2,X_90);
- X_129:bat[:dbl] := aggr.subavg(X_128,X_38,r1_44,true,true);
- X_133:bat[:lng] := aggr.subcount(X_38,X_38,r1_44,false);
+ X_105:bat[:lng] := sql.bind(X_0,"sys","lineitem","l_tax",0);
+ X_112 := algebra.projection(C_17,X_105);
+ X_113:bat[:lng] := batcalc.+(100:lng,X_112);
+ X_116:bat[:hge] := batcalc.*(X_93,X_113);
+ X_117:bat[:hge] := aggr.subsum(X_116,X_38,r1_44,true,true);
+ X_119:bat[:dbl] := batcalc.dbl(2,X_60);
+ X_122:bat[:dbl] := aggr.subavg(X_119,X_38,r1_44,true,true);
+ X_124:bat[:dbl] := batcalc.dbl(2,X_72);
+ X_125:bat[:dbl] := aggr.subavg(X_124,X_38,r1_44,true,true);
+ X_127:bat[:dbl] := batcalc.dbl(2,X_90);
+ X_128:bat[:dbl] := aggr.subavg(X_127,X_38,r1_44,true,true);
+ X_130:bat[:lng] := aggr.subcount(X_38,X_38,r1_44,false);
(X_43,r1_49,r2_49) := algebra.subsort(X_42,false,false);
(X_48,r1_54,r2_54) := algebra.subsort(X_41,r1_49,r2_49,false,false);
X_51 := algebra.projection(r1_54,X_42);
@@ -151,12 +151,12 @@ function user.s4_1():void;
X_64 := algebra.projection(r1_54,X_61);
X_74 := algebra.projection(r1_54,X_73);
X_98 := algebra.projection(r1_54,X_95);
- X_119 := algebra.projection(r1_54,X_118);
- X_124 := algebra.projection(r1_54,X_123);
- X_127 := algebra.projection(r1_54,X_126);
- X_132 := algebra.projection(r1_54,X_129);
- X_135 := algebra.projection(r1_54,X_133);
-
sql.resultSet(X_217,X_219,X_221,X_223,X_225,X_51,X_52,X_64,X_74,X_98,X_119,X_124,X_127,X_132,X_135);
+ X_118 := algebra.projection(r1_54,X_117);
+ X_123 := algebra.projection(r1_54,X_122);
+ X_126 := algebra.projection(r1_54,X_125);
+ X_129 := algebra.projection(r1_54,X_128);
+ X_132 := algebra.projection(r1_54,X_130);
+
sql.resultSet(X_214,X_216,X_218,X_220,X_222,X_51,X_52,X_64,X_74,X_98,X_118,X_123,X_126,X_129,X_132);
end user.s4_1;
#inline actions= 0 time=10 usec
#candidates actions= 1 time=105 usec
diff --git a/sql/benchmarks/tpch/Tests/08-explain.stable.out.int128
b/sql/benchmarks/tpch/Tests/08-explain.stable.out.int128
--- a/sql/benchmarks/tpch/Tests/08-explain.stable.out.int128
+++ b/sql/benchmarks/tpch/Tests/08-explain.stable.out.int128
@@ -59,22 +59,22 @@ Ready.
% clob # type
% 835 # length
function user.s4_1():void;
- X_275:void := querylog.define("explain select\n o_year,\n sum(case\n when
nation = \\'BRAZIL\\' then volume\n else 0\n end) / sum(volume) as
mkt_share\nfrom\n (\n select\n extract(year from o_orderdate) as o_year,\n
l_extendedprice * (1 - l_discount) as volume,\n n2.n_name as nation\n from\n
part,\n supplier,\n lineitem,\n orders,\n customer,\n nation n1,\n nation n2,\n
region\n where\n p_partkey = l_partkey\n and s_suppkey = l_suppkey\n and
l_orderkey = o_orderkey\n and o_custkey = c_custkey\n and c_nationkey =
n1.n_nationkey\n and n1.n_regionkey = r_regionkey\n and r_name =
\\'AMERICA\\'\n and s_nationkey = n2.n_nationkey\n and o_orderdate between date
\\'1995-01-01\\' and date \\'1996-12-31\\'\n and p_type = \\'ECONOMY ANODIZED
STEEL\\'\n ) as all_nations\ngroup by\n o_year\norder by\n
o_year;","sequential_pipe",96);
+ X_273:void := querylog.define("explain select\n o_year,\n sum(case\n when
nation = \\'BRAZIL\\' then volume\n else 0\n end) / sum(volume) as
mkt_share\nfrom\n (\n select\n extract(year from o_orderdate) as o_year,\n
l_extendedprice * (1 - l_discount) as volume,\n n2.n_name as nation\n from\n
part,\n supplier,\n lineitem,\n orders,\n customer,\n nation n1,\n nation n2,\n
region\n where\n p_partkey = l_partkey\n and s_suppkey = l_suppkey\n and
l_orderkey = o_orderkey\n and o_custkey = c_custkey\n and c_nationkey =
n1.n_nationkey\n and n1.n_regionkey = r_regionkey\n and r_name =
\\'AMERICA\\'\n and s_nationkey = n2.n_nationkey\n and o_orderdate between date
\\'1995-01-01\\' and date \\'1996-12-31\\'\n and p_type = \\'ECONOMY ANODIZED
STEEL\\'\n ) as all_nations\ngroup by\n o_year\norder by\n
o_year;","sequential_pipe",96);
+ X_247 := bat.new(nil:str);
+ X_254 := bat.append(X_247,"sys.all_nations");
+ X_264 := bat.append(X_254,"sys.L3");
X_249 := bat.new(nil:str);
- X_256 := bat.append(X_249,"sys.all_nations");
- X_266 := bat.append(X_256,"sys.L3");
- X_251 := bat.new(nil:str);
- X_258 := bat.append(X_251,"o_year");
- X_268 := bat.append(X_258,"mkt_share");
- X_252 := bat.new(nil:str);
- X_260 := bat.append(X_252,"int");
- X_270 := bat.append(X_260,"decimal");
+ X_256 := bat.append(X_249,"o_year");
+ X_266 := bat.append(X_256,"mkt_share");
+ X_250 := bat.new(nil:str);
+ X_258 := bat.append(X_250,"int");
+ X_268 := bat.append(X_258,"decimal");
+ X_251 := bat.new(nil:int);
+ X_260 := bat.append(X_251,32);
+ X_270 := bat.append(X_260,39);
X_253 := bat.new(nil:int);
- X_262 := bat.append(X_253,32);
- X_272 := bat.append(X_262,39);
- X_255 := bat.new(nil:int);
- X_264 := bat.append(X_255,0);
- X_273 := bat.append(X_264,4);
+ X_262 := bat.append(X_253,0);
+ X_271 := bat.append(X_262,4);
X_0 := sql.mvc();
C_1:bat[:oid] := sql.tid(X_0,"sys","nation");
X_4:bat[:oid] :=
sql.bind_idxbat(X_0,"sys","nation","nation_n_regionkey_fkey",0);
@@ -136,23 +136,23 @@ function user.s4_1():void;
X_187:bat[:str] := algebra.projectionpath(r1_162,C_1,X_180);
X_189:bat[:bit] := batcalc.==(X_187,"BRAZIL");
X_192:bat[:bit] := batcalc.isnil(X_189);
- X_197:bat[:bit] := batcalc.ifthenelse(X_192,false,X_189);
- X_199:bat[:lng] := sql.bind(X_0,"sys","lineitem","l_extendedprice",0);
- X_209:bat[:lng] :=
algebra.projectionpath(X_154,X_141,X_118,r1_94,C_77,X_199);
- X_217:bat[:lng] := sql.bind(X_0,"sys","lineitem","l_discount",0);
- X_227:bat[:lng] :=
algebra.projectionpath(X_154,X_141,X_118,r1_94,C_77,X_217);
- X_228:bat[:lng] := batcalc.-(100:lng,X_227);
- X_231:bat[:hge] := batcalc.*(X_209,X_228);
- X_236:bat[:hge] := batcalc.ifthenelse(X_197,X_231,0:hge);
- X_238:bat[:hge] := aggr.subsum(X_236,X_168,r1_176,true,true);
- X_244:bat[:hge] := aggr.subsum(X_231,X_168,r1_176,true,true);
+ X_195:bat[:bit] := batcalc.ifthenelse(X_192,false,X_189);
+ X_197:bat[:lng] := sql.bind(X_0,"sys","lineitem","l_extendedprice",0);
+ X_207:bat[:lng] :=
algebra.projectionpath(X_154,X_141,X_118,r1_94,C_77,X_197);
+ X_215:bat[:lng] := sql.bind(X_0,"sys","lineitem","l_discount",0);
+ X_225:bat[:lng] :=
algebra.projectionpath(X_154,X_141,X_118,r1_94,C_77,X_215);
+ X_226:bat[:lng] := batcalc.-(100:lng,X_225);
+ X_229:bat[:hge] := batcalc.*(X_207,X_226);
+ X_234:bat[:hge] := batcalc.ifthenelse(X_195,X_229,0:hge);
+ X_236:bat[:hge] := aggr.subsum(X_234,X_168,r1_176,true,true);
+ X_242:bat[:hge] := aggr.subsum(X_229,X_168,r1_176,true,true);
X_172 := bat.setKey(X_171,true);
(X_174,r1_182,r2_182) := algebra.subsort(X_172,false,false);
X_179 := algebra.projection(r1_182,X_172);
- X_241:bat[:hge] := batcalc.hge(4,X_238,39,8);
- X_245:bat[:hge] := batcalc./(X_241,X_244);
- X_247 := algebra.projection(r1_182,X_245);
- sql.resultSet(X_266,X_268,X_270,X_272,X_273,X_179,X_247);
+ X_239:bat[:hge] := batcalc.hge(4,X_236,39,8);
+ X_243:bat[:hge] := batcalc./(X_239,X_242);
+ X_245 := algebra.projection(r1_182,X_243);
+ sql.resultSet(X_264,X_266,X_268,X_270,X_271,X_179,X_245);
end user.s4_1;
#inline actions= 0 time=11 usec
#candidates actions= 1 time=121 usec
diff --git a/sql/benchmarks/tpch/Tests/12-explain.stable.out.int128
b/sql/benchmarks/tpch/Tests/12-explain.stable.out.int128
--- a/sql/benchmarks/tpch/Tests/12-explain.stable.out.int128
+++ b/sql/benchmarks/tpch/Tests/12-explain.stable.out.int128
@@ -55,27 +55,27 @@ Ready.
% clob # type
% 684 # length
function user.s4_1():void;
- X_172:void := querylog.define("explain select\n l_shipmode,\n sum(case\n
when o_orderpriority = \\'1-URGENT\\'\n or o_orderpriority = \\'2-HIGH\\'\n
then 1\n else 0\n end) as high_line_count,\n sum(case\n when o_orderpriority <>
\\'1-URGENT\\'\n and o_orderpriority <> \\'2-HIGH\\'\n then 1\n else 0\n end)
as low_line_count\nfrom\n orders,\n lineitem\nwhere\n o_orderkey = l_orderkey\n
and l_shipmode in (\\'MAIL\\', \\'SHIP\\')\n and l_commitdate < l_receiptdate\n
and l_shipdate < l_commitdate\n and l_receiptdate >= date \\'1994-01-01\\'\n
and l_receiptdate < date \\'1994-01-01\\' + interval \\'1\\' year\ngroup by\n
l_shipmode\norder by\n l_shipmode;","sequential_pipe",69);
- X_139 := bat.new(nil:str);
- X_146 := bat.append(X_139,"sys.lineitem");
- X_156 := bat.append(X_146,"sys.L1");
- X_165 := bat.append(X_156,"sys.L2");
- X_141 := bat.new(nil:str);
- X_148 := bat.append(X_141,"l_shipmode");
- X_158 := bat.append(X_148,"high_line_count");
- X_167 := bat.append(X_158,"low_line_count");
- X_142 := bat.new(nil:str);
- X_150 := bat.append(X_142,"char");
- X_160 := bat.append(X_150,"hugeint");
- X_169 := bat.append(X_160,"hugeint");
- X_143 := bat.new(nil:int);
- X_152 := bat.append(X_143,10);
- X_162 := bat.append(X_152,128);
- X_170 := bat.append(X_162,128);
- X_145 := bat.new(nil:int);
- X_154 := bat.append(X_145,0);
- X_164 := bat.append(X_154,0);
- X_171 := bat.append(X_164,0);
+ X_161:void := querylog.define("explain select\n l_shipmode,\n sum(case\n
when o_orderpriority = \\'1-URGENT\\'\n or o_orderpriority = \\'2-HIGH\\'\n
then 1\n else 0\n end) as high_line_count,\n sum(case\n when o_orderpriority <>
\\'1-URGENT\\'\n and o_orderpriority <> \\'2-HIGH\\'\n then 1\n else 0\n end)
as low_line_count\nfrom\n orders,\n lineitem\nwhere\n o_orderkey = l_orderkey\n
and l_shipmode in (\\'MAIL\\', \\'SHIP\\')\n and l_commitdate < l_receiptdate\n
and l_shipdate < l_commitdate\n and l_receiptdate >= date \\'1994-01-01\\'\n
and l_receiptdate < date \\'1994-01-01\\' + interval \\'1\\' year\ngroup by\n
l_shipmode\norder by\n l_shipmode;","sequential_pipe",69);
+ X_128 := bat.new(nil:str);
+ X_135 := bat.append(X_128,"sys.lineitem");
+ X_145 := bat.append(X_135,"sys.L1");
+ X_154 := bat.append(X_145,"sys.L2");
+ X_130 := bat.new(nil:str);
+ X_137 := bat.append(X_130,"l_shipmode");
+ X_147 := bat.append(X_137,"high_line_count");
+ X_156 := bat.append(X_147,"low_line_count");
+ X_131 := bat.new(nil:str);
+ X_139 := bat.append(X_131,"char");
+ X_149 := bat.append(X_139,"hugeint");
+ X_158 := bat.append(X_149,"hugeint");
+ X_132 := bat.new(nil:int);
+ X_141 := bat.append(X_132,10);
+ X_151 := bat.append(X_141,128);
+ X_159 := bat.append(X_151,128);
+ X_134 := bat.new(nil:int);
+ X_143 := bat.append(X_134,0);
+ X_153 := bat.append(X_143,0);
+ X_160 := bat.append(X_153,0);
X_0 := sql.mvc();
X_4:bat[:str] := sql.bind(X_0,"sys","lineitem","l_shipmode",0);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
