Changeset: 334827063038 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=334827063038
Modified Files:
sql/benchmarks/tpch/Tests/20-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/21-explain.stable.out.32bit
Branch: Oct2014
Log Message:
Approved output.
diffs (239 lines):
diff --git a/sql/benchmarks/tpch/Tests/20-explain.stable.out.32bit
b/sql/benchmarks/tpch/Tests/20-explain.stable.out.32bit
--- a/sql/benchmarks/tpch/Tests/20-explain.stable.out.32bit
+++ b/sql/benchmarks/tpch/Tests/20-explain.stable.out.32bit
@@ -94,12 +94,12 @@ function user.s2_1{autoCommit=true}(A0:s
X_55:bat[:oid,:int] := algebra.leftfetchjoinPath(X_43,X_33,X_54);
(X_56,r1_59) := algebra.join(X_31,X_55);
X_58 := algebra.tinter(X_32,X_56);
- X_280 := algebra.leftfetchjoin(X_58,X_23);
+ X_278 := algebra.leftfetchjoin(X_58,X_23);
X_59 :=
sql.bind_idxbat(X_8,"sys","partsupp","partsupp_ps_partkey_ps_suppkey_pkey",0);
(X_62,r1_65) :=
sql.bind_idxbat(X_8,"sys","partsupp","partsupp_ps_partkey_ps_suppkey_pkey",2);
X_64 :=
sql.bind_idxbat(X_8,"sys","partsupp","partsupp_ps_partkey_ps_suppkey_pkey",1);
X_65 := sql.delta(X_59,X_62,r1_65,X_64);
- X_66:bat[:oid,:wrd] := algebra.leftfetchjoin(X_280,X_65);
+ X_66:bat[:oid,:wrd] := algebra.leftfetchjoin(X_278,X_65);
X_67:bat[:oid,:oid] := sql.tid(X_8,"sys","lineitem");
X_69 := sql.bind(X_8,"sys","lineitem","l_shipdate",0);
(X_71,r1_75) := sql.bind(X_8,"sys","lineitem","l_shipdate",2);
@@ -108,100 +108,98 @@ function user.s2_1{autoCommit=true}(A0:s
X_75 := algebra.leftfetchjoin(X_67,X_74);
X_76 := mtime.addmonths(A3,A4);
X_77 := algebra.subselect(X_75,A2,X_76,true,false,false);
- X_281 := algebra.leftfetchjoin(X_77,X_67);
- X_80 := sql.bind(X_8,"sys","lineitem","l_partkey",0);
- (X_84,r1_91) := sql.bind(X_8,"sys","lineitem","l_partkey",2);
- X_87 := sql.bind(X_8,"sys","lineitem","l_partkey",1);
+ X_279 := algebra.leftfetchjoin(X_77,X_67);
+ X_80 := sql.bind(X_8,"sys","lineitem","l_suppkey",0);
+ (X_84,r1_91) := sql.bind(X_8,"sys","lineitem","l_suppkey",2);
+ X_87 := sql.bind(X_8,"sys","lineitem","l_suppkey",1);
X_89 := sql.delta(X_80,X_84,r1_91,X_87);
- X_90:bat[:oid,:int] := algebra.leftfetchjoin(X_281,X_89);
- X_91:bat[:oid,:wrd] := mal.manifold("mkey","hash",X_90);
- X_95 := sql.bind(X_8,"sys","lineitem","l_suppkey",0);
- (X_98,r1_107) := sql.bind(X_8,"sys","lineitem","l_suppkey",2);
- X_100 := sql.bind(X_8,"sys","lineitem","l_suppkey",1);
- X_101 := sql.delta(X_95,X_98,r1_107,X_100);
- X_102:bat[:oid,:int] := algebra.leftfetchjoin(X_281,X_101);
- X_103:bat[:oid,:wrd] := mkey.bulk_rotate_xor_hash(X_91,11,X_102);
- (X_104,r1_114) := algebra.join(X_66,X_103);
- X_106 := algebra.leftfetchjoin(X_58,X_31);
- X_107 := algebra.leftfetchjoin(X_104,X_106);
- X_108 := algebra.leftfetchjoin(r1_114,X_90);
- X_109:bat[:oid,:bit] := batcalc.==(X_107,X_108);
- X_111 := algebra.subselect(X_109,true,true,true,true,false);
- X_113 := algebra.leftfetchjoin(X_111,X_104);
- X_114 := sql.bind(X_8,"sys","partsupp","ps_suppkey",0);
- (X_119,r1_132) := sql.bind(X_8,"sys","partsupp","ps_suppkey",2);
- X_122 := sql.bind(X_8,"sys","partsupp","ps_suppkey",1);
- X_124 := sql.delta(X_114,X_119,r1_132,X_122);
- X_125:bat[:oid,:int] := algebra.leftfetchjoin(X_280,X_124);
- X_126 := algebra.leftfetchjoin(X_113,X_125);
- X_127 := algebra.leftfetchjoin(X_111,r1_114);
- X_128 := algebra.leftfetchjoin(X_127,X_102);
- X_129:bat[:oid,:bit] := batcalc.==(X_126,X_128);
- X_130 := algebra.subselect(X_129,true,true,true,true,false);
- X_131 := algebra.leftfetchjoin(X_130,X_113);
- X_132:bat[:oid,:oid] := batcalc.identity(X_106);
- X_133 := algebra.leftfetchjoin(X_131,X_132);
- (X_134,r1_150,r2_150) := group.subgroupdone(X_133);
- X_282 := algebra.leftfetchjoin(r1_150,X_131);
- X_150 := sql.bind(X_8,"sys","lineitem","l_quantity",0);
- (X_155,r1_178) := sql.bind(X_8,"sys","lineitem","l_quantity",2);
+ X_90:bat[:oid,:int] := algebra.leftfetchjoin(X_279,X_89);
+ X_91 := sql.bind(X_8,"sys","lineitem","l_partkey",0);
+ (X_93,r1_101) := sql.bind(X_8,"sys","lineitem","l_partkey",2);
+ X_95 := sql.bind(X_8,"sys","lineitem","l_partkey",1);
+ X_96 := sql.delta(X_91,X_93,r1_101,X_95);
+ X_97:bat[:oid,:int] := algebra.leftfetchjoin(X_279,X_96);
+ (X_98,r1_107,r2_107) := group.subgroup(X_97);
+ (X_101,r1_110,r2_110) := group.subgroupdone(X_90,X_98);
+ X_104 := algebra.leftfetchjoin(r1_110,X_97);
+ X_109 := algebra.leftfetchjoin(r1_110,X_90);
+ X_149 := sql.bind(X_8,"sys","lineitem","l_quantity",0);
+ (X_154,r1_176) := sql.bind(X_8,"sys","lineitem","l_quantity",2);
X_157 := sql.bind(X_8,"sys","lineitem","l_quantity",1);
- X_158 := sql.delta(X_150,X_155,r1_178,X_157);
- X_159:bat[:oid,:int] :=
algebra.leftfetchjoinPath(X_130,X_127,X_281,X_158);
- X_160:bat[:oid,:lng] := aggr.subsum(X_159,X_134,r1_150,true,true);
- X_137 := sql.bind(X_8,"sys","partsupp","ps_availqty",0);
- (X_139,r1_155) := sql.bind(X_8,"sys","partsupp","ps_availqty",2);
- X_141 := sql.bind(X_8,"sys","partsupp","ps_availqty",1);
- X_142 := sql.delta(X_137,X_139,r1_155,X_141);
- X_143:bat[:oid,:int] := algebra.leftfetchjoinPath(X_282,X_58,X_23,X_142);
- X_144:bat[:oid,:lng] := batcalc.lng(X_143,19,2);
+ X_159 := sql.delta(X_149,X_154,r1_176,X_157);
+ X_160:bat[:oid,:int] := algebra.leftfetchjoin(X_279,X_159);
+ X_161:bat[:oid,:lng] := aggr.subsum(X_160,X_101,r1_110,true,true);
+ X_105:bat[:oid,:wrd] := mal.manifold("mkey","hash",X_104);
+ X_110:bat[:oid,:wrd] := mkey.bulk_rotate_xor_hash(X_105,11,X_109);
+ (X_111,r1_121) := algebra.join(X_66,X_110);
+ X_113:bat[:oid,:int] := algebra.leftfetchjoinPath(X_111,X_58,X_31);
+ X_114 := algebra.leftfetchjoin(r1_121,X_104);
+ X_115:bat[:oid,:bit] := batcalc.==(X_113,X_114);
+ X_117 := algebra.subselect(X_115,true,true,true,true,false);
+ X_119 := algebra.leftfetchjoin(X_117,X_111);
+ X_120 := sql.bind(X_8,"sys","partsupp","ps_suppkey",0);
+ (X_125,r1_139) := sql.bind(X_8,"sys","partsupp","ps_suppkey",2);
+ X_128 := sql.bind(X_8,"sys","partsupp","ps_suppkey",1);
+ X_130 := sql.delta(X_120,X_125,r1_139,X_128);
+ X_131:bat[:oid,:int] := algebra.leftfetchjoin(X_278,X_130);
+ X_132 := algebra.leftfetchjoin(X_119,X_131);
+ X_133 := algebra.leftfetchjoin(X_117,r1_121);
+ X_134 := algebra.leftfetchjoin(X_133,X_109);
+ X_135:bat[:oid,:bit] := batcalc.==(X_132,X_134);
+ X_136 := algebra.subselect(X_135,true,true,true,true,false);
+ X_137 := algebra.leftfetchjoin(X_136,X_119);
+ X_138 := sql.bind(X_8,"sys","partsupp","ps_availqty",0);
+ (X_140,r1_156) := sql.bind(X_8,"sys","partsupp","ps_availqty",2);
+ X_142 := sql.bind(X_8,"sys","partsupp","ps_availqty",1);
+ X_143 := sql.delta(X_138,X_140,r1_156,X_142);
+ X_144:bat[:oid,:int] := algebra.leftfetchjoinPath(X_137,X_278,X_143);
+ X_145:bat[:oid,:lng] := batcalc.lng(X_144,19,2);
X_147 := calc.lng(1,A1,11,1);
- X_162:bat[:oid,:lng] := batcalc.lng(X_160,11,1);
- X_163:bat[:oid,:lng] := batcalc.*(X_147,X_162);
- X_164:bat[:oid,:bit] := batcalc.>(X_144,X_163);
- X_165 := algebra.subselect(X_164,true,true,true,true,false);
- X_167:bat[:oid,:int] := algebra.leftfetchjoinPath(X_165,X_282,X_125);
- (X_168,r1_197,r2_197) := group.subgroupdone(X_167);
- X_171 := algebra.leftfetchjoin(r1_197,X_167);
- (X_172,r1_201) := algebra.join(X_21,X_171);
- X_174 := algebra.tinter(X_22,X_172);
- X_283 := algebra.leftfetchjoin(X_174,X_9);
- X_175 := sql.bind(X_8,"sys","supplier","s_nationkey",0);
- (X_178,r1_207) := sql.bind(X_8,"sys","supplier","s_nationkey",2);
- X_182 := sql.bind(X_8,"sys","supplier","s_nationkey",1);
- X_184 := sql.delta(X_175,X_178,r1_207,X_182);
- X_185:bat[:oid,:int] := algebra.leftfetchjoin(X_283,X_184);
- X_186:bat[:oid,:oid] := sql.tid(X_8,"sys","nation");
- X_188 := sql.bind(X_8,"sys","nation","n_name",0);
- (X_191,r1_221) := sql.bind(X_8,"sys","nation","n_name",2);
- X_193 := sql.bind(X_8,"sys","nation","n_name",1);
- X_194 := sql.delta(X_188,X_191,r1_221,X_193);
- X_195 := algebra.leftfetchjoin(X_186,X_194);
- X_196 := algebra.subselect(X_195,A5,A5,true,true,false);
- X_199 := sql.bind(X_8,"sys","nation","n_nationkey",0);
- (X_201,r1_232) := sql.bind(X_8,"sys","nation","n_nationkey",2);
- X_203 := sql.bind(X_8,"sys","nation","n_nationkey",1);
- X_204 := sql.delta(X_199,X_201,r1_232,X_203);
- X_205:bat[:oid,:int] := algebra.leftfetchjoinPath(X_196,X_186,X_204);
- (X_206,r1_238) := algebra.join(X_185,X_205);
- X_284 := algebra.leftfetchjoin(X_206,X_174);
- X_208 := sql.bind(X_8,"sys","supplier","s_name",0);
- (X_211,r1_243) := sql.bind(X_8,"sys","supplier","s_name",2);
- X_215 := sql.bind(X_8,"sys","supplier","s_name",1);
- X_217 := sql.delta(X_208,X_211,r1_243,X_215);
- X_218:bat[:oid,:str] := algebra.leftfetchjoinPath(X_284,X_9,X_217);
- (X_219,r1_253,r2_253) := algebra.subsort(X_218,false,false);
- X_222 := algebra.leftfetchjoin(r1_253,X_218);
- X_223 := sql.bind(X_8,"sys","supplier","s_address",0);
- (X_226,r1_260) := sql.bind(X_8,"sys","supplier","s_address",2);
- X_228 := sql.bind(X_8,"sys","supplier","s_address",1);
- X_229 := sql.delta(X_223,X_226,r1_260,X_228);
- X_230:bat[:oid,:str] := algebra.leftfetchjoinPath(r1_253,X_284,X_9,X_229);
- X_231 := sql.resultSet(2,1,X_222);
- sql.rsColumn(X_231,"sys.supplier","s_name","varchar",25,0,X_222);
- sql.rsColumn(X_231,"sys.supplier","s_address","varchar",40,0,X_230);
- X_238 := io.stdout();
- sql.exportResult(X_238,X_231);
+ X_163:bat[:oid,:lng] := algebra.leftfetchjoinPath(X_136,X_133,X_161);
+ X_164:bat[:oid,:lng] := batcalc.lng(X_163,11,1);
+ X_165:bat[:oid,:lng] := batcalc.*(X_147,X_164);
+ X_166:bat[:oid,:bit] := batcalc.>(X_145,X_165);
+ X_167 := algebra.subselect(X_166,true,true,true,true,false);
+ X_169:bat[:oid,:int] := algebra.leftfetchjoinPath(X_167,X_137,X_131);
+ (X_170,r1_196) := algebra.join(X_21,X_169);
+ X_172 := algebra.tinter(X_22,X_170);
+ X_280 := algebra.leftfetchjoin(X_172,X_9);
+ X_173 := sql.bind(X_8,"sys","supplier","s_nationkey",0);
+ (X_176,r1_202) := sql.bind(X_8,"sys","supplier","s_nationkey",2);
+ X_178 := sql.bind(X_8,"sys","supplier","s_nationkey",1);
+ X_180 := sql.delta(X_173,X_176,r1_202,X_178);
+ X_181:bat[:oid,:int] := algebra.leftfetchjoin(X_280,X_180);
+ X_182:bat[:oid,:oid] := sql.tid(X_8,"sys","nation");
+ X_184 := sql.bind(X_8,"sys","nation","n_name",0);
+ (X_187,r1_214) := sql.bind(X_8,"sys","nation","n_name",2);
+ X_190 := sql.bind(X_8,"sys","nation","n_name",1);
+ X_192 := sql.delta(X_184,X_187,r1_214,X_190);
+ X_193 := algebra.leftfetchjoin(X_182,X_192);
+ X_194 := algebra.subselect(X_193,A5,A5,true,true,false);
+ X_196 := sql.bind(X_8,"sys","nation","n_nationkey",0);
+ (X_198,r1_226) := sql.bind(X_8,"sys","nation","n_nationkey",2);
+ X_200 := sql.bind(X_8,"sys","nation","n_nationkey",1);
+ X_201 := sql.delta(X_196,X_198,r1_226,X_200);
+ X_202:bat[:oid,:int] := algebra.leftfetchjoinPath(X_194,X_182,X_201);
+ (X_203,r1_232) := algebra.join(X_181,X_202);
+ X_281 := algebra.leftfetchjoin(X_203,X_172);
+ X_205 := sql.bind(X_8,"sys","supplier","s_name",0);
+ (X_208,r1_237) := sql.bind(X_8,"sys","supplier","s_name",2);
+ X_211 := sql.bind(X_8,"sys","supplier","s_name",1);
+ X_212 := sql.delta(X_205,X_208,r1_237,X_211);
+ X_213:bat[:oid,:str] := algebra.leftfetchjoinPath(X_281,X_9,X_212);
+ (X_214,r1_245,r2_245) := algebra.subsort(X_213,false,false);
+ X_218 := algebra.leftfetchjoin(r1_245,X_213);
+ X_219 := sql.bind(X_8,"sys","supplier","s_address",0);
+ (X_222,r1_253) := sql.bind(X_8,"sys","supplier","s_address",2);
+ X_225 := sql.bind(X_8,"sys","supplier","s_address",1);
+ X_227 := sql.delta(X_219,X_222,r1_253,X_225);
+ X_228:bat[:oid,:str] := algebra.leftfetchjoinPath(r1_245,X_281,X_9,X_227);
+ X_229 := sql.resultSet(2,1,X_218);
+ sql.rsColumn(X_229,"sys.supplier","s_name","varchar",25,0,X_218);
+ sql.rsColumn(X_229,"sys.supplier","s_address","varchar",40,0,X_228);
+ X_236 := io.stdout();
+ sql.exportResult(X_236,X_229);
end s2_1;
# querylog.define("explain
select\n\ts_name,\n\ts_address\nfrom\n\tsupplier,\n\tnation\nwhere\n\ts_suppkey
in
(\n\t\tselect\n\t\t\tps_suppkey\n\t\tfrom\n\t\t\tpartsupp\n\t\twhere\n\t\t\tps_partkey
in
(\n\t\t\t\tselect\n\t\t\t\t\tp_partkey\n\t\t\t\tfrom\n\t\t\t\t\tpart\n\t\t\t\twhere\n\t\t\t\t\tp_name
like \\'forest%\\'\n\t\t\t)\n\t\t\tand ps_availqty >
(\n\t\t\t\tselect\n\t\t\t\t\t0.5 *
sum(l_quantity)\n\t\t\t\tfrom\n\t\t\t\t\tlineitem\n\t\t\t\twhere\n\t\t\t\t\tl_partkey
= ps_partkey\n\t\t\t\t\tand l_suppkey = ps_suppkey\n\t\t\t\t\tand l_shipdate
>= date \\'1994-01-01\\'\n\t\t\t\t\tand l_shipdate < date \\'1994-01-01\\' +
interval \\'1\\' year\n\t\t\t)\n\t)\n\tand s_nationkey = n_nationkey\n\tand
n_name = \\'CANADA\\'\norder by\n\ts_name;","sequential_pipe")
diff --git a/sql/benchmarks/tpch/Tests/21-explain.stable.out.32bit
b/sql/benchmarks/tpch/Tests/21-explain.stable.out.32bit
--- a/sql/benchmarks/tpch/Tests/21-explain.stable.out.32bit
+++ b/sql/benchmarks/tpch/Tests/21-explain.stable.out.32bit
@@ -172,18 +172,18 @@ function user.s2_1{autoCommit=true}(A0:s
X_179 := sql.delta(X_169,X_174,r1_224,X_177);
X_180:bat[:oid,:str] :=
algebra.leftfetchjoinPath(X_168,X_258,r1_69,X_61,X_179);
(X_181,r1_235,r2_235) := group.subgroupdone(X_180);
- r1_249 := algebra.leftfetchjoin(r1_235,X_180);
+ X_184 := algebra.leftfetchjoin(r1_235,X_180);
X_185:bat[:oid,:wrd] := aggr.subcount(X_181,X_181,r1_235,false);
- (X_187,r1_245) := algebra.firstn(X_185,100:wrd,false);
- X_189 := algebra.firstn(r1_249,X_187,r1_245,100:wrd,true);
- X_191 := algebra.leftfetchjoin(X_189,r1_249);
- X_192 := algebra.leftfetchjoin(X_189,X_185);
- (X_193,r1_253,r2_253) := algebra.subsort(X_192,true,false);
- (X_197,r1_257,r2_257) := algebra.subsort(X_191,r1_253,r2_253,false,false);
- X_200 := algebra.leftfetchjoin(r1_257,X_191);
+ (X_187,r1_245) := algebra.firstn(X_185,100:wrd,false,false);
+ X_189 := algebra.firstn(X_184,X_187,r1_245,100:wrd,true,false);
+ X_192 := algebra.leftfetchjoin(X_189,X_184);
+ X_193 := algebra.leftfetchjoin(X_189,X_185);
+ (X_194,r1_254,r2_254) := algebra.subsort(X_193,true,false);
+ (X_197,r1_257,r2_257) := algebra.subsort(X_192,r1_254,r2_254,false,false);
+ X_200 := algebra.leftfetchjoin(r1_257,X_192);
X_202 := algebra.subslice(X_200,0:wrd,99:wrd);
X_203 := algebra.leftfetchjoin(X_202,X_200);
- X_204:bat[:oid,:wrd] := algebra.leftfetchjoinPath(X_202,r1_257,X_192);
+ X_204:bat[:oid,:wrd] := algebra.leftfetchjoinPath(X_202,r1_257,X_193);
X_205 := sql.resultSet(2,1,X_203);
sql.rsColumn(X_205,"sys.supplier","s_name","varchar",25,0,X_203);
sql.rsColumn(X_205,"sys.L1","numwait","wrd",32,0,X_204);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
