Changeset: 42bbc5ea0c9a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=42bbc5ea0c9a
Modified Files:
        sql/benchmarks/tpch/Tests/11-explain.stable.out.int128
        sql/benchmarks/tpch/Tests/11-plan.stable.out.int128
        sql/benchmarks/tpch/Tests/14-explain.stable.out.int128
        sql/benchmarks/tpch/Tests/14-plan.stable.out.int128
        sql/benchmarks/tpch/Tests/17-explain.stable.out.int128
        sql/benchmarks/tpch/Tests/17-plan.stable.out.int128
        sql/benchmarks/tpch/Tests/20-explain.stable.out.int128
        sql/benchmarks/tpch/Tests/20-plan.stable.out.int128
        sql/benchmarks/tpch/Tests/22-explain.stable.out.int128
Branch: default
Log Message:

approved output


diffs (truncated from 336 to 300 lines):

diff --git a/sql/benchmarks/tpch/Tests/11-explain.stable.out.int128 
b/sql/benchmarks/tpch/Tests/11-explain.stable.out.int128
--- a/sql/benchmarks/tpch/Tests/11-explain.stable.out.int128
+++ b/sql/benchmarks/tpch/Tests/11-explain.stable.out.int128
@@ -57,7 +57,7 @@ Ready.
 % mal # name
 % clob # type
 % 714 # length
-function user.s2_1{autoCommit=true}(A0:str,A1:lng,A2:str):void;
+function user.s2_1{autoCommit=true}(A0:str,A1:sht,A2:str):void;
     X_5 := sql.mvc();
     X_6:bat[:oid,:oid]  := sql.tid(X_5,"sys","supplier");
     X_9 := sql.bind_idxbat(X_5,"sys","supplier","supplier_s_nationkey_fkey",0);
@@ -117,13 +117,13 @@ function user.s2_1{autoCommit=true}(A0:s
     X_105:hge  := aggr.sum(X_104);
     X_106 := calc.*(X_105,A1);
     X_107 := sql.single(X_106);
-    X_109:bat[:oid,:hge]  := batsql.dec_round(X_107,100:hge);
-    (X_110,r1_169) := 
algebra.subthetajoin(X_85,X_109,nil:BAT,nil:BAT,1,true,nil:lng);
+    X_108:bat[:oid,:hge]  := batcalc.hge(5,X_107,39,2);
+    (X_110,r1_166) := 
algebra.subthetajoin(X_85,X_108,nil:BAT,nil:BAT,1,true,nil:lng);
     X_115 := algebra.tinter(X_63,X_110);
     X_116 := algebra.leftfetchjoin(X_115,X_85);
-    (X_117,r1_176,r2_176) := algebra.subsort(X_116,true,false);
-    X_121:bat[:oid,:int]  := algebra.leftfetchjoinPath(r1_176,X_115,X_62);
-    X_122 := algebra.leftfetchjoin(r1_176,X_116);
+    (X_117,r1_173,r2_173) := algebra.subsort(X_116,true,false);
+    X_121:bat[:oid,:int]  := algebra.leftfetchjoinPath(r1_173,X_115,X_62);
+    X_122 := algebra.leftfetchjoin(r1_173,X_116);
     X_123 := sql.resultSet(2,1,X_121);
     sql.rsColumn(X_123,"sys.partsupp","ps_partkey","int",32,0,X_121);
     sql.rsColumn(X_123,"sys.L1","value","decimal",39,2,X_122);
diff --git a/sql/benchmarks/tpch/Tests/11-plan.stable.out.int128 
b/sql/benchmarks/tpch/Tests/11-plan.stable.out.int128
--- a/sql/benchmarks/tpch/Tests/11-plan.stable.out.int128
+++ b/sql/benchmarks/tpch/Tests/11-plan.stable.out.int128
@@ -81,8 +81,8 @@ project (
 | | | | | table(sys.partsupp) [ partsupp.ps_availqty NOT NULL, 
partsupp.ps_supplycost NOT NULL, partsupp.%partsupp_ps_suppkey_fkey NOT NULL 
JOINIDX sys.partsupp.partsupp_ps_suppkey_fkey ] COUNT 
 | | | | ) [ partsupp.%partsupp_ps_suppkey_fkey NOT NULL = supplier.%TID% NOT 
NULL JOINIDX sys.partsupp.partsupp_ps_suppkey_fkey ]
 | | | ) [  ] [ sys.sum no nil 
(sys.sql_mul(decimal(39,2)[partsupp.ps_supplycost NOT NULL] as 
partsupp.ps_supplycost, partsupp.ps_availqty NOT NULL)) as L3.L3 ]
-| | ) [ sys.sql_mul(L3, decimal(11,10) "1") as L4.L4 ]
-| ) [ L2 > sys.scale_down(L4.L4, hugeint "100") ]
+| | ) [ sys.sql_mul(L3, decimal(4,3) "10") as L4.L4 ]
+| ) [ L2 > decimal(39,2)[L4.L4] ]
 ) [ partsupp.ps_partkey NOT NULL, L1 as L1.value ] [ L1.value ]
 
 # 22:46:31 >  
