Changeset: 815dc790e3f0 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=815dc790e3f0
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/13-explain.stable.out.32bit
        sql/benchmarks/tpch/Tests/16-explain.stable.out.32bit
        sql/benchmarks/tpch/Tests/20-explain.stable.out.32bit
        sql/benchmarks/tpch/Tests/21-explain.stable.out.32bit
        sql/benchmarks/tpch/Tests/22-explain.stable.out.32bit
        
sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out.32bit
        sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
Branch: resultset
Log Message:

approved 32-bit output


diffs (truncated from 493 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
@@ -50,19 +50,74 @@ Ready.
 % .explain # table_name
 % mal # name
 % clob # type
-% 622 # length
+% 623 # length
 function user.s2_1{autoCommit=true}(A0:bte,A1:bte,A2:bte,A3:date,A4:lng):void;
-    X_163:void := querylog.define("explain 
select\n\tl_returnflag,\n\tl_linestatus,\n\tsum(l_quantity) as 
sum_qty,\n\tsum(l_extendedprice) as sum_base_price,\n\tsum(l_extendedprice * (1 
- l_discount)) as sum_disc_price,\n\tsum(l_extendedprice * (1 - l_discount) * 
(1 + l_tax)) as sum_charge,\n\tavg(l_quantity) as 
avg_qty,\n\tavg(l_extendedprice) as avg_price,\n\tavg(l_discount) as 
avg_disc,\n\tcount(*) as count_order\nfrom\n\tlineitem\nwhere\n\tl_shipdate <= 
date \\'1998-12-01\\' - interval \\'90\\' day (3)\ngroup 
by\n\tl_returnflag,\n\tl_linestatus\norder 
by\n\tl_returnflag,\n\tl_linestatus;","sequential_pipe",86);
+    X_208:void := querylog.define("explain 
select\n\tl_returnflag,\n\tl_linestatus,\n\tsum(l_quantity) as 
sum_qty,\n\tsum(l_extendedprice) as sum_base_price,\n\tsum(l_extendedprice * (1 
- l_discount)) as sum_disc_price,\n\tsum(l_extendedprice * (1 - l_discount) * 
(1 + l_tax)) as sum_charge,\n\tavg(l_quantity) as 
avg_qty,\n\tavg(l_extendedprice) as avg_price,\n\tavg(l_discount) as 
avg_disc,\n\tcount(*) as count_order\nfrom\n\tlineitem\nwhere\n\tl_shipdate <= 
date \\'1998-12-01\\' - interval \\'90\\' day (3)\ngroup 
by\n\tl_returnflag,\n\tl_linestatus\norder 
by\n\tl_returnflag,\n\tl_linestatus;","sequential_pipe",129);
+    X_118 := bat.new(nil:oid,nil:str);
+    X_126 := bat.append(X_118,"sys.lineitem");
+    X_136 := bat.append(X_126,"sys.lineitem");
+    X_142 := bat.append(X_136,"sys.L1");
+    X_152 := bat.append(X_142,"sys.L2");
+    X_159 := bat.append(X_152,"sys.L3");
+    X_167 := bat.append(X_159,"sys.L4");
+    X_175 := bat.append(X_167,"sys.L5");
+    X_185 := bat.append(X_175,"sys.L6");
+    X_192 := bat.append(X_185,"sys.L7");
+    X_199 := bat.append(X_192,"sys.L10");
+    X_121 := bat.new(nil:oid,nil:str);
+    X_128 := bat.append(X_121,"l_returnflag");
+    X_137 := bat.append(X_128,"l_linestatus");
+    X_144 := bat.append(X_137,"sum_qty");
+    X_154 := bat.append(X_144,"sum_base_price");
+    X_161 := bat.append(X_154,"sum_disc_price");
+    X_169 := bat.append(X_161,"sum_charge");
+    X_177 := bat.append(X_169,"avg_qty");
+    X_187 := bat.append(X_177,"avg_price");
+    X_194 := bat.append(X_187,"avg_disc");
+    X_201 := bat.append(X_194,"count_order");
+    X_122 := bat.new(nil:oid,nil:str);
+    X_130 := bat.append(X_122,"char");
+    X_139 := bat.append(X_130,"char");
+    X_146 := bat.append(X_139,"decimal");
+    X_156 := bat.append(X_146,"decimal");
+    X_163 := bat.append(X_156,"decimal");
+    X_171 := bat.append(X_163,"decimal");
+    X_179 := bat.append(X_171,"double");
+    X_189 := bat.append(X_179,"double");
+    X_196 := bat.append(X_189,"double");
+    X_203 := bat.append(X_196,"wrd");
+    X_123 := bat.new(nil:oid,nil:int);
+    X_132 := bat.append(X_123,1);
+    X_140 := bat.append(X_132,1);
+    X_148 := bat.append(X_140,19);
+    X_157 := bat.append(X_148,19);
+    X_164 := bat.append(X_157,19);
+    X_172 := bat.append(X_164,19);
+    X_181 := bat.append(X_172,53);
+    X_190 := bat.append(X_181,53);
+    X_197 := bat.append(X_190,53);
+    X_205 := bat.append(X_197,32);
+    X_125 := bat.new(nil:oid,nil:int);
+    X_134 := bat.append(X_125,0);
+    X_141 := bat.append(X_134,0);
+    X_150 := bat.append(X_141,2);
+    X_158 := bat.append(X_150,2);
+    X_165 := bat.append(X_158,4);
+    X_173 := bat.append(X_165,6);
+    X_183 := bat.append(X_173,0);
+    X_191 := bat.append(X_183,0);
+    X_198 := bat.append(X_191,0);
+    X_207 := bat.append(X_198,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");
     X_19 := mtime.date_sub_msec_interval(A3,A4);
-    X_182 := algebra.thetasubselect(X_11,X_8,X_19,"<=");
+    X_227 := algebra.thetasubselect(X_11,X_8,X_19,"<=");
     (X_14,r1_14) := sql.bind(X_7,"sys","lineitem","l_shipdate",2);
-    X_183 := algebra.thetasubselect(r1_14,nil:bat[:oid,:oid],X_19,"<=");
+    X_228 := 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_185 := algebra.thetasubselect(X_17,X_8,X_19,"<=");
-    X_20 := sql.subdelta(X_182,X_8,X_14,X_183,X_185);
+    X_230 := algebra.thetasubselect(X_17,X_8,X_19,"<=");
+    X_20 := sql.subdelta(X_227,X_8,X_14,X_228,X_230);
     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);
     X_26:bat[:oid,:str] := sql.bind(X_7,"sys","lineitem","l_linestatus",1);
@@ -114,28 +169,16 @@ function user.s2_1{autoCommit=true}(A0:b
     (X_42,r1_50,r2_50) := algebra.subsort(X_41,false,false);
     (X_46,r1_54,r2_54) := algebra.subsort(X_40,r1_50,r2_50,false,false);
     X_49 := algebra.leftfetchjoin(r1_54,X_41);
+    X_50 := algebra.leftfetchjoin(r1_54,X_40);
+    X_64 := algebra.leftfetchjoin(r1_54,X_62);
+    X_72 := algebra.leftfetchjoin(r1_54,X_71);
+    X_86 := algebra.leftfetchjoin(r1_54,X_85);
+    X_104 := algebra.leftfetchjoin(r1_54,X_102);
+    X_107 := algebra.leftfetchjoin(r1_54,X_106);
+    X_110 := algebra.leftfetchjoin(r1_54,X_109);
+    X_113 := algebra.leftfetchjoin(r1_54,X_112);
     X_116 := algebra.leftfetchjoin(r1_54,X_114);
-    X_113 := algebra.leftfetchjoin(r1_54,X_112);
-    X_110 := algebra.leftfetchjoin(r1_54,X_109);
-    X_107 := algebra.leftfetchjoin(r1_54,X_106);
-    X_104 := algebra.leftfetchjoin(r1_54,X_102);
-    X_86 := algebra.leftfetchjoin(r1_54,X_85);
-    X_72 := algebra.leftfetchjoin(r1_54,X_71);
-    X_64 := algebra.leftfetchjoin(r1_54,X_62);
-    X_50 := algebra.leftfetchjoin(r1_54,X_40);
-    X_117 := sql.resultSet(10,1,X_49);
-    sql.rsColumn(X_117,"sys.lineitem","l_returnflag","char",1,0,X_49);
-    sql.rsColumn(X_117,"sys.lineitem","l_linestatus","char",1,0,X_50);
-    sql.rsColumn(X_117,"sys.L1","sum_qty","decimal",19,2,X_64);
-    sql.rsColumn(X_117,"sys.L2","sum_base_price","decimal",19,2,X_72);
-    sql.rsColumn(X_117,"sys.L3","sum_disc_price","decimal",19,4,X_86);
-    sql.rsColumn(X_117,"sys.L4","sum_charge","decimal",19,6,X_104);
-    sql.rsColumn(X_117,"sys.L5","avg_qty","double",53,0,X_107);
-    sql.rsColumn(X_117,"sys.L6","avg_price","double",53,0,X_110);
-    sql.rsColumn(X_117,"sys.L7","avg_disc","double",53,0,X_113);
-    sql.rsColumn(X_117,"sys.L10","count_order","wrd",32,0,X_116);
-    X_161 := io.stdout();
-    sql.exportResult(X_161,X_117);
+    
sql.resultSet(X_199,X_201,X_203,X_205,X_207,X_49,X_50,X_64,X_72,X_86,X_104,X_107,X_110,X_113,X_116);
 end user.s2_1;
 
 # 22:53:25 >  
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
@@ -52,7 +52,22 @@ Ready.
 % clob # type
 % 460 # length
 function user.s2_1{autoCommit=true}(A0:date,A1:date,A2:int):void;
-    X_101:void := querylog.define("explain 
select\n\to_orderpriority,\n\tcount(*) as 
order_count\nfrom\n\torders\nwhere\n\to_orderdate >= date 
\\'1993-07-01\\'\n\tand o_orderdate < date \\'1993-07-01\\' + interval \\'3\\' 
month\n\tand exists 
(\n\t\tselect\n\t\t\t*\n\t\tfrom\n\t\t\tlineitem\n\t\twhere\n\t\t\tl_orderkey = 
o_orderkey\n\t\t\tand l_commitdate < l_receiptdate\n\t)\ngroup 
by\n\to_orderpriority\norder by\n\to_orderpriority;","sequential_pipe",54);
+    X_113:void := querylog.define("explain 
select\n\to_orderpriority,\n\tcount(*) as 
order_count\nfrom\n\torders\nwhere\n\to_orderdate >= date 
\\'1993-07-01\\'\n\tand o_orderdate < date \\'1993-07-01\\' + interval \\'3\\' 
month\n\tand exists 
(\n\t\tselect\n\t\t\t*\n\t\tfrom\n\t\t\tlineitem\n\t\twhere\n\t\t\tl_orderkey = 
o_orderkey\n\t\t\tand l_commitdate < l_receiptdate\n\t)\ngroup 
by\n\to_orderpriority\norder by\n\to_orderpriority;","sequential_pipe",65);
+    X_87 := bat.new(nil:oid,nil:str);
+    X_95 := bat.append(X_87,"sys.orders");
+    X_104 := bat.append(X_95,"sys.L1");
+    X_90 := bat.new(nil:oid,nil:str);
+    X_97 := bat.append(X_90,"o_orderpriority");
+    X_106 := bat.append(X_97,"order_count");
+    X_91 := bat.new(nil:oid,nil:str);
+    X_98 := bat.append(X_91,"char");
+    X_108 := bat.append(X_98,"wrd");
+    X_92 := bat.new(nil:oid,nil:int);
+    X_100 := bat.append(X_92,15);
+    X_110 := bat.append(X_100,32);
+    X_94 := bat.new(nil:oid,nil:int);
+    X_102 := bat.append(X_94,0);
+    X_112 := bat.append(X_102,0);
     X_5 := sql.mvc();
     X_6:bat[:oid,:oid]  := sql.tid(X_5,"sys","orders");
     X_9:bat[:oid,:date]  := sql.bind(X_5,"sys","orders","o_orderdate",0);
@@ -99,11 +114,7 @@ function user.s2_1{autoCommit=true}(A0:d
     (X_79,r1_88,r2_88) := algebra.subsort(X_78,false,false);
     X_82 := algebra.leftfetchjoin(r1_88,X_78);
     X_85 := algebra.leftfetchjoin(r1_88,X_83);
-    X_86 := sql.resultSet(2,1,X_82);
-    sql.rsColumn(X_86,"sys.orders","o_orderpriority","char",15,0,X_82);
-    sql.rsColumn(X_86,"sys.L1","order_count","wrd",32,0,X_85);
-    X_99 := io.stdout();
-    sql.exportResult(X_99,X_86);
+    sql.resultSet(X_104,X_106,X_108,X_110,X_112,X_82,X_85);
 end user.s2_1;
 
 # 22:53:26 >  
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
@@ -55,17 +55,32 @@ Ready.
 % clob # type
 % 592 # length
 function user.s2_1{autoCommit=true}(A0:bte,A1:str,A2:date,A3:date,A4:int):void;
-    X_202:void := querylog.define("explain 
select\n\tn_name,\n\tsum(l_extendedprice * (1 - l_discount)) as 
revenue\nfrom\n\tcustomer,\n\torders,\n\tlineitem,\n\tsupplier,\n\tnation,\n\tregion\nwhere\n\tc_custkey
 = o_custkey\n\tand l_orderkey = o_orderkey\n\tand l_suppkey = s_suppkey\n\tand 
c_nationkey = s_nationkey\n\tand s_nationkey = n_nationkey\n\tand n_regionkey = 
r_regionkey\n\tand r_name = \\'ASIA\\'\n\tand o_orderdate >= date 
\\'1994-01-01\\'\n\tand o_orderdate < date \\'1994-01-01\\' + interval \\'1\\' 
year\ngroup by\n\tn_name\norder by\n\trevenue desc;","sequential_pipe",112);
+    X_218:void := querylog.define("explain 
select\n\tn_name,\n\tsum(l_extendedprice * (1 - l_discount)) as 
revenue\nfrom\n\tcustomer,\n\torders,\n\tlineitem,\n\tsupplier,\n\tnation,\n\tregion\nwhere\n\tc_custkey
 = o_custkey\n\tand l_orderkey = o_orderkey\n\tand l_suppkey = s_suppkey\n\tand 
c_nationkey = s_nationkey\n\tand s_nationkey = n_nationkey\n\tand n_regionkey = 
r_regionkey\n\tand r_name = \\'ASIA\\'\n\tand o_orderdate >= date 
\\'1994-01-01\\'\n\tand o_orderdate < date \\'1994-01-01\\' + interval \\'1\\' 
year\ngroup by\n\tn_name\norder by\n\trevenue desc;","sequential_pipe",123);
+    X_190 := bat.new(nil:oid,nil:str);
+    X_198 := bat.append(X_190,"sys.nation");
+    X_208 := bat.append(X_198,"sys.L1");
+    X_193 := bat.new(nil:oid,nil:str);
+    X_200 := bat.append(X_193,"n_name");
+    X_210 := bat.append(X_200,"revenue");
+    X_194 := bat.new(nil:oid,nil:str);
+    X_202 := bat.append(X_194,"char");
+    X_212 := bat.append(X_202,"decimal");
+    X_195 := bat.new(nil:oid,nil:int);
+    X_204 := bat.append(X_195,25);
+    X_214 := bat.append(X_204,19);
+    X_197 := bat.new(nil:oid,nil:int);
+    X_206 := bat.append(X_197,0);
+    X_216 := bat.append(X_206,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");
     X_19 := mtime.addmonths(A3,A4);
-    X_242 := algebra.subselect(X_11,X_8,A2,X_19,true,false,false);
+    X_258 := 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_243 := 
algebra.subselect(r1_14,nil:bat[:oid,:oid],A2,X_19,true,false,false);
+    X_259 := 
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_245 := algebra.subselect(X_17,X_8,A2,X_19,true,false,false);
-    X_20 := sql.subdelta(X_242,X_8,X_14,X_243,X_245);
+    X_261 := algebra.subselect(X_17,X_8,A2,X_19,true,false,false);
+    X_20 := sql.subdelta(X_258,X_8,X_14,X_259,X_261);
     X_22:bat[:oid,:oid]  := 
sql.bind_idxbat(X_7,"sys","orders","orders_o_custkey_fkey",0);
     (X_24,r1_29) := 
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);
@@ -128,12 +143,12 @@ function user.s2_1{autoCommit=true}(A0:b
     X_129 := algebra.leftfetchjoin(r1_141,X_128);
     X_132:bat[:oid,:str] := sql.bind(X_7,"sys","region","r_name",0);
     X_130:bat[:oid,:oid] := sql.tid(X_7,"sys","region");
-    X_246 := algebra.subselect(X_132,X_130,A1,A1,true,true,false);
+    X_262 := algebra.subselect(X_132,X_130,A1,A1,true,true,false);
     (X_134,r1_158) := sql.bind(X_7,"sys","region","r_name",2);
-    X_247 := 
algebra.subselect(r1_158,nil:bat[:oid,:oid],A1,A1,true,true,false);
+    X_263 := 
algebra.subselect(r1_158,nil:bat[:oid,:oid],A1,A1,true,true,false);
     X_137:bat[:oid,:str] := sql.bind(X_7,"sys","region","r_name",1);
-    X_249 := algebra.subselect(X_137,X_130,A1,A1,true,true,false);
-    X_138 := sql.subdelta(X_246,X_130,X_134,X_247,X_249);
+    X_265 := algebra.subselect(X_137,X_130,A1,A1,true,true,false);
+    X_138 := sql.subdelta(X_262,X_130,X_134,X_263,X_265);
     X_140 := X_138;
     (X_141,r1_168) := 
algebra.subjoin(X_129,X_140,nil:BAT,nil:BAT,false,nil:lng);
     X_143 := algebra.leftfetchjoin(X_103,X_98);
@@ -160,11 +175,7 @@ function user.s2_1{autoCommit=true}(A0:b
     (X_183,r1_224,r2_224) := algebra.subsort(X_181,true,false);
     X_187:bat[:oid,:str] := algebra.leftfetchjoinPath(r1_224,r1_219,X_177);
     X_188 := algebra.leftfetchjoin(r1_224,X_181);
-    X_189 := sql.resultSet(2,1,X_187);
-    sql.rsColumn(X_189,"sys.nation","n_name","char",25,0,X_187);
-    sql.rsColumn(X_189,"sys.L1","revenue","decimal",19,4,X_188);
-    X_200 := io.stdout();
-    sql.exportResult(X_200,X_189);
+    sql.resultSet(X_208,X_210,X_212,X_214,X_216,X_187,X_188);
 end user.s2_1;
 
 # 22:53:26 >  
diff --git a/sql/benchmarks/tpch/Tests/13-explain.stable.out.32bit 
b/sql/benchmarks/tpch/Tests/13-explain.stable.out.32bit
--- a/sql/benchmarks/tpch/Tests/13-explain.stable.out.32bit
+++ b/sql/benchmarks/tpch/Tests/13-explain.stable.out.32bit
@@ -51,7 +51,22 @@ Ready.
 % clob # type
 % 450 # length
 function user.s2_1{autoCommit=true}(A0:str):void;
-    X_103:void := querylog.define("explain select\n\tc_count,\n\tcount(*) as 
custdist\nfrom\n\t(\n\t\tselect\n\t\t\tc_custkey,\n\t\t\tcount(o_orderkey)\n\t\tfrom\n\t\t\tcustomer
 left outer join orders on\n\t\t\t\tc_custkey = o_custkey\n\t\t\t\tand 
o_comment not like \\'%special%requests%\\'\n\t\tgroup by\n\t\t\tc_custkey\n\t) 
as c_orders (c_custkey, c_count)\ngroup by\n\tc_count\norder by\n\tcustdist 
desc,\n\tc_count desc;","sequential_pipe",54);
+    X_114:void := querylog.define("explain select\n\tc_count,\n\tcount(*) as 
custdist\nfrom\n\t(\n\t\tselect\n\t\t\tc_custkey,\n\t\t\tcount(o_orderkey)\n\t\tfrom\n\t\t\tcustomer
 left outer join orders on\n\t\t\t\tc_custkey = o_custkey\n\t\t\t\tand 
o_comment not like \\'%special%requests%\\'\n\t\tgroup by\n\t\t\tc_custkey\n\t) 
as c_orders (c_custkey, c_count)\ngroup by\n\tc_count\norder by\n\tcustdist 
desc,\n\tc_count desc;","sequential_pipe",65);
+    X_90 := bat.new(nil:oid,nil:str);
+    X_97 := bat.append(X_90,".c_orders");
+    X_107 := bat.append(X_97,".L2");
+    X_92 := bat.new(nil:oid,nil:str);
+    X_99 := bat.append(X_92,"c_count");
+    X_109 := bat.append(X_99,"custdist");
+    X_93 := bat.new(nil:oid,nil:str);
+    X_101 := bat.append(X_93,"wrd");
+    X_111 := bat.append(X_101,"wrd");
+    X_94 := bat.new(nil:oid,nil:int);
+    X_103 := bat.append(X_94,32);
+    X_112 := bat.append(X_103,32);
+    X_96 := bat.new(nil:oid,nil:int);
+    X_105 := bat.append(X_96,0);
+    X_113 := bat.append(X_105,0);
     X_4:bat[:oid,:int]  := bat.new(nil:oid,nil:int);
     X_3 := sql.mvc();
     X_7:bat[:oid,:oid]  := sql.tid(X_3,"sys","customer");
@@ -98,11 +113,7 @@ function user.s2_1{autoCommit=true}(A0:s
     (X_84,r1_90,r2_90) := algebra.subsort(X_78,r1_87,r2_87,true,false);
     X_87 := algebra.leftfetchjoin(r1_90,X_78);
     X_88 := algebra.leftfetchjoin(r1_90,X_79);
-    X_89 := sql.resultSet(2,1,X_87);
-    sql.rsColumn(X_89,".c_orders","c_count","wrd",32,0,X_87);
-    sql.rsColumn(X_89,".L2","custdist","wrd",32,0,X_88);
-    X_101 := io.stdout();
-    sql.exportResult(X_101,X_89);
+    sql.resultSet(X_107,X_109,X_111,X_112,X_113,X_87,X_88);
 end user.s2_1;
 
 # 22:53:28 >  
diff --git a/sql/benchmarks/tpch/Tests/16-explain.stable.out.32bit 
b/sql/benchmarks/tpch/Tests/16-explain.stable.out.32bit
--- a/sql/benchmarks/tpch/Tests/16-explain.stable.out.32bit
+++ b/sql/benchmarks/tpch/Tests/16-explain.stable.out.32bit
@@ -59,9 +59,34 @@ Ready.
 % .explain # table_name
 % mal # name
 % clob # type
-% 597 # length
+% 598 # length
 function 
user.s2_1{autoCommit=true}(A0:str,A1:str,A2:int,A3:int,A4:int,A5:int,A6:int,A7:int,A8:int,A9:int,A10:str):void;
-    X_187:void := querylog.define("explain 
select\n\tp_brand,\n\tp_type,\n\tp_size,\n\tcount(distinct ps_suppkey) as 
supplier_cnt\nfrom\n\tpartsupp,\n\tpart\nwhere\n\tp_partkey = ps_partkey\n\tand 
p_brand <> \\'Brand#45\\'\n\tand p_type not like \\'MEDIUM POLISHED%\\'\n\tand 
p_size in (49, 14, 23, 45, 19, 3, 36, 9)\n\tand ps_suppkey not in 
(\n\t\tselect\n\t\t\ts_suppkey\n\t\tfrom\n\t\t\tsupplier\n\t\twhere\n\t\t\ts_comment
 like \\'%Customer%Complaints%\\'\n\t)\ngroup 
by\n\tp_brand,\n\tp_type,\n\tp_size\norder by\n\tsupplier_cnt 
desc,\n\tp_brand,\n\tp_type,\n\tp_size;","sequential_pipe",99);
+    X_207:void := querylog.define("explain 
select\n\tp_brand,\n\tp_type,\n\tp_size,\n\tcount(distinct ps_suppkey) as 
supplier_cnt\nfrom\n\tpartsupp,\n\tpart\nwhere\n\tp_partkey = ps_partkey\n\tand 
p_brand <> \\'Brand#45\\'\n\tand p_type not like \\'MEDIUM POLISHED%\\'\n\tand 
p_size in (49, 14, 23, 45, 19, 3, 36, 9)\n\tand ps_suppkey not in 
(\n\t\tselect\n\t\t\ts_suppkey\n\t\tfrom\n\t\t\tsupplier\n\t\twhere\n\t\t\ts_comment
 like \\'%Customer%Complaints%\\'\n\t)\ngroup 
by\n\tp_brand,\n\tp_type,\n\tp_size\norder by\n\tsupplier_cnt 
desc,\n\tp_brand,\n\tp_type,\n\tp_size;","sequential_pipe",118);
+    X_165 := bat.new(nil:oid,nil:str);
+    X_173 := bat.append(X_165,"sys.part");
+    X_183 := bat.append(X_173,"sys.part");
+    X_191 := bat.append(X_183,"sys.part");
+    X_199 := bat.append(X_191,"sys.L4");
+    X_168 := bat.new(nil:oid,nil:str);
+    X_175 := bat.append(X_168,"p_brand");
+    X_184 := bat.append(X_175,"p_type");
+    X_192 := bat.append(X_184,"p_size");
+    X_201 := bat.append(X_192,"supplier_cnt");
+    X_169 := bat.new(nil:oid,nil:str);
+    X_177 := bat.append(X_169,"char");
+    X_186 := bat.append(X_177,"varchar");
+    X_194 := bat.append(X_186,"int");
+    X_203 := bat.append(X_194,"wrd");
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to