Changeset: 9cbc0f0e7d88 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9cbc0f0e7d88
Added Files:
sql/benchmarks/tpch/Tests/02-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/02-plan.stable.out.32bit
sql/benchmarks/tpch/Tests/13-plan.stable.out.32bit
sql/benchmarks/tpch/Tests/16-plan.stable.out.32bit
Removed Files:
sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/04-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
Modified Files:
sql/benchmarks/tpch/Tests/01-explain.stable.out
sql/benchmarks/tpch/Tests/03-explain.stable.out
sql/benchmarks/tpch/Tests/05-explain.stable.out
sql/benchmarks/tpch/Tests/05-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/06-explain.stable.out
sql/benchmarks/tpch/Tests/07-explain.stable.out
sql/benchmarks/tpch/Tests/08-explain.stable.out
sql/benchmarks/tpch/Tests/09-explain.stable.out
sql/benchmarks/tpch/Tests/10-explain.stable.out
sql/benchmarks/tpch/Tests/11-explain.stable.out
sql/benchmarks/tpch/Tests/14-explain.stable.out
sql/benchmarks/tpch/Tests/15-explain.stable.out
sql/benchmarks/tpch/Tests/16-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/19-explain.stable.out
sql/benchmarks/tpch/Tests/20-explain.stable.out.32bit
Branch: default
Log Message:
Approve plans and explain output for TPCH tests.
diffs (truncated from 2685 to 300 lines):
diff --git a/sql/benchmarks/tpch/Tests/01-explain.stable.out
b/sql/benchmarks/tpch/Tests/01-explain.stable.out
--- a/sql/benchmarks/tpch/Tests/01-explain.stable.out
+++ b/sql/benchmarks/tpch/Tests/01-explain.stable.out
@@ -113,17 +113,17 @@ function user.s2_1(A0:bte,A1:bte,A2:bte,
C_1:bat[:oid] := sql.tid(X_0,"sys","lineitem");
X_16:date := mtime.date_sub_msec_interval(A3,A4);
C_236 := algebra.thetasubselect(X_4,C_1,X_16,"<=");
- (C_7,r1_13) := sql.bind(X_0,"sys","lineitem","l_shipdate",2);
+ (C_7:bat[:oid],r1_13:bat[:date]) :=
sql.bind(X_0,"sys","lineitem","l_shipdate",2);
C_237 := algebra.thetasubselect(r1_13,nil:bat[:oid],X_16,"<=");
X_10:bat[:date] := sql.bind(X_0,"sys","lineitem","l_shipdate",1);
C_239 := algebra.thetasubselect(X_10,C_1,X_16,"<=");
C_17 := sql.subdelta(C_236,C_1,C_7,C_237,C_239);
X_19:bat[:str] := sql.bind(X_0,"sys","lineitem","l_linestatus",0);
- (C_21,r1_27) := sql.bind(X_0,"sys","lineitem","l_linestatus",2);
+ (C_21:bat[:oid],r1_27:bat[:str]) :=
sql.bind(X_0,"sys","lineitem","l_linestatus",2);
X_23:bat[:str] := sql.bind(X_0,"sys","lineitem","l_linestatus",1);
X_26 := sql.projectdelta(C_17,X_19,C_21,r1_27,X_23);
X_27:bat[:str] := sql.bind(X_0,"sys","lineitem","l_returnflag",0);
- (C_29,r1_35) := sql.bind(X_0,"sys","lineitem","l_returnflag",2);
+ (C_29:bat[:oid],r1_35:bat[:str]) :=
sql.bind(X_0,"sys","lineitem","l_returnflag",2);
X_31:bat[:str] := sql.bind(X_0,"sys","lineitem","l_returnflag",1);
X_34 := sql.projectdelta(C_17,X_27,C_29,r1_35,X_31);
(X_35,r1_41,r2_41) := group.subgroup(X_34);
@@ -131,18 +131,18 @@ function user.s2_1(A0:bte,A1:bte,A2:bte,
X_41 := algebra.projection(r1_44,X_26);
X_42 := algebra.projection(r1_44,X_34);
X_53:bat[:lng] := sql.bind(X_0,"sys","lineitem","l_quantity",0);
- (C_55,r1_61) := sql.bind(X_0,"sys","lineitem","l_quantity",2);
+ (C_55:bat[:oid],r1_61:bat[:lng]) :=
sql.bind(X_0,"sys","lineitem","l_quantity",2);
X_57:bat[:lng] := sql.bind(X_0,"sys","lineitem","l_quantity",1);
X_60 := sql.projectdelta(C_17,X_53,C_55,r1_61,X_57);
X_61:bat[:lng] := aggr.subsum(X_60,X_38,r1_44,true,true);
X_65:bat[:lng] := sql.bind(X_0,"sys","lineitem","l_extendedprice",0);
- (C_67,r1_73) := sql.bind(X_0,"sys","lineitem","l_extendedprice",2);
+ (C_67:bat[:oid],r1_73:bat[:lng]) :=
sql.bind(X_0,"sys","lineitem","l_extendedprice",2);
X_69:bat[:lng] := sql.bind(X_0,"sys","lineitem","l_extendedprice",1);
X_72 := sql.projectdelta(C_17,X_65,C_67,r1_73,X_69);
X_73:bat[:lng] := aggr.subsum(X_72,X_38,r1_44,true,true);
X_76 := calc.lng(A0,15,2);
X_79:bat[:lng] := sql.bind(X_0,"sys","lineitem","l_discount",0);
- (C_81,r1_87) := sql.bind(X_0,"sys","lineitem","l_discount",2);
+ (C_81:bat[:oid],r1_87:bat[:lng]) :=
sql.bind(X_0,"sys","lineitem","l_discount",2);
X_83:bat[:lng] := sql.bind(X_0,"sys","lineitem","l_discount",1);
X_86 := sql.projectdelta(C_17,X_79,C_81,r1_87,X_83);
X_87:bat[:lng] := batcalc.-(X_76,X_86);
@@ -153,7 +153,7 @@ function user.s2_1(A0:bte,A1:bte,A2:bte,
X_97:bat[:lng] := batcalc.*(X_72,X_96);
X_99 := calc.lng(A2,15,2);
X_100:bat[:lng] := sql.bind(X_0,"sys","lineitem","l_tax",0);
- (C_102,r1_108) := sql.bind(X_0,"sys","lineitem","l_tax",2);
+ (C_102:bat[:oid],r1_108:bat[:lng]) :=
sql.bind(X_0,"sys","lineitem","l_tax",2);
X_104:bat[:lng] := sql.bind(X_0,"sys","lineitem","l_tax",1);
X_107 := sql.projectdelta(C_17,X_100,C_102,r1_108,X_104);
X_108:bat[:lng] := batcalc.+(X_99,X_107);
diff --git a/sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit
b/sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit
deleted file mode 100644
--- a/sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit
+++ /dev/null
@@ -1,187 +0,0 @@
-stdout of test '01-explain` in directory 'sql/benchmarks/tpch` itself:
-
-
-# 22:53:25 >
-# 22:53:25 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=34581" "--set"
"mapi_usock=/var/tmp/mtest-9096/.s.monetdb.34581" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/ufs/manegold/_/Monet/HG/Feb2013/prefix/--disable-debug_--enable-assert_--enable-optimize/var/MonetDB/mTests_sql_benchmarks_tpch"
"--set" "mal_listing=0"
-# 22:53:25 >
-
-# MonetDB 5 server v11.15.12
-# This is an unreleased version
-# Serving database 'mTests_sql_benchmarks_tpch', using 8 threads
-# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
-# Found 15.591 GiB available main-memory.
-# Copyright (c) 1993-July 2008 CWI.
-# Copyright (c) August 2008-2015 MonetDB B.V., all rights reserved
-# Visit http://www.monetdb.org/ for further information
-# Listening for connection requests on mapi:monetdb://rome.ins.cwi.nl:34581/
-# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-9096/.s.monetdb.34581
-# MonetDB/GIS module loaded
-# MonetDB/JAQL module loaded
-# MonetDB/SQL module loaded
-
-Ready.
-
-# 22:53:25 >
-# 22:53:25 > "/usr/bin/python2" "01-explain.SQL.py" "01-explain"
-# 22:53:25 >
-
-#set optimizer = 'sequential_pipe';
-#explain select
-# l_returnflag,
-# l_linestatus,
-# sum(l_quantity) as sum_qty,
-# sum(l_extendedprice) as sum_base_price,
-# sum(l_extendedprice * (1 - l_discount)) as sum_disc_price,
-# sum(l_extendedprice * (1 - l_discount) * (1 + l_tax)) as sum_charge,
-# avg(l_quantity) as avg_qty,
-# avg(l_extendedprice) as avg_price,
-# avg(l_discount) as avg_disc,
-# count(*) as count_order
-#from
-# lineitem
-#where
-# l_shipdate <= date '1998-12-01' - interval '90' day (3)
-#group by
-# l_returnflag,
-# l_linestatus
-#order by
-# l_returnflag,
-# l_linestatus;
-% .explain # table_name
-% mal # name
-% clob # type
-% 607 # length
-function user.s2_1(A0:bte,A1:bte,A2:bte,A3:date,A4:lng):void;
- X_189:void := querylog.define("explain select\n l_returnflag,\n
l_linestatus,\n sum(l_quantity) as sum_qty,\n sum(l_extendedprice) as
sum_base_price,\n sum(l_extendedprice * (1 - l_discount)) as sum_disc_price,\n
sum(l_extendedprice * (1 - l_discount) * (1 + l_tax)) as sum_charge,\n
avg(l_quantity) as avg_qty,\n avg(l_extendedprice) as avg_price,\n
avg(l_discount) as avg_disc,\n count(*) as count_order\nfrom\n
lineitem\nwhere\n l_shipdate <= date \\'1998-12-01\\' - interval \\'90\\' day
(3)\ngroup by\n l_returnflag,\n l_linestatus\norder by\n l_returnflag,\n
l_linestatus;","sequential_pipe",129);
- X_105 := bat.new(nil:oid,nil:str);
- X_113 := bat.append(X_105,"sys.lineitem");
- X_120 := bat.append(X_113,"sys.lineitem");
- X_125 := bat.append(X_120,"sys.L1");
- X_134 := bat.append(X_125,"sys.L2");
- X_141 := bat.append(X_134,"sys.L3");
- X_149 := bat.append(X_141,"sys.L4");
- X_157 := bat.append(X_149,"sys.L5");
- X_166 := bat.append(X_157,"sys.L6");
- X_173 := bat.append(X_166,"sys.L7");
- X_180 := bat.append(X_173,"sys.L10");
- X_108 := bat.new(nil:oid,nil:str);
- X_115 := bat.append(X_108,"l_returnflag");
- X_121 := bat.append(X_115,"l_linestatus");
- X_127 := bat.append(X_121,"sum_qty");
- X_136 := bat.append(X_127,"sum_base_price");
- X_143 := bat.append(X_136,"sum_disc_price");
- X_151 := bat.append(X_143,"sum_charge");
- X_159 := bat.append(X_151,"avg_qty");
- X_168 := bat.append(X_159,"avg_price");
- X_175 := bat.append(X_168,"avg_disc");
- X_182 := bat.append(X_175,"count_order");
- X_109 := bat.new(nil:oid,nil:str);
- X_116 := bat.append(X_109,"char");
- X_122 := bat.append(X_116,"char");
- X_129 := bat.append(X_122,"decimal");
- X_138 := bat.append(X_129,"decimal");
- X_145 := bat.append(X_138,"decimal");
- X_153 := bat.append(X_145,"decimal");
- 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,"bigint");
- X_110 := bat.new(nil:oid,nil:int);
- X_118 := bat.append(X_110,1);
- X_123 := bat.append(X_118,1);
- X_131 := bat.append(X_123,19);
- X_139 := bat.append(X_131,19);
- X_146 := bat.append(X_139,19);
- X_154 := bat.append(X_146,19);
- 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,64);
- X_112 := bat.new(nil:oid,nil:int);
- X_119 := bat.append(X_112,0);
- X_124 := bat.append(X_119,0);
- X_133 := bat.append(X_124,2);
- X_140 := bat.append(X_133,2);
- X_147 := bat.append(X_140,4);
- X_155 := bat.append(X_147,6);
- X_165 := bat.append(X_155,0);
- X_172 := bat.append(X_165,0);
- X_179 := bat.append(X_172,0);
- X_188 := bat.append(X_179,0);
- X_6 := sql.mvc();
- X_10:bat[:date] := sql.bind(X_6,"sys","lineitem","l_shipdate",0);
- C_7:bat[:oid] := sql.tid(X_6,"sys","lineitem");
- X_18:date := mtime.date_sub_msec_interval(A3,A4);
- C_205 := algebra.thetasubselect(X_10,C_7,X_18,"<=");
- (C_13,r1_13) := sql.bind(X_6,"sys","lineitem","l_shipdate",2);
- C_206 := algebra.thetasubselect(r1_13,nil:bat[:oid],X_18,"<=");
- X_16:bat[:date] := sql.bind(X_6,"sys","lineitem","l_shipdate",1);
- C_208 := algebra.thetasubselect(X_16,C_7,X_18,"<=");
- C_19 := sql.subdelta(C_205,C_7,C_13,C_206,C_208);
- X_21:bat[:str] := sql.bind(X_6,"sys","lineitem","l_linestatus",0);
- (C_23,r1_27) := sql.bind(X_6,"sys","lineitem","l_linestatus",2);
- X_25:bat[:str] := sql.bind(X_6,"sys","lineitem","l_linestatus",1);
- X_26 := sql.projectdelta(C_19,X_21,C_23,r1_27,X_25);
- X_27:bat[:str] := sql.bind(X_6,"sys","lineitem","l_returnflag",0);
- (C_29,r1_35) := sql.bind(X_6,"sys","lineitem","l_returnflag",2);
- X_31:bat[:str] := sql.bind(X_6,"sys","lineitem","l_returnflag",1);
- X_32 := sql.projectdelta(C_19,X_27,C_29,r1_35,X_31);
- (X_33,r1_41,r2_41) := group.subgroup(X_32);
- (X_36,r1_44,r2_44) := group.subgroupdone(X_26,X_33);
- X_39 := algebra.projection(r1_44,X_26);
- X_40 := algebra.projection(r1_44,X_32);
- X_50:bat[:lng] := sql.bind(X_6,"sys","lineitem","l_quantity",0);
- (C_52,r1_61) := sql.bind(X_6,"sys","lineitem","l_quantity",2);
- X_54:bat[:lng] := sql.bind(X_6,"sys","lineitem","l_quantity",1);
- X_55 := sql.projectdelta(C_19,X_50,C_52,r1_61,X_54);
- X_56:bat[:lng] := aggr.subsum(X_55,X_36,r1_44,true,true);
- X_59:bat[:lng] := sql.bind(X_6,"sys","lineitem","l_extendedprice",0);
- (C_61,r1_73) := sql.bind(X_6,"sys","lineitem","l_extendedprice",2);
- X_63:bat[:lng] := sql.bind(X_6,"sys","lineitem","l_extendedprice",1);
- X_64 := sql.projectdelta(C_19,X_59,C_61,r1_73,X_63);
- X_65:bat[:lng] := aggr.subsum(X_64,X_36,r1_44,true,true);
- X_67 := calc.lng(A0,15,2);
- X_69:bat[:lng] := sql.bind(X_6,"sys","lineitem","l_discount",0);
- (C_71,r1_87) := sql.bind(X_6,"sys","lineitem","l_discount",2);
- X_73:bat[:lng] := sql.bind(X_6,"sys","lineitem","l_discount",1);
- X_74 := sql.projectdelta(C_19,X_69,C_71,r1_87,X_73);
- X_75:bat[:lng] := batcalc.-(X_67,X_74);
- X_76:bat[:lng] := batcalc.*(X_64,X_75);
- X_77:bat[:lng] := aggr.subsum(X_76,X_36,r1_44,true,true);
- X_79 := calc.lng(A1,15,2);
- X_80:bat[:lng] := batcalc.-(X_79,X_74);
- X_81:bat[:lng] := batcalc.*(X_64,X_80);
- X_82 := calc.lng(A2,15,2);
- X_83:bat[:lng] := sql.bind(X_6,"sys","lineitem","l_tax",0);
- (C_85,r1_108) := sql.bind(X_6,"sys","lineitem","l_tax",2);
- X_87:bat[:lng] := sql.bind(X_6,"sys","lineitem","l_tax",1);
- X_88 := sql.projectdelta(C_19,X_83,C_85,r1_108,X_87);
- X_89:bat[:lng] := batcalc.+(X_82,X_88);
- X_90:bat[:lng] := batcalc.*(X_81,X_89);
- X_91:bat[:lng] := aggr.subsum(X_90,X_36,r1_44,true,true);
- X_93:bat[:dbl] := batcalc.dbl(2,X_55);
- X_94:bat[:dbl] := aggr.subavg(X_93,X_36,r1_44,true,true);
- X_96:bat[:dbl] := batcalc.dbl(2,X_64);
- 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[: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);
- X_49 := algebra.projection(r1_54,X_39);
- X_58 := algebra.projection(r1_54,X_56);
- X_66 := algebra.projection(r1_54,X_65);
- X_78 := algebra.projection(r1_54,X_77);
- X_92 := algebra.projection(r1_54,X_91);
- X_95 := algebra.projection(r1_54,X_94);
- X_98 := algebra.projection(r1_54,X_97);
- X_101 := algebra.projection(r1_54,X_100);
- X_103 := algebra.projection(r1_54,X_102);
-
sql.resultSet(X_179,X_181,X_183,X_185,X_187,X_48,X_49,X_58,X_66,X_78,X_92,X_95,X_98,X_101,X_103);
-end user.s2_1;
-
-# 22:53:25 >
-# 22:53:25 > "Done."
-# 22:53:25 >
-
diff --git a/sql/benchmarks/tpch/Tests/02-explain.stable.out.32bit
b/sql/benchmarks/tpch/Tests/02-explain.stable.out.32bit
new file mode 100644
--- /dev/null
+++ b/sql/benchmarks/tpch/Tests/02-explain.stable.out.32bit
@@ -0,0 +1,257 @@
+stdout of test '02-explain` in directory 'sql/benchmarks/tpch` itself:
+
+
+# 22:53:25 >
+# 22:53:25 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=34581" "--set"
"mapi_usock=/var/tmp/mtest-9096/.s.monetdb.34581" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/ufs/manegold/_/Monet/HG/Feb2013/prefix/--disable-debug_--enable-assert_--enable-optimize/var/MonetDB/mTests_sql_benchmarks_tpch"
"--set" "mal_listing=0"
+# 22:53:25 >
+
+# MonetDB 5 server v11.15.12
+# This is an unreleased version
+# Serving database 'mTests_sql_benchmarks_tpch', using 8 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
+# Found 15.591 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2015 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://rome.ins.cwi.nl:34581/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-9096/.s.monetdb.34581
+# MonetDB/GIS module loaded
+# MonetDB/JAQL module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 22:53:25 >
+# 22:53:25 > "/usr/bin/python2" "02-explain.SQL.py" "02-explain"
+# 22:53:25 >
+
+#set optimizer = 'sequential_pipe';
+#explain select
+# s_acctbal,
+# s_name,
+# n_name,
+# p_partkey,
+# p_mfgr,
+# s_address,
+# s_phone,
+# s_comment
+#from
+# part,
+# supplier,
+# partsupp,
+# nation,
+# region
+#where
+# p_partkey = ps_partkey
+# and s_suppkey = ps_suppkey
+# and p_size = 15
+# and p_type like '%BRASS'
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
