Changeset: 35dd891a5d01 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=35dd891a5d01
Modified Files:
sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/20-explain.stable.out.32bit
Branch: Oct2014
Log Message:
TPCH: approved 32-bit MAL plans
diffs (65 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
@@ -56,12 +56,12 @@ function user.s2_1{autoCommit=true}(A0:b
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_184 := algebra.thetasubselect(X_11,X_8,X_19,"<=");
+ X_185 := algebra.thetasubselect(X_11,X_8,X_19,"<=");
(X_14,r1_14) := sql.bind(X_7,"sys","lineitem","l_shipdate",2);
- X_185 := algebra.thetasubselect(r1_14,X_19,"<=");
+ X_186 := algebra.thetasubselect(r1_14,X_19,"<=");
X_17:bat[:oid,:date] := sql.bind(X_7,"sys","lineitem","l_shipdate",1);
- X_186 := algebra.thetasubselect(X_17,X_8,X_19,"<=");
- X_20 := sql.subdelta(X_184,X_8,X_14,X_185,X_186);
+ X_187 := algebra.thetasubselect(X_17,X_8,X_19,"<=");
+ X_20 := sql.subdelta(X_185,X_8,X_14,X_186,X_187);
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);
@@ -125,7 +125,7 @@ function user.s2_1{autoCommit=true}(A0:b
X_117 := sql.resultSet(10,1,X_49);
sql.rsColumn(X_117,"sys.lineitem","l_returnflag","varchar",1,0,X_49);
sql.rsColumn(X_117,"sys.lineitem","l_linestatus","varchar",1,0,X_50);
- sql.rsColumn(X_117,"sys.L1","sum_qty","bigint",32,0,X_64);
+ sql.rsColumn(X_117,"sys.L1","sum_qty","bigint",64,0,X_64);
sql.rsColumn(X_117,"sys.L2","sum_base_price","decimal",15,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);
@@ -133,8 +133,8 @@ function user.s2_1{autoCommit=true}(A0:b
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_163 := io.stdout();
- sql.exportResult(X_163,X_117);
+ X_164 := io.stdout();
+ sql.exportResult(X_164,X_117);
end s2_1;
# 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")
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
@@ -108,18 +108,18 @@ function user.s2_1{autoCommit=true}(A0:s
X_75 := algebra.leftfetchjoin(X_67,X_74);
X_76 := mtime.addmonths(A3,A4);
X_77 := algebra.subselect(X_75,A2,X_76,true,false,false);
- X_275 := algebra.leftfetchjoin(X_77,X_67);
+ X_274 := algebra.leftfetchjoin(X_77,X_67);
X_80:bat[:oid,:int] := sql.bind(X_8,"sys","lineitem","l_partkey",0);
(X_84,r1_91) := sql.bind(X_8,"sys","lineitem","l_partkey",2);
X_87:bat[:oid,:int] := sql.bind(X_8,"sys","lineitem","l_partkey",1);
X_89 := sql.delta(X_80,X_84,r1_91,X_87);
- X_90:bat[:oid,:int] := algebra.leftfetchjoin(X_275,X_89);
+ X_90:bat[:oid,:int] := algebra.leftfetchjoin(X_274,X_89);
X_91:bat[:oid,:wrd] := batmkey.hash(X_90);
X_93:bat[:oid,:int] := sql.bind(X_8,"sys","lineitem","l_suppkey",0);
(X_96,r1_107) := sql.bind(X_8,"sys","lineitem","l_suppkey",2);
X_98:bat[:oid,:int] := sql.bind(X_8,"sys","lineitem","l_suppkey",1);
X_99 := sql.delta(X_93,X_96,r1_107,X_98);
- X_100:bat[:oid,:int] := algebra.leftfetchjoin(X_275,X_99);
+ X_100:bat[:oid,:int] := algebra.leftfetchjoin(X_274,X_99);
X_101:bat[:oid,:wrd] := mkey.bulk_rotate_xor_hash(X_91,11,X_100);
(X_102,r1_114) := algebra.join(X_66,X_101);
X_104 := algebra.leftfetchjoin(X_58,X_31);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
