Changeset: c7e5e590e6ba for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c7e5e590e6ba
Modified Files:
        monetdb5/optimizer/Tests/manifold2.stable.out.single
        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/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
Branch: no-wrd
Log Message:

Approvals.


diffs (truncated from 315 to 300 lines):

diff --git a/monetdb5/optimizer/Tests/manifold2.stable.out.single 
b/monetdb5/optimizer/Tests/manifold2.stable.out.single
--- a/monetdb5/optimizer/Tests/manifold2.stable.out.single
+++ b/monetdb5/optimizer/Tests/manifold2.stable.out.single
@@ -28,8 +28,8 @@ Ready.
 # 12:52:57 >  
 
 function user.tst(b:bat[:dbl],b2:bat[:dbl]):void;      #[0]  0 <- 1 2 
-    c:wrd := aggr.count(b:bat[:dbl]);          #[1] ALGcount_bat 3 <- 1 
-    c2:wrd := aggr.count(b2:bat[:dbl]);        #[2] ALGcount_bat 4 <- 2 
+    c:lng := aggr.count(b:bat[:dbl]);          #[1] ALGcount_bat 3 <- 1 
+    c2:lng := aggr.count(b2:bat[:dbl]);        #[2] ALGcount_bat 4 <- 2 
     X_9:bat[:dbl] := bat.new(nil:oid,nil:dbl); #[3] CMDBATnew 9 <- 10 11 
 barrier (X_13:oid,X_14:dbl) := iterator.new(b:bat[:dbl]);      #[4] 
ITRbunIterator 13 14 <- 1 
     X_16:dbl := algebra.fetch(b2:bat[:dbl],X_13:oid);  #[5] ALGfetchoid 16 <- 
2 13 
@@ -53,8 +53,8 @@ end user.tst;                           
 #[16]   _16 =  :dbl  
 #[18]   _18 =  :dbl  
 function user.tst(b:bat[:dbl],b2:bat[:dbl]):void;      #[0]  0 <- 1 2 
-    c:wrd := aggr.count(b:bat[:dbl]);          #[1] ALGcount_bat 3 <- 1 
-    c2:wrd := aggr.count(b2:bat[:dbl]);        #[2] ALGcount_bat 4 <- 2 
+    c:lng := aggr.count(b:bat[:dbl]);          #[1] ALGcount_bat 3 <- 1 
+    c2:lng := aggr.count(b2:bat[:dbl]);        #[2] ALGcount_bat 4 <- 2 
     X_9:bat[:dbl] := bat.new(nil:oid,nil:dbl); #[3] CMDBATnew 9 <- 10 11 
 barrier (X_13:oid,X_14:dbl) := iterator.new(b:bat[:dbl]);      #[4] 
ITRbunIterator 13 14 <- 1 
     X_16:dbl := algebra.fetch(b2:bat[:dbl],X_13:oid);  #[5] ALGfetchoid 16 <- 
