Changeset: 2fb9c91c72b1 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2fb9c91c72b1 Modified Files: sql/benchmarks/ssbm/Tests/01-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/02-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/03-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/04-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/05-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/06-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/07-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/08-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/09-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/10-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/11-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/12-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/13-explain.stable.out.int128 Branch: default Log Message:
approved output after bind call changes diffs (truncated from 899 to 300 lines): diff --git a/sql/benchmarks/ssbm/Tests/01-explain.stable.out.int128 b/sql/benchmarks/ssbm/Tests/01-explain.stable.out.int128 --- a/sql/benchmarks/ssbm/Tests/01-explain.stable.out.int128 +++ b/sql/benchmarks/ssbm/Tests/01-explain.stable.out.int128 @@ -39,38 +39,38 @@ Ready. % 246 # length function user.s2_1{autoCommit=true}(A0:int,A1:int,A2:int,A3:int):void; X_6 := sql.mvc(); - X_10 := sql.bind(X_6,"sys","lineorder","lo_quantity",0); - X_18 := sql.bind(X_6,"sys","lineorder","lo_discount",0); + X_10:bat[:oid,:int] := sql.bind(X_6,"sys","lineorder","lo_quantity",0); + X_18:bat[:oid,:int] := sql.bind(X_6,"sys","lineorder","lo_discount",0); X_7:bat[:oid,:oid] := sql.tid(X_6,"sys","lineorder"); X_92 := algebra.subselect(X_18,X_7,A1,A2,true,true,false); (X_20,r1_23) := sql.bind(X_6,"sys","lineorder","lo_discount",2); X_93 := algebra.subselect(r1_23,nil:bat[:oid,:oid],A1,A2,true,true,false); - X_22 := sql.bind(X_6,"sys","lineorder","lo_discount",1); + X_22:bat[:oid,:int] := sql.bind(X_6,"sys","lineorder","lo_discount",1); X_95 := algebra.subselect(X_22,X_7,A1,A2,true,true,false); X_23 := sql.subdelta(X_92,X_7,X_20,X_93,X_95); X_96 := algebra.thetasubselect(X_10,X_23,A3,"<"); (X_13,r1_13) := sql.bind(X_6,"sys","lineorder","lo_quantity",2); X_97 := algebra.thetasubselect(r1_13,nil:bat[:oid,:oid],A3,"<"); - X_16 := sql.bind(X_6,"sys","lineorder","lo_quantity",1); + X_16:bat[:oid,:int] := sql.bind(X_6,"sys","lineorder","lo_quantity",1); X_99 := algebra.thetasubselect(X_16,X_23,A3,"<"); X_25 := sql.subdelta(X_96,X_23,X_13,X_97,X_99); X_27 := sql.bind_idxbat(X_6,"sys","lineorder","lineorder_lo_orderdate_fkey",0); (X_29,r1_36) := sql.bind_idxbat(X_6,"sys","lineorder","lineorder_lo_orderdate_fkey",2); X_31 := sql.bind_idxbat(X_6,"sys","lineorder","lineorder_lo_orderdate_fkey",1); X_32 := sql.projectdelta(X_25,X_27,X_29,r1_36,X_31); - X_36 := sql.bind(X_6,"sys","dwdate","d_year",0); + X_36:bat[:oid,:int] := sql.bind(X_6,"sys","dwdate","d_year",0); X_33:bat[:oid,:oid] := sql.tid(X_6,"sys","dwdate"); X_100 := algebra.subselect(X_36,X_33,A0,A0,true,true,false); (X_39,r1_48) := sql.bind(X_6,"sys","dwdate","d_year",2); X_101 := algebra.subselect(r1_48,nil:bat[:oid,:oid],A0,A0,true,true,false); - X_42 := sql.bind(X_6,"sys","dwdate","d_year",1); + X_42:bat[:oid,:int] := sql.bind(X_6,"sys","dwdate","d_year",1); X_103 := algebra.subselect(X_42,X_33,A0,A0,true,true,false); X_44 := sql.subdelta(X_100,X_33,X_39,X_101,X_103); X_46 := X_44; (X_47,r1_59) := algebra.subjoin(X_32,X_46,nil:BAT,nil:BAT,true,nil:lng); - X_51 := sql.bind(X_6,"sys","lineorder","lo_extendedprice",0); + X_51:bat[:oid,:int] := sql.bind(X_6,"sys","lineorder","lo_extendedprice",0); (X_54,r1_66) := sql.bind(X_6,"sys","lineorder","lo_extendedprice",2); - X_56 := sql.bind(X_6,"sys","lineorder","lo_extendedprice",1); + X_56:bat[:oid,:int] := sql.bind(X_6,"sys","lineorder","lo_extendedprice",1); X_57 := sql.projectdelta(X_25,X_51,X_54,r1_66,X_56); X_58 := algebra.leftfetchjoin(X_47,X_57); X_59 := batcalc.hge(X_58); diff --git a/sql/benchmarks/ssbm/Tests/02-explain.stable.out.int128 b/sql/benchmarks/ssbm/Tests/02-explain.stable.out.int128 --- a/sql/benchmarks/ssbm/Tests/02-explain.stable.out.int128 +++ b/sql/benchmarks/ssbm/Tests/02-explain.stable.out.int128 @@ -39,38 +39,38 @@ Ready. % 269 # length function user.s2_1{autoCommit=true}(A0:int,A1:int,A2:int,A3:int,A4:int):void; X_7 := sql.mvc(); - X_11 := sql.bind(X_7,"sys","lineorder","lo_quantity",0); - X_19 := sql.bind(X_7,"sys","lineorder","lo_discount",0); + X_11:bat[:oid,:int] := sql.bind(X_7,"sys","lineorder","lo_quantity",0); + X_19:bat[:oid,:int] := sql.bind(X_7,"sys","lineorder","lo_discount",0); X_8:bat[:oid,:oid] := sql.tid(X_7,"sys","lineorder"); X_92 := algebra.subselect(X_19,X_8,A1,A2,true,true,false); (X_21,r1_25) := sql.bind(X_7,"sys","lineorder","lo_discount",2); X_93 := algebra.subselect(r1_25,nil:bat[:oid,:oid],A1,A2,true,true,false); - X_23 := sql.bind(X_7,"sys","lineorder","lo_discount",1); + X_23:bat[:oid,:int] := sql.bind(X_7,"sys","lineorder","lo_discount",1); X_95 := algebra.subselect(X_23,X_8,A1,A2,true,true,false); X_24 := sql.subdelta(X_92,X_8,X_21,X_93,X_95); X_96 := algebra.subselect(X_11,X_24,A3,A4,true,true,false); (X_14,r1_14) := sql.bind(X_7,"sys","lineorder","lo_quantity",2); X_97 := algebra.subselect(r1_14,nil:bat[:oid,:oid],A3,A4,true,true,false); - X_17 := sql.bind(X_7,"sys","lineorder","lo_quantity",1); + X_17:bat[:oid,:int] := sql.bind(X_7,"sys","lineorder","lo_quantity",1); X_99 := algebra.subselect(X_17,X_24,A3,A4,true,true,false); X_26 := sql.subdelta(X_96,X_24,X_14,X_97,X_99); X_27 := sql.bind_idxbat(X_7,"sys","lineorder","lineorder_lo_orderdate_fkey",0); (X_29,r1_37) := sql.bind_idxbat(X_7,"sys","lineorder","lineorder_lo_orderdate_fkey",2); X_31 := sql.bind_idxbat(X_7,"sys","lineorder","lineorder_lo_orderdate_fkey",1); X_32 := sql.projectdelta(X_26,X_27,X_29,r1_37,X_31); - X_36 := sql.bind(X_7,"sys","dwdate","d_yearmonthnum",0); + X_36:bat[:oid,:int] := sql.bind(X_7,"sys","dwdate","d_yearmonthnum",0); X_33:bat[:oid,:oid] := sql.tid(X_7,"sys","dwdate"); X_100 := algebra.subselect(X_36,X_33,A0,A0,true,true,false); (X_39,r1_49) := sql.bind(X_7,"sys","dwdate","d_yearmonthnum",2); X_101 := algebra.subselect(r1_49,nil:bat[:oid,:oid],A0,A0,true,true,false); - X_42 := sql.bind(X_7,"sys","dwdate","d_yearmonthnum",1); + X_42:bat[:oid,:int] := sql.bind(X_7,"sys","dwdate","d_yearmonthnum",1); X_103 := algebra.subselect(X_42,X_33,A0,A0,true,true,false); X_44 := sql.subdelta(X_100,X_33,X_39,X_101,X_103); X_46 := X_44; (X_47,r1_60) := algebra.subjoin(X_32,X_46,nil:BAT,nil:BAT,true,nil:lng); - X_51 := sql.bind(X_7,"sys","lineorder","lo_extendedprice",0); + X_51:bat[:oid,:int] := sql.bind(X_7,"sys","lineorder","lo_extendedprice",0); (X_54,r1_67) := sql.bind(X_7,"sys","lineorder","lo_extendedprice",2); - X_56 := sql.bind(X_7,"sys","lineorder","lo_extendedprice",1); + X_56:bat[:oid,:int] := sql.bind(X_7,"sys","lineorder","lo_extendedprice",1); X_57 := sql.projectdelta(X_26,X_51,X_54,r1_67,X_56); X_58 := algebra.leftfetchjoin(X_47,X_57); X_59 := batcalc.hge(X_58); diff --git a/sql/benchmarks/ssbm/Tests/03-explain.stable.out.int128 b/sql/benchmarks/ssbm/Tests/03-explain.stable.out.int128 --- a/sql/benchmarks/ssbm/Tests/03-explain.stable.out.int128 +++ b/sql/benchmarks/ssbm/Tests/03-explain.stable.out.int128 @@ -39,45 +39,45 @@ Ready. % 283 # length function user.s2_1{autoCommit=true}(A0:int,A1:int,A2:int,A3:int,A4:int,A5:int):void; X_8 := sql.mvc(); - X_12 := sql.bind(X_8,"sys","lineorder","lo_quantity",0); - X_20 := sql.bind(X_8,"sys","lineorder","lo_discount",0); + X_12:bat[:oid,:int] := sql.bind(X_8,"sys","lineorder","lo_quantity",0); + X_20:bat[:oid,:int] := sql.bind(X_8,"sys","lineorder","lo_discount",0); X_9:bat[:oid,:oid] := sql.tid(X_8,"sys","lineorder"); X_103 := algebra.subselect(X_20,X_9,A2,A3,true,true,false); (X_22,r1_26) := sql.bind(X_8,"sys","lineorder","lo_discount",2); X_104 := algebra.subselect(r1_26,nil:bat[:oid,:oid],A2,A3,true,true,false); - X_24 := sql.bind(X_8,"sys","lineorder","lo_discount",1); + X_24:bat[:oid,:int] := sql.bind(X_8,"sys","lineorder","lo_discount",1); X_106 := algebra.subselect(X_24,X_9,A2,A3,true,true,false); X_25 := sql.subdelta(X_103,X_9,X_22,X_104,X_106); X_107 := algebra.subselect(X_12,X_25,A4,A5,true,true,false); (X_15,r1_15) := sql.bind(X_8,"sys","lineorder","lo_quantity",2); X_108 := algebra.subselect(r1_15,nil:bat[:oid,:oid],A4,A5,true,true,false); - X_18 := sql.bind(X_8,"sys","lineorder","lo_quantity",1); + X_18:bat[:oid,:int] := sql.bind(X_8,"sys","lineorder","lo_quantity",1); X_110 := algebra.subselect(X_18,X_25,A4,A5,true,true,false); X_27 := sql.subdelta(X_107,X_25,X_15,X_108,X_110); X_28 := sql.bind_idxbat(X_8,"sys","lineorder","lineorder_lo_orderdate_fkey",0); (X_30,r1_38) := sql.bind_idxbat(X_8,"sys","lineorder","lineorder_lo_orderdate_fkey",2); X_32 := sql.bind_idxbat(X_8,"sys","lineorder","lineorder_lo_orderdate_fkey",1); X_33 := sql.projectdelta(X_27,X_28,X_30,r1_38,X_32); - X_37 := sql.bind(X_8,"sys","dwdate","d_weeknuminyear",0); - X_45 := sql.bind(X_8,"sys","dwdate","d_year",0); + X_37:bat[:oid,:int] := sql.bind(X_8,"sys","dwdate","d_weeknuminyear",0); + X_45:bat[:oid,:int] := sql.bind(X_8,"sys","dwdate","d_year",0); X_34:bat[:oid,:oid] := sql.tid(X_8,"sys","dwdate"); X_111 := algebra.subselect(X_45,X_34,A1,A1,true,true,false); (X_47,r1_60) := sql.bind(X_8,"sys","dwdate","d_year",2); X_112 := algebra.subselect(r1_60,nil:bat[:oid,:oid],A1,A1,true,true,false); - X_49 := sql.bind(X_8,"sys","dwdate","d_year",1); + X_49:bat[:oid,:int] := sql.bind(X_8,"sys","dwdate","d_year",1); X_114 := algebra.subselect(X_49,X_34,A1,A1,true,true,false); X_50 := sql.subdelta(X_111,X_34,X_47,X_112,X_114); X_115 := algebra.subselect(X_37,X_50,A0,A0,true,true,false); (X_40,r1_50) := sql.bind(X_8,"sys","dwdate","d_weeknuminyear",2); X_116 := algebra.subselect(r1_50,nil:bat[:oid,:oid],A0,A0,true,true,false); - X_43 := sql.bind(X_8,"sys","dwdate","d_weeknuminyear",1); + X_43:bat[:oid,:int] := sql.bind(X_8,"sys","dwdate","d_weeknuminyear",1); X_118 := algebra.subselect(X_43,X_50,A0,A0,true,true,false); X_53 := sql.subdelta(X_115,X_50,X_40,X_116,X_118); X_54 := X_53; (X_55,r1_71) := algebra.subjoin(X_33,X_54,nil:BAT,nil:BAT,true,nil:lng); - X_59 := sql.bind(X_8,"sys","lineorder","lo_extendedprice",0); + X_59:bat[:oid,:int] := sql.bind(X_8,"sys","lineorder","lo_extendedprice",0); (X_62,r1_78) := sql.bind(X_8,"sys","lineorder","lo_extendedprice",2); - X_65 := sql.bind(X_8,"sys","lineorder","lo_extendedprice",1); + X_65:bat[:oid,:int] := sql.bind(X_8,"sys","lineorder","lo_extendedprice",1); X_66 := sql.projectdelta(X_27,X_59,X_62,r1_78,X_65); X_67 := algebra.leftfetchjoin(X_55,X_66); X_68 := batcalc.hge(X_67); diff --git a/sql/benchmarks/ssbm/Tests/04-explain.stable.out.int128 b/sql/benchmarks/ssbm/Tests/04-explain.stable.out.int128 --- a/sql/benchmarks/ssbm/Tests/04-explain.stable.out.int128 +++ b/sql/benchmarks/ssbm/Tests/04-explain.stable.out.int128 @@ -47,12 +47,12 @@ function user.s2_1{autoCommit=true}(A0:s (X_11,r1_11) := sql.bind_idxbat(X_4,"sys","lineorder","lineorder_lo_partkey_fkey",2); X_14 := sql.bind_idxbat(X_4,"sys","lineorder","lineorder_lo_partkey_fkey",1); X_16 := sql.projectdelta(X_5,X_8,X_11,r1_11,X_14); - X_19 := sql.bind(X_4,"sys","part","p_category",0); + X_19:bat[:oid,:str] := sql.bind(X_4,"sys","part","p_category",0); X_17:bat[:oid,:oid] := sql.tid(X_4,"sys","part"); X_165 := algebra.subselect(X_19,X_17,A0,A0,true,true,false); (X_21,r1_22) := sql.bind(X_4,"sys","part","p_category",2); X_166 := algebra.subselect(r1_22,nil:bat[:oid,:oid],A0,A0,true,true,false); - X_23 := sql.bind(X_4,"sys","part","p_category",1); + X_23:bat[:oid,:str] := sql.bind(X_4,"sys","part","p_category",1); X_168 := algebra.subselect(X_23,X_17,A0,A0,true,true,false); X_24 := sql.subdelta(X_165,X_17,X_21,X_166,X_168); X_26 := X_24; @@ -62,12 +62,12 @@ function user.s2_1{autoCommit=true}(A0:s X_37 := sql.bind_idxbat(X_4,"sys","lineorder","lineorder_lo_suppkey_fkey",1); X_38 := sql.projectdelta(X_5,X_31,X_33,r1_37,X_37); X_39 := algebra.leftfetchjoin(X_27,X_38); - X_42 := sql.bind(X_4,"sys","supplier","s_region",0); + X_42:bat[:oid,:str] := sql.bind(X_4,"sys","supplier","s_region",0); X_40:bat[:oid,:oid] := sql.tid(X_4,"sys","supplier"); X_169 := algebra.subselect(X_42,X_40,A1,A1,true,true,false); (X_45,r1_50) := sql.bind(X_4,"sys","supplier","s_region",2); X_170 := algebra.subselect(r1_50,nil:bat[:oid,:oid],A1,A1,true,true,false); - X_48 := sql.bind(X_4,"sys","supplier","s_region",1); + X_48:bat[:oid,:str] := sql.bind(X_4,"sys","supplier","s_region",1); X_172 := algebra.subselect(X_48,X_40,A1,A1,true,true,false); X_50 := sql.subdelta(X_169,X_40,X_45,X_170,X_172); X_52 := X_50; @@ -81,23 +81,23 @@ function user.s2_1{autoCommit=true}(A0:s X_62:bat[:oid,:oid] := sql.tid(X_4,"sys","dwdate"); (X_65,r1_75) := algebra.subjoin(X_61,X_62,nil:BAT,nil:BAT,true,nil:lng); X_174 := algebra.leftfetchjoin(X_65,X_53); - X_69 := sql.bind(X_4,"sys","part","p_brand1",0); + X_69:bat[:oid,:str] := sql.bind(X_4,"sys","part","p_brand1",0); (X_73,r1_83) := sql.bind(X_4,"sys","part","p_brand1",2); - X_76 := sql.bind(X_4,"sys","part","p_brand1",1); + X_76:bat[:oid,:str] := sql.bind(X_4,"sys","part","p_brand1",1); X_78 := sql.projectdelta(X_24,X_69,X_73,r1_83,X_76); X_79:bat[:oid,:str] := algebra.leftfetchjoinPath(X_174,r1_31,X_78); - X_80 := sql.bind(X_4,"sys","dwdate","d_year",0); + X_80:bat[:oid,:int] := sql.bind(X_4,"sys","dwdate","d_year",0); (X_82,r1_96) := sql.bind(X_4,"sys","dwdate","d_year",2); - X_84 := sql.bind(X_4,"sys","dwdate","d_year",1); + X_84:bat[:oid,:int] := sql.bind(X_4,"sys","dwdate","d_year",1); X_85 := sql.projectdelta(X_62,X_80,X_82,r1_96,X_84); X_86 := algebra.leftfetchjoin(r1_75,X_85); (X_87,r1_102,r2_102) := group.subgroup(X_86); (X_90,r1_105,r2_105) := group.subgroupdone(X_79,X_87); X_93 := algebra.leftfetchjoin(r1_105,X_79); X_94 := algebra.leftfetchjoin(r1_105,X_86); - X_102 := sql.bind(X_4,"sys","lineorder","lo_revenue",0); + X_102:bat[:oid,:int] := sql.bind(X_4,"sys","lineorder","lo_revenue",0); (X_107,r1_122) := sql.bind(X_4,"sys","lineorder","lo_revenue",2); - X_110 := sql.bind(X_4,"sys","lineorder","lo_revenue",1); + X_110:bat[:oid,:int] := sql.bind(X_4,"sys","lineorder","lo_revenue",1); X_112 := sql.projectdelta(X_5,X_102,X_107,r1_122,X_110); X_113:bat[:oid,:int] := algebra.leftfetchjoinPath(X_174,X_27,X_112); X_114:bat[:oid,:hge] := aggr.subsum(X_113,X_90,r1_105,true,true); diff --git a/sql/benchmarks/ssbm/Tests/05-explain.stable.out.int128 b/sql/benchmarks/ssbm/Tests/05-explain.stable.out.int128 --- a/sql/benchmarks/ssbm/Tests/05-explain.stable.out.int128 +++ b/sql/benchmarks/ssbm/Tests/05-explain.stable.out.int128 @@ -49,12 +49,12 @@ function user.s2_1{autoCommit=true}(A0:s (X_12,r1_12) := sql.bind_idxbat(X_5,"sys","lineorder","lineorder_lo_partkey_fkey",2); X_15 := sql.bind_idxbat(X_5,"sys","lineorder","lineorder_lo_partkey_fkey",1); X_17 := sql.projectdelta(X_6,X_9,X_12,r1_12,X_15); - X_20 := sql.bind(X_5,"sys","part","p_brand1",0); + X_20:bat[:oid,:str] := sql.bind(X_5,"sys","part","p_brand1",0); X_18:bat[:oid,:oid] := sql.tid(X_5,"sys","part"); X_158 := algebra.subselect(X_20,X_18,A0,A1,true,true,false); (X_22,r1_23) := sql.bind(X_5,"sys","part","p_brand1",2); X_159 := algebra.subselect(r1_23,nil:bat[:oid,:oid],A0,A1,true,true,false); - X_24 := sql.bind(X_5,"sys","part","p_brand1",1); + X_24:bat[:oid,:str] := sql.bind(X_5,"sys","part","p_brand1",1); X_161 := algebra.subselect(X_24,X_18,A0,A1,true,true,false); X_25 := sql.subdelta(X_158,X_18,X_22,X_159,X_161); X_27 := X_25; @@ -64,12 +64,12 @@ function user.s2_1{autoCommit=true}(A0:s X_38 := sql.bind_idxbat(X_5,"sys","lineorder","lineorder_lo_suppkey_fkey",1); X_39 := sql.projectdelta(X_6,X_32,X_34,r1_39,X_38); X_40 := algebra.leftfetchjoin(X_28,X_39); - X_43 := sql.bind(X_5,"sys","supplier","s_region",0); + X_43:bat[:oid,:str] := sql.bind(X_5,"sys","supplier","s_region",0); X_41:bat[:oid,:oid] := sql.tid(X_5,"sys","supplier"); X_162 := algebra.subselect(X_43,X_41,A2,A2,true,true,false); (X_46,r1_52) := sql.bind(X_5,"sys","supplier","s_region",2); X_163 := algebra.subselect(r1_52,nil:bat[:oid,:oid],A2,A2,true,true,false); - X_49 := sql.bind(X_5,"sys","supplier","s_region",1); + X_49:bat[:oid,:str] := sql.bind(X_5,"sys","supplier","s_region",1); X_165 := algebra.subselect(X_49,X_41,A2,A2,true,true,false); X_51 := sql.subdelta(X_162,X_41,X_46,X_163,X_165); X_53 := X_51; @@ -85,18 +85,18 @@ function user.s2_1{autoCommit=true}(A0:s X_167 := algebra.leftfetchjoin(X_66,X_54); X_70 := sql.projectdelta(X_25,X_20,X_22,r1_23,X_24); X_71:bat[:oid,:str] := algebra.leftfetchjoinPath(X_167,r1_33,X_70); - X_72 := sql.bind(X_5,"sys","dwdate","d_year",0); + X_72:bat[:oid,:int] := sql.bind(X_5,"sys","dwdate","d_year",0); (X_75,r1_88) := sql.bind(X_5,"sys","dwdate","d_year",2); - X_78 := sql.bind(X_5,"sys","dwdate","d_year",1); + X_78:bat[:oid,:int] := sql.bind(X_5,"sys","dwdate","d_year",1); X_80 := sql.projectdelta(X_63,X_72,X_75,r1_88,X_78); X_81 := algebra.leftfetchjoin(r1_77,X_80); (X_82,r1_96,r2_96) := group.subgroup(X_81); (X_85,r1_99,r2_99) := group.subgroupdone(X_71,X_82); X_88 := algebra.leftfetchjoin(r1_99,X_71); X_89 := algebra.leftfetchjoin(r1_99,X_81); - X_97 := sql.bind(X_5,"sys","lineorder","lo_revenue",0); + X_97:bat[:oid,:int] := sql.bind(X_5,"sys","lineorder","lo_revenue",0); (X_101,r1_115) := sql.bind(X_5,"sys","lineorder","lo_revenue",2); - X_103 := sql.bind(X_5,"sys","lineorder","lo_revenue",1); + X_103:bat[:oid,:int] := sql.bind(X_5,"sys","lineorder","lo_revenue",1); X_104 := sql.projectdelta(X_6,X_97,X_101,r1_115,X_103); X_105:bat[:oid,:int] := algebra.leftfetchjoinPath(X_167,X_28,X_104); X_106:bat[:oid,:hge] := aggr.subsum(X_105,X_85,r1_99,true,true); diff --git a/sql/benchmarks/ssbm/Tests/06-explain.stable.out.int128 b/sql/benchmarks/ssbm/Tests/06-explain.stable.out.int128 --- a/sql/benchmarks/ssbm/Tests/06-explain.stable.out.int128 +++ b/sql/benchmarks/ssbm/Tests/06-explain.stable.out.int128 @@ -49,12 +49,12 @@ function user.s2_1{autoCommit=true}(A0:s (X_11,r1_11) := sql.bind_idxbat(X_4,"sys","lineorder","lineorder_lo_partkey_fkey",2); X_14 := sql.bind_idxbat(X_4,"sys","lineorder","lineorder_lo_partkey_fkey",1); X_16 := sql.projectdelta(X_5,X_8,X_11,r1_11,X_14); - X_19 := sql.bind(X_4,"sys","part","p_brand1",0); + X_19:bat[:oid,:str] := sql.bind(X_4,"sys","part","p_brand1",0); X_17:bat[:oid,:oid] := sql.tid(X_4,"sys","part"); X_157 := algebra.subselect(X_19,X_17,A0,A0,true,true,false); (X_21,r1_22) := sql.bind(X_4,"sys","part","p_brand1",2); X_158 := algebra.subselect(r1_22,nil:bat[:oid,:oid],A0,A0,true,true,false); - X_23 := sql.bind(X_4,"sys","part","p_brand1",1); + X_23:bat[:oid,:str] := sql.bind(X_4,"sys","part","p_brand1",1); X_160 := algebra.subselect(X_23,X_17,A0,A0,true,true,false); X_24 := sql.subdelta(X_157,X_17,X_21,X_158,X_160); X_26 := X_24; @@ -64,12 +64,12 @@ function user.s2_1{autoCommit=true}(A0:s X_37 := sql.bind_idxbat(X_4,"sys","lineorder","lineorder_lo_suppkey_fkey",1); X_38 := sql.projectdelta(X_5,X_31,X_33,r1_37,X_37); X_39 := algebra.leftfetchjoin(X_27,X_38); _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list