diff --git a/sql/benchmarks/tpch/Tests/14-explain.stable.out.int128 
b/sql/benchmarks/tpch/Tests/14-explain.stable.out.int128
--- a/sql/benchmarks/tpch/Tests/14-explain.stable.out.int128
+++ b/sql/benchmarks/tpch/Tests/14-explain.stable.out.int128
@@ -43,7 +43,7 @@ Ready.
 % mal # name
 % clob # type
 % 405 # length
-function 
user.s2_1{autoCommit=true}(A0:int,A1:str,A2:bte,A3:bte,A4:bte,A5:date,A6:date,A7:int):void;
+function 
user.s2_1{autoCommit=true}(A0:sht,A1:str,A2:bte,A3:bte,A4:bte,A5:date,A6:date,A7:int):void;
     X_10 := sql.mvc();
     X_14:bat[:oid,:date]  := sql.bind(X_10,"sys","lineitem","l_shipdate",0);
     X_11:bat[:oid,:oid]  := sql.tid(X_10,"sys","lineitem");
diff --git a/sql/benchmarks/tpch/Tests/14-plan.stable.out.int128 
b/sql/benchmarks/tpch/Tests/14-plan.stable.out.int128
--- a/sql/benchmarks/tpch/Tests/14-plan.stable.out.int128
+++ b/sql/benchmarks/tpch/Tests/14-plan.stable.out.int128
@@ -51,7 +51,7 @@ project (
 | | | table(sys.part) [ part.p_type NOT NULL, part.%TID% NOT NULL ] COUNT 
 | | ) [ lineitem.%lineitem_l_partkey_fkey NOT NULL = part.%TID% NOT NULL 
JOINIDX sys.lineitem.lineitem_l_partkey_fkey ]
 | ) [  ] [ sys.sum no nil 
(sys.ifthenelse(sys.ifthenelse(sys.isnull(sys.like(part.p_type NOT NULL, 
char[char(6) "PROMO%"])), boolean "false", sys.like(part.p_type NOT NULL, 
char[char(6) "PROMO%"])), sys.sql_mul(decimal(33,2)[lineitem.l_extendedprice 
NOT NULL] as lineitem.l_extendedprice, sys.sql_sub(decimal(15,2)[tinyint "1"], 
lineitem.l_discount NOT NULL)), decimal(33,4)[tinyint "0"])) as L1.L1, sys.sum 
no nil (sys.sql_mul(decimal(33,2)[lineitem.l_extendedprice NOT NULL] as 
lineitem.l_extendedprice, sys.sql_sub(decimal(15,2)[tinyint "1"], 
lineitem.l_discount NOT NULL))) as L2.L2 ]
-) [ sys.sql_mul(decimal(5,2) "1", sys.sql_div(decimal(37,8)[L1] as L1, L2)) as 
L2.promo_revenue ]
+) [ sys.sql_mul(decimal(4,1) "1", sys.sql_div(decimal(37,8)[L1] as L1, L2)) as 
L2.promo_revenue ]
 
 # 22:46:32 >  
 # 22:46:32 >  "Done."
