Changeset: 9160b990bb20 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9160b990bb20 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 sql/benchmarks/tpch/Tests/01-explain.stable.out.int128 sql/benchmarks/tpch/Tests/12-explain.stable.out.int128 sql/benchmarks/tpch/Tests/17-explain.stable.out.int128 sql/benchmarks/tpch/Tests/18-explain.stable.out.int128 sql/benchmarks/tpch/Tests/20-explain.stable.out.int128 Branch: newstorage Log Message:
approved output diffs (truncated from 942 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 @@ -66,7 +66,7 @@ function user.s2_1{autoCommit=true}(A0:i X_47:bat[:oid,:int] := algebra.leftfetchjoin(X_77,X_16); X_48:bat[:oid,:lng] := batcalc.*(X_46,X_47); X_49:hge := aggr.sum(X_48); - sql.exportValue(1,"sys.L1","revenue","hugeint",64,0,7,X_49,""); + sql.exportValue(1,"sys.L1","revenue","hugeint",128,0,7,X_49,""); end user.s2_1; # 23:10:45 > 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 @@ -66,7 +66,7 @@ function user.s2_1{autoCommit=true}(A0:i X_47:bat[:oid,:int] := algebra.leftfetchjoin(X_77,X_17); X_48:bat[:oid,:lng] := batcalc.*(X_46,X_47); X_49:hge := aggr.sum(X_48); - sql.exportValue(1,"sys.L1","revenue","hugeint",64,0,7,X_49,""); + sql.exportValue(1,"sys.L1","revenue","hugeint",128,0,7,X_49,""); end user.s2_1; # 23:10:45 > 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 @@ -69,7 +69,7 @@ function user.s2_1{autoCommit=true}(A0:i X_53:bat[:oid,:int] := algebra.leftfetchjoin(X_84,X_18); X_54:bat[:oid,:lng] := batcalc.*(X_52,X_53); X_55:hge := aggr.sum(X_54); - sql.exportValue(1,"sys.L1","revenue","hugeint",64,0,7,X_55,""); + sql.exportValue(1,"sys.L1","revenue","hugeint",128,0,7,X_55,""); end user.s2_1; # 23:10:45 > 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 @@ -41,7 +41,7 @@ Ready. % clob # type % 412 # length function user.s2_1{autoCommit=true}(A0:str,A1:str):void; - X_110:void := querylog.define("explain\nselect sum(lo_revenue), d_year, p_brand1\n\tfrom lineorder, dwdate, part, supplier\n\twhere lo_orderdate = d_datekey\n\t\tand lo_partkey = p_partkey\n\t\tand lo_suppkey = s_suppkey\n\t\tand p_category = \\'MFGR#12\\' -- OK to add p_mfgr = ’MFGR#1’\n\t\tand s_region = \\'AMERICA\\'\n\tgroup by d_year, p_brand1\n\torder by d_year, p_brand1;","sequential_pipe",57); + X_111:void := querylog.define("explain\nselect sum(lo_revenue), d_year, p_brand1\n\tfrom lineorder, dwdate, part, supplier\n\twhere lo_orderdate = d_datekey\n\t\tand lo_partkey = p_partkey\n\t\tand lo_suppkey = s_suppkey\n\t\tand p_category = \\'MFGR#12\\' -- OK to add p_mfgr = ’MFGR#1’\n\t\tand s_region = \\'AMERICA\\'\n\tgroup by d_year, p_brand1\n\torder by d_year, p_brand1;","sequential_pipe",57); X_4 := sql.mvc(); X_5:bat[:oid,:oid] := sql.tid(X_4,"sys","lineorder"); X_8:bat[:oid,:int] := sql.bind(X_4,"sys","lineorder","lo_partkey",0); @@ -54,9 +54,9 @@ function user.s2_1{autoCommit=true}(A0:s X_21 := X_19; X_22 := algebra.leftfetchjoin(X_17,X_21); (X_23,r1_24) := algebra.subjoin(X_11,X_22,nil:BAT,nil:BAT,false,nil:lng); - X_138 := algebra.leftfetchjoin(X_23,X_5); + X_139 := algebra.leftfetchjoin(X_23,X_5); X_27:bat[:oid,:int] := sql.bind(X_4,"sys","lineorder","lo_suppkey",0); - X_29:bat[:oid,:int] := algebra.leftfetchjoin(X_138,X_27); + X_29:bat[:oid,:int] := algebra.leftfetchjoin(X_139,X_27); X_32:bat[:oid,:str] := sql.bind(X_4,"sys","supplier","s_region",0); X_34 := X_32; X_30:bat[:oid,:oid] := sql.tid(X_4,"sys","supplier"); @@ -65,17 +65,17 @@ function user.s2_1{autoCommit=true}(A0:s X_41 := X_37; X_42 := algebra.leftfetchjoin(X_35,X_41); (X_43,r1_46) := algebra.subjoin(X_29,X_42,nil:BAT,nil:BAT,false,nil:lng); - X_139 := algebra.leftfetchjoin(X_43,X_23); + X_140 := algebra.leftfetchjoin(X_43,X_23); X_45:bat[:oid,:int] := sql.bind(X_4,"sys","lineorder","lo_orderdate",0); - X_48:bat[:oid,:int] := algebra.leftfetchjoinPath(X_139,X_5,X_45); + X_48:bat[:oid,:int] := algebra.leftfetchjoinPath(X_140,X_5,X_45); X_49:bat[:oid,:oid] := sql.tid(X_4,"sys","dwdate"); X_51:bat[:oid,:int] := sql.bind(X_4,"sys","dwdate","d_datekey",0); X_53 := algebra.leftfetchjoin(X_49,X_51); (X_54,r1_59) := algebra.subjoin(X_48,X_53,nil:BAT,nil:BAT,false,nil:lng); - X_140 := algebra.leftfetchjoin(X_54,X_43); + X_141 := algebra.leftfetchjoin(X_54,X_43); X_59:bat[:oid,:str] := sql.bind(X_4,"sys","part","p_brand1",0); X_62 := X_59; - X_63:bat[:oid,:str] := algebra.leftfetchjoinPath(X_140,r1_24,X_17,X_62); + X_63:bat[:oid,:str] := algebra.leftfetchjoinPath(X_141,r1_24,X_17,X_62); X_64:bat[:oid,:int] := sql.bind(X_4,"sys","dwdate","d_year",0); X_66:bat[:oid,:int] := algebra.leftfetchjoinPath(r1_59,X_49,X_64); (X_67,r1_76,r2_76) := group.subgroup(X_66); @@ -83,7 +83,7 @@ function user.s2_1{autoCommit=true}(A0:s X_73 := algebra.leftfetchjoin(r1_79,X_63); X_74 := algebra.leftfetchjoin(r1_79,X_66); X_81:bat[:oid,:int] := sql.bind(X_4,"sys","lineorder","lo_revenue",0); - X_86:bat[:oid,:int] := algebra.leftfetchjoinPath(X_140,X_23,X_5,X_81); + X_86:bat[:oid,:int] := algebra.leftfetchjoinPath(X_141,X_23,X_5,X_81); X_87:bat[:oid,:hge] := aggr.subsum(X_86,X_70,r1_79,true,true); (X_75,r1_84,r2_84) := algebra.subsort(X_74,false,false); (X_78,r1_87,r2_87) := algebra.subsort(X_73,r1_84,r2_84,false,false); @@ -91,11 +91,11 @@ function user.s2_1{autoCommit=true}(A0:s X_91 := algebra.leftfetchjoin(r1_87,X_73); X_90 := algebra.leftfetchjoin(r1_87,X_74); X_92 := sql.resultSet(3,1,X_89); - sql.rsColumn(X_92,"sys.L1","L1","hugeint",32,0,X_89); + sql.rsColumn(X_92,"sys.L1","L1","hugeint",128,0,X_89); sql.rsColumn(X_92,"sys.dwdate","d_year","int",32,0,X_90); sql.rsColumn(X_92,"sys.part","p_brand1","clob",0,0,X_91); - X_108 := io.stdout(); - sql.exportResult(X_108,X_92); + X_109 := io.stdout(); + sql.exportResult(X_109,X_92); end user.s2_1; # 23:10:46 > 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 @@ -43,7 +43,7 @@ Ready. % clob # type % 481 # length function user.s2_1{autoCommit=true}(A0:str,A1:str,A2:str):void; - X_107:void := querylog.define("explain\nselect sum(lo_revenue), d_year, p_brand1\n\tfrom lineorder, dwdate, part, supplier\n\twhere lo_orderdate = d_datekey\n\t\tand lo_partkey = p_partkey\n\t\tand lo_suppkey = s_suppkey\n\t\t-- OK to add p_mfgr=’MFGR#2’\n\t\t-- OK to add p_category=’MFGR#22’\n\t\tand p_brand1 between \\'MFGR#2221\\' and \\'MFGR#2228\\'\n\t\tand s_region = \\'ASIA\\'\n\tgroup by d_year, p_brand1\n\torder by d_year, p_brand1;","sequential_pipe",55); + X_108:void := querylog.define("explain\nselect sum(lo_revenue), d_year, p_brand1\n\tfrom lineorder, dwdate, part, supplier\n\twhere lo_orderdate = d_datekey\n\t\tand lo_partkey = p_partkey\n\t\tand lo_suppkey = s_suppkey\n\t\t-- OK to add p_mfgr=’MFGR#2’\n\t\t-- OK to add p_category=’MFGR#22’\n\t\tand p_brand1 between \\'MFGR#2221\\' and \\'MFGR#2228\\'\n\t\tand s_region = \\'ASIA\\'\n\tgroup by d_year, p_brand1\n\torder by d_year, p_brand1;","sequential_pipe",55); X_5 := sql.mvc(); X_6:bat[:oid,:oid] := sql.tid(X_5,"sys","lineorder"); X_9:bat[:oid,:int] := sql.bind(X_5,"sys","lineorder","lo_partkey",0); @@ -56,9 +56,9 @@ function user.s2_1{autoCommit=true}(A0:s X_22 := X_20; X_23 := algebra.leftfetchjoin(X_18,X_22); (X_24,r1_26) := algebra.subjoin(X_12,X_23,nil:BAT,nil:BAT,false,nil:lng); - X_134 := algebra.leftfetchjoin(X_24,X_6); + X_135 := algebra.leftfetchjoin(X_24,X_6); X_28:bat[:oid,:int] := sql.bind(X_5,"sys","lineorder","lo_suppkey",0); - X_30:bat[:oid,:int] := algebra.leftfetchjoin(X_134,X_28); + X_30:bat[:oid,:int] := algebra.leftfetchjoin(X_135,X_28); X_33:bat[:oid,:str] := sql.bind(X_5,"sys","supplier","s_region",0); X_35 := X_33; X_31:bat[:oid,:oid] := sql.tid(X_5,"sys","supplier"); @@ -67,15 +67,15 @@ function user.s2_1{autoCommit=true}(A0:s X_42 := X_38; X_43 := algebra.leftfetchjoin(X_36,X_42); (X_44,r1_48) := algebra.subjoin(X_30,X_43,nil:BAT,nil:BAT,false,nil:lng); - X_135 := algebra.leftfetchjoin(X_44,X_24); + X_136 := algebra.leftfetchjoin(X_44,X_24); X_46:bat[:oid,:int] := sql.bind(X_5,"sys","lineorder","lo_orderdate",0); - X_49:bat[:oid,:int] := algebra.leftfetchjoinPath(X_135,X_6,X_46); + X_49:bat[:oid,:int] := algebra.leftfetchjoinPath(X_136,X_6,X_46); X_50:bat[:oid,:oid] := sql.tid(X_5,"sys","dwdate"); X_52:bat[:oid,:int] := sql.bind(X_5,"sys","dwdate","d_datekey",0); X_54 := algebra.leftfetchjoin(X_50,X_52); (X_55,r1_61) := algebra.subjoin(X_49,X_54,nil:BAT,nil:BAT,false,nil:lng); - X_136 := algebra.leftfetchjoin(X_55,X_44); - X_60:bat[:oid,:str] := algebra.leftfetchjoinPath(X_136,r1_26,X_18,X_17); + X_137 := algebra.leftfetchjoin(X_55,X_44); + X_60:bat[:oid,:str] := algebra.leftfetchjoinPath(X_137,r1_26,X_18,X_17); X_61:bat[:oid,:int] := sql.bind(X_5,"sys","dwdate","d_year",0); X_63:bat[:oid,:int] := algebra.leftfetchjoinPath(r1_61,X_50,X_61); (X_64,r1_74,r2_74) := group.subgroup(X_63); @@ -83,7 +83,7 @@ function user.s2_1{autoCommit=true}(A0:s X_70 := algebra.leftfetchjoin(r1_77,X_60); X_71 := algebra.leftfetchjoin(r1_77,X_63); X_78:bat[:oid,:int] := sql.bind(X_5,"sys","lineorder","lo_revenue",0); - X_83:bat[:oid,:int] := algebra.leftfetchjoinPath(X_136,X_24,X_6,X_78); + X_83:bat[:oid,:int] := algebra.leftfetchjoinPath(X_137,X_24,X_6,X_78); X_84:bat[:oid,:hge] := aggr.subsum(X_83,X_67,r1_77,true,true); (X_72,r1_82,r2_82) := algebra.subsort(X_71,false,false); (X_75,r1_85,r2_85) := algebra.subsort(X_70,r1_82,r2_82,false,false); @@ -91,11 +91,11 @@ function user.s2_1{autoCommit=true}(A0:s X_88 := algebra.leftfetchjoin(r1_85,X_70); X_87 := algebra.leftfetchjoin(r1_85,X_71); X_89 := sql.resultSet(3,1,X_86); - sql.rsColumn(X_89,"sys.L1","L1","hugeint",32,0,X_86); + sql.rsColumn(X_89,"sys.L1","L1","hugeint",128,0,X_86); sql.rsColumn(X_89,"sys.dwdate","d_year","int",32,0,X_87); sql.rsColumn(X_89,"sys.part","p_brand1","clob",0,0,X_88); - X_105 := io.stdout(); - sql.exportResult(X_105,X_89); + X_106 := io.stdout(); + sql.exportResult(X_106,X_89); end user.s2_1; # 23:10:46 > 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 @@ -43,7 +43,7 @@ Ready. % clob # type % 457 # length function user.s2_1{autoCommit=true}(A0:str,A1:str):void; - X_106:void := querylog.define("explain\nselect sum(lo_revenue), d_year, p_brand1\n\tfrom lineorder, dwdate, part, supplier\n\twhere lo_orderdate = d_datekey\n\t\tand lo_partkey = p_partkey\n\t\tand lo_suppkey = s_suppkey\n\t\t-- OK to add p_mfgr=’MFGR#2’\n\t\t-- OK to add p_category=’MFGR#22’\n\t\tand p_brand1 = \\'MFGR#2221\\'\n\t\tand s_region = \\'EUROPE\\'\n\tgroup by d_year, p_brand1\n\torder by d_year, p_brand1;","sequential_pipe",55); + X_107:void := querylog.define("explain\nselect sum(lo_revenue), d_year, p_brand1\n\tfrom lineorder, dwdate, part, supplier\n\twhere lo_orderdate = d_datekey\n\t\tand lo_partkey = p_partkey\n\t\tand lo_suppkey = s_suppkey\n\t\t-- OK to add p_mfgr=’MFGR#2’\n\t\t-- OK to add p_category=’MFGR#22’\n\t\tand p_brand1 = \\'MFGR#2221\\'\n\t\tand s_region = \\'EUROPE\\'\n\tgroup by d_year, p_brand1\n\torder by d_year, p_brand1;","sequential_pipe",55); X_4 := sql.mvc(); X_5:bat[:oid,:oid] := sql.tid(X_4,"sys","lineorder"); X_8:bat[:oid,:int] := sql.bind(X_4,"sys","lineorder","lo_partkey",0); @@ -56,9 +56,9 @@ function user.s2_1{autoCommit=true}(A0:s X_21 := X_19; X_22 := algebra.leftfetchjoin(X_17,X_21); (X_23,r1_24) := algebra.subjoin(X_11,X_22,nil:BAT,nil:BAT,false,nil:lng); - X_133 := algebra.leftfetchjoin(X_23,X_5); + X_134 := algebra.leftfetchjoin(X_23,X_5); X_27:bat[:oid,:int] := sql.bind(X_4,"sys","lineorder","lo_suppkey",0); - X_29:bat[:oid,:int] := algebra.leftfetchjoin(X_133,X_27); + X_29:bat[:oid,:int] := algebra.leftfetchjoin(X_134,X_27); X_32:bat[:oid,:str] := sql.bind(X_4,"sys","supplier","s_region",0); X_34 := X_32; X_30:bat[:oid,:oid] := sql.tid(X_4,"sys","supplier"); @@ -67,15 +67,15 @@ function user.s2_1{autoCommit=true}(A0:s X_41 := X_37; X_42 := algebra.leftfetchjoin(X_35,X_41); (X_43,r1_46) := algebra.subjoin(X_29,X_42,nil:BAT,nil:BAT,false,nil:lng); - X_134 := algebra.leftfetchjoin(X_43,X_23); + X_135 := algebra.leftfetchjoin(X_43,X_23); X_45:bat[:oid,:int] := sql.bind(X_4,"sys","lineorder","lo_orderdate",0); - X_48:bat[:oid,:int] := algebra.leftfetchjoinPath(X_134,X_5,X_45); + X_48:bat[:oid,:int] := algebra.leftfetchjoinPath(X_135,X_5,X_45); X_49:bat[:oid,:oid] := sql.tid(X_4,"sys","dwdate"); X_51:bat[:oid,:int] := sql.bind(X_4,"sys","dwdate","d_datekey",0); X_53 := algebra.leftfetchjoin(X_49,X_51); (X_54,r1_59) := algebra.subjoin(X_48,X_53,nil:BAT,nil:BAT,false,nil:lng); - X_135 := algebra.leftfetchjoin(X_54,X_43); - X_59:bat[:oid,:str] := algebra.leftfetchjoinPath(X_135,r1_24,X_17,X_16); + X_136 := algebra.leftfetchjoin(X_54,X_43); + X_59:bat[:oid,:str] := algebra.leftfetchjoinPath(X_136,r1_24,X_17,X_16); X_60:bat[:oid,:int] := sql.bind(X_4,"sys","dwdate","d_year",0); X_62:bat[:oid,:int] := algebra.leftfetchjoinPath(r1_59,X_49,X_60); (X_63,r1_72,r2_72) := group.subgroup(X_62); @@ -83,7 +83,7 @@ function user.s2_1{autoCommit=true}(A0:s X_69 := algebra.leftfetchjoin(r1_75,X_59); X_70 := algebra.leftfetchjoin(r1_75,X_62); X_77:bat[:oid,:int] := sql.bind(X_4,"sys","lineorder","lo_revenue",0); - X_82:bat[:oid,:int] := algebra.leftfetchjoinPath(X_135,X_23,X_5,X_77); + X_82:bat[:oid,:int] := algebra.leftfetchjoinPath(X_136,X_23,X_5,X_77); X_83:bat[:oid,:hge] := aggr.subsum(X_82,X_66,r1_75,true,true); (X_71,r1_80,r2_80) := algebra.subsort(X_70,false,false); (X_74,r1_83,r2_83) := algebra.subsort(X_69,r1_80,r2_80,false,false); @@ -91,11 +91,11 @@ function user.s2_1{autoCommit=true}(A0:s X_87 := algebra.leftfetchjoin(r1_83,X_69); X_86 := algebra.leftfetchjoin(r1_83,X_70); X_88 := sql.resultSet(3,1,X_85); - sql.rsColumn(X_88,"sys.L1","L1","hugeint",32,0,X_85); + sql.rsColumn(X_88,"sys.L1","L1","hugeint",128,0,X_85); sql.rsColumn(X_88,"sys.dwdate","d_year","int",32,0,X_86); sql.rsColumn(X_88,"sys.part","p_brand1","clob",0,0,X_87); - X_104 := io.stdout(); - sql.exportResult(X_104,X_88); + X_105 := io.stdout(); + sql.exportResult(X_105,X_88); end user.s2_1; # 23:10:46 > diff --git a/sql/benchmarks/ssbm/Tests/07-explain.stable.out.int128 b/sql/benchmarks/ssbm/Tests/07-explain.stable.out.int128 --- a/sql/benchmarks/ssbm/Tests/07-explain.stable.out.int128 +++ b/sql/benchmarks/ssbm/Tests/07-explain.stable.out.int128 @@ -42,7 +42,7 @@ Ready. % clob # type % 455 # length function user.s2_1{autoCommit=true}(A0:str,A1:str,A2:int,A3:int):void; - X_127:void := querylog.define("explain\nselect c_nation, s_nation, d_year, sum(lo_revenue) as revenue\n\tfrom customer, lineorder, supplier, dwdate\n\twhere lo_custkey = c_custkey\n\t\tand lo_suppkey = s_suppkey\n\t\tand lo_orderdate = d_datekey\n\t\tand c_region = \\'ASIA\\'\n\t\tand s_region = \\'ASIA\\'\n\t\tand d_year >= 1992 and d_year <= 1997\n\tgroup by c_nation, s_nation, d_year\n\torder by d_year asc, revenue desc;","sequential_pipe",67); + X_128:void := querylog.define("explain\nselect c_nation, s_nation, d_year, sum(lo_revenue) as revenue\n\tfrom customer, lineorder, supplier, dwdate\n\twhere lo_custkey = c_custkey\n\t\tand lo_suppkey = s_suppkey\n\t\tand lo_orderdate = d_datekey\n\t\tand c_region = \\'ASIA\\'\n\t\tand s_region = \\'ASIA\\'\n\t\tand d_year >= 1992 and d_year <= 1997\n\tgroup by c_nation, s_nation, d_year\n\torder by d_year asc, revenue desc;","sequential_pipe",67); X_6 := sql.mvc(); X_7:bat[:oid,:oid] := sql.tid(X_6,"sys","lineorder"); X_10:bat[:oid,:int] := sql.bind(X_6,"sys","lineorder","lo_custkey",0); @@ -55,9 +55,9 @@ function user.s2_1{autoCommit=true}(A0:s X_23 := X_21; X_24 := algebra.leftfetchjoin(X_19,X_23); (X_25,r1_26) := algebra.subjoin(X_13,X_24,nil:BAT,nil:BAT,false,nil:lng); - X_156 := algebra.leftfetchjoin(X_25,X_7); + X_157 := algebra.leftfetchjoin(X_25,X_7); X_29:bat[:oid,:int] := sql.bind(X_6,"sys","lineorder","lo_suppkey",0); - X_31:bat[:oid,:int] := algebra.leftfetchjoin(X_156,X_29); + X_31:bat[:oid,:int] := algebra.leftfetchjoin(X_157,X_29); X_34:bat[:oid,:str] := sql.bind(X_6,"sys","supplier","s_region",0); X_36 := X_34; X_32:bat[:oid,:oid] := sql.tid(X_6,"sys","supplier"); @@ -66,9 +66,9 @@ function user.s2_1{autoCommit=true}(A0:s X_43 := X_39; X_44 := algebra.leftfetchjoin(X_37,X_43); (X_45,r1_48) := algebra.subjoin(X_31,X_44,nil:BAT,nil:BAT,false,nil:lng); - X_157 := algebra.leftfetchjoin(X_45,X_25); + X_158 := algebra.leftfetchjoin(X_45,X_25); X_47:bat[:oid,:int] := sql.bind(X_6,"sys","lineorder","lo_orderdate",0); - X_50:bat[:oid,:int] := algebra.leftfetchjoinPath(X_157,X_7,X_47); + X_50:bat[:oid,:int] := algebra.leftfetchjoinPath(X_158,X_7,X_47); X_53:bat[:oid,:int] := sql.bind(X_6,"sys","dwdate","d_year",0); X_55 := X_53; X_51:bat[:oid,:oid] := sql.tid(X_6,"sys","dwdate"); @@ -77,16 +77,16 @@ function user.s2_1{autoCommit=true}(A0:s X_60 := X_58; X_61 := algebra.leftfetchjoin(X_56,X_60); (X_62,r1_69) := algebra.subjoin(X_50,X_61,nil:BAT,nil:BAT,false,nil:lng); - X_158 := algebra.leftfetchjoin(X_62,X_45); + X_159 := algebra.leftfetchjoin(X_62,X_45); X_66:bat[:oid,:int] := sql.bind(X_6,"sys","lineorder","lo_revenue",0); - X_68:bat[:oid,:int] := algebra.leftfetchjoinPath(X_158,X_25,X_7,X_66); - X_159 := algebra.leftfetchjoin(r1_48,X_37); + X_68:bat[:oid,:int] := algebra.leftfetchjoinPath(X_159,X_25,X_7,X_66); + X_160 := algebra.leftfetchjoin(r1_48,X_37); X_69:bat[:oid,:str] := sql.bind(X_6,"sys","supplier","s_nation",0); X_74 := X_69; - X_75:bat[:oid,:str] := algebra.leftfetchjoinPath(X_62,X_159,X_74); + X_75:bat[:oid,:str] := algebra.leftfetchjoinPath(X_62,X_160,X_74); X_76:bat[:oid,:str] := sql.bind(X_6,"sys","customer","c_nation",0); X_79 := X_76; - X_80:bat[:oid,:str] := algebra.leftfetchjoinPath(X_158,r1_26,X_19,X_79); + X_80:bat[:oid,:str] := algebra.leftfetchjoinPath(X_159,r1_26,X_19,X_79); X_81:bat[:oid,:int] := algebra.leftfetchjoinPath(r1_69,X_56,X_55); (X_82,r1_98,r2_98) := group.subgroup(X_81); (X_85,r1_101,r2_101) := group.subgroup(X_80,X_82); _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list