Changeset: 832ce13a58b9 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=832ce13a58b9 Modified Files: sql/benchmarks/tpch/Tests/16-explain.stable.out.32bit sql/benchmarks/tpch/Tests/20-explain.stable.out.32bit Branch: int128 Log Message:
Merge with default branch. diffs (truncated from 466 to 300 lines): diff --git a/sql/benchmarks/tpch/Tests/16-explain.stable.out.32bit b/sql/benchmarks/tpch/Tests/16-explain.stable.out.32bit --- a/sql/benchmarks/tpch/Tests/16-explain.stable.out.32bit +++ b/sql/benchmarks/tpch/Tests/16-explain.stable.out.32bit @@ -63,94 +63,94 @@ Ready. function user.s2_1{autoCommit=true}(A0:str,A1:str,A2:int,A3:int,A4:int,A5:int,A6:int,A7:int,A8:int,A9:int,A10:str):void; X_13 := sql.mvc(); X_14:bat[:oid,:oid] := sql.tid(X_13,"sys","partsupp"); - X_17 := sql.bind_idxbat(X_13,"sys","partsupp","partsupp_ps_partkey_fkey",0); - (X_20,r1_20) := sql.bind_idxbat(X_13,"sys","partsupp","partsupp_ps_partkey_fkey",2); - X_23 := sql.bind_idxbat(X_13,"sys","partsupp","partsupp_ps_partkey_fkey",1); + X_17 := sql.bind(X_13,"sys","partsupp","ps_suppkey",0); + (X_20,r1_20) := sql.bind(X_13,"sys","partsupp","ps_suppkey",2); + X_23 := sql.bind(X_13,"sys","partsupp","ps_suppkey",1); X_25 := sql.delta(X_17,X_20,r1_20,X_23); X_26 := algebra.leftfetchjoin(X_14,X_25); - X_27:bat[:oid,:oid] := sql.tid(X_13,"sys","part"); - X_29 := sql.bind(X_13,"sys","part","p_size",0); - (X_31,r1_31) := sql.bind(X_13,"sys","part","p_size",2); - X_33 := sql.bind(X_13,"sys","part","p_size",1); - X_34 := sql.delta(X_29,X_31,r1_31,X_33); - X_35 := algebra.leftfetchjoin(X_27,X_34); - X_36 := sql.bind(X_13,"sys","part","p_type",0); - (X_38,r1_39) := sql.bind(X_13,"sys","part","p_type",2); - X_40 := sql.bind(X_13,"sys","part","p_type",1); - X_41 := sql.delta(X_36,X_38,r1_39,X_40); - X_42 := algebra.leftfetchjoin(X_27,X_41); - X_44 := sql.bind(X_13,"sys","part","p_brand",0); - (X_47,r1_50) := sql.bind(X_13,"sys","part","p_brand",2); - X_49 := sql.bind(X_13,"sys","part","p_brand",1); - X_50 := sql.delta(X_44,X_47,r1_50,X_49); - X_51 := algebra.leftfetchjoin(X_27,X_50); - X_52 := algebra.subselect(X_51,A0,A0,true,true,true); - X_54 := algebra.likesubselect(X_42,X_52,A1,"",true); - X_55 := algebra.subselect(X_35,X_54,A2,A2,true,true,false); - X_57 := algebra.subselect(X_35,X_54,A3,A3,true,true,false); - X_58 := bat.mergecand(X_55,X_57); - X_59 := algebra.subselect(X_35,X_54,A4,A4,true,true,false); - X_60 := bat.mergecand(X_58,X_59); - X_61 := algebra.subselect(X_35,X_54,A5,A5,true,true,false); - X_62 := bat.mergecand(X_60,X_61); - X_63 := algebra.subselect(X_35,X_54,A6,A6,true,true,false); - X_64 := bat.mergecand(X_62,X_63); - X_65 := algebra.subselect(X_35,X_54,A7,A7,true,true,false); - X_66 := bat.mergecand(X_64,X_65); - X_67 := algebra.subselect(X_35,X_54,A8,A8,true,true,false); - X_68 := bat.mergecand(X_66,X_67); - X_69 := algebra.subselect(X_35,X_54,A9,A9,true,true,false); - X_70 := bat.mergecand(X_68,X_69); - X_71 := algebra.leftfetchjoin(X_70,X_27); - (X_72,r1_83) := algebra.join(X_26,X_71); - X_74 := sql.bind(X_13,"sys","partsupp","ps_suppkey",0); - (X_79,r1_90) := sql.bind(X_13,"sys","partsupp","ps_suppkey",2); - X_82 := sql.bind(X_13,"sys","partsupp","ps_suppkey",1); - X_84 := sql.delta(X_74,X_79,r1_90,X_82); - X_85:bat[:oid,:int] := algebra.leftfetchjoinPath(X_72,X_14,X_84); - X_86 := bat.mirror(X_85); - X_87:bat[:oid,:oid] := sql.tid(X_13,"sys","supplier"); - X_89 := sql.bind(X_13,"sys","supplier","s_comment",0); - (X_91,r1_103) := sql.bind(X_13,"sys","supplier","s_comment",2); - X_93 := sql.bind(X_13,"sys","supplier","s_comment",1); - X_94 := sql.delta(X_89,X_91,r1_103,X_93); - X_95 := algebra.leftfetchjoin(X_87,X_94); - X_97 := algebra.likesubselect(X_95,A10,"",false); - X_99 := sql.bind(X_13,"sys","supplier","s_suppkey",0); - (X_101,r1_115) := sql.bind(X_13,"sys","supplier","s_suppkey",2); - X_103 := sql.bind(X_13,"sys","supplier","s_suppkey",1); - X_104 := sql.delta(X_99,X_101,r1_115,X_103); - X_105:bat[:oid,:int] := algebra.leftfetchjoinPath(X_97,X_87,X_104); - (X_106,r1_121) := algebra.join(X_85,X_105); - X_108 := algebra.tdiff(X_86,X_106); - X_206 := algebra.leftfetchjoin(X_108,r1_83); - X_109:bat[:oid,:str] := algebra.leftfetchjoinPath(X_206,X_70,X_42); - X_110:bat[:oid,:str] := algebra.leftfetchjoinPath(X_206,X_70,X_51); - X_111:bat[:oid,:int] := algebra.leftfetchjoinPath(X_206,X_70,X_35); - X_112 := algebra.leftfetchjoin(X_108,X_85); - (X_113,r1_134,r2_134) := group.subgroup(X_112); - (X_116,r1_137,r2_137) := group.subgroup(X_111,X_113); - (X_119,r1_140,r2_140) := group.subgroup(X_110,X_116); - (X_122,r1_143,r2_143) := group.subgroupdone(X_109,X_119); - X_125 := algebra.leftfetchjoin(r1_143,X_109); - X_126 := algebra.leftfetchjoin(r1_143,X_110); - X_127 := algebra.leftfetchjoin(r1_143,X_111); - X_140 := algebra.leftfetchjoin(r1_143,X_112); - (X_128,r1_149,r2_149) := group.subgroup(X_127); - (X_131,r1_152,r2_152) := group.subgroup(X_126,X_128); - (X_134,r1_155,r2_155) := group.subgroupdone(X_125,X_131); - X_137 := algebra.leftfetchjoin(r1_155,X_127); - X_138 := algebra.leftfetchjoin(r1_155,X_125); - X_139 := algebra.leftfetchjoin(r1_155,X_126); - X_141:bat[:oid,:wrd] := aggr.subcount(X_140,X_134,r1_155,true); - (X_143,r1_164,r2_164) := algebra.subsort(X_141,true,false); - (X_147,r1_168,r2_168) := algebra.subsort(X_139,r1_164,r2_164,false,false); - (X_150,r1_171,r2_171) := algebra.subsort(X_138,r1_168,r2_168,false,false); - (X_153,r1_174,r2_174) := algebra.subsort(X_137,r1_171,r2_171,false,false); - X_156 := algebra.leftfetchjoin(r1_174,X_139); - X_159 := algebra.leftfetchjoin(r1_174,X_141); - X_158 := algebra.leftfetchjoin(r1_174,X_137); - X_157 := algebra.leftfetchjoin(r1_174,X_138); + X_27 := bat.mirror(X_26); + X_28:bat[:oid,:oid] := sql.tid(X_13,"sys","supplier"); + X_30 := sql.bind(X_13,"sys","supplier","s_comment",0); + (X_32,r1_32) := sql.bind(X_13,"sys","supplier","s_comment",2); + X_34 := sql.bind(X_13,"sys","supplier","s_comment",1); + X_35 := sql.delta(X_30,X_32,r1_32,X_34); + X_36 := algebra.leftfetchjoin(X_28,X_35); + X_38 := algebra.likesubselect(X_36,A10,"",false); + X_40 := sql.bind(X_13,"sys","supplier","s_suppkey",0); + (X_42,r1_44) := sql.bind(X_13,"sys","supplier","s_suppkey",2); + X_44 := sql.bind(X_13,"sys","supplier","s_suppkey",1); + X_45 := sql.delta(X_40,X_42,r1_44,X_44); + X_46:bat[:oid,:int] := algebra.leftfetchjoinPath(X_38,X_28,X_45); + (X_47,r1_50) := algebra.join(X_26,X_46); + X_49 := algebra.tdiff(X_27,X_47); + X_50 := sql.bind_idxbat(X_13,"sys","partsupp","partsupp_ps_partkey_fkey",0); + (X_55,r1_58) := sql.bind_idxbat(X_13,"sys","partsupp","partsupp_ps_partkey_fkey",2); + X_58 := sql.bind_idxbat(X_13,"sys","partsupp","partsupp_ps_partkey_fkey",1); + X_60 := sql.delta(X_50,X_55,r1_58,X_58); + X_61:bat[:oid,:oid] := algebra.leftfetchjoinPath(X_49,X_14,X_60); + X_62:bat[:oid,:oid] := sql.tid(X_13,"sys","part"); + X_64 := sql.bind(X_13,"sys","part","p_size",0); + (X_66,r1_70) := sql.bind(X_13,"sys","part","p_size",2); + X_68 := sql.bind(X_13,"sys","part","p_size",1); + X_69 := sql.delta(X_64,X_66,r1_70,X_68); + X_70 := algebra.leftfetchjoin(X_62,X_69); + X_71 := sql.bind(X_13,"sys","part","p_type",0); + (X_73,r1_78) := sql.bind(X_13,"sys","part","p_type",2); + X_75 := sql.bind(X_13,"sys","part","p_type",1); + X_76 := sql.delta(X_71,X_73,r1_78,X_75); + X_77 := algebra.leftfetchjoin(X_62,X_76); + X_79 := sql.bind(X_13,"sys","part","p_brand",0); + (X_82,r1_89) := sql.bind(X_13,"sys","part","p_brand",2); + X_84 := sql.bind(X_13,"sys","part","p_brand",1); + X_85 := sql.delta(X_79,X_82,r1_89,X_84); + X_86 := algebra.leftfetchjoin(X_62,X_85); + X_87 := algebra.subselect(X_86,A0,A0,true,true,true); + X_89 := algebra.likesubselect(X_77,X_87,A1,"",true); + X_90 := algebra.subselect(X_70,X_89,A2,A2,true,true,false); + X_92 := algebra.subselect(X_70,X_89,A3,A3,true,true,false); + X_93 := bat.mergecand(X_90,X_92); + X_94 := algebra.subselect(X_70,X_89,A4,A4,true,true,false); + X_95 := bat.mergecand(X_93,X_94); + X_96 := algebra.subselect(X_70,X_89,A5,A5,true,true,false); + X_97 := bat.mergecand(X_95,X_96); + X_98 := algebra.subselect(X_70,X_89,A6,A6,true,true,false); + X_99 := bat.mergecand(X_97,X_98); + X_100 := algebra.subselect(X_70,X_89,A7,A7,true,true,false); + X_101 := bat.mergecand(X_99,X_100); + X_102 := algebra.subselect(X_70,X_89,A8,A8,true,true,false); + X_103 := bat.mergecand(X_101,X_102); + X_104 := algebra.subselect(X_70,X_89,A9,A9,true,true,false); + X_105 := bat.mergecand(X_103,X_104); + X_106 := algebra.leftfetchjoin(X_105,X_62); + (X_107,r1_122) := algebra.join(X_61,X_106); + X_206 := algebra.leftfetchjoin(r1_122,X_105); + X_109:bat[:oid,:str] := algebra.leftfetchjoin(X_206,X_77); + X_110:bat[:oid,:str] := algebra.leftfetchjoin(X_206,X_86); + X_111:bat[:oid,:int] := algebra.leftfetchjoin(X_206,X_70); + X_112:bat[:oid,:int] := algebra.leftfetchjoinPath(X_107,X_49,X_26); + (X_113,r1_132,r2_132) := group.subgroup(X_112); + (X_116,r1_135,r2_135) := group.subgroup(X_111,X_113); + (X_119,r1_138,r2_138) := group.subgroup(X_110,X_116); + (X_122,r1_141,r2_141) := group.subgroupdone(X_109,X_119); + X_125 := algebra.leftfetchjoin(r1_141,X_109); + X_126 := algebra.leftfetchjoin(r1_141,X_110); + X_127 := algebra.leftfetchjoin(r1_141,X_111); + X_140 := algebra.leftfetchjoin(r1_141,X_112); + (X_128,r1_147,r2_147) := group.subgroup(X_127); + (X_131,r1_150,r2_150) := group.subgroup(X_126,X_128); + (X_134,r1_153,r2_153) := group.subgroupdone(X_125,X_131); + X_137 := algebra.leftfetchjoin(r1_153,X_127); + X_138 := algebra.leftfetchjoin(r1_153,X_125); + X_139 := algebra.leftfetchjoin(r1_153,X_126); + X_141:bat[:oid,:wrd] := aggr.subcount(X_140,X_134,r1_153,true); + (X_143,r1_162,r2_162) := algebra.subsort(X_141,true,false); + (X_147,r1_166,r2_166) := algebra.subsort(X_139,r1_162,r2_162,false,false); + (X_150,r1_169,r2_169) := algebra.subsort(X_138,r1_166,r2_166,false,false); + (X_153,r1_172,r2_172) := algebra.subsort(X_137,r1_169,r2_169,false,false); + X_156 := algebra.leftfetchjoin(r1_172,X_139); + X_159 := algebra.leftfetchjoin(r1_172,X_141); + X_158 := algebra.leftfetchjoin(r1_172,X_137); + X_157 := algebra.leftfetchjoin(r1_172,X_138); X_160 := sql.resultSet(4,1,X_156); sql.rsColumn(X_160,"sys.part","p_brand","varchar",10,0,X_156); sql.rsColumn(X_160,"sys.part","p_type","varchar",25,0,X_157); 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 @@ -67,145 +67,141 @@ Ready. function user.s2_1{autoCommit=true}(A0:str,A1:bte,A2:date,A3:date,A4:int,A5:str):void; X_8 := sql.mvc(); X_9:bat[:oid,:oid] := sql.tid(X_8,"sys","supplier"); - X_12 := sql.bind(X_8,"sys","supplier","s_nationkey",0); - (X_15,r1_15) := sql.bind(X_8,"sys","supplier","s_nationkey",2); - X_18 := sql.bind(X_8,"sys","supplier","s_nationkey",1); + X_12 := sql.bind(X_8,"sys","supplier","s_suppkey",0); + (X_15,r1_15) := sql.bind(X_8,"sys","supplier","s_suppkey",2); + X_18 := sql.bind(X_8,"sys","supplier","s_suppkey",1); X_20 := sql.delta(X_12,X_15,r1_15,X_18); X_21 := algebra.leftfetchjoin(X_9,X_20); - X_22:bat[:oid,:oid] := sql.tid(X_8,"sys","nation"); - X_24 := sql.bind(X_8,"sys","nation","n_name",0); - (X_26,r1_26) := sql.bind(X_8,"sys","nation","n_name",2); - X_28 := sql.bind(X_8,"sys","nation","n_name",1); - X_29 := sql.delta(X_24,X_26,r1_26,X_28); - X_30 := algebra.leftfetchjoin(X_22,X_29); - X_31 := algebra.subselect(X_30,A5,A5,true,true,false); - X_33 := sql.bind(X_8,"sys","nation","n_nationkey",0); - (X_35,r1_36) := sql.bind(X_8,"sys","nation","n_nationkey",2); - X_37 := sql.bind(X_8,"sys","nation","n_nationkey",1); - X_38 := sql.delta(X_33,X_35,r1_36,X_37); - X_39:bat[:oid,:int] := algebra.leftfetchjoinPath(X_31,X_22,X_38); - (X_40,r1_42) := algebra.join(X_21,X_39); - X_284 := algebra.leftfetchjoin(X_40,X_9); - X_42 := sql.bind(X_8,"sys","supplier","s_suppkey",0); - (X_47,r1_49) := sql.bind(X_8,"sys","supplier","s_suppkey",2); - X_50 := sql.bind(X_8,"sys","supplier","s_suppkey",1); - X_52 := sql.delta(X_42,X_47,r1_49,X_50); - X_53:bat[:oid,:int] := algebra.leftfetchjoin(X_284,X_52); - X_54 := bat.mirror(X_53); - X_55:bat[:oid,:oid] := sql.tid(X_8,"sys","partsupp"); - X_57 := sql.bind(X_8,"sys","partsupp","ps_partkey",0); - (X_59,r1_62) := sql.bind(X_8,"sys","partsupp","ps_partkey",2); - X_61 := sql.bind(X_8,"sys","partsupp","ps_partkey",1); - X_62 := sql.delta(X_57,X_59,r1_62,X_61); - X_63 := algebra.leftfetchjoin(X_55,X_62); - X_64 := bat.mirror(X_63); - X_65:bat[:oid,:oid] := sql.tid(X_8,"sys","part"); - X_67 := sql.bind(X_8,"sys","part","p_name",0); - (X_69,r1_72) := sql.bind(X_8,"sys","part","p_name",2); - X_71 := sql.bind(X_8,"sys","part","p_name",1); - X_72 := sql.delta(X_67,X_69,r1_72,X_71); - X_73 := algebra.leftfetchjoin(X_65,X_72); - X_75 := algebra.likesubselect(X_73,A0,"",false); - X_77 := sql.bind(X_8,"sys","part","p_partkey",0); - (X_81,r1_86) := sql.bind(X_8,"sys","part","p_partkey",2); - X_84 := sql.bind(X_8,"sys","part","p_partkey",1); - X_86 := sql.delta(X_77,X_81,r1_86,X_84); - X_87:bat[:oid,:int] := algebra.leftfetchjoinPath(X_75,X_65,X_86); - (X_88,r1_94) := algebra.join(X_63,X_87); - X_90 := algebra.tinter(X_64,X_88); - X_285 := algebra.leftfetchjoin(X_90,X_55); - X_91 := sql.bind_idxbat(X_8,"sys","partsupp","partsupp_ps_partkey_ps_suppkey_pkey",0); - (X_94,r1_100) := sql.bind_idxbat(X_8,"sys","partsupp","partsupp_ps_partkey_ps_suppkey_pkey",2); - X_96 := sql.bind_idxbat(X_8,"sys","partsupp","partsupp_ps_partkey_ps_suppkey_pkey",1); - X_97 := sql.delta(X_91,X_94,r1_100,X_96); - X_98:bat[:oid,:wrd] := algebra.leftfetchjoin(X_285,X_97); - X_99:bat[:oid,:oid] := sql.tid(X_8,"sys","lineitem"); - X_101 := sql.bind(X_8,"sys","lineitem","l_shipdate",0); - (X_103,r1_110) := sql.bind(X_8,"sys","lineitem","l_shipdate",2); - X_105 := sql.bind(X_8,"sys","lineitem","l_shipdate",1); - X_106 := sql.delta(X_101,X_103,r1_110,X_105); - X_107 := algebra.leftfetchjoin(X_99,X_106); - X_108 := mtime.addmonths(A3,A4); - X_109 := algebra.subselect(X_107,A2,X_108,true,false,false); - X_286 := algebra.leftfetchjoin(X_109,X_99); - X_112 := sql.bind(X_8,"sys","lineitem","l_partkey",0); - (X_116,r1_126) := sql.bind(X_8,"sys","lineitem","l_partkey",2); - X_119 := sql.bind(X_8,"sys","lineitem","l_partkey",1); - X_121 := sql.delta(X_112,X_116,r1_126,X_119); - X_122:bat[:oid,:int] := algebra.leftfetchjoin(X_286,X_121); - X_123:bat[:oid,:wrd] := mal.manifold("mkey","hash",X_122); - X_127 := sql.bind(X_8,"sys","lineitem","l_suppkey",0); - (X_130,r1_142) := sql.bind(X_8,"sys","lineitem","l_suppkey",2); - X_132 := sql.bind(X_8,"sys","lineitem","l_suppkey",1); - X_133 := sql.delta(X_127,X_130,r1_142,X_132); - X_134:bat[:oid,:int] := algebra.leftfetchjoin(X_286,X_133); - X_135:bat[:oid,:wrd] := mkey.bulk_rotate_xor_hash(X_123,11,X_134); - (X_136,r1_149) := algebra.join(X_98,X_135); - X_138 := algebra.leftfetchjoin(X_90,X_63); - X_139 := algebra.leftfetchjoin(X_136,X_138); - X_140 := algebra.leftfetchjoin(r1_149,X_122); - X_141:bat[:oid,:bit] := batcalc.==(X_139,X_140); - X_143 := algebra.subselect(X_141,true,true,true,true,false); - X_145 := algebra.leftfetchjoin(X_143,X_136); - X_146 := sql.bind(X_8,"sys","partsupp","ps_suppkey",0); - (X_151,r1_167) := sql.bind(X_8,"sys","partsupp","ps_suppkey",2); - X_154 := sql.bind(X_8,"sys","partsupp","ps_suppkey",1); - X_156 := sql.delta(X_146,X_151,r1_167,X_154); - X_157:bat[:oid,:int] := algebra.leftfetchjoin(X_285,X_156); - X_158 := algebra.leftfetchjoin(X_145,X_157); - X_159 := algebra.leftfetchjoin(X_143,r1_149); - X_160 := algebra.leftfetchjoin(X_159,X_134); - X_161:bat[:oid,:bit] := batcalc.==(X_158,X_160); - X_162 := algebra.subselect(X_161,true,true,true,true,false); - X_163 := algebra.leftfetchjoin(X_162,X_145); - X_164:bat[:oid,:oid] := batcalc.identity(X_138); - X_165 := algebra.leftfetchjoin(X_163,X_164); - (X_166,r1_185,r2_185) := group.subgroupdone(X_165); - X_287 := algebra.leftfetchjoin(r1_185,X_163); - X_182 := sql.bind(X_8,"sys","lineitem","l_quantity",0); - (X_187,r1_213) := sql.bind(X_8,"sys","lineitem","l_quantity",2); - X_189 := sql.bind(X_8,"sys","lineitem","l_quantity",1); - X_190 := sql.delta(X_182,X_187,r1_213,X_189); - X_191:bat[:oid,:int] := algebra.leftfetchjoinPath(X_162,X_159,X_286,X_190); - X_192:bat[:oid,:lng] := aggr.subsum(X_191,X_166,r1_185,true,true); - X_169 := sql.bind(X_8,"sys","partsupp","ps_availqty",0); - (X_171,r1_190) := sql.bind(X_8,"sys","partsupp","ps_availqty",2); - X_173 := sql.bind(X_8,"sys","partsupp","ps_availqty",1); - X_174 := sql.delta(X_169,X_171,r1_190,X_173); - X_175:bat[:oid,:int] := algebra.leftfetchjoinPath(X_287,X_90,X_55,X_174); _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list