Changeset: 6c4f128fa4ee for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6c4f128fa4ee
Modified Files:
        sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit
Branch: Jan2014
Log Message:

Approved.


diffs (159 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,85 +56,84 @@ function user.s2_1{autoCommit=true}(A0:b
     X_11 := 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_183 := algebra.thetasubselect(X_11,X_8,X_19,"<=");
+    X_180 := algebra.thetasubselect(X_11,X_8,X_19,"<=");
     (X_14,r1_14) := sql.bind(X_7,"sys","lineitem","l_shipdate",2);
-    X_184 := algebra.thetasubselect(r1_14,X_19,"<=");
+    X_181 := algebra.thetasubselect(r1_14,X_19,"<=");
     X_17 := sql.bind(X_7,"sys","lineitem","l_shipdate",1);
-    X_185 := algebra.thetasubselect(X_17,X_8,X_19,"<=");
-    X_20 := sql.subdelta(X_183,X_8,X_14,X_184,X_185);
+    X_182 := algebra.thetasubselect(X_17,X_8,X_19,"<=");
+    X_20 := sql.subdelta(X_180,X_8,X_14,X_181,X_182);
+    X_28 := sql.bind(X_7,"sys","lineitem","l_linestatus",0);
+    (X_30,r1_36) := sql.bind(X_7,"sys","lineitem","l_linestatus",2);
+    X_32 := sql.bind(X_7,"sys","lineitem","l_linestatus",1);
+    X_33 := sql.projectdelta(X_20,X_28,X_30,r1_36,X_32);
     X_22 := sql.bind(X_7,"sys","lineitem","l_returnflag",0);
     (X_24,r1_28) := sql.bind(X_7,"sys","lineitem","l_returnflag",2);
     X_26 := sql.bind(X_7,"sys","lineitem","l_returnflag",1);
     X_27 := sql.projectdelta(X_20,X_22,X_24,r1_28,X_26);
-    X_28 := sql.bind(X_7,"sys","lineitem","l_linestatus",0);
-    (X_30,r1_36) := sql.bind(X_7,"sys","lineitem","l_linestatus",2);
-    X_32 := sql.bind(X_7,"sys","lineitem","l_linestatus",1);
-    X_33 := sql.projectdelta(X_20,X_28,X_30,r1_36,X_32);
-    (X_34,r1_42,r2_42) := group.subgroup(X_33);
-    (X_37,r1_45,r2_45) := group.subgroupdone(X_27,X_34);
-    X_40 := algebra.leftfetchjoin(r1_45,X_33);
-    X_41 := algebra.leftfetchjoin(r1_45,X_27);
-    X_51 := sql.bind(X_7,"sys","lineitem","l_quantity",0);
-    (X_56,r1_64) := sql.bind(X_7,"sys","lineitem","l_quantity",2);
-    X_59 := sql.bind(X_7,"sys","lineitem","l_quantity",1);
-    X_61 := sql.projectdelta(X_20,X_51,X_56,r1_64,X_59);
-    X_62:bat[:oid,:lng]  := aggr.subsum(X_61,X_37,r1_45,true,true);
-    X_65 := sql.bind(X_7,"sys","lineitem","l_extendedprice",0);
-    (X_67,r1_77) := sql.bind(X_7,"sys","lineitem","l_extendedprice",2);
-    X_69 := sql.bind(X_7,"sys","lineitem","l_extendedprice",1);
-    X_70 := sql.projectdelta(X_20,X_65,X_67,r1_77,X_69);
-    X_71:bat[:oid,:lng]  := aggr.subsum(X_70,X_37,r1_45,true,true);
-    X_73 := calc.lng(A0,15,2);
-    X_75 := sql.bind(X_7,"sys","lineitem","l_discount",0);
-    (X_77,r1_90) := sql.bind(X_7,"sys","lineitem","l_discount",2);
-    X_79 := sql.bind(X_7,"sys","lineitem","l_discount",1);
-    X_82 := sql.projectdelta(X_20,X_75,X_77,r1_90,X_79);
-    X_83:bat[:oid,:lng]  := batcalc.-(X_73,X_82);
-    X_84:bat[:oid,:lng]  := batcalc.*(X_70,X_83);
-    X_85:bat[:oid,:lng]  := aggr.subsum(X_84,X_37,r1_45,true,true);
-    X_87 := calc.lng(A1,15,2);
-    X_89:bat[:oid,:lng]  := batcalc.-(X_87,X_82);
-    X_90:bat[:oid,:lng]  := batcalc.*(X_70,X_89);
-    X_91 := calc.lng(A2,15,2);
-    X_92 := sql.bind(X_7,"sys","lineitem","l_tax",0);
-    (X_95,r1_115) := sql.bind(X_7,"sys","lineitem","l_tax",2);
-    X_97 := sql.bind(X_7,"sys","lineitem","l_tax",1);
-    X_99 := sql.projectdelta(X_20,X_92,X_95,r1_115,X_97);
-    X_100:bat[:oid,:lng]  := batcalc.+(X_91,X_99);
-    X_101:bat[:oid,:lng]  := batcalc.*(X_90,X_100);
-    X_102:bat[:oid,:lng]  := aggr.subsum(X_101,X_37,r1_45,true,true);
-    X_105 := batcalc.dbl(X_61);
-    X_106:bat[:oid,:dbl]  := aggr.subavg(X_105,X_37,r1_45,true,true);
-    X_108:bat[:oid,:dbl]  := batcalc.dbl(2,X_70);
-    X_109:bat[:oid,:dbl]  := aggr.subavg(X_108,X_37,r1_45,true,true);
-    X_111:bat[:oid,:dbl]  := batcalc.dbl(2,X_82);
-    X_112:bat[:oid,:dbl]  := aggr.subavg(X_111,X_37,r1_45,true,true);
-    X_114:bat[:oid,:wrd]  := aggr.subcount(X_37,X_37,r1_45,false);
-    (X_42,r1_50,r2_50) := algebra.subsort(X_41,false,false);
-    (X_46,r1_54,r2_54) := algebra.subsort(X_40,r1_50,r2_50,false,false);
-    X_49 := algebra.leftfetchjoin(r1_54,X_41);
-    X_116 := algebra.leftfetchjoin(r1_54,X_114);
-    X_113 := algebra.leftfetchjoin(r1_54,X_112);
+    (X_34,r1_45,r2_45) := group.subgroup(X_33,X_27);
+    X_37 := algebra.leftfetchjoin(r1_45,X_33);
+    X_38 := algebra.leftfetchjoin(r1_45,X_27);
+    X_48 := sql.bind(X_7,"sys","lineitem","l_quantity",0);
+    (X_53,r1_64) := sql.bind(X_7,"sys","lineitem","l_quantity",2);
+    X_56 := sql.bind(X_7,"sys","lineitem","l_quantity",1);
+    X_58 := sql.projectdelta(X_20,X_48,X_53,r1_64,X_56);
+    X_59:bat[:oid,:lng]  := aggr.subsum(X_58,X_34,r1_45,true,true);
+    X_62 := sql.bind(X_7,"sys","lineitem","l_extendedprice",0);
+    (X_64,r1_77) := sql.bind(X_7,"sys","lineitem","l_extendedprice",2);
+    X_66 := sql.bind(X_7,"sys","lineitem","l_extendedprice",1);
+    X_67 := sql.projectdelta(X_20,X_62,X_64,r1_77,X_66);
+    X_68:bat[:oid,:lng]  := aggr.subsum(X_67,X_34,r1_45,true,true);
+    X_70 := calc.lng(A0,15,2);
+    X_72 := sql.bind(X_7,"sys","lineitem","l_discount",0);
+    (X_74,r1_90) := sql.bind(X_7,"sys","lineitem","l_discount",2);
+    X_76 := sql.bind(X_7,"sys","lineitem","l_discount",1);
+    X_79 := sql.projectdelta(X_20,X_72,X_74,r1_90,X_76);
+    X_80:bat[:oid,:lng]  := batcalc.-(X_70,X_79);
+    X_81:bat[:oid,:lng]  := batcalc.*(X_67,X_80);
+    X_82:bat[:oid,:lng]  := aggr.subsum(X_81,X_34,r1_45,true,true);
+    X_84 := calc.lng(A1,15,2);
+    X_86:bat[:oid,:lng]  := batcalc.-(X_84,X_79);
+    X_87:bat[:oid,:lng]  := batcalc.*(X_67,X_86);
+    X_88 := calc.lng(A2,15,2);
+    X_89 := sql.bind(X_7,"sys","lineitem","l_tax",0);
+    (X_92,r1_115) := sql.bind(X_7,"sys","lineitem","l_tax",2);
+    X_94 := sql.bind(X_7,"sys","lineitem","l_tax",1);
+    X_96 := sql.projectdelta(X_20,X_89,X_92,r1_115,X_94);
+    X_97:bat[:oid,:lng]  := batcalc.+(X_88,X_96);
+    X_98:bat[:oid,:lng]  := batcalc.*(X_87,X_97);
+    X_99:bat[:oid,:lng]  := aggr.subsum(X_98,X_34,r1_45,true,true);
+    X_102 := batcalc.dbl(X_58);
+    X_103:bat[:oid,:dbl]  := aggr.subavg(X_102,X_34,r1_45,true,true);
+    X_105:bat[:oid,:dbl]  := batcalc.dbl(2,X_67);
+    X_106:bat[:oid,:dbl]  := aggr.subavg(X_105,X_34,r1_45,true,true);
+    X_108:bat[:oid,:dbl]  := batcalc.dbl(2,X_79);
+    X_109:bat[:oid,:dbl]  := aggr.subavg(X_108,X_34,r1_45,true,true);
+    X_111:bat[:oid,:wrd]  := aggr.subcount(X_34,X_34,r1_45,false);
+    (X_39,r1_50,r2_50) := algebra.subsort(X_38,false,false);
+    (X_43,r1_54,r2_54) := algebra.subsort(X_37,r1_50,r2_50,false,false);
+    X_46 := algebra.leftfetchjoin(r1_54,X_38);
+    X_113 := algebra.leftfetchjoin(r1_54,X_111);
     X_110 := algebra.leftfetchjoin(r1_54,X_109);
     X_107 := algebra.leftfetchjoin(r1_54,X_106);
-    X_104 := algebra.leftfetchjoin(r1_54,X_102);
-    X_86 := algebra.leftfetchjoin(r1_54,X_85);
-    X_72 := algebra.leftfetchjoin(r1_54,X_71);
-    X_64 := algebra.leftfetchjoin(r1_54,X_62);
-    X_50 := algebra.leftfetchjoin(r1_54,X_40);
-    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.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);
-    sql.rsColumn(X_117,"sys.L5","avg_qty","double",53,0,X_107);
-    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_104 := algebra.leftfetchjoin(r1_54,X_103);
+    X_101 := algebra.leftfetchjoin(r1_54,X_99);
+    X_83 := algebra.leftfetchjoin(r1_54,X_82);
+    X_69 := algebra.leftfetchjoin(r1_54,X_68);
+    X_61 := algebra.leftfetchjoin(r1_54,X_59);
+    X_47 := algebra.leftfetchjoin(r1_54,X_37);
+    X_114 := sql.resultSet(10,1,X_46);
+    sql.rsColumn(X_114,"sys.lineitem","l_returnflag","varchar",1,0,X_46);
+    sql.rsColumn(X_114,"sys.lineitem","l_linestatus","varchar",1,0,X_47);
+    sql.rsColumn(X_114,"sys.L1","sum_qty","bigint",32,0,X_61);
+    sql.rsColumn(X_114,"sys.L2","sum_base_price","decimal",15,2,X_69);
+    sql.rsColumn(X_114,"sys.L3","sum_disc_price","decimal",19,4,X_83);
+    sql.rsColumn(X_114,"sys.L4","sum_charge","decimal",19,6,X_101);
+    sql.rsColumn(X_114,"sys.L5","avg_qty","double",53,0,X_104);
+    sql.rsColumn(X_114,"sys.L6","avg_price","double",53,0,X_107);
+    sql.rsColumn(X_114,"sys.L7","avg_disc","double",53,0,X_110);
+    sql.rsColumn(X_114,"sys.L10","count_order","wrd",32,0,X_113);
+    X_160 := io.stdout();
+    sql.exportResult(X_160,X_114);
 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")
 
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to