Changeset: ec90bb7a5eb3 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ec90bb7a5eb3 Modified Files: sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit sql/benchmarks/tpch/Tests/04-explain.stable.out.32bit sql/benchmarks/tpch/Tests/05-explain.stable.out.32bit sql/benchmarks/tpch/Tests/13-explain.stable.out.32bit sql/benchmarks/tpch/Tests/16-explain.stable.out.32bit sql/benchmarks/tpch/Tests/20-explain.stable.out.32bit sql/benchmarks/tpch/Tests/21-explain.stable.out.32bit sql/benchmarks/tpch/Tests/22-explain.stable.out.32bit Branch: default Log Message:
Approved 32 bit output. diffs (truncated from 1488 to 300 lines): diff --git a/sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit b/sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit --- a/sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit +++ b/sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit @@ -52,72 +52,72 @@ Ready. % clob # type % 623 # length function user.s2_1{autoCommit=true}(A0:bte,A1:bte,A2:bte,A3:date,A4:lng):void; - X_208:void := querylog.define("explain select\n\tl_returnflag,\n\tl_linestatus,\n\tsum(l_quantity) as sum_qty,\n\tsum(l_extendedprice) as sum_base_price,\n\tsum(l_extendedprice * (1 - l_discount)) as sum_disc_price,\n\tsum(l_extendedprice * (1 - l_discount) * (1 + l_tax)) as sum_charge,\n\tavg(l_quantity) as avg_qty,\n\tavg(l_extendedprice) as avg_price,\n\tavg(l_discount) as avg_disc,\n\tcount(*) as count_order\nfrom\n\tlineitem\nwhere\n\tl_shipdate <= date \\'1998-12-01\\' - interval \\'90\\' day (3)\ngroup by\n\tl_returnflag,\n\tl_linestatus\norder by\n\tl_returnflag,\n\tl_linestatus;","sequential_pipe",129); - X_118 := bat.new(nil:oid,nil:str); - X_126 := bat.append(X_118,"sys.lineitem"); - X_136 := bat.append(X_126,"sys.lineitem"); - X_142 := bat.append(X_136,"sys.L1"); - X_152 := bat.append(X_142,"sys.L2"); - X_159 := bat.append(X_152,"sys.L3"); - X_167 := bat.append(X_159,"sys.L4"); - X_175 := bat.append(X_167,"sys.L5"); - X_185 := bat.append(X_175,"sys.L6"); - X_192 := bat.append(X_185,"sys.L7"); - X_199 := bat.append(X_192,"sys.L10"); - X_121 := bat.new(nil:oid,nil:str); - X_128 := bat.append(X_121,"l_returnflag"); - X_137 := bat.append(X_128,"l_linestatus"); - X_144 := bat.append(X_137,"sum_qty"); - X_154 := bat.append(X_144,"sum_base_price"); - X_161 := bat.append(X_154,"sum_disc_price"); - X_169 := bat.append(X_161,"sum_charge"); - X_177 := bat.append(X_169,"avg_qty"); - X_187 := bat.append(X_177,"avg_price"); - X_194 := bat.append(X_187,"avg_disc"); - X_201 := bat.append(X_194,"count_order"); - X_122 := bat.new(nil:oid,nil:str); - X_130 := bat.append(X_122,"char"); - X_139 := bat.append(X_130,"char"); - X_146 := bat.append(X_139,"decimal"); - X_156 := bat.append(X_146,"decimal"); - X_163 := bat.append(X_156,"decimal"); - X_171 := bat.append(X_163,"decimal"); - X_179 := bat.append(X_171,"double"); - X_189 := bat.append(X_179,"double"); - X_196 := bat.append(X_189,"double"); - X_203 := bat.append(X_196,"wrd"); - X_123 := bat.new(nil:oid,nil:int); - X_132 := bat.append(X_123,1); - X_140 := bat.append(X_132,1); - X_148 := bat.append(X_140,19); - X_157 := bat.append(X_148,19); - X_164 := bat.append(X_157,19); - X_172 := bat.append(X_164,19); - X_181 := bat.append(X_172,53); - X_190 := bat.append(X_181,53); - X_197 := bat.append(X_190,53); - X_205 := bat.append(X_197,32); - X_125 := bat.new(nil:oid,nil:int); - X_134 := bat.append(X_125,0); - X_141 := bat.append(X_134,0); - X_150 := bat.append(X_141,2); - X_158 := bat.append(X_150,2); - X_165 := bat.append(X_158,4); - X_173 := bat.append(X_165,6); - X_183 := bat.append(X_173,0); - X_191 := bat.append(X_183,0); - X_198 := bat.append(X_191,0); - X_207 := bat.append(X_198,0); + X_189:void := querylog.define("explain select\n\tl_returnflag,\n\tl_linestatus,\n\tsum(l_quantity) as sum_qty,\n\tsum(l_extendedprice) as sum_base_price,\n\tsum(l_extendedprice * (1 - l_discount)) as sum_disc_price,\n\tsum(l_extendedprice * (1 - l_discount) * (1 + l_tax)) as sum_charge,\n\tavg(l_quantity) as avg_qty,\n\tavg(l_extendedprice) as avg_price,\n\tavg(l_discount) as avg_disc,\n\tcount(*) as count_order\nfrom\n\tlineitem\nwhere\n\tl_shipdate <= date \\'1998-12-01\\' - interval \\'90\\' day (3)\ngroup by\n\tl_returnflag,\n\tl_linestatus\norder by\n\tl_returnflag,\n\tl_linestatus;","sequential_pipe",129); + X_105 := bat.new(nil:oid,nil:str); + X_113 := bat.append(X_105,"sys.lineitem"); + X_120 := bat.append(X_113,"sys.lineitem"); + X_125 := bat.append(X_120,"sys.L1"); + X_134 := bat.append(X_125,"sys.L2"); + X_141 := bat.append(X_134,"sys.L3"); + X_149 := bat.append(X_141,"sys.L4"); + X_157 := bat.append(X_149,"sys.L5"); + X_166 := bat.append(X_157,"sys.L6"); + X_173 := bat.append(X_166,"sys.L7"); + X_180 := bat.append(X_173,"sys.L10"); + X_108 := bat.new(nil:oid,nil:str); + X_115 := bat.append(X_108,"l_returnflag"); + X_121 := bat.append(X_115,"l_linestatus"); + X_127 := bat.append(X_121,"sum_qty"); + X_136 := bat.append(X_127,"sum_base_price"); + X_143 := bat.append(X_136,"sum_disc_price"); + X_151 := bat.append(X_143,"sum_charge"); + X_159 := bat.append(X_151,"avg_qty"); + X_168 := bat.append(X_159,"avg_price"); + X_175 := bat.append(X_168,"avg_disc"); + X_182 := bat.append(X_175,"count_order"); + X_109 := bat.new(nil:oid,nil:str); + X_116 := bat.append(X_109,"char"); + X_122 := bat.append(X_116,"char"); + X_129 := bat.append(X_122,"decimal"); + X_138 := bat.append(X_129,"decimal"); + X_145 := bat.append(X_138,"decimal"); + X_153 := bat.append(X_145,"decimal"); + X_161 := bat.append(X_153,"double"); + X_170 := bat.append(X_161,"double"); + X_177 := bat.append(X_170,"double"); + X_184 := bat.append(X_177,"wrd"); + X_110 := bat.new(nil:oid,nil:int); + X_118 := bat.append(X_110,1); + X_123 := bat.append(X_118,1); + X_131 := bat.append(X_123,19); + X_139 := bat.append(X_131,19); + X_146 := bat.append(X_139,19); + X_154 := bat.append(X_146,19); + X_163 := bat.append(X_154,53); + X_171 := bat.append(X_163,53); + X_178 := bat.append(X_171,53); + X_186 := bat.append(X_178,32); + X_112 := bat.new(nil:oid,nil:int); + X_119 := bat.append(X_112,0); + X_124 := bat.append(X_119,0); + X_133 := bat.append(X_124,2); + X_140 := bat.append(X_133,2); + X_147 := bat.append(X_140,4); + X_155 := bat.append(X_147,6); + X_165 := bat.append(X_155,0); + X_172 := bat.append(X_165,0); + X_179 := bat.append(X_172,0); + X_188 := bat.append(X_179,0); X_7 := sql.mvc(); X_11:bat[:oid,:date] := sql.bind(X_7,"sys","lineitem","l_shipdate",0); X_8:bat[:oid,:oid] := sql.tid(X_7,"sys","lineitem"); X_19 := mtime.date_sub_msec_interval(A3,A4); - X_227 := algebra.thetasubselect(X_11,X_8,X_19,"<="); + X_215 := algebra.thetasubselect(X_11,X_8,X_19,"<="); (X_14,r1_14) := sql.bind(X_7,"sys","lineitem","l_shipdate",2); - X_228 := algebra.thetasubselect(r1_14,nil:bat[:oid,:oid],X_19,"<="); + X_216 := algebra.thetasubselect(r1_14,nil:bat[:oid,:oid],X_19,"<="); X_17:bat[:oid,:date] := sql.bind(X_7,"sys","lineitem","l_shipdate",1); - X_230 := algebra.thetasubselect(X_17,X_8,X_19,"<="); - X_20 := sql.subdelta(X_227,X_8,X_14,X_228,X_230); + X_218 := algebra.thetasubselect(X_17,X_8,X_19,"<="); + X_20 := sql.subdelta(X_215,X_8,X_14,X_216,X_218); X_22:bat[:oid,:str] := sql.bind(X_7,"sys","lineitem","l_linestatus",0); (X_24,r1_28) := sql.bind(X_7,"sys","lineitem","l_linestatus",2); X_26:bat[:oid,:str] := sql.bind(X_7,"sys","lineitem","l_linestatus",1); @@ -131,54 +131,54 @@ function user.s2_1{autoCommit=true}(A0:b X_40 := algebra.leftfetchjoin(r1_45,X_27); X_41 := algebra.leftfetchjoin(r1_45,X_33); X_51:bat[:oid,:lng] := sql.bind(X_7,"sys","lineitem","l_quantity",0); - (X_56,r1_64) := sql.bind(X_7,"sys","lineitem","l_quantity",2); - X_59:bat[:oid,:lng] := sql.bind(X_7,"sys","lineitem","l_quantity",1); - X_61 := sql.projectdelta(X_20,X_51,X_56,r1_64,X_59); - X_62:bat[:oid,:lng] := aggr.subsum(X_61,X_37,r1_45,true,true); - X_65:bat[:oid,:lng] := sql.bind(X_7,"sys","lineitem","l_extendedprice",0); - (X_67,r1_77) := sql.bind(X_7,"sys","lineitem","l_extendedprice",2); - X_69:bat[:oid,:lng] := sql.bind(X_7,"sys","lineitem","l_extendedprice",1); - X_70 := sql.projectdelta(X_20,X_65,X_67,r1_77,X_69); - X_71:bat[:oid,:lng] := aggr.subsum(X_70,X_37,r1_45,true,true); - X_73 := calc.lng(A0,15,2); - X_75:bat[:oid,:lng] := sql.bind(X_7,"sys","lineitem","l_discount",0); - (X_77,r1_90) := sql.bind(X_7,"sys","lineitem","l_discount",2); - X_79:bat[:oid,:lng] := sql.bind(X_7,"sys","lineitem","l_discount",1); - X_82 := sql.projectdelta(X_20,X_75,X_77,r1_90,X_79); - X_83:bat[:oid,:lng] := batcalc.-(X_73,X_82); - X_84:bat[:oid,:lng] := batcalc.*(X_70,X_83); - X_85:bat[:oid,:lng] := aggr.subsum(X_84,X_37,r1_45,true,true); - X_87 := calc.lng(A1,15,2); - X_89:bat[:oid,:lng] := batcalc.-(X_87,X_82); - X_90:bat[:oid,:lng] := batcalc.*(X_70,X_89); - X_91 := calc.lng(A2,15,2); - X_92:bat[:oid,:lng] := sql.bind(X_7,"sys","lineitem","l_tax",0); - (X_95,r1_115) := sql.bind(X_7,"sys","lineitem","l_tax",2); - X_97:bat[:oid,:lng] := sql.bind(X_7,"sys","lineitem","l_tax",1); - X_99 := sql.projectdelta(X_20,X_92,X_95,r1_115,X_97); - X_100:bat[:oid,:lng] := batcalc.+(X_91,X_99); - X_101:bat[:oid,:lng] := batcalc.*(X_90,X_100); - X_102:bat[:oid,:lng] := aggr.subsum(X_101,X_37,r1_45,true,true); - X_105:bat[:oid,:dbl] := batcalc.dbl(2,X_61); - X_106:bat[:oid,:dbl] := aggr.subavg(X_105,X_37,r1_45,true,true); - X_108:bat[:oid,:dbl] := batcalc.dbl(2,X_70); - X_109:bat[:oid,:dbl] := aggr.subavg(X_108,X_37,r1_45,true,true); - X_111:bat[:oid,:dbl] := batcalc.dbl(2,X_82); - X_112:bat[:oid,:dbl] := aggr.subavg(X_111,X_37,r1_45,true,true); - X_114:bat[:oid,:wrd] := aggr.subcount(X_37,X_37,r1_45,false); + (X_53,r1_62) := sql.bind(X_7,"sys","lineitem","l_quantity",2); + X_55:bat[:oid,:lng] := sql.bind(X_7,"sys","lineitem","l_quantity",1); + X_56 := sql.projectdelta(X_20,X_51,X_53,r1_62,X_55); + X_57:bat[:oid,:lng] := aggr.subsum(X_56,X_37,r1_45,true,true); + X_59:bat[:oid,:lng] := sql.bind(X_7,"sys","lineitem","l_extendedprice",0); + (X_61,r1_74) := sql.bind(X_7,"sys","lineitem","l_extendedprice",2); + X_63:bat[:oid,:lng] := sql.bind(X_7,"sys","lineitem","l_extendedprice",1); + X_64 := sql.projectdelta(X_20,X_59,X_61,r1_74,X_63); + X_65:bat[:oid,:lng] := aggr.subsum(X_64,X_37,r1_45,true,true); + X_67 := calc.lng(A0,15,2); + X_69:bat[:oid,:lng] := sql.bind(X_7,"sys","lineitem","l_discount",0); + (X_71,r1_88) := sql.bind(X_7,"sys","lineitem","l_discount",2); + X_73:bat[:oid,:lng] := sql.bind(X_7,"sys","lineitem","l_discount",1); + X_74 := sql.projectdelta(X_20,X_69,X_71,r1_88,X_73); + X_75:bat[:oid,:lng] := batcalc.-(X_67,X_74); + X_76:bat[:oid,:lng] := batcalc.*(X_64,X_75); + X_77:bat[:oid,:lng] := aggr.subsum(X_76,X_37,r1_45,true,true); + X_79 := calc.lng(A1,15,2); + X_80:bat[:oid,:lng] := batcalc.-(X_79,X_74); + X_81:bat[:oid,:lng] := batcalc.*(X_64,X_80); + X_82 := calc.lng(A2,15,2); + X_83:bat[:oid,:lng] := sql.bind(X_7,"sys","lineitem","l_tax",0); + (X_85,r1_109) := sql.bind(X_7,"sys","lineitem","l_tax",2); + X_87:bat[:oid,:lng] := sql.bind(X_7,"sys","lineitem","l_tax",1); + X_88 := sql.projectdelta(X_20,X_83,X_85,r1_109,X_87); + X_89:bat[:oid,:lng] := batcalc.+(X_82,X_88); + X_90:bat[:oid,:lng] := batcalc.*(X_81,X_89); + X_91:bat[:oid,:lng] := aggr.subsum(X_90,X_37,r1_45,true,true); + X_93:bat[:oid,:dbl] := batcalc.dbl(2,X_56); + X_94:bat[:oid,:dbl] := aggr.subavg(X_93,X_37,r1_45,true,true); + X_96:bat[:oid,:dbl] := batcalc.dbl(2,X_64); + X_97:bat[:oid,:dbl] := aggr.subavg(X_96,X_37,r1_45,true,true); + X_99:bat[:oid,:dbl] := batcalc.dbl(2,X_74); + X_100:bat[:oid,:dbl] := aggr.subavg(X_99,X_37,r1_45,true,true); + X_102:bat[:oid,:wrd] := aggr.subcount(X_37,X_37,r1_45,false); (X_42,r1_50,r2_50) := algebra.subsort(X_41,false,false); - (X_46,r1_54,r2_54) := algebra.subsort(X_40,r1_50,r2_50,false,false); - X_49 := algebra.leftfetchjoin(r1_54,X_41); - X_50 := algebra.leftfetchjoin(r1_54,X_40); - X_64 := algebra.leftfetchjoin(r1_54,X_62); - X_72 := algebra.leftfetchjoin(r1_54,X_71); - X_86 := algebra.leftfetchjoin(r1_54,X_85); - X_104 := algebra.leftfetchjoin(r1_54,X_102); - X_107 := algebra.leftfetchjoin(r1_54,X_106); - X_110 := algebra.leftfetchjoin(r1_54,X_109); - X_113 := algebra.leftfetchjoin(r1_54,X_112); - X_116 := algebra.leftfetchjoin(r1_54,X_114); - sql.resultSet(X_199,X_201,X_203,X_205,X_207,X_49,X_50,X_64,X_72,X_86,X_104,X_107,X_110,X_113,X_116); + (X_46,r1_55,r2_55) := algebra.subsort(X_40,r1_50,r2_50,false,false); + X_49 := algebra.leftfetchjoin(r1_55,X_41); + X_50 := algebra.leftfetchjoin(r1_55,X_40); + X_58 := algebra.leftfetchjoin(r1_55,X_57); + X_66 := algebra.leftfetchjoin(r1_55,X_65); + X_78 := algebra.leftfetchjoin(r1_55,X_77); + X_92 := algebra.leftfetchjoin(r1_55,X_91); + X_95 := algebra.leftfetchjoin(r1_55,X_94); + X_98 := algebra.leftfetchjoin(r1_55,X_97); + X_101 := algebra.leftfetchjoin(r1_55,X_100); + X_103 := algebra.leftfetchjoin(r1_55,X_102); + sql.resultSet(X_180,X_182,X_184,X_186,X_188,X_49,X_50,X_58,X_66,X_78,X_92,X_95,X_98,X_101,X_103); end user.s2_1; # 22:53:25 > diff --git a/sql/benchmarks/tpch/Tests/04-explain.stable.out.32bit b/sql/benchmarks/tpch/Tests/04-explain.stable.out.32bit --- a/sql/benchmarks/tpch/Tests/04-explain.stable.out.32bit +++ b/sql/benchmarks/tpch/Tests/04-explain.stable.out.32bit @@ -52,22 +52,22 @@ Ready. % clob # type % 460 # length function user.s2_1{autoCommit=true}(A0:date,A1:date,A2:int):void; - X_113:void := querylog.define("explain select\n\to_orderpriority,\n\tcount(*) as order_count\nfrom\n\torders\nwhere\n\to_orderdate >= date \\'1993-07-01\\'\n\tand o_orderdate < date \\'1993-07-01\\' + interval \\'3\\' month\n\tand exists (\n\t\tselect\n\t\t\t*\n\t\tfrom\n\t\t\tlineitem\n\t\twhere\n\t\t\tl_orderkey = o_orderkey\n\t\t\tand l_commitdate < l_receiptdate\n\t)\ngroup by\n\to_orderpriority\norder by\n\to_orderpriority;","sequential_pipe",65); - X_87 := bat.new(nil:oid,nil:str); - X_95 := bat.append(X_87,"sys.orders"); - X_104 := bat.append(X_95,"sys.L1"); - X_90 := bat.new(nil:oid,nil:str); - X_97 := bat.append(X_90,"o_orderpriority"); - X_106 := bat.append(X_97,"order_count"); - X_91 := bat.new(nil:oid,nil:str); - X_98 := bat.append(X_91,"char"); - X_108 := bat.append(X_98,"wrd"); - X_92 := bat.new(nil:oid,nil:int); - X_100 := bat.append(X_92,15); - X_110 := bat.append(X_100,32); - X_94 := bat.new(nil:oid,nil:int); - X_102 := bat.append(X_94,0); - X_112 := bat.append(X_102,0); + X_103:void := querylog.define("explain select\n\to_orderpriority,\n\tcount(*) as order_count\nfrom\n\torders\nwhere\n\to_orderdate >= date \\'1993-07-01\\'\n\tand o_orderdate < date \\'1993-07-01\\' + interval \\'3\\' month\n\tand exists (\n\t\tselect\n\t\t\t*\n\t\tfrom\n\t\t\tlineitem\n\t\twhere\n\t\t\tl_orderkey = o_orderkey\n\t\t\tand l_commitdate < l_receiptdate\n\t)\ngroup by\n\to_orderpriority\norder by\n\to_orderpriority;","sequential_pipe",65); + X_78 := bat.new(nil:oid,nil:str); + X_86 := bat.append(X_78,"sys.orders"); + X_94 := bat.append(X_86,"sys.L1"); + X_81 := bat.new(nil:oid,nil:str); + X_88 := bat.append(X_81,"o_orderpriority"); + X_96 := bat.append(X_88,"order_count"); + X_82 := bat.new(nil:oid,nil:str); + X_89 := bat.append(X_82,"char"); + X_98 := bat.append(X_89,"wrd"); + X_83 := bat.new(nil:oid,nil:int); + X_91 := bat.append(X_83,15); + X_100 := bat.append(X_91,32); + X_85 := bat.new(nil:oid,nil:int); + X_93 := bat.append(X_85,0); + X_102 := bat.append(X_93,0); X_5 := sql.mvc(); X_6:bat[:oid,:oid] := sql.tid(X_5,"sys","orders"); X_9:bat[:oid,:date] := sql.bind(X_5,"sys","orders","o_orderdate",0); @@ -78,43 +78,43 @@ function user.s2_1{autoCommit=true}(A0:d X_19 := mtime.addmonths(A1,A2); X_20 := algebra.subselect(X_18,A0,X_19,true,false,false); X_22:bat[:oid,:int] := sql.bind(X_5,"sys","orders","o_orderkey",0); - (X_24,r1_27) := sql.bind(X_5,"sys","orders","o_orderkey",2); + (X_24,r1_28) := sql.bind(X_5,"sys","orders","o_orderkey",2); X_26:bat[:oid,:int] := sql.bind(X_5,"sys","orders","o_orderkey",1); - X_27 := sql.delta(X_22,X_24,r1_27,X_26); + X_27 := sql.delta(X_22,X_24,r1_28,X_26); X_28:bat[:oid,:int] := algebra.leftfetchjoinPath(X_20,X_6,X_27); X_29 := bat.mirror(X_28); X_30:bat[:oid,:oid] := sql.tid(X_5,"sys","lineitem"); X_32:bat[:oid,:date] := sql.bind(X_5,"sys","lineitem","l_commitdate",0); - (X_34,r1_38) := sql.bind(X_5,"sys","lineitem","l_commitdate",2); - X_37:bat[:oid,:date] := sql.bind(X_5,"sys","lineitem","l_commitdate",1); - X_38 := sql.delta(X_32,X_34,r1_38,X_37); - X_39 := algebra.leftfetchjoin(X_30,X_38); - X_40:bat[:oid,:date] := sql.bind(X_5,"sys","lineitem","l_receiptdate",0); - (X_43,r1_47) := sql.bind(X_5,"sys","lineitem","l_receiptdate",2); - X_46:bat[:oid,:date] := sql.bind(X_5,"sys","lineitem","l_receiptdate",1); _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list