2 13 
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
@@ -85,7 +85,7 @@ function user.s2_1(A0:bte,A1:bte,A2:bte,
     X_161 := bat.append(X_153,"double");
     X_170 := bat.append(X_161,"double");
     X_177 := bat.append(X_170,"double");
-    X_184 := bat.append(X_177,"wrd");
+    X_184 := bat.append(X_177,"bigint");
     X_110 := bat.new(nil:oid,nil:int);
     X_118 := bat.append(X_110,1);
     X_123 := bat.append(X_118,1);
@@ -96,7 +96,7 @@ function user.s2_1(A0:bte,A1:bte,A2:bte,
     X_163 := bat.append(X_154,53);
     X_171 := bat.append(X_163,53);
     X_178 := bat.append(X_171,53);
-    X_186 := bat.append(X_178,32);
+    X_186 := bat.append(X_178,64);
     X_112 := bat.new(nil:oid,nil:int);
     X_119 := bat.append(X_112,0);
     X_124 := bat.append(X_119,0);
@@ -165,7 +165,7 @@ function user.s2_1(A0:bte,A1:bte,A2:bte,
     X_97:bat[:dbl] := aggr.subavg(X_96,X_36,r1_44,true,true);
     X_99:bat[:dbl] := batcalc.dbl(2,X_74);
     X_100:bat[:dbl] := aggr.subavg(X_99,X_36,r1_44,true,true);
-    X_102:bat[:wrd] := aggr.subcount(X_36,X_36,r1_44,false);
+    X_102:bat[:lng] := aggr.subcount(X_36,X_36,r1_44,false);
     (X_41,r1_49,r2_49) := algebra.subsort(X_40,false,false);
     (X_45,r1_54,r2_54) := algebra.subsort(X_39,r1_49,r2_49,false,false);
     X_48 := algebra.projection(r1_54,X_40);
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
@@ -61,10 +61,10 @@ function user.s2_1(A0:date,A1:date,A2:in
     X_96 := bat.append(X_88,"order_count");
     X_82 := bat.new(nil:oid,nil:str);
     X_89 := bat.append(X_82,"char");
-    X_98 := bat.append(X_89,"wrd");
+    X_98 := bat.append(X_89,"bigint");
     X_83 := bat.new(nil:oid,nil:int);
     X_91 := bat.append(X_83,15);
-    X_100 := bat.append(X_91,32);
+    X_100 := bat.append(X_91,64);
     X_85 := bat.new(nil:oid,nil:int);
     X_93 := bat.append(X_85,0);
     X_102 := bat.append(X_93,0);
@@ -110,7 +110,7 @@ function user.s2_1(A0:date,A1:date,A2:in
     X_66:bat[:str] := algebra.projectionpath(C_59,C_19,C_5,X_65);
     (X_67,r1_79,r2_79) := group.subgroupdone(X_66);
     X_70 := algebra.projection(r1_79,X_66);
-    X_75:bat[:wrd] := aggr.subcount(X_67,X_67,r1_79,false);
+    X_75:bat[:lng] := aggr.subcount(X_67,X_67,r1_79,false);
     (X_71,r1_83,r2_83) := algebra.subsort(X_70,false,false);
     X_74 := algebra.projection(r1_83,X_70);
     X_76 := algebra.projection(r1_83,X_75);
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
@@ -99,24 +99,24 @@ function user.s2_1(A0:bte,A1:str,A2:date
     X_49:bat[:int] := sql.bind(X_6,"sys","lineitem","l_suppkey",1);
     X_50 := sql.projectdelta(C_35,X_45,C_47,r1_58,X_49);
     X_51 := algebra.projection(r1_54,X_50);
-    X_52:bat[:wrd] := batmkey.hash(X_51);
+    X_52:bat[:lng] := batmkey.hash(X_51);
     X_54:bat[:int] := sql.bind(X_6,"sys","customer","c_nationkey",0);
     (C_56,r1_71) := sql.bind(X_6,"sys","customer","c_nationkey",2);
     X_58:bat[:int] := sql.bind(X_6,"sys","customer","c_nationkey",1);
     X_59 := sql.projectdelta(C_28,X_54,C_56,r1_71,X_58);
     X_60:bat[:int] := algebra.projectionpath(X_43,r1_38,X_59);
-    X_61:bat[:wrd] := mkey.bulk_rotate_xor_hash(X_52,11,X_60);
+    X_61:bat[:lng] := mkey.bulk_rotate_xor_hash(X_52,11,X_60);
     C_62:bat[:oid] := sql.tid(X_6,"sys","supplier");
     X_64:bat[:int] := sql.bind(X_6,"sys","supplier","s_suppkey",0);
     (C_66,r1_83) := sql.bind(X_6,"sys","supplier","s_suppkey",2);
     X_68:bat[:int] := sql.bind(X_6,"sys","supplier","s_suppkey",1);
     X_69 := sql.projectdelta(C_62,X_64,C_66,r1_83,X_68);
-    X_70:bat[:wrd] := batmkey.hash(X_69);
+    X_70:bat[:lng] := batmkey.hash(X_69);
     X_71:bat[:int] := sql.bind(X_6,"sys","supplier","s_nationkey",0);
     (C_73,r1_92) := sql.bind(X_6,"sys","supplier","s_nationkey",2);
     X_75:bat[:int] := sql.bind(X_6,"sys","supplier","s_nationkey",1);
     X_76 := sql.projectdelta(C_62,X_71,C_73,r1_92,X_75);
-    X_77:bat[:wrd] := mkey.bulk_rotate_xor_hash(X_70,11,X_76);
+    X_77:bat[:lng] := mkey.bulk_rotate_xor_hash(X_70,11,X_76);
     (X_78,r1_98) := algebra.subjoin(X_61,X_77,nil:BAT,nil:BAT,false,nil:lng);
     X_80 := algebra.projection(X_78,X_51);
     X_81 := algebra.projection(r1_98,X_69);
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
@@ -59,11 +59,11 @@ function user.s2_1(A0:str):void;
     X_87 := bat.append(X_81,"c_count");
     X_96 := bat.append(X_87,"custdist");
     X_82 := bat.new(nil:oid,nil:str);
-    X_89 := bat.append(X_82,"wrd");
-    X_98 := bat.append(X_89,"wrd");
+    X_89 := bat.append(X_82,"bigint");
+    X_98 := bat.append(X_89,"bigint");
     X_83 := bat.new(nil:oid,nil:int);
-    X_91 := bat.append(X_83,32);
-    X_99 := bat.append(X_91,32);
+    X_91 := bat.append(X_83,64);
+    X_99 := bat.append(X_91,64);
     X_84 := bat.new(nil:oid,nil:int);
     X_93 := bat.append(X_84,0);
     X_100 := bat.append(X_93,0);
@@ -105,10 +105,10 @@ function user.s2_1(A0:str):void;
     X_59 := algebra.projection(X_53,X_50);
     X_60 := bat.append(X_58,X_59,true);
     (X_61,r1_75,r2_75) := group.subgroupdone(X_60);
-    X_64:bat[:wrd] := aggr.subcount(X_55,X_61,r1_75,true);
+    X_64:bat[:lng] := aggr.subcount(X_55,X_61,r1_75,true);
     (X_65,r1_79,r2_79) := group.subgroupdone(X_64);
     X_68 := algebra.projection(r1_79,X_64);
-    X_69:bat[:wrd] := aggr.subcount(X_65,X_65,r1_79,false);
+    X_69:bat[:lng] := aggr.subcount(X_65,X_65,r1_79,false);
     (X_70,r1_84,r2_84) := algebra.subsort(X_69,true,false);
     (X_73,r1_87,r2_87) := algebra.subsort(X_68,r1_84,r2_84,true,false);
     X_76 := algebra.projection(r1_87,X_68);
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
@@ -61,7 +61,7 @@ Ready.
 % clob # type
 % 598 # length
 function 
user.s2_1(A0:str,A1:str,A2:int,A3:int,A4:int,A5:int,A6:int,A7:int,A8:int,A9:int,A10:str):void;
-    X_190: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_191: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_152 := bat.new(nil:oid,nil:str);
     X_160 := bat.append(X_152,"sys.part");
     X_168 := bat.append(X_160,"sys.part");
@@ -76,17 +76,17 @@ function user.s2_1(A0:str,A1:str,A2:int,
     X_163 := bat.append(X_156,"char");
     X_170 := bat.append(X_163,"varchar");
     X_177 := bat.append(X_170,"int");
-    X_186 := bat.append(X_177,"wrd");
+    X_186 := bat.append(X_177,"bigint");
     X_157 := bat.new(nil:oid,nil:int);
     X_165 := bat.append(X_157,10);
     X_172 := bat.append(X_165,25);
     X_179 := bat.append(X_172,32);
-    X_188 := bat.append(X_179,32);
+    X_188 := bat.append(X_179,64);
     X_159 := bat.new(nil:oid,nil:int);
     X_167 := bat.append(X_159,0);
     X_174 := bat.append(X_167,0);
     X_181 := bat.append(X_174,0);
-    X_189 := bat.append(X_181,0);
+    X_190 := bat.append(X_181,0);
     X_12 := sql.mvc();
     C_13:bat[:oid] := sql.tid(X_12,"sys","partsupp");
     X_16:bat[:int] := sql.bind(X_12,"sys","partsupp","ps_suppkey",0);
@@ -167,7 +167,7 @@ function user.s2_1(A0:str,A1:str,A2:int,
     X_130 := algebra.projection(r1_153,X_119);
     X_131 := algebra.projection(r1_153,X_118);
     X_132 := algebra.projection(r1_153,X_120);
-    X_134:bat[:wrd] := aggr.subcount(X_133,X_127,r1_153,true);
+    X_134:bat[:lng] := aggr.subcount(X_133,X_127,r1_153,true);
     (X_135,r1_162,r2_162) := algebra.subsort(X_134,true,false);
     (X_138,r1_166,r2_166) := algebra.subsort(X_132,r1_162,r2_162,false,false);
     (X_141,r1_169,r2_169) := algebra.subsort(X_131,r1_166,r2_166,false,false);
@@ -176,7 +176,7 @@ function user.s2_1(A0:str,A1:str,A2:int,
     X_148 := algebra.projection(r1_172,X_131);
     X_149 := algebra.projection(r1_172,X_130);
     X_150 := algebra.projection(r1_172,X_134);
-    sql.resultSet(X_182,X_184,X_186,X_188,X_189,X_147,X_148,X_149,X_150);
+    sql.resultSet(X_182,X_184,X_186,X_188,X_190,X_147,X_148,X_149,X_150);
 end user.s2_1;
 
 # 22:53:29 >  
diff --git a/sql/benchmarks/tpch/Tests/20-explain.stable.out.32bit 
b/sql/benchmarks/tpch/Tests/20-explain.stable.out.32bit
--- a/sql/benchmarks/tpch/Tests/20-explain.stable.out.32bit
+++ b/sql/benchmarks/tpch/Tests/20-explain.stable.out.32bit
@@ -110,11 +110,11 @@ function user.s2_1(A0:str,A1:bte,A2:date
     X_51:bat[:int] := algebra.projectionpath(C_42,C_32,X_50);
     (X_52,r1_55) := algebra.subjoin(X_30,X_51,nil:BAT,nil:BAT,false,nil:lng);
     C_55 := algebra.subinter(X_31,X_52,nil:BAT,nil:BAT,false,nil:lng);
-    X_56:bat[:wrd] := 
sql.bind_idxbat(X_7,"sys","partsupp","partsupp_ps_partkey_ps_suppkey_pkey",0);
+    X_56:bat[:lng] := 
sql.bind_idxbat(X_7,"sys","partsupp","partsupp_ps_partkey_ps_suppkey_pkey",0);
     (X_58,r1_61) := 
sql.bind_idxbat(X_7,"sys","partsupp","partsupp_ps_partkey_ps_suppkey_pkey",2);
-    X_60:bat[:wrd] := 
sql.bind_idxbat(X_7,"sys","partsupp","partsupp_ps_partkey_ps_suppkey_pkey",1);
+    X_60:bat[:lng] := 
sql.bind_idxbat(X_7,"sys","partsupp","partsupp_ps_partkey_ps_suppkey_pkey",1);
     X_61 := sql.delta(X_56,X_58,r1_61,X_60);
-    X_62:bat[:wrd] := algebra.projectionpath(C_55,C_22,X_61);
+    X_62:bat[:lng] := algebra.projectionpath(C_55,C_22,X_61);
     C_63:bat[:oid] := sql.tid(X_7,"sys","lineitem");
     X_65:bat[:date] := sql.bind(X_7,"sys","lineitem","l_shipdate",0);
     (C_67,r1_71) := sql.bind(X_7,"sys","lineitem","l_shipdate",2);
@@ -128,13 +128,13 @@ function user.s2_1(A0:str,A1:bte,A2:date
     X_79:bat[:int] := sql.bind(X_7,"sys","lineitem","l_partkey",1);
     X_80 := sql.delta(X_75,C_77,r1_86,X_79);
     X_81:bat[:int] := algebra.projectionpath(C_73,C_63,X_80);
-    X_82:bat[:wrd] := batmkey.hash(X_81);
+    X_82:bat[:lng] := batmkey.hash(X_81);
     X_84:bat[:int] := sql.bind(X_7,"sys","lineitem","l_suppkey",0);
     (C_86,r1_99) := sql.bind(X_7,"sys","lineitem","l_suppkey",2);
     X_88:bat[:int] := sql.bind(X_7,"sys","lineitem","l_suppkey",1);
     X_89 := sql.delta(X_84,C_86,r1_99,X_88);
     X_90:bat[:int] := algebra.projectionpath(C_73,C_63,X_89);
-    X_91:bat[:wrd] := mkey.bulk_rotate_xor_hash(X_82,11,X_90);
+    X_91:bat[:lng] := mkey.bulk_rotate_xor_hash(X_82,11,X_90);
     (X_92,r1_106) := algebra.subjoin(X_62,X_91,nil:BAT,nil:BAT,false,nil:lng);
     X_94 := algebra.projection(C_55,X_30);
     X_95 := algebra.projection(X_92,X_94);
diff --git a/sql/benchmarks/tpch/Tests/21-explain.stable.out.32bit 
b/sql/benchmarks/tpch/Tests/21-explain.stable.out.32bit
--- a/sql/benchmarks/tpch/Tests/21-explain.stable.out.32bit
+++ b/sql/benchmarks/tpch/Tests/21-explain.stable.out.32bit
@@ -71,10 +71,10 @@ function user.s2_1(A0:str,A1:str):void;
     X_169 := bat.append(X_161,"numwait");
     X_155 := bat.new(nil:oid,nil:str);
     X_162 := bat.append(X_155,"char");
-    X_171 := bat.append(X_162,"wrd");
+    X_171 := bat.append(X_162,"bigint");
     X_156 := bat.new(nil:oid,nil:int);
     X_164 := bat.append(X_156,25);
-    X_173 := bat.append(X_164,32);
+    X_173 := bat.append(X_164,64);
     X_158 := bat.new(nil:oid,nil:int);
     X_166 := bat.append(X_158,0);
     X_175 := bat.append(X_166,0);
@@ -168,7 +168,7 @@ function user.s2_1(A0:str,A1:str):void;
     X_127:bat[:str] := 
algebra.projectionpath(X_120,C_109,X_88,r1_74,C_59,X_126);
     (X_128,r1_211,r2_211) := group.subgroupdone(X_127);
     X_131 := algebra.projection(r1_211,X_127);
-    X_132:bat[:wrd] := aggr.subcount(X_128,X_128,r1_211,false);
+    X_132:bat[:lng] := aggr.subcount(X_128,X_128,r1_211,false);
     (C_135,r1_222) := algebra.firstn(X_132,100,false,false);
     C_137 := algebra.firstn(X_131,C_135,r1_222,100,true,false);
     X_138 := algebra.projection(C_137,X_131);
@@ -176,9 +176,9 @@ function user.s2_1(A0:str,A1:str):void;
     (X_140,r1_230,r2_230) := algebra.subsort(X_139,true,false);
     (X_143,r1_233,r2_233) := algebra.subsort(X_138,r1_230,r2_230,false,false);
     X_146 := algebra.projection(r1_233,X_138);
-    X_147 := algebra.subslice(X_146,0,99:wrd);
+    X_147 := algebra.subslice(X_146,0,99:lng);
     X_148 := algebra.projection(X_147,X_146);
-    X_149:bat[:wrd] := algebra.projectionpath(X_147,r1_233,X_139);
+    X_149:bat[:lng] := algebra.projectionpath(X_147,r1_233,X_139);
     sql.resultSet(X_167,X_169,X_171,X_173,X_175,X_148,X_149);
 end user.s2_1;
 
diff --git a/sql/benchmarks/tpch/Tests/22-explain.stable.out.32bit 
b/sql/benchmarks/tpch/Tests/22-explain.stable.out.32bit
--- a/sql/benchmarks/tpch/Tests/22-explain.stable.out.32bit
+++ b/sql/benchmarks/tpch/Tests/22-explain.stable.out.32bit
@@ -69,11 +69,11 @@ function user.s2_1(A0:int,A1:int,A2:int,
     X_153 := bat.append(X_144,"totacctbal");
     X_130 := bat.new(nil:oid,nil:str);
     X_138 := bat.append(X_130,"char");
-    X_146 := bat.append(X_138,"wrd");
+    X_146 := bat.append(X_138,"bigint");
     X_155 := bat.append(X_146,"decimal");
     X_131 := bat.new(nil:oid,nil:int);
     X_140 := bat.append(X_131,15);
-    X_148 := bat.append(X_140,32);
+    X_148 := bat.append(X_140,64);
     X_157 := bat.append(X_148,19);
     X_133 := bat.new(nil:oid,nil:int);
     X_141 := bat.append(X_133,0);
@@ -149,7 +149,7 @@ function user.s2_1(A0:int,A1:int,A2:int,
     X_111:bat[:str] := batstr.substring(X_110,A0,A1);
     (X_112,r1_171,r2_171) := group.subgroupdone(X_111);
     X_115 := algebra.projection(r1_171,X_111);
-    X_120:bat[:wrd] := aggr.subcount(X_112,X_112,r1_171,false);
+    X_120:bat[:lng] := aggr.subcount(X_112,X_112,r1_171,false);
     X_122:bat[:lng] := algebra.projectionpath(X_109,C_95,X_67);
     X_123:bat[:lng] := aggr.subsum(X_122,X_112,r1_171,true,true);
     (X_116,r1_175,r2_175) := algebra.subsort(X_115,false,false);
diff --git 
a/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit 
b/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
--- a/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
+++ b/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
@@ -50,7 +50,7 @@ Operation successful
 
+==================================================================================================+
 | function user.s3_1():void;                                                   
                    |
 |     X_41:void := querylog.define("explain select count(*) from 
tables\n;","sequential_pipe",27); |
-|     X_2:bat[:wrd] := bat.new(nil:oid,nil:wrd);                               
                    |
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to