Changeset: 1310db5a9f46 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1310db5a9f46 Modified Files: sql/benchmarks/tpch/Tests/20-explain.stable.out.32bit sql/benchmarks/tpch/Tests/22-explain.stable.out.32bit Branch: Oct2014 Log Message:
Approve 32 bit output. diffs (276 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_273 := algebra.leftfetchjoin(X_58,X_23); + X_274 := algebra.leftfetchjoin(X_58,X_23); X_59:bat[:oid,:wrd] := 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:bat[:oid,:wrd] := 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_273,X_65); + X_66:bat[:oid,:wrd] := algebra.leftfetchjoin(X_274,X_65); X_67:bat[:oid,:oid] := sql.tid(X_8,"sys","lineitem"); X_69:bat[:oid,:date] := sql.bind(X_8,"sys","lineitem","l_shipdate",0); (X_71,r1_75) := sql.bind(X_8,"sys","lineitem","l_shipdate",2); @@ -108,18 +108,18 @@ 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_274 := algebra.leftfetchjoin(X_77,X_67); + X_275 := algebra.leftfetchjoin(X_77,X_67); X_80:bat[:oid,:int] := sql.bind(X_8,"sys","lineitem","l_partkey",0); (X_84,r1_91) := sql.bind(X_8,"sys","lineitem","l_partkey",2); X_87:bat[:oid,:int] := sql.bind(X_8,"sys","lineitem","l_partkey",1); X_89 := sql.delta(X_80,X_84,r1_91,X_87); - X_90:bat[:oid,:int] := algebra.leftfetchjoin(X_274,X_89); + X_90:bat[:oid,:int] := algebra.leftfetchjoin(X_275,X_89); X_91:bat[:oid,:wrd] := batmkey.hash(X_90); X_93:bat[:oid,:int] := sql.bind(X_8,"sys","lineitem","l_suppkey",0); (X_96,r1_107) := sql.bind(X_8,"sys","lineitem","l_suppkey",2); X_98:bat[:oid,:int] := sql.bind(X_8,"sys","lineitem","l_suppkey",1); X_99 := sql.delta(X_93,X_96,r1_107,X_98); - X_100:bat[:oid,:int] := algebra.leftfetchjoin(X_274,X_99); + X_100:bat[:oid,:int] := algebra.leftfetchjoin(X_275,X_99); X_101:bat[:oid,:wrd] := mkey.bulk_rotate_xor_hash(X_91,11,X_100); (X_102,r1_114) := algebra.join(X_66,X_101); X_104 := algebra.leftfetchjoin(X_58,X_31); @@ -132,7 +132,7 @@ function user.s2_1{autoCommit=true}(A0:s (X_117,r1_132) := sql.bind(X_8,"sys","partsupp","ps_suppkey",2); X_120:bat[:oid,:int] := sql.bind(X_8,"sys","partsupp","ps_suppkey",1); X_122 := sql.delta(X_112,X_117,r1_132,X_120); - X_123:bat[:oid,:int] := algebra.leftfetchjoin(X_273,X_122); + X_123:bat[:oid,:int] := algebra.leftfetchjoin(X_274,X_122); X_124 := algebra.leftfetchjoin(X_111,X_123); X_125 := algebra.leftfetchjoin(X_109,r1_114); X_126 := algebra.leftfetchjoin(X_125,X_100); @@ -142,64 +142,64 @@ function user.s2_1{autoCommit=true}(A0:s X_130:bat[:oid,:oid] := batcalc.identity(X_104); X_131 := algebra.leftfetchjoin(X_129,X_130); (X_132,r1_150,r2_150) := group.subgroupdone(X_131); - X_275 := algebra.leftfetchjoin(r1_150,X_129); - X_144:bat[:oid,:int] := sql.bind(X_8,"sys","lineitem","l_quantity",0); - (X_149,r1_172) := sql.bind(X_8,"sys","lineitem","l_quantity",2); - X_152:bat[:oid,:int] := sql.bind(X_8,"sys","lineitem","l_quantity",1); - X_154 := sql.delta(X_144,X_149,r1_172,X_152); - X_155:bat[:oid,:int] := algebra.leftfetchjoinPath(X_128,X_125,X_274,X_154); - X_156:bat[:oid,:lng] := aggr.subsum(X_155,X_132,r1_150,true,true); + X_276 := algebra.leftfetchjoin(r1_150,X_129); + X_148:bat[:oid,:int] := sql.bind(X_8,"sys","lineitem","l_quantity",0); + (X_153,r1_178) := sql.bind(X_8,"sys","lineitem","l_quantity",2); + X_155:bat[:oid,:int] := sql.bind(X_8,"sys","lineitem","l_quantity",1); + X_156 := sql.delta(X_148,X_153,r1_178,X_155); + X_157:bat[:oid,:int] := algebra.leftfetchjoinPath(X_128,X_125,X_275,X_156); + X_158:bat[:oid,:lng] := aggr.subsum(X_157,X_132,r1_150,true,true); X_135:bat[:oid,:int] := sql.bind(X_8,"sys","partsupp","ps_availqty",0); (X_137,r1_155) := sql.bind(X_8,"sys","partsupp","ps_availqty",2); X_139:bat[:oid,:int] := sql.bind(X_8,"sys","partsupp","ps_availqty",1); X_140 := sql.delta(X_135,X_137,r1_155,X_139); - X_141:bat[:oid,:int] := algebra.leftfetchjoinPath(X_275,X_58,X_23,X_140); - X_142 := calc.lng(1,A1,11,1); - X_158:bat[:oid,:lng] := batcalc.lng(X_156,11,1); - X_159:bat[:oid,:lng] := batcalc.*(X_142,X_158); - X_160:bat[:oid,:int] := batcalc.int(2,X_159); - X_161:bat[:oid,:bit] := batcalc.>(X_141,X_160); - X_162 := algebra.subselect(X_161,true,true,true,true,false); - X_164:bat[:oid,:int] := algebra.leftfetchjoinPath(X_162,X_275,X_123); - (X_165,r1_197) := algebra.join(X_21,X_164); - X_167 := algebra.tinter(X_22,X_165); - X_276 := algebra.leftfetchjoin(X_167,X_9); - X_168:bat[:oid,:int] := sql.bind(X_8,"sys","supplier","s_nationkey",0); - (X_173,r1_205) := sql.bind(X_8,"sys","supplier","s_nationkey",2); - X_176:bat[:oid,:int] := sql.bind(X_8,"sys","supplier","s_nationkey",1); - X_178 := sql.delta(X_168,X_173,r1_205,X_176); - X_179:bat[:oid,:int] := algebra.leftfetchjoin(X_276,X_178); + X_141:bat[:oid,:int] := algebra.leftfetchjoinPath(X_276,X_58,X_23,X_140); + X_142:bat[:oid,:lng] := batcalc.lng(X_141,19,2); + X_145 := calc.lng(1,A1,11,1); + X_160:bat[:oid,:lng] := batcalc.lng(X_158,11,1); + X_161:bat[:oid,:lng] := batcalc.*(X_145,X_160); + X_162:bat[:oid,:bit] := batcalc.>(X_142,X_161); + X_163 := algebra.subselect(X_162,true,true,true,true,false); + X_165:bat[:oid,:int] := algebra.leftfetchjoinPath(X_163,X_276,X_123); + (X_166,r1_197) := algebra.join(X_21,X_165); + X_168 := algebra.tinter(X_22,X_166); + X_277 := algebra.leftfetchjoin(X_168,X_9); + X_169:bat[:oid,:int] := sql.bind(X_8,"sys","supplier","s_nationkey",0); + (X_172,r1_203) := sql.bind(X_8,"sys","supplier","s_nationkey",2); + X_175:bat[:oid,:int] := sql.bind(X_8,"sys","supplier","s_nationkey",1); + X_178 := sql.delta(X_169,X_172,r1_203,X_175); + X_179:bat[:oid,:int] := algebra.leftfetchjoin(X_277,X_178); X_180:bat[:oid,:oid] := sql.tid(X_8,"sys","nation"); X_182:bat[:oid,:str] := sql.bind(X_8,"sys","nation","n_name",0); - (X_184,r1_217) := sql.bind(X_8,"sys","nation","n_name",2); - X_186:bat[:oid,:str] := sql.bind(X_8,"sys","nation","n_name",1); - X_187 := sql.delta(X_182,X_184,r1_217,X_186); - X_188 := algebra.leftfetchjoin(X_180,X_187); - X_189 := algebra.subselect(X_188,A5,A5,true,true,false); - X_191:bat[:oid,:int] := sql.bind(X_8,"sys","nation","n_nationkey",0); - (X_193,r1_227) := sql.bind(X_8,"sys","nation","n_nationkey",2); - X_195:bat[:oid,:int] := sql.bind(X_8,"sys","nation","n_nationkey",1); - X_196 := sql.delta(X_191,X_193,r1_227,X_195); - X_197:bat[:oid,:int] := algebra.leftfetchjoinPath(X_189,X_180,X_196); - (X_198,r1_233) := algebra.join(X_179,X_197); - X_277 := algebra.leftfetchjoin(X_198,X_167); - X_200:bat[:oid,:str] := sql.bind(X_8,"sys","supplier","s_name",0); - (X_205,r1_240) := sql.bind(X_8,"sys","supplier","s_name",2); + (X_185,r1_217) := sql.bind(X_8,"sys","nation","n_name",2); + X_187:bat[:oid,:str] := sql.bind(X_8,"sys","nation","n_name",1); + X_188 := sql.delta(X_182,X_185,r1_217,X_187); + X_189 := algebra.leftfetchjoin(X_180,X_188); + X_190 := algebra.subselect(X_189,A5,A5,true,true,false); + X_192:bat[:oid,:int] := sql.bind(X_8,"sys","nation","n_nationkey",0); + (X_194,r1_227) := sql.bind(X_8,"sys","nation","n_nationkey",2); + X_196:bat[:oid,:int] := sql.bind(X_8,"sys","nation","n_nationkey",1); + X_197 := sql.delta(X_192,X_194,r1_227,X_196); + X_198:bat[:oid,:int] := algebra.leftfetchjoinPath(X_190,X_180,X_197); + (X_199,r1_233) := algebra.join(X_179,X_198); + X_278 := algebra.leftfetchjoin(X_199,X_168); + X_201:bat[:oid,:str] := sql.bind(X_8,"sys","supplier","s_name",0); + (X_204,r1_238) := sql.bind(X_8,"sys","supplier","s_name",2); X_208:bat[:oid,:str] := sql.bind(X_8,"sys","supplier","s_name",1); - X_210 := sql.delta(X_200,X_205,r1_240,X_208); - X_211:bat[:oid,:str] := algebra.leftfetchjoinPath(X_277,X_9,X_210); - (X_212,r1_249,r2_249) := algebra.subsort(X_211,false,false); - X_216 := algebra.leftfetchjoin(r1_249,X_211); + X_210 := sql.delta(X_201,X_204,r1_238,X_208); + X_211:bat[:oid,:str] := algebra.leftfetchjoinPath(X_278,X_9,X_210); + (X_212,r1_248,r2_248) := algebra.subsort(X_211,false,false); + X_216 := algebra.leftfetchjoin(r1_248,X_211); X_217:bat[:oid,:str] := sql.bind(X_8,"sys","supplier","s_address",0); - (X_219,r1_256) := sql.bind(X_8,"sys","supplier","s_address",2); - X_221:bat[:oid,:str] := sql.bind(X_8,"sys","supplier","s_address",1); - X_222 := sql.delta(X_217,X_219,r1_256,X_221); - X_223:bat[:oid,:str] := algebra.leftfetchjoinPath(r1_249,X_277,X_9,X_222); - X_224 := sql.resultSet(2,1,X_216); - sql.rsColumn(X_224,"sys.supplier","s_name","varchar",25,0,X_216); - sql.rsColumn(X_224,"sys.supplier","s_address","varchar",40,0,X_223); - X_231 := io.stdout(); - sql.exportResult(X_231,X_224); + (X_220,r1_256) := sql.bind(X_8,"sys","supplier","s_address",2); + X_222:bat[:oid,:str] := sql.bind(X_8,"sys","supplier","s_address",1); + X_223 := sql.delta(X_217,X_220,r1_256,X_222); + X_224:bat[:oid,:str] := algebra.leftfetchjoinPath(r1_248,X_278,X_9,X_223); + X_225 := sql.resultSet(2,1,X_216); + sql.rsColumn(X_225,"sys.supplier","s_name","varchar",25,0,X_216); + sql.rsColumn(X_225,"sys.supplier","s_address","varchar",40,0,X_224); + X_232 := io.stdout(); + sql.exportResult(X_232,X_225); 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/22-explain.stable.out.32bit b/sql/benchmarks/tpch/Tests/22-explain.stable.out.32bit --- a/sql/benchmarks/tpch/Tests/22-explain.stable.out.32bit +++ b/sql/benchmarks/tpch/Tests/22-explain.stable.out.32bit @@ -91,57 +91,57 @@ function user.s2_1{autoCommit=true}(A0:i X_71 := sql.delta(X_66,X_68,r1_80,X_70); X_72 := algebra.leftfetchjoin(X_24,X_71); X_73 := algebra.leftfetchjoin(X_52,X_72); - X_74:bat[:oid,:str] := batstr.substring(X_36,A12,A13); - X_77 := calc.lng(1,A11,15,2); - X_79 := algebra.thetasubselect(X_72,X_77,">"); - X_81 := algebra.subselect(X_74,X_79,A14,A14,true,true,false); - X_84 := algebra.subselect(X_74,X_79,A15,A15,true,true,false); - X_85 := bat.mergecand(X_81,X_84); - X_86 := algebra.subselect(X_74,X_79,A16,A16,true,true,false); - X_87 := bat.mergecand(X_85,X_86); - X_88 := algebra.subselect(X_74,X_79,A17,A17,true,true,false); - X_89 := bat.mergecand(X_87,X_88); - X_90 := algebra.subselect(X_74,X_79,A18,A18,true,true,false); - X_91 := bat.mergecand(X_89,X_90); - X_92 := algebra.subselect(X_74,X_79,A19,A19,true,true,false); - X_93 := bat.mergecand(X_91,X_92); - X_94 := algebra.subselect(X_74,X_79,A20,A20,true,true,false); - X_95 := bat.mergecand(X_93,X_94); - X_96 := algebra.leftfetchjoin(X_95,X_72); - X_97:bat[:oid,:dbl] := batcalc.dbl(2,X_96); - X_99:dbl := aggr.avg(X_97); - X_100 := sql.single(X_99); - X_101:bat[:oid,:lng] := batcalc.lng(X_100,15,2); - (X_103,r1_147) := algebra.thetajoin(X_73,X_101,1); - X_106 := algebra.tinter(X_65,X_103); - X_107 := algebra.leftfetchjoin(X_106,X_64); - X_108 := bat.mirror(X_107); - X_109:bat[:oid,:oid] := sql.tid(X_23,"sys","orders"); - X_112:bat[:oid,:int] := sql.bind(X_23,"sys","orders","o_custkey",0); - (X_115,r1_159) := sql.bind(X_23,"sys","orders","o_custkey",2); - X_117:bat[:oid,:int] := sql.bind(X_23,"sys","orders","o_custkey",1); - X_118 := sql.delta(X_112,X_115,r1_159,X_117); - X_119 := algebra.leftfetchjoin(X_109,X_118); - (X_120,r1_164) := algebra.join(X_107,X_119); - X_122 := algebra.tdiff(X_108,X_120); - X_180 := algebra.leftfetchjoin(X_122,X_106); - X_123:bat[:oid,:str] := algebra.leftfetchjoinPath(X_180,X_52,X_36); - X_124:bat[:oid,:str] := batstr.substring(X_123,A0,A1); - (X_125,r1_175,r2_175) := group.subgroupdone(X_124); - X_128 := algebra.leftfetchjoin(r1_175,X_124); - X_134:bat[:oid,:wrd] := aggr.subcount(X_125,X_125,r1_175,false); - X_136:bat[:oid,:lng] := algebra.leftfetchjoin(X_180,X_73); - X_137:bat[:oid,:lng] := aggr.subsum(X_136,X_125,r1_175,true,true); - (X_129,r1_179,r2_179) := algebra.subsort(X_128,false,false); - X_133 := algebra.leftfetchjoin(r1_179,X_128); - X_139 := algebra.leftfetchjoin(r1_179,X_137); - X_135 := algebra.leftfetchjoin(r1_179,X_134); - X_140 := sql.resultSet(3,1,X_133); - sql.rsColumn(X_140,"sys.custsale","cntrycode","varchar",15,0,X_133); - sql.rsColumn(X_140,"sys.L2","numcust","wrd",32,0,X_135); - sql.rsColumn(X_140,"sys.L3","totacctbal","decimal",15,2,X_139); - X_159 := io.stdout(); - sql.exportResult(X_159,X_140); + X_74:bat[:oid,:dbl] := batcalc.dbl(2,X_73); + X_75:bat[:oid,:str] := batstr.substring(X_36,A12,A13); + X_78 := calc.lng(1,A11,15,2); + X_80 := algebra.thetasubselect(X_72,X_78,">"); + X_82 := algebra.subselect(X_75,X_80,A14,A14,true,true,false); + X_85 := algebra.subselect(X_75,X_80,A15,A15,true,true,false); + X_86 := bat.mergecand(X_82,X_85); + X_87 := algebra.subselect(X_75,X_80,A16,A16,true,true,false); + X_88 := bat.mergecand(X_86,X_87); + X_89 := algebra.subselect(X_75,X_80,A17,A17,true,true,false); + X_90 := bat.mergecand(X_88,X_89); + X_91 := algebra.subselect(X_75,X_80,A18,A18,true,true,false); + X_92 := bat.mergecand(X_90,X_91); + X_93 := algebra.subselect(X_75,X_80,A19,A19,true,true,false); + X_94 := bat.mergecand(X_92,X_93); + X_95 := algebra.subselect(X_75,X_80,A20,A20,true,true,false); + X_96 := bat.mergecand(X_94,X_95); + X_97 := algebra.leftfetchjoin(X_96,X_72); + X_98:bat[:oid,:dbl] := batcalc.dbl(2,X_97); + X_100:dbl := aggr.avg(X_98); + X_101 := sql.single(X_100); + (X_102,r1_147) := algebra.thetajoin(X_74,X_101,1); + X_105 := algebra.tinter(X_65,X_102); + X_106 := algebra.leftfetchjoin(X_105,X_64); + X_107 := bat.mirror(X_106); + X_108:bat[:oid,:oid] := sql.tid(X_23,"sys","orders"); + X_111:bat[:oid,:int] := sql.bind(X_23,"sys","orders","o_custkey",0); + (X_114,r1_159) := sql.bind(X_23,"sys","orders","o_custkey",2); + X_116:bat[:oid,:int] := sql.bind(X_23,"sys","orders","o_custkey",1); + X_117 := sql.delta(X_111,X_114,r1_159,X_116); + X_118 := algebra.leftfetchjoin(X_108,X_117); + (X_119,r1_164) := algebra.join(X_106,X_118); + X_121 := algebra.tdiff(X_107,X_119); + X_179 := algebra.leftfetchjoin(X_121,X_105); + X_122:bat[:oid,:str] := algebra.leftfetchjoinPath(X_179,X_52,X_36); + X_123:bat[:oid,:str] := batstr.substring(X_122,A0,A1); + (X_124,r1_175,r2_175) := group.subgroupdone(X_123); + X_127 := algebra.leftfetchjoin(r1_175,X_123); + X_133:bat[:oid,:wrd] := aggr.subcount(X_124,X_124,r1_175,false); + X_135:bat[:oid,:lng] := algebra.leftfetchjoin(X_179,X_73); + X_136:bat[:oid,:lng] := aggr.subsum(X_135,X_124,r1_175,true,true); + (X_128,r1_179,r2_179) := algebra.subsort(X_127,false,false); + X_132 := algebra.leftfetchjoin(r1_179,X_127); + X_138 := algebra.leftfetchjoin(r1_179,X_136); + X_134 := algebra.leftfetchjoin(r1_179,X_133); + X_139 := sql.resultSet(3,1,X_132); + sql.rsColumn(X_139,"sys.custsale","cntrycode","varchar",15,0,X_132); + sql.rsColumn(X_139,"sys.L2","numcust","wrd",32,0,X_134); + sql.rsColumn(X_139,"sys.L3","totacctbal","decimal",15,2,X_138); + X_158 := io.stdout(); + sql.exportResult(X_158,X_139); end s2_1; # querylog.define("explain select\n\tcntrycode,\n\tcount(*) as numcust,\n\tsum(c_acctbal) as totacctbal\nfrom\n\t(\n\t\tselect\n\t\t\tsubstring(c_phone from 1 for 2) as cntrycode,\n\t\t\tc_acctbal\n\t\tfrom\n\t\t\tcustomer\n\t\twhere\n\t\t\tsubstring(c_phone from 1 for 2) in\n\t\t\t\t(\\'13\\', \\'31\\', \\'23\\', \\'29\\', \\'30\\', \\'18\\', \\'17\\')\n\t\t\tand c_acctbal > (\n\t\t\t\tselect\n\t\t\t\t\tavg(c_acctbal)\n\t\t\t\tfrom\n\t\t\t\t\tcustomer\n\t\t\t\twhere\n\t\t\t\t\tc_acctbal > 0.00\n\t\t\t\t\tand substring(c_phone from 1 for 2) in\n\t\t\t\t\t\t(\\'13\\', \\'31\\', \\'23\\', \\'29\\', \\'30\\', \\'18\\', \\'17\\')\n\t\t\t)\n\t\t\tand not exists (\n\t\t\t\tselect\n\t\t\t\t\t*\n\t\t\t\tfrom\n\t\t\t\t\torders\n\t\t\t\twhere\n\t\t\t\t\to_custkey = c_custkey\n\t\t\t)\n\t) as custsale\ngroup by\n\tcntrycode\norder by\n\tcntrycode;","sequential_pipe") _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list