diff --git a/sql/benchmarks/tpch/Tests/17-explain.stable.out.int128 
b/sql/benchmarks/tpch/Tests/17-explain.stable.out.int128
--- a/sql/benchmarks/tpch/Tests/17-explain.stable.out.int128
+++ b/sql/benchmarks/tpch/Tests/17-explain.stable.out.int128
@@ -94,13 +94,13 @@ function user.s2_1{autoCommit=true}(A0:b
     (X_76,r1_90) := sql.bind(X_6,"sys","lineitem","l_quantity",2);
     X_78:bat[:oid,:int]  := sql.bind(X_6,"sys","lineitem","l_quantity",1);
     X_79 := sql.projectdelta(X_7,X_74,X_76,r1_90,X_78);
-    X_86 := algebra.leftfetchjoin(X_58,X_79);
-    X_87 := batcalc.dbl(X_86);
-    X_88:bat[:oid,:dbl]  := aggr.subavg(X_87,X_71,r1_85,true,true);
+    X_85 := algebra.leftfetchjoin(X_58,X_79);
+    X_86 := batcalc.dbl(X_85);
+    X_87:bat[:oid,:dbl]  := aggr.subavg(X_86,X_71,r1_85,true,true);
     X_80:bat[:oid,:int]  := algebra.leftfetchjoinPath(X_150,X_43,X_79);
-    X_81 := batcalc.dbl(X_80);
-    X_90:bat[:oid,:dbl]  := batcalc.*(A3,X_88);
-    X_91:bat[:oid,:bit]  := batcalc.<(X_81,X_90);
+    X_89:bat[:oid,:dbl]  := batcalc.*(A3,X_87);
+    X_90 := batcalc.int(X_89);
+    X_91:bat[:oid,:bit]  := batcalc.<(X_80,X_90);
     X_92 := algebra.subselect(X_91,true,true,true,true,false);
     X_94:bat[:oid,:lng]  := sql.bind(X_6,"sys","lineitem","l_extendedprice",0);
     (X_97,r1_124) := sql.bind(X_6,"sys","lineitem","l_extendedprice",2);
@@ -109,9 +109,9 @@ function user.s2_1{autoCommit=true}(A0:b
     X_101:bat[:oid,:lng]  := algebra.leftfetchjoinPath(X_92,X_150,X_43,X_100);
     X_102:hge  := aggr.sum(X_101);
     X_103 := calc.lng(2,X_102,15,2);
-    X_105 := calc.lng(2,X_103,18,5);
+    X_106 := calc.lng(2,X_103,18,5);
     X_109 := calc.lng(1,A0,15,2);
-    X_111 := calc./(X_105,X_109);
+    X_111 := calc./(X_106,X_109);
     sql.exportValue(1,"sys.L3","avg_yearly","decimal",18,3,8,X_111,"");
 end s2_1;
 # querylog.define("explain select\n\tsum(l_extendedprice) / 7.0 as 
avg_yearly\nfrom\n\tlineitem,\n\tpart\nwhere\n\tp_partkey = l_partkey\n\tand 
p_brand = \\'Brand#23\\'\n\tand p_container = \\'MED BOX\\'\n\tand l_quantity < 
(\n\t\tselect\n\t\t\t0.2 * 
avg(l_quantity)\n\t\tfrom\n\t\t\tlineitem\n\t\twhere\n\t\t\tl_partkey = 
p_partkey\n\t);","sequential_pipe")
diff --git a/sql/benchmarks/tpch/Tests/17-plan.stable.out.int128 
b/sql/benchmarks/tpch/Tests/17-plan.stable.out.int128
--- a/sql/benchmarks/tpch/Tests/17-plan.stable.out.int128
+++ b/sql/benchmarks/tpch/Tests/17-plan.stable.out.int128
@@ -64,7 +64,7 @@ project (
 | | | | | ) [ L4.l_partkey NOT NULL = part.p_partkey NOT NULL ]
 | | | | ) [ L5.L5 ] [ lineitem.l_quantity NOT NULL, lineitem.l_extendedprice 
NOT NULL, L5.L5 HASHCOL , sys.avg no nil (double[L4.l_quantity NOT NULL] as 
lineitem.l_quantity) as L1.L1 ]
 | | | ) [ lineitem.l_quantity NOT NULL, lineitem.l_extendedprice NOT NULL, 
sys.sql_mul(double(53,1)[decimal(2,1) "2"], L1) as L2.L2 ]
-| | ) [ double(53,1)[lineitem.l_quantity NOT NULL] < L2.L2 ]
+| | ) [ lineitem.l_quantity NOT NULL < int[L2.L2] ]
 | ) [  ] [ sys.sum no nil (lineitem.l_extendedprice NOT NULL) NOT NULL as 
L3.L3 ]
 ) [ sys.sql_div(decimal(18,5)[decimal(15,2)[L3 NOT NULL]] as L3, 
decimal(15,2)[decimal(2,1) "70"]) as L3.avg_yearly ]
 
