Changeset: 6d8ce9c282f4 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6d8ce9c282f4 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/20-explain.stable.out.32bit sql/benchmarks/tpch/Tests/22-explain.stable.out.32bit Branch: default Log Message:
Approved 32 bit output. diffs (truncated from 615 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 @@ -110,41 +110,41 @@ function user.s2_1{autoCommit=true}(A0:b 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"); + C_8:bat[:oid,:oid] := sql.tid(X_7,"sys","lineitem"); X_19 := mtime.date_sub_msec_interval(A3,A4); - X_215 := algebra.thetasubselect(X_11,X_8,X_19,"<="); - (X_14,r1_14) := sql.bind(X_7,"sys","lineitem","l_shipdate",2); - X_216 := algebra.thetasubselect(r1_14,nil:bat[:oid,:oid],X_19,"<="); + C_212 := algebra.thetasubselect(X_11,C_8,X_19,"<="); + (C_14,r1_14) := sql.bind(X_7,"sys","lineitem","l_shipdate",2); + C_213 := 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_218 := algebra.thetasubselect(X_17,X_8,X_19,"<="); - X_20 := sql.subdelta(X_215,X_8,X_14,X_216,X_218); + C_215 := algebra.thetasubselect(X_17,C_8,X_19,"<="); + C_20 := sql.subdelta(C_212,C_8,C_14,C_213,C_215); 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); + (C_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); - X_27 := sql.projectdelta(X_20,X_22,X_24,r1_28,X_26); + X_27 := sql.projectdelta(C_20,X_22,C_24,r1_28,X_26); X_28:bat[:oid,:str] := sql.bind(X_7,"sys","lineitem","l_returnflag",0); - (X_30,r1_36) := sql.bind(X_7,"sys","lineitem","l_returnflag",2); + (C_30,r1_36) := sql.bind(X_7,"sys","lineitem","l_returnflag",2); X_32:bat[:oid,:str] := sql.bind(X_7,"sys","lineitem","l_returnflag",1); - X_33 := sql.projectdelta(X_20,X_28,X_30,r1_36,X_32); + X_33 := sql.projectdelta(C_20,X_28,C_30,r1_36,X_32); (X_34,r1_42,r2_42) := group.subgroup(X_33); (X_37,r1_45,r2_45) := group.subgroupdone(X_27,X_34); 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_53,r1_62) := sql.bind(X_7,"sys","lineitem","l_quantity",2); + (C_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_56 := sql.projectdelta(C_20,X_51,C_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); + (C_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_64 := sql.projectdelta(C_20,X_59,C_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); + (C_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_74 := sql.projectdelta(C_20,X_69,C_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); @@ -153,9 +153,9 @@ function user.s2_1{autoCommit=true}(A0:b 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); + (C_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_88 := sql.projectdelta(C_20,X_83,C_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); 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 @@ -69,45 +69,45 @@ function user.s2_1{autoCommit=true}(A0:d 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"); + C_6:bat[:oid,:oid] := sql.tid(X_5,"sys","orders"); X_9:bat[:oid,:date] := sql.bind(X_5,"sys","orders","o_orderdate",0); - (X_12,r1_12) := sql.bind(X_5,"sys","orders","o_orderdate",2); + (C_12,r1_12) := sql.bind(X_5,"sys","orders","o_orderdate",2); X_15:bat[:oid,:date] := sql.bind(X_5,"sys","orders","o_orderdate",1); - X_17 := sql.delta(X_9,X_12,r1_12,X_15); - X_18 := algebra.leftfetchjoin(X_6,X_17); + X_17 := sql.delta(X_9,C_12,r1_12,X_15); + X_18 := algebra.leftfetchjoin(C_6,X_17); X_19 := mtime.addmonths(A1,A2); - X_20 := algebra.subselect(X_18,A0,X_19,true,false,false); + C_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_28) := sql.bind(X_5,"sys","orders","o_orderkey",2); + (C_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_28,X_26); - X_28:bat[:oid,:int] := algebra.leftfetchjoinPath(X_20,X_6,X_27); + X_27 := sql.delta(X_22,C_24,r1_28,X_26); + X_28:bat[:oid,:int] := algebra.leftfetchjoinPath(C_20,C_6,X_27); X_29 := bat.mirror(X_28); - X_30:bat[:oid,:oid] := sql.tid(X_5,"sys","lineitem"); + C_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_39) := sql.bind(X_5,"sys","lineitem","l_commitdate",2); + (C_34,r1_39) := sql.bind(X_5,"sys","lineitem","l_commitdate",2); X_36:bat[:oid,:date] := sql.bind(X_5,"sys","lineitem","l_commitdate",1); - X_37 := sql.delta(X_32,X_34,r1_39,X_36); - X_38 := algebra.leftfetchjoin(X_30,X_37); + X_37 := sql.delta(X_32,C_34,r1_39,X_36); + X_38 := algebra.leftfetchjoin(C_30,X_37); X_39:bat[:oid,:date] := sql.bind(X_5,"sys","lineitem","l_receiptdate",0); - (X_41,r1_46) := sql.bind(X_5,"sys","lineitem","l_receiptdate",2); + (C_41,r1_46) := sql.bind(X_5,"sys","lineitem","l_receiptdate",2); X_43:bat[:oid,:date] := sql.bind(X_5,"sys","lineitem","l_receiptdate",1); - X_44 := sql.delta(X_39,X_41,r1_46,X_43); - X_45 := algebra.leftfetchjoin(X_30,X_44); + X_44 := sql.delta(X_39,C_41,r1_46,X_43); + X_45 := algebra.leftfetchjoin(C_30,X_44); X_46:bat[:oid,:bit] := batcalc.<(X_38,X_45); - X_47 := algebra.subselect(X_46,true,true,true,true,false); + C_47 := algebra.subselect(X_46,true,true,true,true,false); X_48:bat[:oid,:int] := sql.bind(X_5,"sys","lineitem","l_orderkey",0); - (X_50,r1_59) := sql.bind(X_5,"sys","lineitem","l_orderkey",2); + (C_50,r1_59) := sql.bind(X_5,"sys","lineitem","l_orderkey",2); X_52:bat[:oid,:int] := sql.bind(X_5,"sys","lineitem","l_orderkey",1); - X_53 := sql.delta(X_48,X_50,r1_59,X_52); - X_54:bat[:oid,:int] := algebra.leftfetchjoinPath(X_47,X_30,X_53); + X_53 := sql.delta(X_48,C_50,r1_59,X_52); + X_54:bat[:oid,:int] := algebra.leftfetchjoinPath(C_47,C_30,X_53); (X_55,r1_65) := algebra.subjoin(X_28,X_54,nil:BAT,nil:BAT,false,nil:lng); - X_59 := algebra.subinter(X_29,X_55,nil:BAT,nil:BAT,false,nil:lng); + C_59 := algebra.subinter(X_29,X_55,nil:BAT,nil:BAT,false,nil:lng); X_60:bat[:oid,:str] := sql.bind(X_5,"sys","orders","o_orderpriority",0); - (X_62,r1_74) := sql.bind(X_5,"sys","orders","o_orderpriority",2); + (C_62,r1_74) := sql.bind(X_5,"sys","orders","o_orderpriority",2); X_64:bat[:oid,:str] := sql.bind(X_5,"sys","orders","o_orderpriority",1); - X_65 := sql.delta(X_60,X_62,r1_74,X_64); - X_66:bat[:oid,:str] := algebra.leftfetchjoinPath(X_59,X_20,X_6,X_65); + X_65 := sql.delta(X_60,C_62,r1_74,X_64); + X_66:bat[:oid,:str] := algebra.leftfetchjoinPath(C_59,C_20,C_6,X_65); (X_67,r1_81,r2_81) := group.subgroupdone(X_66); X_70 := algebra.leftfetchjoin(r1_81,X_66); X_75:bat[:oid,:wrd] := aggr.subcount(X_67,X_67,r1_81,false); diff --git a/sql/benchmarks/tpch/Tests/05-explain.stable.out.32bit b/sql/benchmarks/tpch/Tests/05-explain.stable.out.32bit --- a/sql/benchmarks/tpch/Tests/05-explain.stable.out.32bit +++ b/sql/benchmarks/tpch/Tests/05-explain.stable.out.32bit @@ -73,100 +73,100 @@ function user.s2_1{autoCommit=true}(A0:b X_178 := bat.append(X_169,4); X_7 := sql.mvc(); X_11:bat[:oid,:date] := sql.bind(X_7,"sys","orders","o_orderdate",0); - X_8:bat[:oid,:oid] := sql.tid(X_7,"sys","orders"); + C_8:bat[:oid,:oid] := sql.tid(X_7,"sys","orders"); X_19 := mtime.addmonths(A3,A4); - X_237 := algebra.subselect(X_11,X_8,A2,X_19,true,false,false); - (X_14,r1_14) := sql.bind(X_7,"sys","orders","o_orderdate",2); - X_238 := algebra.subselect(r1_14,nil:bat[:oid,:oid],A2,X_19,true,false,false); + C_220 := algebra.subselect(X_11,C_8,A2,X_19,true,false,false); + (C_14,r1_14) := sql.bind(X_7,"sys","orders","o_orderdate",2); + C_221 := algebra.subselect(r1_14,nil:bat[:oid,:oid],A2,X_19,true,false,false); X_17:bat[:oid,:date] := sql.bind(X_7,"sys","orders","o_orderdate",1); - X_240 := algebra.subselect(X_17,X_8,A2,X_19,true,false,false); - X_20 := sql.subdelta(X_237,X_8,X_14,X_238,X_240); + C_223 := algebra.subselect(X_17,C_8,A2,X_19,true,false,false); + C_20 := sql.subdelta(C_220,C_8,C_14,C_221,C_223); X_22:bat[:oid,:oid] := sql.bind_idxbat(X_7,"sys","orders","orders_o_custkey_fkey",0); (X_24,r1_30) := sql.bind_idxbat(X_7,"sys","orders","orders_o_custkey_fkey",2); X_26:bat[:oid,:oid] := sql.bind_idxbat(X_7,"sys","orders","orders_o_custkey_fkey",1); - X_27 := sql.projectdelta(X_20,X_22,X_24,r1_30,X_26); - X_28:bat[:oid,:oid] := sql.tid(X_7,"sys","customer"); - (X_30,r1_38) := algebra.subjoin(X_27,X_28,nil:BAT,nil:BAT,false,nil:lng); - X_34 := algebra.leftfetchjoin(X_30,X_20); - X_35:bat[:oid,:oid] := sql.tid(X_7,"sys","lineitem"); + X_27 := sql.projectdelta(C_20,X_22,X_24,r1_30,X_26); + C_28:bat[:oid,:oid] := sql.tid(X_7,"sys","customer"); + (X_30,r1_38) := algebra.subjoin(X_27,C_28,nil:BAT,nil:BAT,false,nil:lng); + X_34 := algebra.leftfetchjoin(X_30,C_20); + C_35:bat[:oid,:oid] := sql.tid(X_7,"sys","lineitem"); X_37:bat[:oid,:oid] := sql.bind_idxbat(X_7,"sys","lineitem","lineitem_l_orderkey_fkey",0); (X_39,r1_49) := sql.bind_idxbat(X_7,"sys","lineitem","lineitem_l_orderkey_fkey",2); X_41:bat[:oid,:oid] := sql.bind_idxbat(X_7,"sys","lineitem","lineitem_l_orderkey_fkey",1); - X_42 := sql.projectdelta(X_35,X_37,X_39,r1_49,X_41); + X_42 := sql.projectdelta(C_35,X_37,X_39,r1_49,X_41); (X_43,r1_54) := algebra.subjoin(X_34,X_42,nil:BAT,nil:BAT,false,nil:lng); X_45:bat[:oid,:int] := sql.bind(X_7,"sys","lineitem","l_suppkey",0); - (X_47,r1_58) := sql.bind(X_7,"sys","lineitem","l_suppkey",2); + (C_47,r1_58) := sql.bind(X_7,"sys","lineitem","l_suppkey",2); X_49:bat[:oid,:int] := sql.bind(X_7,"sys","lineitem","l_suppkey",1); - X_50 := sql.projectdelta(X_35,X_45,X_47,r1_58,X_49); + X_50 := sql.projectdelta(C_35,X_45,C_47,r1_58,X_49); X_51 := algebra.leftfetchjoin(r1_54,X_50); X_52:bat[:oid,:wrd] := batmkey.hash(X_51); X_54:bat[:oid,:int] := sql.bind(X_7,"sys","customer","c_nationkey",0); - (X_56,r1_71) := sql.bind(X_7,"sys","customer","c_nationkey",2); + (C_56,r1_71) := sql.bind(X_7,"sys","customer","c_nationkey",2); X_58:bat[:oid,:int] := sql.bind(X_7,"sys","customer","c_nationkey",1); - X_59 := sql.projectdelta(X_28,X_54,X_56,r1_71,X_58); + X_59 := sql.projectdelta(C_28,X_54,C_56,r1_71,X_58); X_60:bat[:oid,:int] := algebra.leftfetchjoinPath(X_43,r1_38,X_59); X_61:bat[:oid,:wrd] := mkey.bulk_rotate_xor_hash(X_52,11,X_60); - X_62:bat[:oid,:oid] := sql.tid(X_7,"sys","supplier"); + C_62:bat[:oid,:oid] := sql.tid(X_7,"sys","supplier"); X_64:bat[:oid,:int] := sql.bind(X_7,"sys","supplier","s_suppkey",0); - (X_66,r1_83) := sql.bind(X_7,"sys","supplier","s_suppkey",2); + (C_66,r1_83) := sql.bind(X_7,"sys","supplier","s_suppkey",2); X_68:bat[:oid,:int] := sql.bind(X_7,"sys","supplier","s_suppkey",1); - X_69 := sql.projectdelta(X_62,X_64,X_66,r1_83,X_68); + X_69 := sql.projectdelta(C_62,X_64,C_66,r1_83,X_68); X_70:bat[:oid,:wrd] := batmkey.hash(X_69); X_71:bat[:oid,:int] := sql.bind(X_7,"sys","supplier","s_nationkey",0); - (X_73,r1_92) := sql.bind(X_7,"sys","supplier","s_nationkey",2); + (C_73,r1_92) := sql.bind(X_7,"sys","supplier","s_nationkey",2); X_75:bat[:oid,:int] := sql.bind(X_7,"sys","supplier","s_nationkey",1); - X_76 := sql.projectdelta(X_62,X_71,X_73,r1_92,X_75); + X_76 := sql.projectdelta(C_62,X_71,C_73,r1_92,X_75); X_77:bat[:oid,:wrd] := mkey.bulk_rotate_xor_hash(X_70,11,X_76); (X_78,r1_98) := algebra.subjoin(X_61,X_77,nil:BAT,nil:BAT,false,nil:lng); X_80 := algebra.leftfetchjoin(X_78,X_51); X_81 := algebra.leftfetchjoin(r1_98,X_69); X_82:bat[:oid,:bit] := batcalc.==(X_80,X_81); - X_83 := algebra.subselect(X_82,true,true,true,false,false); - X_84 := algebra.leftfetchjoin(X_83,X_78); + C_83 := algebra.subselect(X_82,true,true,true,false,false); + X_84 := algebra.leftfetchjoin(C_83,X_78); X_85 := algebra.leftfetchjoin(X_84,X_60); - X_86 := algebra.leftfetchjoin(X_83,r1_98); + X_86 := algebra.leftfetchjoin(C_83,r1_98); X_87 := algebra.leftfetchjoin(X_86,X_76); X_88:bat[:oid,:bit] := batcalc.==(X_85,X_87); - X_89 := algebra.subselect(X_88,true,true,true,false,false); + C_89 := algebra.subselect(X_88,true,true,true,false,false); X_90:bat[:oid,:oid] := sql.bind_idxbat(X_7,"sys","supplier","supplier_s_nationkey_fkey",0); (X_92,r1_122) := sql.bind_idxbat(X_7,"sys","supplier","supplier_s_nationkey_fkey",2); X_94:bat[:oid,:oid] := sql.bind_idxbat(X_7,"sys","supplier","supplier_s_nationkey_fkey",1); - X_95 := sql.projectdelta(X_62,X_90,X_92,r1_122,X_94); - X_96:bat[:oid,:oid] := algebra.leftfetchjoinPath(X_89,X_86,X_95); - X_97:bat[:oid,:oid] := sql.tid(X_7,"sys","nation"); - (X_99,r1_130) := algebra.subjoin(X_96,X_97,nil:BAT,nil:BAT,false,nil:lng); + X_95 := sql.projectdelta(C_62,X_90,X_92,r1_122,X_94); + X_96:bat[:oid,:oid] := algebra.leftfetchjoinPath(C_89,X_86,X_95); + C_97:bat[:oid,:oid] := sql.tid(X_7,"sys","nation"); + (X_99,r1_130) := algebra.subjoin(X_96,C_97,nil:BAT,nil:BAT,false,nil:lng); X_101:bat[:oid,:oid] := sql.bind_idxbat(X_7,"sys","nation","nation_n_regionkey_fkey",0); (X_103,r1_134) := sql.bind_idxbat(X_7,"sys","nation","nation_n_regionkey_fkey",2); X_105:bat[:oid,:oid] := sql.bind_idxbat(X_7,"sys","nation","nation_n_regionkey_fkey",1); - X_106 := sql.projectdelta(X_97,X_101,X_103,r1_134,X_105); + X_106 := sql.projectdelta(C_97,X_101,X_103,r1_134,X_105); X_107 := algebra.leftfetchjoin(r1_130,X_106); X_110:bat[:oid,:str] := sql.bind(X_7,"sys","region","r_name",0); - X_108:bat[:oid,:oid] := sql.tid(X_7,"sys","region"); - X_241 := algebra.subselect(X_110,X_108,A1,A1,true,false,false); - (X_112,r1_144) := sql.bind(X_7,"sys","region","r_name",2); - X_242 := algebra.subselect(r1_144,nil:bat[:oid,:oid],A1,A1,true,false,false); + C_108:bat[:oid,:oid] := sql.tid(X_7,"sys","region"); + C_224 := algebra.subselect(X_110,C_108,A1,A1,true,false,false); + (C_112,r1_144) := sql.bind(X_7,"sys","region","r_name",2); + C_225 := algebra.subselect(r1_144,nil:bat[:oid,:oid],A1,A1,true,false,false); X_114:bat[:oid,:str] := sql.bind(X_7,"sys","region","r_name",1); - X_243 := algebra.subselect(X_114,X_108,A1,A1,true,false,false); - X_115 := sql.subdelta(X_241,X_108,X_112,X_242,X_243); - (X_116,r1_155) := algebra.subjoin(X_107,X_115,nil:BAT,nil:BAT,false,nil:lng); - X_118 := algebra.leftfetchjoin(X_89,X_84); + C_226 := algebra.subselect(X_114,C_108,A1,A1,true,false,false); + C_115 := sql.subdelta(C_224,C_108,C_112,C_225,C_226); + (X_116,r1_155) := algebra.subjoin(X_107,C_115,nil:BAT,nil:BAT,false,nil:lng); + X_118 := algebra.leftfetchjoin(C_89,X_84); X_119:bat[:oid,:lng] := sql.bind(X_7,"sys","lineitem","l_extendedprice",0); - (X_121,r1_163) := sql.bind(X_7,"sys","lineitem","l_extendedprice",2); + (C_121,r1_163) := sql.bind(X_7,"sys","lineitem","l_extendedprice",2); X_123:bat[:oid,:lng] := sql.bind(X_7,"sys","lineitem","l_extendedprice",1); - X_124 := sql.projectdelta(X_35,X_119,X_121,r1_163,X_123); + X_124 := sql.projectdelta(C_35,X_119,C_121,r1_163,X_123); X_125:bat[:oid,:lng] := algebra.leftfetchjoinPath(X_116,X_99,X_118,r1_54,X_124); X_126 := calc.lng(A0,15,2); X_128:bat[:oid,:lng] := sql.bind(X_7,"sys","lineitem","l_discount",0); - (X_130,r1_178) := sql.bind(X_7,"sys","lineitem","l_discount",2); + (C_130,r1_178) := sql.bind(X_7,"sys","lineitem","l_discount",2); X_132:bat[:oid,:lng] := sql.bind(X_7,"sys","lineitem","l_discount",1); - X_133 := sql.projectdelta(X_35,X_128,X_130,r1_178,X_132); + X_133 := sql.projectdelta(C_35,X_128,C_130,r1_178,X_132); X_134:bat[:oid,:lng] := algebra.leftfetchjoinPath(X_116,X_99,X_118,r1_54,X_133); X_135:bat[:oid,:lng] := batcalc.-(X_126,X_134); X_136:bat[:oid,:lng] := batcalc.*(X_125,X_135); X_137:bat[:oid,:str] := sql.bind(X_7,"sys","nation","n_name",0); - (X_139,r1_194) := sql.bind(X_7,"sys","nation","n_name",2); + (C_139,r1_194) := sql.bind(X_7,"sys","nation","n_name",2); X_141:bat[:oid,:str] := sql.bind(X_7,"sys","nation","n_name",1); - X_142 := sql.projectdelta(X_97,X_137,X_139,r1_194,X_141); + X_142 := sql.projectdelta(C_97,X_137,C_139,r1_194,X_141); X_143:bat[:oid,:str] := algebra.leftfetchjoinPath(X_116,r1_130,X_142); (X_144,r1_201,r2_201) := group.subgroupdone(X_143); X_147:bat[:oid,:lng] := aggr.subsum(X_136,X_144,r1_201,true,true); 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 @@ -82,128 +82,128 @@ function user.s2_1{autoCommit=true}(A0:s X_203 := bat.append(X_195,0); X_210 := bat.append(X_203,0); X_8 := sql.mvc(); _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list