Changeset: 3f3735f8528f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3f3735f8528f
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/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/19-explain.stable.out
Branch: Jun2016
Log Message:
Approve explain output.
diffs (truncated from 384 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
@@ -131,18 +131,18 @@ function user.s2_1(A0:bte,A1:bte,A2:bte,
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);
+ (C_52:bat[:oid],r1_61:bat[:lng]) :=
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);
+ (C_61:bat[:oid],r1_73:bat[:lng]) :=
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);
+ (C_71:bat[:oid],r1_87:bat[:lng]) :=
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);
@@ -153,7 +153,7 @@ function user.s2_1(A0:bte,A1:bte,A2:bte,
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);
+ (C_85:bat[:oid],r1_108:bat[:lng]) :=
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);
diff --git a/sql/benchmarks/tpch/Tests/03-explain.stable.out
b/sql/benchmarks/tpch/Tests/03-explain.stable.out
--- a/sql/benchmarks/tpch/Tests/03-explain.stable.out
+++ b/sql/benchmarks/tpch/Tests/03-explain.stable.out
@@ -133,13 +133,13 @@ function user.s2_1(A0:bte,A1:str,A2:date
(X_79,r1_102,r2_102) := group.subgroupdone(X_58,X_76);
X_82 := algebra.projection(r1_102,X_58);
X_83:bat[:lng] := sql.bind(X_5,"sys","lineitem","l_extendedprice",0);
- (C_85,r1_108) := sql.bind(X_5,"sys","lineitem","l_extendedprice",2);
+ (C_85:bat[:oid],r1_108:bat[:lng]) :=
sql.bind(X_5,"sys","lineitem","l_extendedprice",2);
X_87:bat[:lng] := sql.bind(X_5,"sys","lineitem","l_extendedprice",1);
X_88 := sql.projectdelta(C_47,X_83,C_85,r1_108,X_87);
X_89 := algebra.projection(r1_72,X_88);
X_90 := calc.lng(A0,15,2);
X_92:bat[:lng] := sql.bind(X_5,"sys","lineitem","l_discount",0);
- (C_94,r1_121) := sql.bind(X_5,"sys","lineitem","l_discount",2);
+ (C_94:bat[:oid],r1_121:bat[:lng]) :=
sql.bind(X_5,"sys","lineitem","l_discount",2);
X_96:bat[:lng] := sql.bind(X_5,"sys","lineitem","l_discount",1);
X_97 := sql.projectdelta(C_47,X_92,C_94,r1_121,X_96);
X_98 := algebra.projection(r1_72,X_97);
diff --git a/sql/benchmarks/tpch/Tests/05-explain.stable.out
b/sql/benchmarks/tpch/Tests/05-explain.stable.out
--- a/sql/benchmarks/tpch/Tests/05-explain.stable.out
+++ b/sql/benchmarks/tpch/Tests/05-explain.stable.out
@@ -151,20 +151,20 @@ function user.s2_1(A0:bte,A1:str,A2:date
(X_116,r1_155) :=
algebra.subjoin(X_107,C_115,nil:BAT,nil:BAT,false,nil:lng);
X_118 := algebra.projection(C_89,X_84);
X_119:bat[:lng] := sql.bind(X_6,"sys","lineitem","l_extendedprice",0);
- (C_121,r1_163) := sql.bind(X_6,"sys","lineitem","l_extendedprice",2);
+ (C_121:bat[:oid],r1_163:bat[:lng]) :=
sql.bind(X_6,"sys","lineitem","l_extendedprice",2);
X_123:bat[:lng] := sql.bind(X_6,"sys","lineitem","l_extendedprice",1);
X_124 := sql.projectdelta(C_35,X_119,C_121,r1_163,X_123);
X_125:bat[:lng] := algebra.projectionpath(X_116,X_99,X_118,r1_54,X_124);
X_126 := calc.lng(A0,15,2);
X_128:bat[:lng] := sql.bind(X_6,"sys","lineitem","l_discount",0);
- (C_130,r1_178) := sql.bind(X_6,"sys","lineitem","l_discount",2);
+ (C_130:bat[:oid],r1_178:bat[:lng]) :=
sql.bind(X_6,"sys","lineitem","l_discount",2);
X_132:bat[:lng] := sql.bind(X_6,"sys","lineitem","l_discount",1);
X_133 := sql.projectdelta(C_35,X_128,C_130,r1_178,X_132);
X_134:bat[:lng] := algebra.projectionpath(X_116,X_99,X_118,r1_54,X_133);
X_135:bat[:lng] := batcalc.-(X_126,X_134);
X_136:bat[:lng] := batcalc.*(X_125,X_135);
X_137:bat[:str] := sql.bind(X_6,"sys","nation","n_name",0);
- (C_139,r1_194) := sql.bind(X_6,"sys","nation","n_name",2);
+ (C_139:bat[:oid],r1_194:bat[:str]) :=
sql.bind(X_6,"sys","nation","n_name",2);
X_141:bat[:str] := sql.bind(X_6,"sys","nation","n_name",1);
X_142 := sql.projectdelta(C_97,X_137,C_139,r1_194,X_141);
X_143:bat[:str] := algebra.projectionpath(X_116,r1_130,X_142);
diff --git a/sql/benchmarks/tpch/Tests/07-explain.stable.out
b/sql/benchmarks/tpch/Tests/07-explain.stable.out
--- a/sql/benchmarks/tpch/Tests/07-explain.stable.out
+++ b/sql/benchmarks/tpch/Tests/07-explain.stable.out
@@ -162,13 +162,13 @@ function user.s2_1(A0:bte,A1:str,A2:str,
X_123 := algebra.projection(r1_171,X_111);
X_124 := algebra.projection(r1_171,X_112);
X_137:bat[:lng] := sql.bind(X_8,"sys","lineitem","l_extendedprice",0);
- (C_139,r1_193) := sql.bind(X_8,"sys","lineitem","l_extendedprice",2);
+ (C_139:bat[:oid],r1_193:bat[:lng]) :=
sql.bind(X_8,"sys","lineitem","l_extendedprice",2);
X_141:bat[:lng] := sql.bind(X_8,"sys","lineitem","l_extendedprice",1);
X_142 := sql.delta(X_137,C_139,r1_193,X_141);
X_143:bat[:lng] :=
algebra.projectionpath(X_108,X_100,X_87,X_76,X_54,r1_45,C_31,C_22,X_142);
X_144 := calc.lng(A0,15,2);
X_146:bat[:lng] := sql.bind(X_8,"sys","lineitem","l_discount",0);
- (C_148,r1_211) := sql.bind(X_8,"sys","lineitem","l_discount",2);
+ (C_148:bat[:oid],r1_211:bat[:lng]) :=
sql.bind(X_8,"sys","lineitem","l_discount",2);
X_150:bat[:lng] := sql.bind(X_8,"sys","lineitem","l_discount",1);
X_151 := sql.delta(X_146,C_148,r1_211,X_150);
X_152:bat[:lng] :=
algebra.projectionpath(X_108,X_100,X_87,X_76,X_54,r1_45,C_31,C_22,X_151);
diff --git a/sql/benchmarks/tpch/Tests/08-explain.stable.out
b/sql/benchmarks/tpch/Tests/08-explain.stable.out
--- a/sql/benchmarks/tpch/Tests/08-explain.stable.out
+++ b/sql/benchmarks/tpch/Tests/08-explain.stable.out
@@ -84,7 +84,7 @@ function user.s2_1(A0:str,A1:bte,A2:bte,
X_23:bat[:str] := sql.bind(X_8,"sys","region","r_name",0);
C_21:bat[:oid] := sql.tid(X_8,"sys","region");
C_208 := algebra.subselect(X_23,C_21,A3,A3,true,false,false);
- (C_25,r1_26) := sql.bind(X_8,"sys","region","r_name",2);
+ (C_25:bat[:oid],r1_26:bat[:str]) :=
sql.bind(X_8,"sys","region","r_name",2);
C_209 := algebra.subselect(r1_26,nil:bat[:oid],A3,A3,true,false,false);
X_27:bat[:str] := sql.bind(X_8,"sys","region","r_name",1);
C_211 := algebra.subselect(X_27,C_21,A3,A3,true,false,false);
@@ -101,7 +101,7 @@ function user.s2_1(A0:str,A1:bte,A2:bte,
X_49:bat[:date] := sql.bind(X_8,"sys","orders","o_orderdate",0);
C_47:bat[:oid] := sql.tid(X_8,"sys","orders");
C_212 := algebra.subselect(X_49,C_47,A4,A5,true,true,false);
- (C_51,r1_59) := sql.bind(X_8,"sys","orders","o_orderdate",2);
+ (C_51:bat[:oid],r1_59:bat[:date]) :=
sql.bind(X_8,"sys","orders","o_orderdate",2);
C_213 := algebra.subselect(r1_59,nil:bat[:oid],A4,A5,true,true,false);
X_53:bat[:date] := sql.bind(X_8,"sys","orders","o_orderdate",1);
C_214 := algebra.subselect(X_53,C_47,A4,A5,true,true,false);
@@ -119,31 +119,31 @@ function user.s2_1(A0:str,A1:bte,A2:bte,
X_71 := sql.projectdelta(C_64,X_66,X_68,r1_89,X_70);
(X_72,r1_94) := algebra.subjoin(X_63,X_71,nil:BAT,nil:BAT,false,nil:lng);
X_74:bat[:int] := sql.bind(X_8,"sys","lineitem","l_partkey",0);
- (C_76,r1_98) := sql.bind(X_8,"sys","lineitem","l_partkey",2);
+ (C_76:bat[:oid],r1_98:bat[:int]) :=
sql.bind(X_8,"sys","lineitem","l_partkey",2);
X_78:bat[:int] := sql.bind(X_8,"sys","lineitem","l_partkey",1);
X_79 := sql.projectdelta(C_64,X_74,C_76,r1_98,X_78);
X_80 := algebra.projection(r1_94,X_79);
X_83:bat[:str] := sql.bind(X_8,"sys","part","p_type",0);
C_81:bat[:oid] := sql.tid(X_8,"sys","part");
C_215 := algebra.subselect(X_83,C_81,A6,A6,true,false,false);
- (C_85,r1_108) := sql.bind(X_8,"sys","part","p_type",2);
+ (C_85:bat[:oid],r1_108:bat[:str]) := sql.bind(X_8,"sys","part","p_type",2);
C_216 := algebra.subselect(r1_108,nil:bat[:oid],A6,A6,true,false,false);
X_87:bat[:str] := sql.bind(X_8,"sys","part","p_type",1);
C_217 := algebra.subselect(X_87,C_81,A6,A6,true,false,false);
C_88 := sql.subdelta(C_215,C_81,C_85,C_216,C_217);
X_89:bat[:int] := sql.bind(X_8,"sys","part","p_partkey",0);
- (C_91,r1_120) := sql.bind(X_8,"sys","part","p_partkey",2);
+ (C_91:bat[:oid],r1_120:bat[:int]) :=
sql.bind(X_8,"sys","part","p_partkey",2);
X_93:bat[:int] := sql.bind(X_8,"sys","part","p_partkey",1);
X_94 := sql.projectdelta(C_88,X_89,C_91,r1_120,X_93);
(X_95,r1_126) := algebra.subjoin(X_80,X_94,nil:BAT,nil:BAT,false,nil:lng);
X_97:bat[:int] := sql.bind(X_8,"sys","lineitem","l_suppkey",0);
- (C_99,r1_133) := sql.bind(X_8,"sys","lineitem","l_suppkey",2);
+ (C_99:bat[:oid],r1_133:bat[:int]) :=
sql.bind(X_8,"sys","lineitem","l_suppkey",2);
X_101:bat[:int] := sql.bind(X_8,"sys","lineitem","l_suppkey",1);
X_102 := sql.projectdelta(C_64,X_97,C_99,r1_133,X_101);
X_103:bat[:int] := algebra.projectionpath(X_95,r1_94,X_102);
C_104:bat[:oid] := sql.tid(X_8,"sys","supplier");
X_106:bat[:int] := sql.bind(X_8,"sys","supplier","s_suppkey",0);
- (C_108,r1_144) := sql.bind(X_8,"sys","supplier","s_suppkey",2);
+ (C_108:bat[:oid],r1_144:bat[:int]) :=
sql.bind(X_8,"sys","supplier","s_suppkey",2);
X_110:bat[:int] := sql.bind(X_8,"sys","supplier","s_suppkey",1);
X_111 := sql.projectdelta(C_104,X_106,C_108,r1_144,X_110);
(X_112,r1_149) :=
algebra.subjoin(X_103,X_111,nil:BAT,nil:BAT,false,nil:lng);
@@ -167,13 +167,13 @@ function user.s2_1(A0:str,A1:bte,A2:bte,
X_143:bat[:bit] := batcalc.isnil(X_142);
X_144:bat[:bit] := batcalc.ifthenelse(X_143,false,X_142);
X_145:bat[:lng] := sql.bind(X_8,"sys","lineitem","l_extendedprice",0);
- (C_147,r1_209) := sql.bind(X_8,"sys","lineitem","l_extendedprice",2);
+ (C_147:bat[:oid],r1_209:bat[:lng]) :=
sql.bind(X_8,"sys","lineitem","l_extendedprice",2);
X_149:bat[:lng] := sql.bind(X_8,"sys","lineitem","l_extendedprice",1);
X_150 := sql.projectdelta(C_64,X_145,C_147,r1_209,X_149);
X_151:bat[:lng] := algebra.projectionpath(X_121,X_112,X_95,r1_94,X_150);
X_152 := calc.lng(A2,15,2);
X_154:bat[:lng] := sql.bind(X_8,"sys","lineitem","l_discount",0);
- (C_156,r1_224) := sql.bind(X_8,"sys","lineitem","l_discount",2);
+ (C_156:bat[:oid],r1_224:bat[:lng]) :=
sql.bind(X_8,"sys","lineitem","l_discount",2);
X_158:bat[:lng] := sql.bind(X_8,"sys","lineitem","l_discount",1);
X_159 := sql.projectdelta(C_64,X_154,C_156,r1_224,X_158);
X_160:bat[:lng] := algebra.projectionpath(X_121,X_112,X_95,r1_94,X_159);
diff --git a/sql/benchmarks/tpch/Tests/09-explain.stable.out
b/sql/benchmarks/tpch/Tests/09-explain.stable.out
--- a/sql/benchmarks/tpch/Tests/09-explain.stable.out
+++ b/sql/benchmarks/tpch/Tests/09-explain.stable.out
@@ -145,25 +145,25 @@ function user.s2_1(A0:bte,A1:str):void;
X_107 := algebra.projection(r1_133,X_93);
X_108 := algebra.projection(r1_133,X_100);
X_118:bat[:lng] := sql.bind(X_3,"sys","lineitem","l_extendedprice",0);
- (C_120,r1_150) := sql.bind(X_3,"sys","lineitem","l_extendedprice",2);
+ (C_120:bat[:oid],r1_150:bat[:lng]) :=
sql.bind(X_3,"sys","lineitem","l_extendedprice",2);
X_122:bat[:lng] := sql.bind(X_3,"sys","lineitem","l_extendedprice",1);
X_123 := sql.projectdelta(C_25,X_118,C_120,r1_150,X_122);
X_124:bat[:lng] := algebra.projectionpath(X_84,X_73,X_62,X_51,r1_40,X_123);
X_125 := calc.lng(A0,15,2);
X_127:bat[:lng] := sql.bind(X_3,"sys","lineitem","l_discount",0);
- (C_129,r1_166) := sql.bind(X_3,"sys","lineitem","l_discount",2);
+ (C_129:bat[:oid],r1_166:bat[:lng]) :=
sql.bind(X_3,"sys","lineitem","l_discount",2);
X_131:bat[:lng] := sql.bind(X_3,"sys","lineitem","l_discount",1);
X_132 := sql.projectdelta(C_25,X_127,C_129,r1_166,X_131);
X_133:bat[:lng] := algebra.projectionpath(X_84,X_73,X_62,X_51,r1_40,X_132);
X_134:bat[:lng] := batcalc.-(X_125,X_133);
X_135:bat[:lng] := batcalc.*(X_124,X_134);
X_136:bat[:lng] := sql.bind(X_3,"sys","partsupp","ps_supplycost",0);
- (C_138,r1_183) := sql.bind(X_3,"sys","partsupp","ps_supplycost",2);
+ (C_138:bat[:oid],r1_183:bat[:lng]) :=
sql.bind(X_3,"sys","partsupp","ps_supplycost",2);
X_140:bat[:lng] := sql.bind(X_3,"sys","partsupp","ps_supplycost",1);
X_141 := sql.projectdelta(C_60,X_136,C_138,r1_183,X_140);
X_142:bat[:lng] := algebra.projectionpath(X_84,X_73,r1_76,X_141);
X_143:bat[:lng] := sql.bind(X_3,"sys","lineitem","l_quantity",0);
- (C_145,r1_193) := sql.bind(X_3,"sys","lineitem","l_quantity",2);
+ (C_145:bat[:oid],r1_193:bat[:lng]) :=
sql.bind(X_3,"sys","lineitem","l_quantity",2);
X_147:bat[:lng] := sql.bind(X_3,"sys","lineitem","l_quantity",1);
X_148 := sql.projectdelta(C_25,X_143,C_145,r1_193,X_147);
X_149:bat[:lng] := algebra.projectionpath(X_84,X_73,X_62,X_51,r1_40,X_148);
diff --git a/sql/benchmarks/tpch/Tests/10-explain.stable.out
b/sql/benchmarks/tpch/Tests/10-explain.stable.out
--- a/sql/benchmarks/tpch/Tests/10-explain.stable.out
+++ b/sql/benchmarks/tpch/Tests/10-explain.stable.out
@@ -160,13 +160,13 @@ function user.s2_1(A0:bte,A1:date,A2:dat
(X_79,r1_99,r2_99) := group.subgroupdone(X_68,X_76);
X_82 := algebra.projection(r1_99,X_75);
X_85:bat[:lng] := sql.bind(X_6,"sys","lineitem","l_extendedprice",0);
- (C_87,r1_119) := sql.bind(X_6,"sys","lineitem","l_extendedprice",2);
+ (C_87:bat[:oid],r1_119:bat[:lng]) :=
sql.bind(X_6,"sys","lineitem","l_extendedprice",2);
X_89:bat[:lng] := sql.bind(X_6,"sys","lineitem","l_extendedprice",1);
X_90 := sql.projectdelta(C_18,X_85,C_87,r1_119,X_89);
X_91:bat[:lng] := algebra.projectionpath(X_60,X_49,X_36,X_90);
X_92 := calc.lng(A0,15,2);
X_94:bat[:lng] := sql.bind(X_6,"sys","lineitem","l_discount",0);
- (C_96,r1_134) := sql.bind(X_6,"sys","lineitem","l_discount",2);
+ (C_96:bat[:oid],r1_134:bat[:lng]) :=
sql.bind(X_6,"sys","lineitem","l_discount",2);
X_98:bat[:lng] := sql.bind(X_6,"sys","lineitem","l_discount",1);
X_99 := sql.projectdelta(C_18,X_94,C_96,r1_134,X_98);
X_100:bat[:lng] := algebra.projectionpath(X_60,X_49,X_36,X_99);
@@ -183,28 +183,28 @@ function user.s2_1(A0:bte,A1:date,A2:dat
X_130:bat[:str] :=
algebra.projectionpath(X_113,r1_161,C_107,X_83,r1_99,X_68);
X_114 := algebra.projection(X_113,X_112);
X_115:bat[:str] := sql.bind(X_6,"sys","customer","c_name",0);
- (C_117,r1_176) := sql.bind(X_6,"sys","customer","c_name",2);
+ (C_117:bat[:oid],r1_176:bat[:str]) :=
sql.bind(X_6,"sys","customer","c_name",2);
X_119:bat[:str] := sql.bind(X_6,"sys","customer","c_name",1);
X_120 := sql.projectdelta(C_47,X_115,C_117,r1_176,X_119);
X_121:bat[:str] := algebra.projectionpath(X_113,r1_161,C_107,r1_111,X_120);
X_122:bat[:lng] := algebra.projectionpath(X_113,r1_161,X_108);
X_123:bat[:lng] := sql.bind(X_6,"sys","customer","c_acctbal",0);
- (C_125,r1_189) := sql.bind(X_6,"sys","customer","c_acctbal",2);
+ (C_125:bat[:oid],r1_189:bat[:lng]) :=
sql.bind(X_6,"sys","customer","c_acctbal",2);
X_127:bat[:lng] := sql.bind(X_6,"sys","customer","c_acctbal",1);
X_128 := sql.projectdelta(C_47,X_123,C_125,r1_189,X_127);
X_129:bat[:lng] := algebra.projectionpath(X_113,r1_161,C_107,r1_111,X_128);
X_131:bat[:str] := sql.bind(X_6,"sys","customer","c_address",0);
- (C_133,r1_205) := sql.bind(X_6,"sys","customer","c_address",2);
+ (C_133:bat[:oid],r1_205:bat[:str]) :=
sql.bind(X_6,"sys","customer","c_address",2);
X_135:bat[:str] := sql.bind(X_6,"sys","customer","c_address",1);
X_136 := sql.projectdelta(C_47,X_131,C_133,r1_205,X_135);
X_137:bat[:str] := algebra.projectionpath(X_113,r1_161,C_107,r1_111,X_136);
X_138:bat[:str] := sql.bind(X_6,"sys","customer","c_phone",0);
- (C_140,r1_216) := sql.bind(X_6,"sys","customer","c_phone",2);
+ (C_140:bat[:oid],r1_216:bat[:str]) :=
sql.bind(X_6,"sys","customer","c_phone",2);
X_142:bat[:str] := sql.bind(X_6,"sys","customer","c_phone",1);
X_143 := sql.projectdelta(C_47,X_138,C_140,r1_216,X_142);
X_144:bat[:str] := algebra.projectionpath(X_113,r1_161,C_107,r1_111,X_143);
X_145:bat[:str] := sql.bind(X_6,"sys","customer","c_comment",0);
- (C_147,r1_227) := sql.bind(X_6,"sys","customer","c_comment",2);
+ (C_147:bat[:oid],r1_227:bat[:str]) :=
sql.bind(X_6,"sys","customer","c_comment",2);
X_149:bat[:str] := sql.bind(X_6,"sys","customer","c_comment",1);
X_150 := sql.projectdelta(C_47,X_145,C_147,r1_227,X_149);
X_151:bat[:str] := algebra.projectionpath(X_113,r1_161,C_107,r1_111,X_150);
diff --git a/sql/benchmarks/tpch/Tests/11-explain.stable.out
b/sql/benchmarks/tpch/Tests/11-explain.stable.out
--- a/sql/benchmarks/tpch/Tests/11-explain.stable.out
+++ b/sql/benchmarks/tpch/Tests/11-explain.stable.out
@@ -84,13 +84,13 @@ function user.s2_1(A0:str,A1:sht,A2:str)
X_44 := algebra.projection(C_36,X_43);
(X_83,r1_121) := algebra.subjoin(X_82,X_44,nil:BAT,nil:BAT,false,nil:lng);
X_60:bat[:lng] := sql.bind(X_4,"sys","partsupp","ps_supplycost",0);
- (C_62,r1_67) := sql.bind(X_4,"sys","partsupp","ps_supplycost",2);
+ (C_62:bat[:oid],r1_67:bat[:lng]) :=
sql.bind(X_4,"sys","partsupp","ps_supplycost",2);
X_64:bat[:lng] := sql.bind(X_4,"sys","partsupp","ps_supplycost",1);
X_65 := sql.delta(X_60,C_62,r1_67,X_64);
X_66 := algebra.projection(C_36,X_65);
X_85 := algebra.projection(r1_121,X_66);
X_68:bat[:int] := sql.bind(X_4,"sys","partsupp","ps_availqty",0);
- (C_70,r1_75) := sql.bind(X_4,"sys","partsupp","ps_availqty",2);
+ (C_70:bat[:oid],r1_75:bat[:int]) :=
sql.bind(X_4,"sys","partsupp","ps_availqty",2);
X_72:bat[:int] := sql.bind(X_4,"sys","partsupp","ps_availqty",1);
X_73 := sql.delta(X_68,C_70,r1_75,X_72);
X_74 := algebra.projection(C_36,X_73);
diff --git a/sql/benchmarks/tpch/Tests/14-explain.stable.out
b/sql/benchmarks/tpch/Tests/14-explain.stable.out
--- a/sql/benchmarks/tpch/Tests/14-explain.stable.out
+++ b/sql/benchmarks/tpch/Tests/14-explain.stable.out
@@ -50,23 +50,23 @@ function user.s2_1(A0:sht,A1:str,A2:bte,
C_10:bat[:oid] := sql.tid(X_9,"sys","lineitem");
X_21:date := mtime.addmonths(A6,A7);
C_99 := algebra.subselect(X_13,C_10,A5,X_21,true,false,false);
- (C_16,r1_17) := sql.bind(X_9,"sys","lineitem","l_shipdate",2);
+ (C_16:bat[:oid],r1_17:bat[:date]) :=
sql.bind(X_9,"sys","lineitem","l_shipdate",2);
C_100 := algebra.subselect(r1_17,nil:bat[:oid],A5,X_21,true,false,false);
X_19:bat[:date] := sql.bind(X_9,"sys","lineitem","l_shipdate",1);
C_102 := algebra.subselect(X_19,C_10,A5,X_21,true,false,false);
C_22 := sql.subdelta(C_99,C_10,C_16,C_100,C_102);
X_25:bat[:int] := sql.bind(X_9,"sys","lineitem","l_partkey",0);
- (C_27,r1_34) := sql.bind(X_9,"sys","lineitem","l_partkey",2);
+ (C_27:bat[:oid],r1_34:bat[:int]) :=
sql.bind(X_9,"sys","lineitem","l_partkey",2);
X_29:bat[:int] := sql.bind(X_9,"sys","lineitem","l_partkey",1);
X_30 := sql.projectdelta(C_22,X_25,C_27,r1_34,X_29);
C_31:bat[:oid] := sql.tid(X_9,"sys","part");
X_33:bat[:int] := sql.bind(X_9,"sys","part","p_partkey",0);
- (C_35,r1_44) := sql.bind(X_9,"sys","part","p_partkey",2);
+ (C_35:bat[:oid],r1_44:bat[:int]) :=
sql.bind(X_9,"sys","part","p_partkey",2);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