diff --git a/sql/benchmarks/tpch/Tests/20-explain.stable.out.int128 
b/sql/benchmarks/tpch/Tests/20-explain.stable.out.int128
--- a/sql/benchmarks/tpch/Tests/20-explain.stable.out.int128
+++ b/sql/benchmarks/tpch/Tests/20-explain.stable.out.int128
@@ -143,61 +143,61 @@ function user.s2_1{autoCommit=true}(A0:s
     X_137 := algebra.leftfetchjoin(X_135,X_136);
     (X_138,r1_154,r2_154) := group.subgroupdone(X_137);
     X_287 := algebra.leftfetchjoin(r1_154,X_135);
-    X_155:bat[:oid,:int]  := sql.bind(X_8,"sys","lineitem","l_quantity",0);
-    (X_160,r1_183) := sql.bind(X_8,"sys","lineitem","l_quantity",2);
-    X_162:bat[:oid,:int]  := sql.bind(X_8,"sys","lineitem","l_quantity",1);
-    X_163 := sql.delta(X_155,X_160,r1_183,X_162);
-    X_164:bat[:oid,:int]  := 
algebra.leftfetchjoinPath(X_134,X_131,X_286,X_163);
-    X_165:bat[:oid,:hge]  := aggr.subsum(X_164,X_138,r1_154,true,true);
+    X_152:bat[:oid,:int]  := sql.bind(X_8,"sys","lineitem","l_quantity",0);
+    (X_157,r1_178) := sql.bind(X_8,"sys","lineitem","l_quantity",2);
+    X_160:bat[:oid,:int]  := sql.bind(X_8,"sys","lineitem","l_quantity",1);
+    X_162 := sql.delta(X_152,X_157,r1_178,X_160);
+    X_163:bat[:oid,:int]  := 
algebra.leftfetchjoinPath(X_134,X_131,X_286,X_162);
+    X_164:bat[:oid,:hge]  := aggr.subsum(X_163,X_138,r1_154,true,true);
     X_141:bat[:oid,:int]  := sql.bind(X_8,"sys","partsupp","ps_availqty",0);
     (X_143,r1_159) := sql.bind(X_8,"sys","partsupp","ps_availqty",2);
     X_145:bat[:oid,:int]  := sql.bind(X_8,"sys","partsupp","ps_availqty",1);
     X_146 := sql.delta(X_141,X_143,r1_159,X_145);
     X_147:bat[:oid,:int]  := algebra.leftfetchjoinPath(X_287,X_61,X_23,X_146);
-    X_148:bat[:oid,:hge]  := batcalc.hge(X_147,22,2);
-    X_151 := calc.lng(1,A1,11,1);
-    X_154 := calc.hge(1,X_151,22,1);
-    X_167:bat[:oid,:lng]  := batcalc.lng(X_165,11,1);
-    X_168:bat[:oid,:hge]  := batcalc.*(X_154,X_167);
-    X_169:bat[:oid,:bit]  := batcalc.>(X_148,X_168);
+    X_148 := calc.lng(1,A1,11,1);
+    X_150 := calc.hge(1,X_148,22,1);
+    X_166:bat[:oid,:lng]  := batcalc.lng(X_164,11,1);
+    X_167:bat[:oid,:hge]  := batcalc.*(X_150,X_166);
+    X_168:bat[:oid,:int]  := batcalc.int(2,X_167);
+    X_169:bat[:oid,:bit]  := batcalc.>(X_147,X_168);
     X_170 := algebra.subselect(X_169,true,true,true,true,false);
     X_172:bat[:oid,:int]  := algebra.leftfetchjoinPath(X_170,X_287,X_129);
     (X_173,r1_203) := algebra.subjoin(X_21,X_172,nil:BAT,nil:BAT,true,nil:lng);
     X_177 := algebra.tinter(X_22,X_173);
     X_288 := algebra.leftfetchjoin(X_177,X_9);
     X_178:bat[:oid,:int]  := sql.bind(X_8,"sys","supplier","s_nationkey",0);
-    (X_181,r1_211) := sql.bind(X_8,"sys","supplier","s_nationkey",2);
-    X_185:bat[:oid,:int]  := sql.bind(X_8,"sys","supplier","s_nationkey",1);
-    X_187 := sql.delta(X_178,X_181,r1_211,X_185);
-    X_188:bat[:oid,:int]  := algebra.leftfetchjoin(X_288,X_187);
-    X_189:bat[:oid,:oid]  := sql.tid(X_8,"sys","nation");
-    X_191:bat[:oid,:str]  := sql.bind(X_8,"sys","nation","n_name",0);
+    (X_183,r1_213) := sql.bind(X_8,"sys","supplier","s_nationkey",2);
+    X_186:bat[:oid,:int]  := sql.bind(X_8,"sys","supplier","s_nationkey",1);
+    X_188 := sql.delta(X_178,X_183,r1_213,X_186);
+    X_189:bat[:oid,:int]  := algebra.leftfetchjoin(X_288,X_188);
+    X_190:bat[:oid,:oid]  := sql.tid(X_8,"sys","nation");
+    X_192:bat[:oid,:str]  := sql.bind(X_8,"sys","nation","n_name",0);
     (X_194,r1_225) := sql.bind(X_8,"sys","nation","n_name",2);
     X_196:bat[:oid,:str]  := sql.bind(X_8,"sys","nation","n_name",1);
-    X_197 := sql.delta(X_191,X_194,r1_225,X_196);
-    X_198 := algebra.leftfetchjoin(X_189,X_197);
+    X_197 := sql.delta(X_192,X_194,r1_225,X_196);
+    X_198 := algebra.leftfetchjoin(X_190,X_197);
     X_199 := algebra.subselect(X_198,A5,A5,true,true,false);
     X_202:bat[:oid,:int]  := sql.bind(X_8,"sys","nation","n_nationkey",0);
     (X_204,r1_236) := sql.bind(X_8,"sys","nation","n_nationkey",2);
     X_206:bat[:oid,:int]  := sql.bind(X_8,"sys","nation","n_nationkey",1);
     X_207 := sql.delta(X_202,X_204,r1_236,X_206);
-    X_208:bat[:oid,:int]  := algebra.leftfetchjoinPath(X_199,X_189,X_207);
-    (X_209,r1_242) := 
algebra.subjoin(X_188,X_208,nil:BAT,nil:BAT,true,nil:lng);
+    X_208:bat[:oid,:int]  := algebra.leftfetchjoinPath(X_199,X_190,X_207);
+    (X_209,r1_242) := 
algebra.subjoin(X_189,X_208,nil:BAT,nil:BAT,true,nil:lng);
     X_289 := algebra.leftfetchjoin(X_209,X_177);
     X_213:bat[:oid,:str]  := sql.bind(X_8,"sys","supplier","s_name",0);
-    (X_217,r1_250) := sql.bind(X_8,"sys","supplier","s_name",2);
-    X_220:bat[:oid,:str]  := sql.bind(X_8,"sys","supplier","s_name",1);
-    X_222 := sql.delta(X_213,X_217,r1_250,X_220);
-    X_223:bat[:oid,:str]  := algebra.leftfetchjoinPath(X_289,X_9,X_222);
-    (X_224,r1_259,r2_259) := algebra.subsort(X_223,false,false);
-    X_227 := algebra.leftfetchjoin(r1_259,X_223);
-    X_228:bat[:oid,:str]  := sql.bind(X_8,"sys","supplier","s_address",0);
+    (X_218,r1_251) := sql.bind(X_8,"sys","supplier","s_name",2);
+    X_221:bat[:oid,:str]  := sql.bind(X_8,"sys","supplier","s_name",1);
+    X_223 := sql.delta(X_213,X_218,r1_251,X_221);
+    X_224:bat[:oid,:str]  := algebra.leftfetchjoinPath(X_289,X_9,X_223);
+    (X_225,r1_260,r2_260) := algebra.subsort(X_224,false,false);
+    X_228 := algebra.leftfetchjoin(r1_260,X_224);
+    X_229:bat[:oid,:str]  := sql.bind(X_8,"sys","supplier","s_address",0);
     (X_231,r1_266) := sql.bind(X_8,"sys","supplier","s_address",2);
     X_233:bat[:oid,:str]  := sql.bind(X_8,"sys","supplier","s_address",1);
-    X_234 := sql.delta(X_228,X_231,r1_266,X_233);
-    X_235:bat[:oid,:str]  := algebra.leftfetchjoinPath(r1_259,X_289,X_9,X_234);
-    X_236 := sql.resultSet(2,1,X_227);
-    sql.rsColumn(X_236,"sys.supplier","s_name","varchar",25,0,X_227);
+    X_234 := sql.delta(X_229,X_231,r1_266,X_233);
+    X_235:bat[:oid,:str]  := algebra.leftfetchjoinPath(r1_260,X_289,X_9,X_234);
+    X_236 := sql.resultSet(2,1,X_228);
+    sql.rsColumn(X_236,"sys.supplier","s_name","varchar",25,0,X_228);
     sql.rsColumn(X_236,"sys.supplier","s_address","varchar",40,0,X_235);
     X_243 := io.stdout();
     sql.exportResult(X_243,X_236);
diff --git a/sql/benchmarks/tpch/Tests/20-plan.stable.out.int128 
b/sql/benchmarks/tpch/Tests/20-plan.stable.out.int128
--- a/sql/benchmarks/tpch/Tests/20-plan.stable.out.int128
+++ b/sql/benchmarks/tpch/Tests/20-plan.stable.out.int128
@@ -89,7 +89,7 @@ project (
 | | | | | | | | ) [ partsupp.ps_partkey NOT NULL = L16.l_partkey NOT NULL 
HASHCOL , partsupp.ps_suppkey NOT NULL = L16.l_suppkey NOT NULL HASHCOL  ]
 | | | | | | | ) [ L17.L17 ] [ partsupp.ps_suppkey NOT NULL, 
partsupp.ps_availqty NOT NULL, L17.L17 HASHCOL , sys.sum no nil (L16.l_quantity 
NOT NULL as lineitem.l_quantity) NOT NULL as L12.L12 ]
 | | | | | | ) [ partsupp.ps_suppkey NOT NULL, partsupp.ps_availqty NOT NULL, 
sys.sql_mul(decimal(22,1)[decimal(11,1)[decimal(2,1) "5"]], decimal(11,1)[L12 
NOT NULL] as L12) as L13.L13 ]
-| | | | | ) [ decimal(22,2)[partsupp.ps_availqty NOT NULL] > L13.L13 ]
+| | | | | ) [ partsupp.ps_availqty NOT NULL > int[L13.L13] ]
 | | | | ) [ partsupp.ps_suppkey NOT NULL as L15.L14 ]
 | | | ) [ supplier.s_suppkey NOT NULL HASHCOL  = L15.L14 NOT NULL ],
 | | | select (
diff --git a/sql/benchmarks/tpch/Tests/22-explain.stable.out.int128 
b/sql/benchmarks/tpch/Tests/22-explain.stable.out.int128
--- a/sql/benchmarks/tpch/Tests/22-explain.stable.out.int128
+++ b/sql/benchmarks/tpch/Tests/22-explain.stable.out.int128
@@ -57,7 +57,7 @@ Ready.
 % mal # name
 % clob # type
 % 868 # length
-function 
user.s2_1{autoCommit=true}(A0:int,A1:int,A2:int,A3:int,A4:str,A5:str,A6:str,A7:str,A8:str,A9:str,A10:str,A11:sht,A12:int,A13:int,A14:str,A15:str,A16:str,A17:str,A18:str,A19:str,A20:str):void;
+function 
user.s2_1{autoCommit=true}(A0:int,A1:int,A2:int,A3:int,A4:str,A5:str,A6:str,A7:str,A8:str,A9:str,A10:str,A11:bte,A12:int,A13:int,A14:str,A15:str,A16:str,A17:str,A18:str,A19:str,A20:str):void;
     X_23 := sql.mvc();
     X_24:bat[:oid,:oid]  := sql.tid(X_23,"sys","customer");
     X_27:bat[:oid,:str]  := sql.bind(X_23,"sys","customer","c_phone",0);
@@ -91,57 +91,57 @@ function user.s2_1{autoCommit=true}(A0:i
     X_71 := sql.delta(X_66,X_68,r1_80,X_70);
     X_72 := algebra.leftfetchjoin(X_24,X_71);
     X_73 := algebra.leftfetchjoin(X_52,X_72);
-    X_74:bat[:oid,:dbl]  := batcalc.dbl(2,X_73);
-    X_75:bat[:oid,:str]  := batstr.substring(X_36,A12,A13);
-    X_77 := calc.lng(2,A11,15,2);
+    X_74:bat[:oid,:str]  := batstr.substring(X_36,A12,A13);
+    X_77 := calc.lng(1,A11,15,2);
     X_79 := algebra.thetasubselect(X_72,X_77,">");
-    X_81 := algebra.subselect(X_75,X_79,A14,A14,true,true,false);
-    X_84 := algebra.subselect(X_75,X_79,A15,A15,true,true,false);
+    X_81 := algebra.subselect(X_74,X_79,A14,A14,true,true,false);
+    X_84 := algebra.subselect(X_74,X_79,A15,A15,true,true,false);
     X_85 := bat.mergecand(X_81,X_84);
-    X_86 := algebra.subselect(X_75,X_79,A16,A16,true,true,false);
+    X_86 := algebra.subselect(X_74,X_79,A16,A16,true,true,false);
     X_87 := bat.mergecand(X_85,X_86);
-    X_88 := algebra.subselect(X_75,X_79,A17,A17,true,true,false);
+    X_88 := algebra.subselect(X_74,X_79,A17,A17,true,true,false);
     X_89 := bat.mergecand(X_87,X_88);
-    X_90 := algebra.subselect(X_75,X_79,A18,A18,true,true,false);
+    X_90 := algebra.subselect(X_74,X_79,A18,A18,true,true,false);
     X_91 := bat.mergecand(X_89,X_90);
-    X_92 := algebra.subselect(X_75,X_79,A19,A19,true,true,false);
+    X_92 := algebra.subselect(X_74,X_79,A19,A19,true,true,false);
     X_93 := bat.mergecand(X_91,X_92);
-    X_94 := algebra.subselect(X_75,X_79,A20,A20,true,true,false);
+    X_94 := algebra.subselect(X_74,X_79,A20,A20,true,true,false);
     X_95 := bat.mergecand(X_93,X_94);
     X_96 := algebra.leftfetchjoin(X_95,X_72);
     X_97:bat[:oid,:dbl]  := batcalc.dbl(2,X_96);
     X_99:dbl  := aggr.avg(X_97);
     X_100 := sql.single(X_99);
-    (X_101,r1_147) := 
algebra.subthetajoin(X_74,X_100,nil:BAT,nil:BAT,1,true,nil:lng);
-    X_106 := algebra.tinter(X_65,X_101);
-    X_107 := algebra.leftfetchjoin(X_106,X_64);
-    X_108 := bat.mirror(X_107);
-    X_109:bat[:oid,:oid]  := sql.tid(X_23,"sys","orders");
-    X_112:bat[:oid,:int]  := sql.bind(X_23,"sys","orders","o_custkey",0);
-    (X_115,r1_161) := sql.bind(X_23,"sys","orders","o_custkey",2);
-    X_117:bat[:oid,:int]  := sql.bind(X_23,"sys","orders","o_custkey",1);
-    X_118 := sql.delta(X_112,X_115,r1_161,X_117);
-    X_119 := algebra.leftfetchjoin(X_109,X_118);
-    (X_120,r1_166) := 
algebra.subjoin(X_107,X_119,nil:BAT,nil:BAT,true,nil:lng);
-    X_123 := algebra.tdiff(X_108,X_120);
-    X_180 := algebra.leftfetchjoin(X_123,X_106);
-    X_124:bat[:oid,:str]  := algebra.leftfetchjoinPath(X_180,X_52,X_36);
-    X_125:bat[:oid,:str]  := batstr.substring(X_124,A0,A1);
-    (X_126,r1_178,r2_178) := group.subgroupdone(X_125);
-    X_129 := algebra.leftfetchjoin(r1_178,X_125);
-    X_135:bat[:oid,:wrd]  := aggr.subcount(X_126,X_126,r1_178,false);
-    X_137:bat[:oid,:lng]  := algebra.leftfetchjoin(X_180,X_73);
-    X_138:bat[:oid,:hge]  := aggr.subsum(X_137,X_126,r1_178,true,true);
-    (X_130,r1_182,r2_182) := algebra.subsort(X_129,false,false);
-    X_134 := algebra.leftfetchjoin(r1_182,X_129);
-    X_139 := algebra.leftfetchjoin(r1_182,X_138);
-    X_136 := algebra.leftfetchjoin(r1_182,X_135);
-    X_140 := sql.resultSet(3,1,X_134);
-    sql.rsColumn(X_140,"sys.custsale","cntrycode","varchar",15,0,X_134);
-    sql.rsColumn(X_140,"sys.L2","numcust","wrd",64,0,X_136);
-    sql.rsColumn(X_140,"sys.L3","totacctbal","decimal",15,2,X_139);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to