Changeset: a423ad041951 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a423ad041951
Modified Files:
clients/Tests/MAL-signatures_all.stable.out
clients/Tests/MAL-signatures_all.stable.out.int128
clients/Tests/SQL-dump_all.stable.out.int128
clients/Tests/SQL-dump_all.stable.out.oid32.int128
sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out
sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out.int128
sql/benchmarks/tpch/LOCKED/Tests/01.stable.out.int128
sql/benchmarks/tpch/LOCKED/Tests/03.stable.out.int128
sql/benchmarks/tpch/LOCKED/Tests/05.stable.out.int128
sql/benchmarks/tpch/LOCKED/Tests/06.stable.out.int128
sql/benchmarks/tpch/LOCKED/Tests/07.stable.out.int128
sql/benchmarks/tpch/LOCKED/Tests/08.stable.out.int128
sql/benchmarks/tpch/LOCKED/Tests/10.stable.out.int128
sql/benchmarks/tpch/LOCKED/Tests/15.stable.out.int128
sql/benchmarks/tpch/LOCKED/Tests/17.stable.out
sql/benchmarks/tpch/LOCKED/Tests/18.stable.out
sql/benchmarks/tpch/LOCKED/Tests/18.stable.out.int128
sql/benchmarks/tpch/LOCKED/Tests/19.stable.out.int128
sql/benchmarks/tpch/LOCKED/Tests/22.stable.out
sql/benchmarks/tpch/LOCKED/Tests/22.stable.out.int128
sql/benchmarks/tpch/Tests/01-22.stable.out
sql/benchmarks/tpch/Tests/01-22.stable.out.int128
sql/benchmarks/tpch/Tests/01-explain.stable.out.int128
sql/benchmarks/tpch/Tests/01.stable.out.int128
sql/benchmarks/tpch/Tests/03-explain.stable.out.int128
sql/benchmarks/tpch/Tests/03.stable.out.int128
sql/benchmarks/tpch/Tests/05-explain.stable.out.int128
sql/benchmarks/tpch/Tests/05.stable.out.int128
sql/benchmarks/tpch/Tests/06-explain.stable.out.int128
sql/benchmarks/tpch/Tests/06.stable.out.int128
sql/benchmarks/tpch/Tests/07-explain.stable.out.int128
sql/benchmarks/tpch/Tests/07.stable.out.int128
sql/benchmarks/tpch/Tests/08-explain.stable.out.int128
sql/benchmarks/tpch/Tests/08-plan.stable.out.int128
sql/benchmarks/tpch/Tests/08.stable.out.int128
sql/benchmarks/tpch/Tests/10-explain.stable.out.int128
sql/benchmarks/tpch/Tests/10.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/15-explain.stable.out.int128
sql/benchmarks/tpch/Tests/15.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/17.stable.out
sql/benchmarks/tpch/Tests/18-explain.stable.out.int128
sql/benchmarks/tpch/Tests/18-plan.stable.out.int128
sql/benchmarks/tpch/Tests/18.stable.out
sql/benchmarks/tpch/Tests/18.stable.out.int128
sql/benchmarks/tpch/Tests/19-explain.stable.out.int128
sql/benchmarks/tpch/Tests/19.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
sql/benchmarks/tpch/Tests/22-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/22-explain.stable.out.int128
sql/benchmarks/tpch/Tests/22.stable.out
sql/common/sql_types.c
sql/server/rel_optimizer.c
sql/test/BugTracker-2010/Tests/crash-with-huge-query.Bug-2647.stable.out
sql/test/BugTracker-2011/Tests/subquery_in_from_clause.Bug-2812.stable.out
sql/test/BugTracker-2012/Tests/aggregate_incorrect_precision_scale.Bug-3182.stable.out
sql/test/BugTracker-2012/Tests/boolean_coersion.Bug-3012.stable.out
sql/test/BugTracker-2013/Tests/bogus_aggregation_casts.Bug-3342.stable.out
sql/test/BugTracker-2013/Tests/median.Bug-3352.stable.out
sql/test/Dependencies/Tests/Dependencies_bam.stable.out
sql/test/Dependencies/Tests/Dependencies_bam.stable.out.int128
sql/test/leaks/Tests/check0_bam.stable.out.int128
sql/test/leaks/Tests/check1_bam.stable.out.int128
sql/test/leaks/Tests/check2_bam.stable.out.int128
sql/test/leaks/Tests/check3_bam.stable.out.int128
sql/test/leaks/Tests/check4_bam.stable.out.int128
sql/test/leaks/Tests/check5_bam.stable.out.int128
Branch: default
Log Message:
fixed bug in aggregate handling with large result types (hge)
diffs (truncated from 1912 to 300 lines):
diff --git a/clients/Tests/MAL-signatures_all.stable.out
b/clients/Tests/MAL-signatures_all.stable.out
--- a/clients/Tests/MAL-signatures_all.stable.out
+++ b/clients/Tests/MAL-signatures_all.stable.out
@@ -2320,10 +2320,6 @@ command algebra.ilike(s:str,pat:str):bit
address PCREilike2;
command algebra.ilike(s:str,pat:str,esc:str):bit
address PCREilike3;
-pattern algebra.joinPath(l:bat[:any,:any]...):bat[:oid,:any]
-address ALGjoinPath;
-comment Routine to handle join paths. The type analysis is rather tricky.
-
command
algebra.join(left:bat[:oid,:any_2],rl:bat[:oid,:any_2],rh:bat[:oid,:any_2],li:bit,hi:bit)
(l:bat[:oid,:oid],r:bat[:oid,:oid])
address ALGrangejoin2;
command algebra.join(left:bat[:oid,:any_1],right:bat[:oid,:any_1])
(l:bat[:oid,:oid],r:bat[:oid,:oid])
diff --git a/clients/Tests/MAL-signatures_all.stable.out.int128
b/clients/Tests/MAL-signatures_all.stable.out.int128
--- a/clients/Tests/MAL-signatures_all.stable.out.int128
+++ b/clients/Tests/MAL-signatures_all.stable.out.int128
@@ -2831,10 +2831,6 @@ command algebra.ilike(s:str,pat:str):bit
address PCREilike2;
command algebra.ilike(s:str,pat:str,esc:str):bit
address PCREilike3;
-pattern algebra.joinPath(l:bat[:any,:any]...):bat[:oid,:any]
-address ALGjoinPath;
-comment Routine to handle join paths. The type analysis is rather tricky.
-
command
algebra.join(left:bat[:oid,:any_2],rl:bat[:oid,:any_2],rh:bat[:oid,:any_2],li:bit,hi:bit)
(l:bat[:oid,:oid],r:bat[:oid,:oid])
address ALGrangejoin2;
command algebra.join(left:bat[:oid,:any_1],right:bat[:oid,:any_1])
(l:bat[:oid,:oid],r:bat[:oid,:oid])
diff --git a/clients/Tests/SQL-dump_all.stable.out.int128
b/clients/Tests/SQL-dump_all.stable.out.int128
--- a/clients/Tests/SQL-dump_all.stable.out.int128
+++ b/clients/Tests/SQL-dump_all.stable.out.int128
@@ -6067,7 +6067,7 @@ CREATE TABLE "sys"."dependencies" (
"depend_id" INTEGER,
"depend_type" SMALLINT
);
-COPY 231 RECORDS INTO "sys"."dependencies" FROM stdin USING DELIMITERS
'\t','\n','"';
+COPY 229 RECORDS INTO "sys"."dependencies" FROM stdin USING DELIMITERS
'\t','\n','"';
417 5722 7
418 5722 7
1023 5722 7
@@ -6100,7 +6100,6 @@ 2086 6020 7
2090 6020 7
2083 6020 7
2079 6020 7
-36 6020 7
5654 6025 7
2047 6025 7
2046 6025 7
@@ -6153,7 +6152,6 @@ 2087 6050 7
2103 6050 7
2102 6050 7
2104 6050 7
-36 6050 7
33 6050 7
32 6050 7
34 6050 7
diff --git a/clients/Tests/SQL-dump_all.stable.out.oid32.int128
b/clients/Tests/SQL-dump_all.stable.out.oid32.int128
--- a/clients/Tests/SQL-dump_all.stable.out.oid32.int128
+++ b/clients/Tests/SQL-dump_all.stable.out.oid32.int128
@@ -6072,7 +6072,7 @@ CREATE TABLE "sys"."dependencies" (
"depend_id" INTEGER,
"depend_type" SMALLINT
);
-COPY 231 RECORDS INTO "sys"."dependencies" FROM stdin USING DELIMITERS
'\t','\n','"';
+COPY 229 RECORDS INTO "sys"."dependencies" FROM stdin USING DELIMITERS
'\t','\n','"';
417 5722 7
418 5722 7
1023 5722 7
@@ -6105,7 +6105,6 @@ 2086 6020 7
2090 6020 7
2083 6020 7
2079 6020 7
-36 6020 7
5654 6025 7
2047 6025 7
2046 6025 7
@@ -6158,7 +6157,6 @@ 2087 6050 7
2103 6050 7
2102 6050 7
2104 6050 7
-36 6050 7
33 6050 7
32 6050 7
34 6050 7
diff --git a/sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out
b/sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out
--- a/sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out
+++ b/sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out
@@ -324,7 +324,7 @@ Ready.
% rewrite, count # name
% clob, int # type
% 7, 1 # length
-[ "joinidx", 5 ]
+[ "joinidx", 4 ]
# 11:48:06 >
# 11:48:06 > Mtimeout -timeout 60 MapiClient -lsql -umonetdb -Pmonetdb
--host=localhost --port=35781
@@ -756,7 +756,7 @@ Ready.
% rewrite, count # name
% clob, int # type
% 7, 1 # length
-[ "joinidx", 1 ]
+[ "joinidx", 0 ]
# 11:48:06 >
# 11:48:06 > Mtimeout -timeout 60 MapiClient -lsql -umonetdb -Pmonetdb
--host=localhost --port=35781
@@ -1214,7 +1214,7 @@ Ready.
% sys.customer, sys.customer, sys.orders, sys.orders,
sys.orders, sys.L6 # table_name
% c_name, c_custkey, o_orderkey, o_orderdate, o_totalprice,
L6 # name
% varchar, int, int, date, decimal, decimal # type
-% 18, 3, 5, 10, 17, 17 # length
+% 18, 3, 5, 10, 17, 41 # length
[ "Customer#000000667", 667, 29158, 1995-10-21, 439687.23,
305.00 ]
[ "Customer#000000178", 178, 6882, 1997-04-09, 422359.65,
303.00 ]
#select * from optimizer_stats() stats;
@@ -1356,7 +1356,7 @@ Ready.
% sys.custsale, sys.L2, sys.L3 # table_name
% cntrycode, numcust, totacctbal # name
% char, wrd, decimal # type
-% 15, 2, 17 # length
+% 15, 2, 41 # length
[ "13", 10, 75359.29 ]
[ "17", 8, 62288.98 ]
[ "18", 14, 111072.45 ]
diff --git a/sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out.int128
b/sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out.int128
--- a/sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out.int128
+++ b/sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out.int128
@@ -52,7 +52,7 @@ Ready.
% sys.lineitem, sys.lineitem, sys.L1, sys.L2, sys.L3, sys.L4, sys.L5,
sys.L6, sys.L7, sys.L10 # table_name
% l_returnflag, l_linestatus, sum_qty, sum_base_price,
sum_disc_price, sum_charge, avg_qty, avg_price, avg_disc,
count_order # name
% char, char, decimal, decimal, decimal,
decimal, double, double, double, wrd # type
-% 1, 1, 17, 17, 35, 41, 24, 24, 24, 5 #
length
+% 1, 1, 41, 41, 41, 41, 24, 24, 24, 5 #
length
[ "A", "F", 380456.00, 532348211.65, 505822441.4861,
526165934.000839, 25.57515461, 35785.70931, 0.05008133907, 14876
]
[ "N", "F", 8971.00, 12384801.37, 11798257.2080,
12282485.056933, 25.77873563, 35588.50968, 0.04775862069, 348
]
[ "N", "O", 742802.00, 1041502841.45, 989737518.6346,
1029418531.523350, 25.45498783, 35691.12921, 0.04993111956, 29181
]
@@ -113,7 +113,7 @@ Ready.
% sys.lineitem, sys.L1, sys.orders, sys.orders # table_name
% l_orderkey, revenue, o_orderdate, o_shippriority # name
% int, decimal, date, int # type
-% 5, 35, 10, 1 # length
+% 5, 41, 10, 1 # length
[ 47714, 267010.5894, 1995-03-11, 0 ]
[ 22276, 266351.5562, 1995-01-29, 0 ]
[ 32965, 263768.3414, 1995-02-25, 0 ]
@@ -201,7 +201,7 @@ Ready.
% sys.nation, sys.L1 # table_name
% n_name, revenue # name
% char, decimal # type
-% 25, 35 # length
+% 25, 41 # length
[ "VIETNAM", 1000926.6999 ]
[ "CHINA", 740210.7570 ]
[ "JAPAN", 660651.2425 ]
@@ -229,7 +229,7 @@ Ready.
% sys.L1 # table_name
% revenue # name
% decimal # type
-% 32 # length
+% 41 # length
[ 1193053.2253 ]
% .stats, .stats # table_name
% rewrite, count # name
@@ -271,7 +271,7 @@ Ready.
% sys.shipping, sys.shipping, sys.shipping, sys.L1 # table_name
% supp_nation, cust_nation, l_year, revenue # name
% char, char, int, decimal # type
-% 25, 25, 4, 35 # length
+% 25, 25, 4, 41 # length
[ "FRANCE", "GERMANY", 1995, 268068.5774 ]
[ "FRANCE", "GERMANY", 1996, 303862.2980 ]
[ "GERMANY", "FRANCE", 1995, 621159.4882 ]
@@ -280,7 +280,7 @@ Ready.
% rewrite, count # name
% clob, int # type
% 7, 1 # length
-[ "joinidx", 5 ]
+[ "joinidx", 4 ]
# 11:48:06 >
# 11:48:06 > Mtimeout -timeout 60 MapiClient -lsql -umonetdb -Pmonetdb
--host=localhost --port=35781
@@ -317,7 +317,7 @@ Ready.
% sys.all_nations, sys.L3 # table_name
% o_year, mkt_share # name
% int, decimal # type
-% 4, 39 # length
+% 4, 41 # length
[ 1995, 0.0000 ]
[ 1996, 0.0000 ]
% .stats, .stats # table_name
@@ -579,7 +579,7 @@ Ready.
% sys.customer, sys.customer, sys.L1, sys.customer, sys.nation,
sys.customer, sys.customer, sys.customer # table_name
% c_custkey, c_name, revenue, c_acctbal, n_name, c_address,
c_phone, c_comment # name
% int, varchar, decimal, decimal, char, varchar,
char, varchar # type
-% 4, 18, 35, 17, 25, 40, 15, 116 # length
+% 4, 18, 41, 17, 25, 40, 15, 116 # length
[ 679, "Customer#000000679", 378211.3252, 1394.44, "IRAN",
"IJf1FlZL9I9m,rvofcoKy5pRUOjUQV", "20-146-696-9508", "ely pending
frays boost carefully" ]
[ 1201, "Customer#000001201", 374331.5340, 5165.39, "IRAN",
"LfCSVKWozyWOGDW02g9UX,XgH5YU2o5ql1zBrN", "20-825-400-1187", "lyly
pending packages. special requests sleep-- platelets use blithely after the
instructions. sometimes even id" ]
[ 422, "Customer#000000422", 366451.0126, -272.14, "INDONESIA",
"AyNzZBvmIDo42JtjP9xzaK3pnvkh Qc0o08ssnvq", "19-299-247-2444",
"eposits; furiously ironic packages accordi" ]
@@ -785,7 +785,7 @@ Ready.
% rewrite, count # name
% clob, int # type
% 7, 1 # length
-[ "joinidx", 1 ]
+[ "joinidx", 0 ]
# 11:48:06 >
# 11:48:06 > Mtimeout -timeout 60 MapiClient -lsql -umonetdb -Pmonetdb
--host=localhost --port=35781
@@ -794,7 +794,7 @@ Ready.
% sys.supplier, sys.supplier, sys.supplier, sys.supplier,
sys.revenue0 # table_name
% s_suppkey, s_name, s_address, s_phone, total_revenue # name
% int, char, varchar, char, decimal # type
-% 2, 25, 36, 15, 35 # length
+% 2, 25, 36, 15, 41 # length
[ 21, "Supplier#000000021", "81CavellcrJ0PQ3CPBID0Z0JwyJm0ka5igEs",
"12-253-590-5816", 1161099.4636 ]
% .stats, .stats # table_name
% rewrite, count # name
@@ -1166,13 +1166,13 @@ Ready.
% sys.L3 # table_name
% avg_yearly # name
% decimal # type
-% 20 # length
+% 41 # length
[ NULL ]
% .stats, .stats # table_name
% rewrite, count # name
% clob, int # type
% 7, 1 # length
-[ "joinidx", 1 ]
+[ "joinidx", 0 ]
# 11:48:06 >
# 11:48:06 > Mtimeout -timeout 60 MapiClient -lsql -umonetdb -Pmonetdb
--host=localhost --port=35781
@@ -1214,7 +1214,7 @@ Ready.
% sys.customer, sys.customer, sys.orders, sys.orders,
sys.orders, sys.L6 # table_name
% c_name, c_custkey, o_orderkey, o_orderdate, o_totalprice,
L6 # name
% varchar, int, int, date, decimal, decimal # type
-% 18, 3, 5, 10, 17, 17 # length
+% 18, 3, 5, 10, 17, 41 # length
[ "Customer#000000667", 667, 29158, 1995-10-21, 439687.23,
305.00 ]
[ "Customer#000000178", 178, 6882, 1997-04-09, 422359.65,
303.00 ]
#select * from optimizer_stats() stats;
@@ -1252,7 +1252,7 @@ Ready.
% sys.L1 # table_name
% revenue # name
% decimal # type
-% 35 # length
+% 41 # length
[ 22923.0280 ]
% .stats, .stats # table_name
% rewrite, count # name
@@ -1264,6 +1264,45 @@ Ready.
# 17:17:26 > Mtimeout -timeout 60 mclient -lsql -ftest -Eutf-8 -i -e
--host=/var/tmp/mtest-26556 --port=38510 <
/net/madrid/export/scratch1/sjoerd/src/MonetDB/virgin/sql/benchmarks/tpch/LOCKED/../20.sql
# 17:17:26 >
+#select
+# s_name,
+# s_address
+#from
+# supplier,
+# nation
+#where
+# s_suppkey in (
+# select
+# ps_suppkey
+# from
+# partsupp
+# where
+# ps_partkey in (
+# select
+# p_partkey
+# from
+# part
+# where
+# p_name like 'forest%'
+# )
+# and ps_availqty > (
+# select
+# 0.5 * sum(l_quantity)
+# from
+# lineitem
+# where
+# l_partkey = ps_partkey
+# and l_suppkey = ps_suppkey
+# and l_shipdate >= date '1994-01-01'
+# and l_shipdate < date '1994-01-01' +
interval '1' year
+# )
+# )
+# and s_nationkey = n_nationkey
+% sys.supplier, sys.supplier # table_name
+% s_name, s_address # name
+% char, varchar # type
+% 25, 30 # length
+[ "Supplier#000000013", "HK71HQyWoqRWOX8GI FpgAifW,2PoH" ]
#select * from optimizer_stats() stats;
% .stats, .stats # table_name
% rewrite, count # name
@@ -1352,7 +1391,7 @@ Ready.
% sys.custsale, sys.L2, sys.L3 # table_name
% cntrycode, numcust, totacctbal # name
% char, wrd, decimal # type
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
