Changeset: f9f762d697e0 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f9f762d697e0
Added Files:
sql/test/BugTracker-2014/Tests/querylog.Bug-3607.stable.err.single
sql/test/BugTracker-2014/Tests/querylog.Bug-3607.stable.out.single
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit
sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
Modified Files:
monetdb5/optimizer/Tests/manifold2.stable.out.single
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/21-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/22-explain.stable.out.32bit
sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.out.32bit
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
sql/test/Dependencies/Tests/Dependencies.stable.out
Branch: Jun2016
Log Message:
32 bit and single threaded approvals.
diffs (truncated from 19125 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
@@ -26,19 +26,19 @@ Ready.
# 12:52:57 > "mclient" "-lmal" "-ftest" "-Eutf-8"
"--host=/var/tmp/mtest-23074" "--port=30414"
# 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
- 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
- X_18:dbl := calc.max(X_14:dbl,X_16:dbl); #[6] CALCmax 18 <- 14 16
- bat.append(X_9:bat[:dbl],X_18:dbl); #[7] BKCappend_val_wrap 19 <- 9
18
- redo (X_13:oid,X_14:dbl) := iterator.next(b:bat[:dbl]); #[8] ITRbunNext
13 14 <- 1
-exit (X_13:oid,X_14:dbl); #[9] 13 14
- z:bat[:dbl] := X_9:bat[:dbl]; #[10] 5 <- 9
- io.print(z:bat[:dbl],b:bat[:dbl],b2:bat[:dbl]); #[11] IOtable 8 <- 5 1
2
-end user.tst; #[12]
+function user.tst(b:bat[:dbl],b2:bat[:dbl]):void; #[0] (0) 0 <- 1 2
+ c:wrd := aggr.count(b:bat[:dbl]); #[1] (0) ALGcount_bat 3 <- 1
+ c2:wrd := aggr.count(b2:bat[:dbl]); #[2] (0) ALGcount_bat 4 <- 2
+ X_9:bat[:dbl] := bat.new(nil:oid,nil:dbl); #[3] (0) CMDBATnew 9 <- 10 11
+barrier (X_13:oid,X_14:dbl) := iterator.new(b:bat[:dbl]); #[4] (0)
ITRbunIterator 13 14 <- 1
+ X_16:dbl := algebra.fetch(b2:bat[:dbl],X_13:oid); #[5] (0) ALGfetchoid 16
<- 2 13
+ X_18:dbl := calc.max(X_14:dbl,X_16:dbl); #[6] (0) CALCmax 18 <- 14 16
+ bat.append(X_9:bat[:dbl],X_18:dbl); #[7] (0) BKCappend_val_wrap 19
<- 9 18
+ redo (X_13:oid,X_14:dbl) := iterator.next(b:bat[:dbl]); #[8] (0)
ITRbunNext 13 14 <- 1
+exit (X_13:oid,X_14:dbl); #[9] (0) 13 14
+ z:bat[:dbl] := X_9:bat[:dbl]; #[10] (0) 5 <- 9
+ io.print(z:bat[:dbl],b:bat[:dbl],b2:bat[:dbl]); #[11] (0) IOtable 8 <-
5 1 2
+end user.tst; #[12] (0)
#[1] b = :bat[:dbl]
#[2] b2 = :bat[:dbl]
#[5] z = :bat[:dbl]
@@ -51,19 +51,19 @@ end user.tst;
#[14] _14 = :dbl
#[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
- 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
- X_18:dbl := calc.max(X_14:dbl,X_16:dbl); #[6] CALCmax 18 <- 14 16
- bat.append(X_9:bat[:dbl],X_18:dbl); #[7] BKCappend_val_wrap 19 <- 9
18
- redo (X_13:oid,X_14:dbl) := iterator.next(b:bat[:dbl]); #[8] ITRbunNext
13 14 <- 1
-exit (X_13:oid,X_14:dbl); #[9] 13 14
- z:bat[:dbl] := X_9:bat[:dbl]; #[10] 5 <- 9
- io.print(z:bat[:dbl],b:bat[:dbl],b2:bat[:dbl]); #[11] IOtable 8 <- 5 1
2
-end user.tst; #[12]
+function user.tst(b:bat[:dbl],b2:bat[:dbl]):void; #[0] (0) 0 <- 1 2
+ c:wrd := aggr.count(b:bat[:dbl]); #[1] (0) ALGcount_bat 3 <- 1
+ c2:wrd := aggr.count(b2:bat[:dbl]); #[2] (0) ALGcount_bat 4 <- 2
+ X_9:bat[:dbl] := bat.new(nil:oid,nil:dbl); #[3] (0) CMDBATnew 9 <- 10 11
+barrier (X_13:oid,X_14:dbl) := iterator.new(b:bat[:dbl]); #[4] (0)
ITRbunIterator 13 14 <- 1
+ X_16:dbl := algebra.fetch(b2:bat[:dbl],X_13:oid); #[5] (0) ALGfetchoid 16
<- 2 13
+ X_18:dbl := calc.max(X_14:dbl,X_16:dbl); #[6] (0) CALCmax 18 <- 14 16
+ bat.append(X_9:bat[:dbl],X_18:dbl); #[7] (0) BKCappend_val_wrap 19
<- 9 18
+ redo (X_13:oid,X_14:dbl) := iterator.next(b:bat[:dbl]); #[8] (0)
ITRbunNext 13 14 <- 1
+exit (X_13:oid,X_14:dbl); #[9] (0) 13 14
+ z:bat[:dbl] := X_9:bat[:dbl]; #[10] (0) 5 <- 9
+ io.print(z:bat[:dbl],b:bat[:dbl],b2:bat[:dbl]); #[11] (0) IOtable 8 <-
5 1 2
+end user.tst; #[12] (0)
# 09:02:36 >
# 09:02:36 > "Done."
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,22 +52,22 @@ Ready.
% clob # type
% 422 # length
function user.s2_1(A0:date,A1:date,A2:int):void;
- X_103:void := querylog.define("explain select\n o_orderpriority,\n
count(*) as order_count\nfrom\n orders\nwhere\n o_orderdate >= date
\\'1993-07-01\\'\n and o_orderdate < date \\'1993-07-01\\' + interval \\'3\\'
month\n and exists (\n select\n *\n from\n lineitem\n where\n l_orderkey =
o_orderkey\n and l_commitdate < l_receiptdate\n )\ngroup by\n
o_orderpriority\norder by\n o_orderpriority;","sequential_pipe",65);
- X_78 := bat.new(nil:oid,nil:str);
- X_86 := bat.append(X_78,"sys.orders");
- X_94 := bat.append(X_86,"sys.L1");
- X_81 := bat.new(nil:oid,nil:str);
- X_88 := bat.append(X_81,"o_orderpriority");
- X_96 := bat.append(X_88,"order_count");
+ X_104:void := querylog.define("explain select\n o_orderpriority,\n
count(*) as order_count\nfrom\n orders\nwhere\n o_orderdate >= date
\\'1993-07-01\\'\n and o_orderdate < date \\'1993-07-01\\' + interval \\'3\\'
month\n and exists (\n select\n *\n from\n lineitem\n where\n l_orderkey =
o_orderkey\n and l_commitdate < l_receiptdate\n )\ngroup by\n
o_orderpriority\norder by\n o_orderpriority;","sequential_pipe",66);
+ X_79 := bat.new(nil:oid,nil:str);
+ X_87 := bat.append(X_79,"sys.orders");
+ X_95 := bat.append(X_87,"sys.L1");
X_82 := bat.new(nil:oid,nil:str);
- X_89 := bat.append(X_82,"char");
- X_98 := bat.append(X_89,"wrd");
- X_83 := bat.new(nil:oid,nil:int);
- X_91 := bat.append(X_83,15);
- X_100 := bat.append(X_91,32);
- X_85 := bat.new(nil:oid,nil:int);
- X_93 := bat.append(X_85,0);
- X_102 := bat.append(X_93,0);
+ X_89 := bat.append(X_82,"o_orderpriority");
+ X_97 := bat.append(X_89,"order_count");
+ X_83 := bat.new(nil:oid,nil:str);
+ X_90 := bat.append(X_83,"char");
+ X_99 := bat.append(X_90,"wrd");
+ X_84 := bat.new(nil:oid,nil:int);
+ X_92 := bat.append(X_84,15);
+ X_101 := bat.append(X_92,32);
+ X_86 := bat.new(nil:oid,nil:int);
+ X_94 := bat.append(X_86,0);
+ X_103 := bat.append(X_94,0);
X_4 := sql.mvc();
C_5:bat[:oid] := sql.tid(X_4,"sys","orders");
X_8:bat[:date] := sql.bind(X_4,"sys","orders","o_orderdate",0);
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,32 +55,32 @@ Ready.
% clob # type
% 573 # length
function user.s2_1(A0:bte,A1:str,A2:date,A3:date,A4:int):void;
- X_180:void := querylog.define("explain select\n n_name,\n
sum(l_extendedprice * (1 - l_discount)) as revenue\nfrom\n customer,\n
orders,\n lineitem,\n supplier,\n nation,\n region\nwhere\n c_custkey =
o_custkey\n and l_orderkey = o_orderkey\n and l_suppkey = s_suppkey\n and
c_nationkey = s_nationkey\n and s_nationkey = n_nationkey\n and n_regionkey =
r_regionkey\n and r_name = \\'ASIA\\'\n and o_orderdate >= date
\\'1994-01-01\\'\n and o_orderdate < date \\'1994-01-01\\' + interval \\'1\\'
year\ngroup by\n n_name\norder by\n revenue desc;","sequential_pipe",121);
- X_154 := bat.new(nil:oid,nil:str);
- X_162 := bat.append(X_154,"sys.nation");
- X_170 := bat.append(X_162,"sys.L1");
- X_157 := bat.new(nil:oid,nil:str);
- X_164 := bat.append(X_157,"n_name");
- X_172 := bat.append(X_164,"revenue");
- X_158 := bat.new(nil:oid,nil:str);
- X_165 := bat.append(X_158,"char");
- X_174 := bat.append(X_165,"decimal");
- X_159 := bat.new(nil:oid,nil:int);
- X_167 := bat.append(X_159,25);
- X_176 := bat.append(X_167,19);
+ X_182:void := querylog.define("explain select\n n_name,\n
sum(l_extendedprice * (1 - l_discount)) as revenue\nfrom\n customer,\n
orders,\n lineitem,\n supplier,\n nation,\n region\nwhere\n c_custkey =
o_custkey\n and l_orderkey = o_orderkey\n and l_suppkey = s_suppkey\n and
c_nationkey = s_nationkey\n and s_nationkey = n_nationkey\n and n_regionkey =
r_regionkey\n and r_name = \\'ASIA\\'\n and o_orderdate >= date
\\'1994-01-01\\'\n and o_orderdate < date \\'1994-01-01\\' + interval \\'1\\'
year\ngroup by\n n_name\norder by\n revenue desc;","sequential_pipe",123);
+ X_156 := bat.new(nil:oid,nil:str);
+ X_164 := bat.append(X_156,"sys.nation");
+ X_172 := bat.append(X_164,"sys.L1");
+ X_159 := bat.new(nil:oid,nil:str);
+ X_166 := bat.append(X_159,"n_name");
+ X_174 := bat.append(X_166,"revenue");
+ X_160 := bat.new(nil:oid,nil:str);
+ X_167 := bat.append(X_160,"char");
+ X_176 := bat.append(X_167,"decimal");
X_161 := bat.new(nil:oid,nil:int);
- X_169 := bat.append(X_161,0);
- X_178 := bat.append(X_169,4);
+ X_169 := bat.append(X_161,25);
+ X_178 := bat.append(X_169,19);
+ X_163 := bat.new(nil:oid,nil:int);
+ X_171 := bat.append(X_163,0);
+ X_180 := bat.append(X_171,4);
X_6 := sql.mvc();
X_10:bat[:date] := sql.bind(X_6,"sys","orders","o_orderdate",0);
C_7:bat[:oid] := sql.tid(X_6,"sys","orders");
X_18:date := mtime.addmonths(A3,A4);
- C_189 := algebra.subselect(X_10,C_7,A2,X_18,true,false,false);
+ C_191 := algebra.subselect(X_10,C_7,A2,X_18,true,false,false);
(C_13,r1_13) := sql.bind(X_6,"sys","orders","o_orderdate",2);
- C_190 := algebra.subselect(r1_13,nil:bat[:oid],A2,X_18,true,false,false);
+ C_192 := algebra.subselect(r1_13,nil:bat[:oid],A2,X_18,true,false,false);
X_16:bat[:date] := sql.bind(X_6,"sys","orders","o_orderdate",1);
- C_192 := algebra.subselect(X_16,C_7,A2,X_18,true,false,false);
- C_19 := sql.subdelta(C_189,C_7,C_13,C_190,C_192);
+ C_194 := algebra.subselect(X_16,C_7,A2,X_18,true,false,false);
+ C_19 := sql.subdelta(C_191,C_7,C_13,C_192,C_194);
X_22:bat[:oid] :=
sql.bind_idxbat(X_6,"sys","orders","orders_o_custkey_fkey",0);
(X_24,r1_30) :=
sql.bind_idxbat(X_6,"sys","orders","orders_o_custkey_fkey",2);
X_26:bat[:oid] :=
sql.bind_idxbat(X_6,"sys","orders","orders_o_custkey_fkey",1);
@@ -170,10 +170,12 @@ function user.s2_1(A0:bte,A1:str,A2:date
X_143:bat[:str] := algebra.projectionpath(X_116,r1_130,X_142);
(X_144,r1_201,r2_201) := group.subgroupdone(X_143);
X_147:bat[:lng] := aggr.subsum(X_136,X_144,r1_201,true,true);
+ X_151 := algebra.projection(r1_201,X_143);
(X_148,r1_207,r2_207) := algebra.subsort(X_147,true,false);
- X_151:bat[:str] := algebra.projectionpath(r1_207,r1_201,X_143);
- X_152 := algebra.projection(r1_207,X_147);
- sql.resultSet(X_170,X_172,X_174,X_176,X_178,X_151,X_152);
+ X_152 := bat.setKey(X_151,true);
+ X_153 := algebra.projection(r1_207,X_152);
+ X_154 := algebra.projection(r1_207,X_147);
+ sql.resultSet(X_172,X_174,X_176,X_178,X_180,X_153,X_154);
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,22 +51,22 @@ Ready.
% clob # type
% 400 # length
function user.s2_1(A0:str):void;
- X_101:void := querylog.define("explain select\n c_count,\n count(*) as
custdist\nfrom\n (\n select\n c_custkey,\n count(o_orderkey)\n from\n customer
left outer join orders on\n c_custkey = o_custkey\n and o_comment not like
\\'%special%requests%\\'\n group by\n c_custkey\n ) as c_orders (c_custkey,
c_count)\ngroup by\n c_count\norder by\n custdist desc,\n c_count
desc;","sequential_pipe",65);
- X_79 := bat.new(nil:oid,nil:str);
- X_85 := bat.append(X_79,".c_orders");
- X_94 := bat.append(X_85,".L2");
- X_81 := bat.new(nil:oid,nil:str);
- X_87 := bat.append(X_81,"c_count");
- X_96 := bat.append(X_87,"custdist");
+ X_102:void := querylog.define("explain select\n c_count,\n count(*) as
custdist\nfrom\n (\n select\n c_custkey,\n count(o_orderkey)\n from\n customer
left outer join orders on\n c_custkey = o_custkey\n and o_comment not like
\\'%special%requests%\\'\n group by\n c_custkey\n ) as c_orders (c_custkey,
c_count)\ngroup by\n c_count\norder by\n custdist desc,\n c_count
desc;","sequential_pipe",66);
+ X_80 := bat.new(nil:oid,nil:str);
+ X_86 := bat.append(X_80,".c_orders");
+ X_95 := bat.append(X_86,".L2");
X_82 := bat.new(nil:oid,nil:str);
- X_89 := bat.append(X_82,"wrd");
- X_98 := bat.append(X_89,"wrd");
- X_83 := bat.new(nil:oid,nil:int);
- X_91 := bat.append(X_83,32);
- X_99 := bat.append(X_91,32);
+ X_88 := bat.append(X_82,"c_count");
+ X_97 := bat.append(X_88,"custdist");
+ X_83 := bat.new(nil:oid,nil:str);
+ X_90 := bat.append(X_83,"wrd");
+ X_99 := bat.append(X_90,"wrd");
X_84 := bat.new(nil:oid,nil:int);
- X_93 := bat.append(X_84,0);
- X_100 := bat.append(X_93,0);
+ X_92 := bat.append(X_84,32);
+ X_100 := bat.append(X_92,32);
+ X_85 := bat.new(nil:oid,nil:int);
+ X_94 := bat.append(X_85,0);
+ X_101 := bat.append(X_94,0);
X_3:bat[:int] := bat.new(nil:oid,nil:int);
X_2 := sql.mvc();
C_6:bat[:oid] := sql.tid(X_2,"sys","customer");
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
@@ -62,22 +62,22 @@ Ready.
% clob # type
% 729 # length
function user.s2_1(A0:str,A1:str):void;
- X_176:void := querylog.define("explain select\n s_name,\n count(*) as
numwait\nfrom\n supplier,\n lineitem l1,\n orders,\n nation\nwhere\n s_suppkey
= l1.l_suppkey\n and o_orderkey = l1.l_orderkey\n and o_orderstatus = \\'F\\'\n
and l1.l_receiptdate > l1.l_commitdate\n and exists (\n select\n *\n from\n
lineitem l2\n where\n l2.l_orderkey = l1.l_orderkey\n and l2.l_suppkey <>
l1.l_suppkey\n )\n and not exists (\n select\n *\n from\n lineitem l3\n where\n
l3.l_orderkey = l1.l_orderkey\n and l3.l_suppkey <> l1.l_suppkey\n and
l3.l_receiptdate > l3.l_commitdate\n )\n and s_nationkey = n_nationkey\n and
n_name = \\'SAUDI ARABIA\\'\ngroup by\n s_name\norder by\n numwait desc,\n
s_name\nlimit 100;","sequential_pipe",120);
- X_151 := bat.new(nil:oid,nil:str);
- X_159 := bat.append(X_151,"sys.supplier");
- X_167 := bat.append(X_159,"sys.L1");
- X_154 := bat.new(nil:oid,nil:str);
- X_161 := bat.append(X_154,"s_name");
- X_169 := bat.append(X_161,"numwait");
+ X_177:void := querylog.define("explain select\n s_name,\n count(*) as
numwait\nfrom\n supplier,\n lineitem l1,\n orders,\n nation\nwhere\n s_suppkey
= l1.l_suppkey\n and o_orderkey = l1.l_orderkey\n and o_orderstatus = \\'F\\'\n
and l1.l_receiptdate > l1.l_commitdate\n and exists (\n select\n *\n from\n
lineitem l2\n where\n l2.l_orderkey = l1.l_orderkey\n and l2.l_suppkey <>
l1.l_suppkey\n )\n and not exists (\n select\n *\n from\n lineitem l3\n where\n
l3.l_orderkey = l1.l_orderkey\n and l3.l_suppkey <> l1.l_suppkey\n and
l3.l_receiptdate > l3.l_commitdate\n )\n and s_nationkey = n_nationkey\n and
n_name = \\'SAUDI ARABIA\\'\ngroup by\n s_name\norder by\n numwait desc,\n
s_name\nlimit 100;","sequential_pipe",121);
+ X_152 := bat.new(nil:oid,nil:str);
+ X_160 := bat.append(X_152,"sys.supplier");
+ X_168 := bat.append(X_160,"sys.L1");
X_155 := bat.new(nil:oid,nil:str);
- X_162 := bat.append(X_155,"char");
- X_171 := bat.append(X_162,"wrd");
- X_156 := bat.new(nil:oid,nil:int);
- X_164 := bat.append(X_156,25);
- X_173 := bat.append(X_164,32);
- X_158 := bat.new(nil:oid,nil:int);
- X_166 := bat.append(X_158,0);
- X_175 := bat.append(X_166,0);
+ X_162 := bat.append(X_155,"s_name");
+ X_170 := bat.append(X_162,"numwait");
+ X_156 := bat.new(nil:oid,nil:str);
+ X_163 := bat.append(X_156,"char");
+ X_172 := bat.append(X_163,"wrd");
+ X_157 := bat.new(nil:oid,nil:int);
+ X_165 := bat.append(X_157,25);
+ X_174 := bat.append(X_165,32);
+ X_159 := bat.new(nil:oid,nil:int);
+ X_167 := bat.append(X_159,0);
+ X_176 := bat.append(X_167,0);
X_3 := sql.mvc();
C_4:bat[:oid] := sql.tid(X_3,"sys","lineitem");
X_7:bat[:date] := sql.bind(X_3,"sys","lineitem","l_receiptdate",0);
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
@@ -58,27 +58,27 @@ Ready.
% clob # type
% 710 # length
function
user.s2_1(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_160:void := querylog.define("explain select\n cntrycode,\n count(*) as
numcust,\n sum(c_acctbal) as totacctbal\nfrom\n (\n select\n substring(c_phone
from 1 for 2) as cntrycode,\n c_acctbal\n from\n customer\n where\n
substring(c_phone from 1 for 2) in\n (\\'13\\', \\'31\\', \\'23\\', \\'29\\',
\\'30\\', \\'18\\', \\'17\\')\n and c_acctbal > (\n select\n avg(c_acctbal)\n
from\n customer\n where\n c_acctbal > 0.00\n and substring(c_phone from 1 for
2) in\n (\\'13\\', \\'31\\', \\'23\\', \\'29\\', \\'30\\', \\'18\\',
\\'17\\')\n )\n and not exists (\n select\n *\n from\n orders\n where\n
o_custkey = c_custkey\n )\n ) as custsale\ngroup by\n cntrycode\norder by\n
cntrycode;","sequential_pipe",101);
- X_126 := bat.new(nil:oid,nil:str);
- X_134 := bat.append(X_126,"sys.custsale");
- X_142 := bat.append(X_134,"sys.L2");
- X_151 := bat.append(X_142,"sys.L3");
- X_129 := bat.new(nil:oid,nil:str);
- X_136 := bat.append(X_129,"cntrycode");
- X_144 := bat.append(X_136,"numcust");
- X_153 := bat.append(X_144,"totacctbal");
+ X_161:void := querylog.define("explain select\n cntrycode,\n count(*) as
numcust,\n sum(c_acctbal) as totacctbal\nfrom\n (\n select\n substring(c_phone
from 1 for 2) as cntrycode,\n c_acctbal\n from\n customer\n where\n
substring(c_phone from 1 for 2) in\n (\\'13\\', \\'31\\', \\'23\\', \\'29\\',
\\'30\\', \\'18\\', \\'17\\')\n and c_acctbal > (\n select\n avg(c_acctbal)\n
from\n customer\n where\n c_acctbal > 0.00\n and substring(c_phone from 1 for
2) in\n (\\'13\\', \\'31\\', \\'23\\', \\'29\\', \\'30\\', \\'18\\',
\\'17\\')\n )\n and not exists (\n select\n *\n from\n orders\n where\n
o_custkey = c_custkey\n )\n ) as custsale\ngroup by\n cntrycode\norder by\n
cntrycode;","sequential_pipe",102);
+ X_127 := bat.new(nil:oid,nil:str);
+ X_135 := bat.append(X_127,"sys.custsale");
+ X_143 := bat.append(X_135,"sys.L2");
+ X_152 := bat.append(X_143,"sys.L3");
X_130 := bat.new(nil:oid,nil:str);
- X_138 := bat.append(X_130,"char");
- X_146 := bat.append(X_138,"wrd");
- 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_157 := bat.append(X_148,19);
- X_133 := bat.new(nil:oid,nil:int);
- X_141 := bat.append(X_133,0);
- X_150 := bat.append(X_141,0);
- X_159 := bat.append(X_150,2);
+ X_137 := bat.append(X_130,"cntrycode");
+ X_145 := bat.append(X_137,"numcust");
+ X_154 := bat.append(X_145,"totacctbal");
+ X_131 := bat.new(nil:oid,nil:str);
+ X_139 := bat.append(X_131,"char");
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list