Changeset: 02afb0086a5b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=02afb0086a5b
Modified Files:
        sql/benchmarks/tpch/Tests/15-explain.stable.out.int128
Branch: resultset
Log Message:

approved output


diffs (166 lines):

diff --git a/sql/benchmarks/tpch/Tests/15-explain.stable.out.int128 
b/sql/benchmarks/tpch/Tests/15-explain.stable.out.int128
--- a/sql/benchmarks/tpch/Tests/15-explain.stable.out.int128
+++ b/sql/benchmarks/tpch/Tests/15-explain.stable.out.int128
@@ -59,39 +59,39 @@ Ready.
 % .explain # table_name
 % mal # name
 % clob # type
-% 322 # length
+% 325 # length
 function user.s3_1{autoCommit=true}():void;
-    X_169:void  := querylog.define("explain 
select\n\ts_suppkey,\n\ts_name,\n\ts_address,\n\ts_phone,\n\ttotal_revenue\nfrom\n\tsupplier,\n\trevenue0\nwhere\n\ts_suppkey
 = supplier_no\n\tand total_revenue = 
(\n\t\tselect\n\t\t\tmax(total_revenue)\n\t\tfrom\n\t\t\trevenue0\n\t)\norder 
by\n\ts_suppkey;","sequential_pipe");
-    X_119 := bat.new(nil:oid,nil:str);
-    X_127 := bat.append(X_119,"sys.supplier");
-    X_137 := bat.append(X_127,"sys.supplier");
-    X_145 := bat.append(X_137,"sys.supplier");
-    X_152 := bat.append(X_145,"sys.supplier");
-    X_159 := bat.append(X_152,"sys.revenue0");
-    X_122 := bat.new(nil:oid,nil:str);
-    X_129 := bat.append(X_122,"s_suppkey");
-    X_138 := bat.append(X_129,"s_name");
-    X_146 := bat.append(X_138,"s_address");
-    X_153 := bat.append(X_146,"s_phone");
-    X_161 := bat.append(X_153,"total_revenue");
-    X_123 := bat.new(nil:oid,nil:str);
-    X_131 := bat.append(X_123,"int");
-    X_140 := bat.append(X_131,"varchar");
-    X_148 := bat.append(X_140,"varchar");
-    X_155 := bat.append(X_148,"varchar");
-    X_163 := bat.append(X_155,"decimal");
+    X_167:void := querylog.define("explain 
select\n\ts_suppkey,\n\ts_name,\n\ts_address,\n\ts_phone,\n\ttotal_revenue\nfrom\n\tsupplier,\n\trevenue0\nwhere\n\ts_suppkey
 = supplier_no\n\tand total_revenue = 
(\n\t\tselect\n\t\t\tmax(total_revenue)\n\t\tfrom\n\t\t\trevenue0\n\t)\norder 
by\n\ts_suppkey;","sequential_pipe",100);
+    X_117 := bat.new(nil:oid,nil:str);
+    X_125 := bat.append(X_117,"sys.supplier");
+    X_135 := bat.append(X_125,"sys.supplier");
+    X_143 := bat.append(X_135,"sys.supplier");
+    X_150 := bat.append(X_143,"sys.supplier");
+    X_157 := bat.append(X_150,"sys.revenue0");
+    X_120 := bat.new(nil:oid,nil:str);
+    X_127 := bat.append(X_120,"s_suppkey");
+    X_136 := bat.append(X_127,"s_name");
+    X_144 := bat.append(X_136,"s_address");
+    X_151 := bat.append(X_144,"s_phone");
+    X_159 := bat.append(X_151,"total_revenue");
+    X_121 := bat.new(nil:oid,nil:str);
+    X_129 := bat.append(X_121,"int");
+    X_138 := bat.append(X_129,"varchar");
+    X_146 := bat.append(X_138,"varchar");
+    X_153 := bat.append(X_146,"varchar");
+    X_161 := bat.append(X_153,"decimal");
+    X_122 := bat.new(nil:oid,nil:int);
+    X_131 := bat.append(X_122,32);
+    X_140 := bat.append(X_131,25);
+    X_147 := bat.append(X_140,40);
+    X_154 := bat.append(X_147,15);
+    X_163 := bat.append(X_154,33);
     X_124 := bat.new(nil:oid,nil:int);
-    X_133 := bat.append(X_124,32);
-    X_142 := bat.append(X_133,25);
-    X_149 := bat.append(X_142,40);
-    X_156 := bat.append(X_149,15);
-    X_165 := bat.append(X_156,33);
-    X_126 := bat.new(nil:oid,nil:int);
-    X_135 := bat.append(X_126,0);
-    X_144 := bat.append(X_135,0);
-    X_151 := bat.append(X_144,0);
-    X_158 := bat.append(X_151,0);
-    X_167 := bat.append(X_158,4);
+    X_133 := bat.append(X_124,0);
+    X_142 := bat.append(X_133,0);
+    X_149 := bat.append(X_142,0);
+    X_156 := bat.append(X_149,0);
+    X_165 := bat.append(X_156,4);
     X_2 := sql.mvc();
     X_3:bat[:oid,:oid]  := sql.tid(X_2,"sys","supplier");
     X_6:bat[:oid,:int]  := sql.bind(X_2,"sys","supplier","s_suppkey",0);
@@ -105,8 +105,8 @@ function user.s3_1{autoCommit=true}():vo
     X_22:bat[:oid,:date]  := sql.bind(X_2,"sys","lineitem","l_shipdate",1);
     X_23 := sql.delta(X_18,X_20,r1_20,X_22);
     X_24 := algebra.leftfetchjoin(X_16,X_23);
-    X_27 := mtime.addmonths("1996-01-01":date,3);
-    X_28 := algebra.subselect(X_24,"1996-01-01":date,X_27,true,false,false);
+    X_27 := mtime.addmonths("1996-01-01",3);
+    X_28 := algebra.subselect(X_24,"1996-01-01",X_27,true,false,false);
     X_30:bat[:oid,:int]  := sql.bind(X_2,"sys","lineitem","l_suppkey",0);
     (X_32,r1_35) := sql.bind(X_2,"sys","lineitem","l_suppkey",2);
     X_35:bat[:oid,:int]  := sql.bind(X_2,"sys","lineitem","l_suppkey",1);
@@ -121,45 +121,44 @@ function user.s3_1{autoCommit=true}():vo
     X_58 := sql.delta(X_49,X_53,r1_56,X_56);
     X_59 := algebra.leftfetchjoin(X_16,X_58);
     X_60 := algebra.leftfetchjoin(X_28,X_59);
-    X_61:bat[:oid,:hge]  := batcalc.hge(2,X_60,33,2);
-    X_63:bat[:oid,:lng]  := sql.bind(X_2,"sys","lineitem","l_discount",0);
-    (X_66,r1_75) := sql.bind(X_2,"sys","lineitem","l_discount",2);
-    X_68:bat[:oid,:lng]  := sql.bind(X_2,"sys","lineitem","l_discount",1);
-    X_69 := sql.delta(X_63,X_66,r1_75,X_68);
-    X_70 := algebra.leftfetchjoin(X_16,X_69);
-    X_71 := algebra.leftfetchjoin(X_28,X_70);
-    X_72:bat[:oid,:lng]  := batcalc.-(100:lng,X_71);
-    X_73:bat[:oid,:hge]  := batcalc.*(X_61,X_72);
-    X_74:bat[:oid,:hge]  := aggr.subsum(X_73,X_39,r1_42,true,true);
+    X_61:bat[:oid,:lng] := sql.bind(X_2,"sys","lineitem","l_discount",0);
+    (X_64,r1_75) := sql.bind(X_2,"sys","lineitem","l_discount",2);
+    X_66:bat[:oid,:lng] := sql.bind(X_2,"sys","lineitem","l_discount",1);
+    X_67 := sql.delta(X_61,X_64,r1_75,X_66);
+    X_68 := algebra.leftfetchjoin(X_16,X_67);
+    X_69 := algebra.leftfetchjoin(X_28,X_68);
+    X_70:bat[:oid,:lng] := batcalc.-(100:lng,X_69);
+    X_71:bat[:oid,:hge] := batcalc.*(X_60,X_70);
+    X_72:bat[:oid,:hge] := aggr.subsum(X_71,X_39,r1_42,true,true);
     (X_43,r1_46) := algebra.subjoin(X_15,X_42,nil:BAT,nil:BAT,false,nil:lng);
     X_47 := algebra.leftfetchjoin(X_43,X_15);
     X_48 := bat.mirror(X_47);
-    X_76 := algebra.leftfetchjoin(r1_46,X_74);
-    X_78 := aggr.max(X_74);
-    X_79 := sql.single(X_78);
-    (X_80,r1_157) := algebra.subjoin(X_76,X_79,nil:BAT,nil:BAT,false,nil:lng);
-    X_85 := algebra.tinter(X_48,X_80);
-    X_86 := algebra.leftfetchjoin(X_85,X_47);
-    (X_87,r1_164,r2_164) := algebra.subsort(X_86,false,false);
-    X_90 := algebra.leftfetchjoin(r1_164,X_86);
-    X_193 := algebra.leftfetchjoin(r1_164,X_85);
-    X_91:bat[:oid,:str]  := sql.bind(X_2,"sys","supplier","s_name",0);
-    (X_95,r1_172) := sql.bind(X_2,"sys","supplier","s_name",2);
-    X_98:bat[:oid,:str]  := sql.bind(X_2,"sys","supplier","s_name",1);
-    X_101 := sql.delta(X_91,X_95,r1_172,X_98);
-    X_102:bat[:oid,:str]  := algebra.leftfetchjoinPath(X_193,X_43,X_3,X_101);
-    X_103:bat[:oid,:str]  := sql.bind(X_2,"sys","supplier","s_address",0);
-    (X_105,r1_185) := sql.bind(X_2,"sys","supplier","s_address",2);
-    X_107:bat[:oid,:str]  := sql.bind(X_2,"sys","supplier","s_address",1);
-    X_108 := sql.delta(X_103,X_105,r1_185,X_107);
-    X_109:bat[:oid,:str]  := algebra.leftfetchjoinPath(X_193,X_43,X_3,X_108);
-    X_110:bat[:oid,:str]  := sql.bind(X_2,"sys","supplier","s_phone",0);
-    (X_112,r1_195) := sql.bind(X_2,"sys","supplier","s_phone",2);
-    X_114:bat[:oid,:str]  := sql.bind(X_2,"sys","supplier","s_phone",1);
-    X_115 := sql.delta(X_110,X_112,r1_195,X_114);
-    X_116:bat[:oid,:str]  := algebra.leftfetchjoinPath(X_193,X_43,X_3,X_115);
-    X_117:bat[:oid,:hge]  := algebra.leftfetchjoin(X_193,X_76);
-    sql.resultSet(X_159,X_161,X_163,X_165,X_167,X_90,X_102,X_109,X_116,X_117);
+    X_74 := algebra.leftfetchjoin(r1_46,X_72);
+    X_76 := aggr.max(X_72);
+    X_77 := sql.single(X_76);
+    (X_78,r1_157) := algebra.subjoin(X_74,X_77,nil:BAT,nil:BAT,false,nil:lng);
+    X_83 := algebra.tinter(X_48,X_78);
+    X_84 := algebra.leftfetchjoin(X_83,X_47);
+    (X_85,r1_164,r2_164) := algebra.subsort(X_84,false,false);
+    X_88 := algebra.leftfetchjoin(r1_164,X_84);
+    X_191 := algebra.leftfetchjoin(r1_164,X_83);
+    X_89:bat[:oid,:str] := sql.bind(X_2,"sys","supplier","s_name",0);
+    (X_93,r1_172) := sql.bind(X_2,"sys","supplier","s_name",2);
+    X_96:bat[:oid,:str] := sql.bind(X_2,"sys","supplier","s_name",1);
+    X_99 := sql.delta(X_89,X_93,r1_172,X_96);
+    X_100:bat[:oid,:str] := algebra.leftfetchjoinPath(X_191,X_43,X_3,X_99);
+    X_101:bat[:oid,:str] := sql.bind(X_2,"sys","supplier","s_address",0);
+    (X_103,r1_185) := sql.bind(X_2,"sys","supplier","s_address",2);
+    X_105:bat[:oid,:str] := sql.bind(X_2,"sys","supplier","s_address",1);
+    X_106 := sql.delta(X_101,X_103,r1_185,X_105);
+    X_107:bat[:oid,:str] := algebra.leftfetchjoinPath(X_191,X_43,X_3,X_106);
+    X_108:bat[:oid,:str] := sql.bind(X_2,"sys","supplier","s_phone",0);
+    (X_110,r1_195) := sql.bind(X_2,"sys","supplier","s_phone",2);
+    X_112:bat[:oid,:str] := sql.bind(X_2,"sys","supplier","s_phone",1);
+    X_113 := sql.delta(X_108,X_110,r1_195,X_112);
+    X_114:bat[:oid,:str] := algebra.leftfetchjoinPath(X_191,X_43,X_3,X_113);
+    X_115:bat[:oid,:hge] := algebra.leftfetchjoin(X_191,X_74);
+    sql.resultSet(X_157,X_159,X_161,X_163,X_165,X_88,X_100,X_107,X_114,X_115);
 end user.s3_1;
 #drop view revenue0;
 
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to