Changeset: aa371f63fb0c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=aa371f63fb0c
Added Files:
sql/test/BugTracker-2015/Tests/incorrect_result_type.Bug-3687.sql
sql/test/BugTracker-2015/Tests/incorrect_result_type.Bug-3687.stable.err
sql/test/BugTracker-2015/Tests/incorrect_result_type.Bug-3687.stable.out
Modified Files:
clients/Tests/SQL-dump_all.stable.out
clients/Tests/SQL-dump_all.stable.out.oid32
sql/benchmarks/ATIS/Tests/select_group.stable.out
sql/benchmarks/ssbm/Tests/01-explain.stable.out
sql/benchmarks/ssbm/Tests/02-explain.stable.out
sql/benchmarks/ssbm/Tests/03-explain.stable.out
sql/benchmarks/ssbm/Tests/04-explain.stable.out
sql/benchmarks/ssbm/Tests/05-explain.stable.out
sql/benchmarks/ssbm/Tests/06-explain.stable.out
sql/benchmarks/ssbm/Tests/07-explain.stable.out
sql/benchmarks/ssbm/Tests/08-explain.stable.out
sql/benchmarks/ssbm/Tests/09-explain.stable.out
sql/benchmarks/ssbm/Tests/10-explain.stable.out
sql/benchmarks/tpch/Tests/01-explain.stable.out
sql/benchmarks/tpch/Tests/12-explain.stable.out
sql/benchmarks/tpch/Tests/18-explain.stable.out
sql/benchmarks/tpch/Tests/20-explain.stable.out
sql/benchmarks/tpch/Tests/20-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/20-plan.stable.out
sql/common/sql_types.c
sql/test/BugTracker-2009/Tests/case_evaluates_all_branches.SF-2893484.stable.out
sql/test/BugTracker-2015/Tests/All
Branch: Oct2014
Log Message:
fixed bug 3687, ie use correct result type for aggregates
diffs (truncated from 1400 to 300 lines):
diff --git a/clients/Tests/SQL-dump_all.stable.out
b/clients/Tests/SQL-dump_all.stable.out
--- a/clients/Tests/SQL-dump_all.stable.out
+++ b/clients/Tests/SQL-dump_all.stable.out
@@ -1832,7 +1832,7 @@ 6470 "columnsize" "bigint" 64 0
6475 NUL
6471 "heapsize" "bigint" 64 0 6475 NULL true
4 NULL
6472 "hashes" "bigint" 64 0 6475 NULL true
5 NULL
6473 "imprints" "bigint" 64 0 6475 NULL true
6 NULL
-6474 "auxiliary" "bigint" 53 0 6475 NULL true
7 NULL
+6474 "auxiliary" "bigint" 64 0 6475 NULL true
7 NULL
6477 "schema" "clob" 0 0 6490 NULL true 0
NULL
6478 "table" "clob" 0 0 6490 NULL true 1 NULL
6479 "column" "clob" 0 0 6490 NULL true 2
NULL
diff --git a/clients/Tests/SQL-dump_all.stable.out.oid32
b/clients/Tests/SQL-dump_all.stable.out.oid32
--- a/clients/Tests/SQL-dump_all.stable.out.oid32
+++ b/clients/Tests/SQL-dump_all.stable.out.oid32
@@ -1832,7 +1832,7 @@ 6470 "columnsize" "bigint" 64 0
6475 NUL
6471 "heapsize" "bigint" 64 0 6475 NULL true
4 NULL
6472 "hashes" "bigint" 64 0 6475 NULL true
5 NULL
6473 "imprints" "bigint" 64 0 6475 NULL true
6 NULL
-6474 "auxiliary" "bigint" 53 0 6475 NULL true
7 NULL
+6474 "auxiliary" "bigint" 64 0 6475 NULL true
7 NULL
6477 "schema" "clob" 0 0 6490 NULL true 0
NULL
6478 "table" "clob" 0 0 6490 NULL true 1 NULL
6479 "column" "clob" 0 0 6490 NULL true 2
NULL
diff --git a/sql/benchmarks/ATIS/Tests/select_group.stable.out
b/sql/benchmarks/ATIS/Tests/select_group.stable.out
--- a/sql/benchmarks/ATIS/Tests/select_group.stable.out
+++ b/sql/benchmarks/ATIS/Tests/select_group.stable.out
@@ -67,7 +67,7 @@ Ready.
% sys.L1 # table_name
% L1 # name
% decimal # type
-% 2 # length
+% 20 # length
[ 278 ]
#select avg(engines) from aircraft;
% sys.L1 # table_name
diff --git a/sql/benchmarks/ssbm/Tests/01-explain.stable.out
b/sql/benchmarks/ssbm/Tests/01-explain.stable.out
--- a/sql/benchmarks/ssbm/Tests/01-explain.stable.out
+++ b/sql/benchmarks/ssbm/Tests/01-explain.stable.out
@@ -78,7 +78,7 @@ function user.s2_1{autoCommit=true}(A0:i
X_59 := algebra.leftfetchjoin(X_47,X_58);
X_60:bat[:oid,:lng] := batcalc.*(X_57,X_59);
X_61:lng := aggr.sum(X_60);
- sql.exportValue(1,"sys.L1","revenue","bigint",53,0,7,X_61,"");
+ sql.exportValue(1,"sys.L1","revenue","bigint",64,0,7,X_61,"");
end s2_1;
# querylog.define("explain\nselect sum(lo_extendedprice*lo_discount) as
revenue\n\tfrom lineorder, dwdate\n\twhere lo_orderdate = d_datekey\n\t\tand
d_year = 1993\n\t\tand lo_discount between 1 and 3\n\t\tand lo_quantity <
25;","sequential_pipe")
diff --git a/sql/benchmarks/ssbm/Tests/02-explain.stable.out
b/sql/benchmarks/ssbm/Tests/02-explain.stable.out
--- a/sql/benchmarks/ssbm/Tests/02-explain.stable.out
+++ b/sql/benchmarks/ssbm/Tests/02-explain.stable.out
@@ -78,7 +78,7 @@ function user.s2_1{autoCommit=true}(A0:i
X_59 := algebra.leftfetchjoin(X_47,X_58);
X_60:bat[:oid,:lng] := batcalc.*(X_57,X_59);
X_61:lng := aggr.sum(X_60);
- sql.exportValue(1,"sys.L1","revenue","bigint",53,0,7,X_61,"");
+ sql.exportValue(1,"sys.L1","revenue","bigint",64,0,7,X_61,"");
end s2_1;
# querylog.define("explain\nselect sum(lo_extendedprice*lo_discount) as
revenue\n\tfrom lineorder, dwdate\n\twhere lo_orderdate = d_datekey\n\t\tand
d_yearmonthnum = 199401\n\t\tand lo_discount between 4 and 6\n\t\tand
lo_quantity between 26 and 35;","sequential_pipe")
diff --git a/sql/benchmarks/ssbm/Tests/03-explain.stable.out
b/sql/benchmarks/ssbm/Tests/03-explain.stable.out
--- a/sql/benchmarks/ssbm/Tests/03-explain.stable.out
+++ b/sql/benchmarks/ssbm/Tests/03-explain.stable.out
@@ -85,7 +85,7 @@ function user.s2_1{autoCommit=true}(A0:i
X_68 := algebra.leftfetchjoin(X_55,X_67);
X_69:bat[:oid,:lng] := batcalc.*(X_66,X_68);
X_70:lng := aggr.sum(X_69);
- sql.exportValue(1,"sys.L1","revenue","bigint",53,0,7,X_70,"");
+ sql.exportValue(1,"sys.L1","revenue","bigint",64,0,7,X_70,"");
end s2_1;
# querylog.define("explain\nselect sum(lo_extendedprice*lo_discount) as
revenue\n\tfrom lineorder, dwdate\n\twhere lo_orderdate = d_datekey\n\t\tand
d_weeknuminyear = 6 and d_year = 1994\n\t\tand lo_discount between 5 and
7\n\t\tand lo_quantity between 36 and 40;","sequential_pipe")
diff --git a/sql/benchmarks/ssbm/Tests/04-explain.stable.out
b/sql/benchmarks/ssbm/Tests/04-explain.stable.out
--- a/sql/benchmarks/ssbm/Tests/04-explain.stable.out
+++ b/sql/benchmarks/ssbm/Tests/04-explain.stable.out
@@ -49,12 +49,12 @@ function user.s2_1{autoCommit=true}(A0:s
X_16 := sql.projectdelta(X_5,X_8,X_11,r1_11,X_14);
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_160 := algebra.subselect(X_19,X_17,A0,A0,true,true,false);
+ X_161 := 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_161 := algebra.subselect(r1_22,A0,A0,true,true,false);
+ X_162 := algebra.subselect(r1_22,A0,A0,true,true,false);
X_23:bat[:oid,:str] := sql.bind(X_4,"sys","part","p_category",1);
- X_162 := algebra.subselect(X_23,X_17,A0,A0,true,true,false);
- X_24 := sql.subdelta(X_160,X_17,X_21,X_161,X_162);
+ X_163 := algebra.subselect(X_23,X_17,A0,A0,true,true,false);
+ X_24 := sql.subdelta(X_161,X_17,X_21,X_162,X_163);
X_26 := X_24;
(X_27,r1_31) := algebra.join(X_16,X_26);
X_29:bat[:oid,:oid] :=
sql.bind_idxbat(X_4,"sys","lineorder","lineorder_lo_suppkey_fkey",0);
@@ -64,28 +64,28 @@ function user.s2_1{autoCommit=true}(A0:s
X_35 := algebra.leftfetchjoin(X_27,X_34);
X_39:bat[:oid,:str] := sql.bind(X_4,"sys","supplier","s_region",0);
X_36:bat[:oid,:oid] := sql.tid(X_4,"sys","supplier");
- X_163 := algebra.subselect(X_39,X_36,A1,A1,true,true,false);
+ X_164 := algebra.subselect(X_39,X_36,A1,A1,true,true,false);
(X_42,r1_47) := sql.bind(X_4,"sys","supplier","s_region",2);
- X_164 := algebra.subselect(r1_47,A1,A1,true,true,false);
+ X_165 := algebra.subselect(r1_47,A1,A1,true,true,false);
X_45:bat[:oid,:str] := sql.bind(X_4,"sys","supplier","s_region",1);
- X_165 := algebra.subselect(X_45,X_36,A1,A1,true,true,false);
- X_47 := sql.subdelta(X_163,X_36,X_42,X_164,X_165);
+ X_166 := algebra.subselect(X_45,X_36,A1,A1,true,true,false);
+ X_47 := sql.subdelta(X_164,X_36,X_42,X_165,X_166);
X_49 := X_47;
(X_50,r1_58) := algebra.join(X_35,X_49);
- X_166 := algebra.leftfetchjoin(X_50,X_27);
+ X_167 := algebra.leftfetchjoin(X_50,X_27);
X_52:bat[:oid,:oid] :=
sql.bind_idxbat(X_4,"sys","lineorder","lineorder_lo_orderdate_fkey",0);
(X_55,r1_63) :=
sql.bind_idxbat(X_4,"sys","lineorder","lineorder_lo_orderdate_fkey",2);
X_57:bat[:oid,:oid] :=
sql.bind_idxbat(X_4,"sys","lineorder","lineorder_lo_orderdate_fkey",1);
X_58 := sql.projectdelta(X_5,X_52,X_55,r1_63,X_57);
- X_59:bat[:oid,:oid] := algebra.leftfetchjoin(X_166,X_58);
+ X_59:bat[:oid,:oid] := algebra.leftfetchjoin(X_167,X_58);
X_60:bat[:oid,:oid] := sql.tid(X_4,"sys","dwdate");
(X_62,r1_72) := algebra.join(X_59,X_60);
- X_167 := algebra.leftfetchjoin(X_62,X_50);
+ X_168 := algebra.leftfetchjoin(X_62,X_50);
X_64:bat[:oid,:str] := sql.bind(X_4,"sys","part","p_brand1",0);
(X_68,r1_78) := sql.bind(X_4,"sys","part","p_brand1",2);
X_70:bat[:oid,:str] := sql.bind(X_4,"sys","part","p_brand1",1);
X_71 := sql.projectdelta(X_24,X_64,X_68,r1_78,X_70);
- X_72:bat[:oid,:str] := algebra.leftfetchjoinPath(X_167,r1_31,X_71);
+ X_72:bat[:oid,:str] := algebra.leftfetchjoinPath(X_168,r1_31,X_71);
X_73:bat[:oid,:int] := sql.bind(X_4,"sys","dwdate","d_year",0);
(X_76,r1_90) := sql.bind(X_4,"sys","dwdate","d_year",2);
X_79:bat[:oid,:int] := sql.bind(X_4,"sys","dwdate","d_year",1);
@@ -99,7 +99,7 @@ function user.s2_1{autoCommit=true}(A0:s
(X_102,r1_117) := sql.bind(X_4,"sys","lineorder","lo_revenue",2);
X_104:bat[:oid,:int] := sql.bind(X_4,"sys","lineorder","lo_revenue",1);
X_105 := sql.projectdelta(X_5,X_98,X_102,r1_117,X_104);
- X_106:bat[:oid,:int] := algebra.leftfetchjoinPath(X_167,X_27,X_105);
+ X_106:bat[:oid,:int] := algebra.leftfetchjoinPath(X_168,X_27,X_105);
X_107:bat[:oid,:lng] := aggr.subsum(X_106,X_86,r1_101,true,true);
(X_91,r1_106,r2_106) := algebra.subsort(X_90,false,false);
(X_95,r1_110,r2_110) := algebra.subsort(X_89,r1_106,r2_106,false,false);
@@ -107,11 +107,11 @@ function user.s2_1{autoCommit=true}(A0:s
X_111 := algebra.leftfetchjoin(r1_110,X_89);
X_110 := algebra.leftfetchjoin(r1_110,X_90);
X_112 := sql.resultSet(3,1,X_109);
- sql.rsColumn(X_112,"sys.L1","L1","bigint",32,0,X_109);
+ sql.rsColumn(X_112,"sys.L1","L1","bigint",64,0,X_109);
sql.rsColumn(X_112,"sys.dwdate","d_year","int",32,0,X_110);
sql.rsColumn(X_112,"sys.part","p_brand1","clob",0,0,X_111);
- X_129 := io.stdout();
- sql.exportResult(X_129,X_112);
+ X_130 := io.stdout();
+ sql.exportResult(X_130,X_112);
end s2_1;
# 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")
diff --git a/sql/benchmarks/ssbm/Tests/05-explain.stable.out
b/sql/benchmarks/ssbm/Tests/05-explain.stable.out
--- a/sql/benchmarks/ssbm/Tests/05-explain.stable.out
+++ b/sql/benchmarks/ssbm/Tests/05-explain.stable.out
@@ -51,12 +51,12 @@ function user.s2_1{autoCommit=true}(A0:s
X_17 := sql.projectdelta(X_6,X_9,X_12,r1_12,X_15);
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_154 := algebra.subselect(X_20,X_18,A0,A1,true,true,false);
+ X_155 := 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_155 := algebra.subselect(r1_23,A0,A1,true,true,false);
+ X_156 := algebra.subselect(r1_23,A0,A1,true,true,false);
X_24:bat[:oid,:str] := sql.bind(X_5,"sys","part","p_brand1",1);
- X_156 := algebra.subselect(X_24,X_18,A0,A1,true,true,false);
- X_25 := sql.subdelta(X_154,X_18,X_22,X_155,X_156);
+ X_157 := algebra.subselect(X_24,X_18,A0,A1,true,true,false);
+ X_25 := sql.subdelta(X_155,X_18,X_22,X_156,X_157);
X_27 := X_25;
(X_28,r1_33) := algebra.join(X_17,X_27);
X_30:bat[:oid,:oid] :=
sql.bind_idxbat(X_5,"sys","lineorder","lineorder_lo_suppkey_fkey",0);
@@ -66,25 +66,25 @@ function user.s2_1{autoCommit=true}(A0:s
X_38 := algebra.leftfetchjoin(X_28,X_37);
X_41:bat[:oid,:str] := sql.bind(X_5,"sys","supplier","s_region",0);
X_39:bat[:oid,:oid] := sql.tid(X_5,"sys","supplier");
- X_157 := algebra.subselect(X_41,X_39,A2,A2,true,true,false);
+ X_158 := algebra.subselect(X_41,X_39,A2,A2,true,true,false);
(X_44,r1_50) := sql.bind(X_5,"sys","supplier","s_region",2);
- X_158 := algebra.subselect(r1_50,A2,A2,true,true,false);
+ X_159 := algebra.subselect(r1_50,A2,A2,true,true,false);
X_47:bat[:oid,:str] := sql.bind(X_5,"sys","supplier","s_region",1);
- X_159 := algebra.subselect(X_47,X_39,A2,A2,true,true,false);
- X_49 := sql.subdelta(X_157,X_39,X_44,X_158,X_159);
+ X_160 := algebra.subselect(X_47,X_39,A2,A2,true,true,false);
+ X_49 := sql.subdelta(X_158,X_39,X_44,X_159,X_160);
X_51 := X_49;
(X_52,r1_61) := algebra.join(X_38,X_51);
- X_160 := algebra.leftfetchjoin(X_52,X_28);
+ X_161 := algebra.leftfetchjoin(X_52,X_28);
X_54:bat[:oid,:oid] :=
sql.bind_idxbat(X_5,"sys","lineorder","lineorder_lo_orderdate_fkey",0);
(X_56,r1_65) :=
sql.bind_idxbat(X_5,"sys","lineorder","lineorder_lo_orderdate_fkey",2);
X_58:bat[:oid,:oid] :=
sql.bind_idxbat(X_5,"sys","lineorder","lineorder_lo_orderdate_fkey",1);
X_59 := sql.projectdelta(X_6,X_54,X_56,r1_65,X_58);
- X_60:bat[:oid,:oid] := algebra.leftfetchjoin(X_160,X_59);
+ X_60:bat[:oid,:oid] := algebra.leftfetchjoin(X_161,X_59);
X_61:bat[:oid,:oid] := sql.tid(X_5,"sys","dwdate");
(X_64,r1_75) := algebra.join(X_60,X_61);
- X_161 := algebra.leftfetchjoin(X_64,X_52);
+ X_162 := algebra.leftfetchjoin(X_64,X_52);
X_66 := sql.projectdelta(X_25,X_20,X_22,r1_23,X_24);
- X_67:bat[:oid,:str] := algebra.leftfetchjoinPath(X_161,r1_33,X_66);
+ X_67:bat[:oid,:str] := algebra.leftfetchjoinPath(X_162,r1_33,X_66);
X_68:bat[:oid,:int] := sql.bind(X_5,"sys","dwdate","d_year",0);
(X_71,r1_84) := sql.bind(X_5,"sys","dwdate","d_year",2);
X_74:bat[:oid,:int] := sql.bind(X_5,"sys","dwdate","d_year",1);
@@ -98,7 +98,7 @@ function user.s2_1{autoCommit=true}(A0:s
(X_97,r1_111) := sql.bind(X_5,"sys","lineorder","lo_revenue",2);
X_99:bat[:oid,:int] := sql.bind(X_5,"sys","lineorder","lo_revenue",1);
X_100 := sql.projectdelta(X_6,X_93,X_97,r1_111,X_99);
- X_101:bat[:oid,:int] := algebra.leftfetchjoinPath(X_161,X_28,X_100);
+ X_101:bat[:oid,:int] := algebra.leftfetchjoinPath(X_162,X_28,X_100);
X_102:bat[:oid,:lng] := aggr.subsum(X_101,X_81,r1_95,true,true);
(X_86,r1_100,r2_100) := algebra.subsort(X_85,false,false);
(X_90,r1_104,r2_104) := algebra.subsort(X_84,r1_100,r2_100,false,false);
@@ -106,11 +106,11 @@ function user.s2_1{autoCommit=true}(A0:s
X_106 := algebra.leftfetchjoin(r1_104,X_84);
X_105 := algebra.leftfetchjoin(r1_104,X_85);
X_107 := sql.resultSet(3,1,X_104);
- sql.rsColumn(X_107,"sys.L1","L1","bigint",32,0,X_104);
+ sql.rsColumn(X_107,"sys.L1","L1","bigint",64,0,X_104);
sql.rsColumn(X_107,"sys.dwdate","d_year","int",32,0,X_105);
sql.rsColumn(X_107,"sys.part","p_brand1","clob",0,0,X_106);
- X_124 := io.stdout();
- sql.exportResult(X_124,X_107);
+ X_125 := io.stdout();
+ sql.exportResult(X_125,X_107);
end s2_1;
# 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")
diff --git a/sql/benchmarks/ssbm/Tests/06-explain.stable.out
b/sql/benchmarks/ssbm/Tests/06-explain.stable.out
--- a/sql/benchmarks/ssbm/Tests/06-explain.stable.out
+++ b/sql/benchmarks/ssbm/Tests/06-explain.stable.out
@@ -51,12 +51,12 @@ function user.s2_1{autoCommit=true}(A0:s
X_16 := sql.projectdelta(X_5,X_8,X_11,r1_11,X_14);
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_152 := algebra.subselect(X_19,X_17,A0,A0,true,true,false);
+ X_153 := 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_153 := algebra.subselect(r1_22,A0,A0,true,true,false);
+ X_154 := algebra.subselect(r1_22,A0,A0,true,true,false);
X_23:bat[:oid,:str] := sql.bind(X_4,"sys","part","p_brand1",1);
- X_154 := algebra.subselect(X_23,X_17,A0,A0,true,true,false);
- X_24 := sql.subdelta(X_152,X_17,X_21,X_153,X_154);
+ X_155 := algebra.subselect(X_23,X_17,A0,A0,true,true,false);
+ X_24 := sql.subdelta(X_153,X_17,X_21,X_154,X_155);
X_26 := X_24;
(X_27,r1_31) := algebra.join(X_16,X_26);
X_29:bat[:oid,:oid] :=
sql.bind_idxbat(X_4,"sys","lineorder","lineorder_lo_suppkey_fkey",0);
@@ -66,25 +66,25 @@ function user.s2_1{autoCommit=true}(A0:s
X_35 := algebra.leftfetchjoin(X_27,X_34);
X_39:bat[:oid,:str] := sql.bind(X_4,"sys","supplier","s_region",0);
X_36:bat[:oid,:oid] := sql.tid(X_4,"sys","supplier");
- X_155 := algebra.subselect(X_39,X_36,A1,A1,true,true,false);
+ X_156 := algebra.subselect(X_39,X_36,A1,A1,true,true,false);
(X_42,r1_47) := sql.bind(X_4,"sys","supplier","s_region",2);
- X_156 := algebra.subselect(r1_47,A1,A1,true,true,false);
+ X_157 := algebra.subselect(r1_47,A1,A1,true,true,false);
X_45:bat[:oid,:str] := sql.bind(X_4,"sys","supplier","s_region",1);
- X_157 := algebra.subselect(X_45,X_36,A1,A1,true,true,false);
- X_47 := sql.subdelta(X_155,X_36,X_42,X_156,X_157);
+ X_158 := algebra.subselect(X_45,X_36,A1,A1,true,true,false);
+ X_47 := sql.subdelta(X_156,X_36,X_42,X_157,X_158);
X_49 := X_47;
(X_50,r1_58) := algebra.join(X_35,X_49);
- X_158 := algebra.leftfetchjoin(X_50,X_27);
+ X_159 := algebra.leftfetchjoin(X_50,X_27);
X_52:bat[:oid,:oid] :=
sql.bind_idxbat(X_4,"sys","lineorder","lineorder_lo_orderdate_fkey",0);
(X_55,r1_63) :=
sql.bind_idxbat(X_4,"sys","lineorder","lineorder_lo_orderdate_fkey",2);
X_57:bat[:oid,:oid] :=
sql.bind_idxbat(X_4,"sys","lineorder","lineorder_lo_orderdate_fkey",1);
X_58 := sql.projectdelta(X_5,X_52,X_55,r1_63,X_57);
- X_59:bat[:oid,:oid] := algebra.leftfetchjoin(X_158,X_58);
+ X_59:bat[:oid,:oid] := algebra.leftfetchjoin(X_159,X_58);
X_60:bat[:oid,:oid] := sql.tid(X_4,"sys","dwdate");
(X_62,r1_72) := algebra.join(X_59,X_60);
- X_159 := algebra.leftfetchjoin(X_62,X_50);
+ X_160 := algebra.leftfetchjoin(X_62,X_50);
X_64 := sql.projectdelta(X_24,X_19,X_21,r1_22,X_23);
- X_65:bat[:oid,:str] := algebra.leftfetchjoinPath(X_159,r1_31,X_64);
+ X_65:bat[:oid,:str] := algebra.leftfetchjoinPath(X_160,r1_31,X_64);
X_66:bat[:oid,:int] := sql.bind(X_4,"sys","dwdate","d_year",0);
(X_70,r1_82) := sql.bind(X_4,"sys","dwdate","d_year",2);
X_73:bat[:oid,:int] := sql.bind(X_4,"sys","dwdate","d_year",1);
@@ -98,7 +98,7 @@ function user.s2_1{autoCommit=true}(A0:s
(X_95,r1_108) := sql.bind(X_4,"sys","lineorder","lo_revenue",2);
X_97:bat[:oid,:int] := sql.bind(X_4,"sys","lineorder","lo_revenue",1);
X_98 := sql.projectdelta(X_5,X_92,X_95,r1_108,X_97);
- X_99:bat[:oid,:int] := algebra.leftfetchjoinPath(X_159,X_27,X_98);
+ X_99:bat[:oid,:int] := algebra.leftfetchjoinPath(X_160,X_27,X_98);
X_100:bat[:oid,:lng] := aggr.subsum(X_99,X_80,r1_93,true,true);
(X_85,r1_98,r2_98) := algebra.subsort(X_84,false,false);
(X_89,r1_102,r2_102) := algebra.subsort(X_83,r1_98,r2_98,false,false);
@@ -106,11 +106,11 @@ function user.s2_1{autoCommit=true}(A0:s
X_104 := algebra.leftfetchjoin(r1_102,X_83);
X_103 := algebra.leftfetchjoin(r1_102,X_84);
X_105 := sql.resultSet(3,1,X_102);
- sql.rsColumn(X_105,"sys.L1","L1","bigint",32,0,X_102);
+ sql.rsColumn(X_105,"sys.L1","L1","bigint",64,0,X_102);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
