Changeset: 13b158ae9dfd for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=13b158ae9dfd
Modified Files:
sql/backends/monet5/UDF/Tests/udf-fuse.stable.out
sql/backends/monet5/UDF/Tests/udf-reverse.stable.out
sql/backends/monet5/sql_gencode.c
sql/benchmarks/ssbm/Tests/01-explain.stable.out
sql/benchmarks/ssbm/Tests/01-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/02-explain.stable.out
sql/benchmarks/ssbm/Tests/02-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/03-explain.stable.out
sql/benchmarks/ssbm/Tests/03-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/04-explain.stable.out
sql/benchmarks/ssbm/Tests/04-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/05-explain.stable.out
sql/benchmarks/ssbm/Tests/05-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/06-explain.stable.out
sql/benchmarks/ssbm/Tests/06-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/07-explain.stable.out
sql/benchmarks/ssbm/Tests/07-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/08-explain.stable.out
sql/benchmarks/ssbm/Tests/08-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/09-explain.stable.out
sql/benchmarks/ssbm/Tests/09-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/10-explain.stable.out
sql/benchmarks/ssbm/Tests/10-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/11-explain.stable.out
sql/benchmarks/ssbm/Tests/11-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/12-explain.stable.out
sql/benchmarks/ssbm/Tests/12-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/13-explain.stable.out
sql/benchmarks/ssbm/Tests/13-explain.stable.out.int128
sql/benchmarks/tpch/Tests/01-explain.stable.out
sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/01-explain.stable.out.int128
sql/benchmarks/tpch/Tests/02-explain.stable.out
sql/benchmarks/tpch/Tests/03-explain.stable.out
sql/benchmarks/tpch/Tests/03-explain.stable.out.int128
sql/benchmarks/tpch/Tests/04-explain.stable.out
sql/benchmarks/tpch/Tests/04-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/05-explain.stable.out
sql/benchmarks/tpch/Tests/05-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/05-explain.stable.out.int128
sql/benchmarks/tpch/Tests/06-explain.stable.out
sql/benchmarks/tpch/Tests/06-explain.stable.out.int128
sql/benchmarks/tpch/Tests/07-explain.stable.out
sql/benchmarks/tpch/Tests/07-explain.stable.out.int128
sql/benchmarks/tpch/Tests/08-explain.stable.out
sql/benchmarks/tpch/Tests/08-explain.stable.out.int128
sql/benchmarks/tpch/Tests/09-explain.stable.out
sql/benchmarks/tpch/Tests/09-explain.stable.out.int128
sql/benchmarks/tpch/Tests/10-explain.stable.out
sql/benchmarks/tpch/Tests/10-explain.stable.out.int128
sql/benchmarks/tpch/Tests/11-explain.stable.out
sql/benchmarks/tpch/Tests/11-explain.stable.out.int128
sql/benchmarks/tpch/Tests/12-explain.stable.out
sql/benchmarks/tpch/Tests/12-explain.stable.out.int128
sql/benchmarks/tpch/Tests/13-explain.stable.out
sql/benchmarks/tpch/Tests/13-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/14-explain.stable.out.int128
sql/benchmarks/tpch/Tests/15-explain.stable.out
sql/benchmarks/tpch/Tests/15-explain.stable.out.int128
sql/benchmarks/tpch/Tests/16-explain.stable.out
sql/benchmarks/tpch/Tests/16-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/17-explain.stable.out
sql/benchmarks/tpch/Tests/17-explain.stable.out.int128
sql/benchmarks/tpch/Tests/18-explain.stable.out
sql/benchmarks/tpch/Tests/18-explain.stable.out.int128
sql/benchmarks/tpch/Tests/19-explain.stable.out
sql/benchmarks/tpch/Tests/19-explain.stable.out.int128
sql/benchmarks/tpch/Tests/20-explain.stable.out
sql/benchmarks/tpch/Tests/20-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/20-explain.stable.out.int128
sql/benchmarks/tpch/Tests/21-explain.stable.out
sql/benchmarks/tpch/Tests/21-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/22-explain.stable.out
sql/benchmarks/tpch/Tests/22-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/22-explain.stable.out.int128
sql/test/BugTracker-2009/Tests/POWER_vs_prod.SF-2596114.stable.out
sql/test/BugTracker-2009/Tests/error_while_drop_func_returns_table_type.SF-2604573.stable.out
sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.stable.out
sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out
sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out
sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out.32bit
sql/test/BugTracker-2011/Tests/UDF_in_schema.Bug-2817.stable.out
sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out
sql/test/BugTracker-2012/Tests/mal_syntax_error.Bug-2949.stable.out
sql/test/BugTracker-2012/Tests/querycache.Bug-3212.stable.out
sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
sql/test/BugTracker-2014/Tests/manifold.Bug-3556.stable.out
sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out
sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out.single
sql/test/BugTracker-2014/Tests/queueError.Bug-3604.stable.out
sql/test/BugTracker-2015/Tests/useless_casts.Bug-3756.stable.out
sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
sql/test/mergetables/Tests/mergequery.stable.out
Branch: Jun2016
Log Message:
backported fix for mal types of both results of the delta function for
updates
diffs (truncated from 4555 to 300 lines):
diff --git a/sql/backends/monet5/UDF/Tests/udf-fuse.stable.out
b/sql/backends/monet5/UDF/Tests/udf-fuse.stable.out
--- a/sql/backends/monet5/UDF/Tests/udf-fuse.stable.out
+++ b/sql/backends/monet5/UDF/Tests/udf-fuse.stable.out
@@ -109,12 +109,12 @@ function user.s14_1():void;
X_1 := sql.mvc();
C_2:bat[:oid] := sql.tid(X_1,"sys","udf_fuse");
X_5:bat[:bte] := sql.bind(X_1,"sys","udf_fuse","a",0);
- (C_8,r1_8) := sql.bind(X_1,"sys","udf_fuse","a",2);
+ (C_8:bat[:oid],r1_8:bat[:bte]) := sql.bind(X_1,"sys","udf_fuse","a",2);
X_11:bat[:bte] := sql.bind(X_1,"sys","udf_fuse","a",1);
X_13 := sql.delta(X_5,C_8,r1_8,X_11);
X_14 := algebra.projection(C_2,X_13);
X_15:bat[:bte] := sql.bind(X_1,"sys","udf_fuse","b",0);
- (C_17,r1_17) := sql.bind(X_1,"sys","udf_fuse","b",2);
+ (C_17:bat[:oid],r1_17:bat[:bte]) := sql.bind(X_1,"sys","udf_fuse","b",2);
X_19:bat[:bte] := sql.bind(X_1,"sys","udf_fuse","b",1);
X_20 := sql.delta(X_15,C_17,r1_17,X_19);
X_21 := algebra.projection(C_2,X_20);
@@ -141,12 +141,12 @@ function user.s15_1():void;
X_1 := sql.mvc();
C_2:bat[:oid] := sql.tid(X_1,"sys","udf_fuse");
X_5:bat[:sht] := sql.bind(X_1,"sys","udf_fuse","c",0);
- (C_8,r1_8) := sql.bind(X_1,"sys","udf_fuse","c",2);
+ (C_8:bat[:oid],r1_8:bat[:sht]) := sql.bind(X_1,"sys","udf_fuse","c",2);
X_11:bat[:sht] := sql.bind(X_1,"sys","udf_fuse","c",1);
X_13 := sql.delta(X_5,C_8,r1_8,X_11);
X_14 := algebra.projection(C_2,X_13);
X_15:bat[:sht] := sql.bind(X_1,"sys","udf_fuse","d",0);
- (C_17,r1_17) := sql.bind(X_1,"sys","udf_fuse","d",2);
+ (C_17:bat[:oid],r1_17:bat[:sht]) := sql.bind(X_1,"sys","udf_fuse","d",2);
X_19:bat[:sht] := sql.bind(X_1,"sys","udf_fuse","d",1);
X_20 := sql.delta(X_15,C_17,r1_17,X_19);
X_21 := algebra.projection(C_2,X_20);
@@ -173,12 +173,12 @@ function user.s16_1():void;
X_1 := sql.mvc();
C_2:bat[:oid] := sql.tid(X_1,"sys","udf_fuse");
X_5:bat[:int] := sql.bind(X_1,"sys","udf_fuse","e",0);
- (C_8,r1_8) := sql.bind(X_1,"sys","udf_fuse","e",2);
+ (C_8:bat[:oid],r1_8:bat[:int]) := sql.bind(X_1,"sys","udf_fuse","e",2);
X_11:bat[:int] := sql.bind(X_1,"sys","udf_fuse","e",1);
X_13 := sql.delta(X_5,C_8,r1_8,X_11);
X_14 := algebra.projection(C_2,X_13);
X_15:bat[:int] := sql.bind(X_1,"sys","udf_fuse","f",0);
- (C_17,r1_17) := sql.bind(X_1,"sys","udf_fuse","f",2);
+ (C_17:bat[:oid],r1_17:bat[:int]) := sql.bind(X_1,"sys","udf_fuse","f",2);
X_19:bat[:int] := sql.bind(X_1,"sys","udf_fuse","f",1);
X_20 := sql.delta(X_15,C_17,r1_17,X_19);
X_21 := algebra.projection(C_2,X_20);
diff --git a/sql/backends/monet5/UDF/Tests/udf-reverse.stable.out
b/sql/backends/monet5/UDF/Tests/udf-reverse.stable.out
--- a/sql/backends/monet5/UDF/Tests/udf-reverse.stable.out
+++ b/sql/backends/monet5/UDF/Tests/udf-reverse.stable.out
@@ -98,7 +98,7 @@ function user.s10_1():void;
X_1 := sql.mvc();
C_2:bat[:oid] := sql.tid(X_1,"sys","udf_reverse");
X_5:bat[:str] := sql.bind(X_1,"sys","udf_reverse","x",0);
- (C_8,r1_8) := sql.bind(X_1,"sys","udf_reverse","x",2);
+ (C_8:bat[:oid],r1_8:bat[:str]) := sql.bind(X_1,"sys","udf_reverse","x",2);
X_11:bat[:str] := sql.bind(X_1,"sys","udf_reverse","x",1);
X_13 := sql.delta(X_5,C_8,r1_8,X_11);
X_14 := algebra.projection(C_2,X_13);
diff --git a/sql/backends/monet5/sql_gencode.c
b/sql/backends/monet5/sql_gencode.c
--- a/sql/backends/monet5/sql_gencode.c
+++ b/sql/backends/monet5/sql_gencode.c
@@ -1104,6 +1104,8 @@ static int
return -1;
if (s->flag == RD_UPD_ID) {
q = pushReturn(mb, q, newTmpVariable(mb,
newBatType(TYPE_oid, tt)));
+ setVarUDFtype(mb, getArg(q, 0));
+ setVarUDFtype(mb, getArg(q, 1));
} else {
setVarType(mb, getArg(q, 0),
newBatType(TYPE_oid, tt));
setVarUDFtype(mb, getArg(q, 0));
@@ -1120,6 +1122,8 @@ static int
if (s->flag == RD_UPD_ID) {
/* rename second result */
renameVariable(mb, getArg(q, 1), "r1_%d",
s->nr);
+ setVarType(mb, getArg(q, 1),
newBatType(TYPE_oid, tt));
+ setVarUDFtype(mb, getArg(q, 1));
}
if (s->flag != RD_INS && s->partition) {
sql_trans *tr = sql->mvc->session->tr;
diff --git a/sql/benchmarks/ssbm/Tests/01-explain.stable.out
b/sql/benchmarks/ssbm/Tests/01-explain.stable.out
--- a/sql/benchmarks/ssbm/Tests/01-explain.stable.out
+++ b/sql/benchmarks/ssbm/Tests/01-explain.stable.out
@@ -44,13 +44,13 @@ function user.s2_1(A0:int,A1:int,A2:int,
X_17:bat[:int] := sql.bind(X_5,"sys","lineorder","lo_discount",0);
C_6:bat[:oid] := sql.tid(X_5,"sys","lineorder");
C_72 := algebra.subselect(X_17,C_6,A1,A2,true,true,false);
- (C_19,r1_22) := sql.bind(X_5,"sys","lineorder","lo_discount",2);
+ (C_19:bat[:oid],r1_22:bat[:int]) :=
sql.bind(X_5,"sys","lineorder","lo_discount",2);
C_73 := algebra.subselect(r1_22,nil:bat[:oid],A1,A2,true,true,false);
X_21:bat[:int] := sql.bind(X_5,"sys","lineorder","lo_discount",1);
C_75 := algebra.subselect(X_21,C_6,A1,A2,true,true,false);
C_22 := sql.subdelta(C_72,C_6,C_19,C_73,C_75);
C_76 := algebra.thetasubselect(X_9,C_22,A3,"<");
- (C_12,r1_12) := sql.bind(X_5,"sys","lineorder","lo_quantity",2);
+ (C_12:bat[:oid],r1_12:bat[:int]) :=
sql.bind(X_5,"sys","lineorder","lo_quantity",2);
C_77 := algebra.thetasubselect(r1_12,nil:bat[:oid],A3,"<");
X_15:bat[:int] := sql.bind(X_5,"sys","lineorder","lo_quantity",1);
C_78 := algebra.thetasubselect(X_15,C_22,A3,"<");
@@ -62,14 +62,14 @@ function user.s2_1(A0:int,A1:int,A2:int,
X_35:bat[:int] := sql.bind(X_5,"sys","dwdate","d_year",0);
C_33:bat[:oid] := sql.tid(X_5,"sys","dwdate");
C_79 := algebra.subselect(X_35,C_33,A0,A0,true,false,false);
- (C_37,r1_47) := sql.bind(X_5,"sys","dwdate","d_year",2);
+ (C_37:bat[:oid],r1_47:bat[:int]) :=
sql.bind(X_5,"sys","dwdate","d_year",2);
C_80 := algebra.subselect(r1_47,nil:bat[:oid],A0,A0,true,false,false);
X_39:bat[:int] := sql.bind(X_5,"sys","dwdate","d_year",1);
C_81 := algebra.subselect(X_39,C_33,A0,A0,true,false,false);
C_40 := sql.subdelta(C_79,C_33,C_37,C_80,C_81);
(X_41,r1_55) := algebra.subjoin(X_32,C_40,nil:BAT,nil:BAT,false,nil:lng);
X_45:bat[:int] := sql.bind(X_5,"sys","lineorder","lo_extendedprice",0);
- (C_47,r1_62) := sql.bind(X_5,"sys","lineorder","lo_extendedprice",2);
+ (C_47:bat[:oid],r1_62:bat[:int]) :=
sql.bind(X_5,"sys","lineorder","lo_extendedprice",2);
X_49:bat[:int] := sql.bind(X_5,"sys","lineorder","lo_extendedprice",1);
X_50 := sql.projectdelta(C_25,X_45,C_47,r1_62,X_49);
X_51 := algebra.projection(X_41,X_50);
diff --git a/sql/benchmarks/ssbm/Tests/01-explain.stable.out.int128
b/sql/benchmarks/ssbm/Tests/01-explain.stable.out.int128
--- a/sql/benchmarks/ssbm/Tests/01-explain.stable.out.int128
+++ b/sql/benchmarks/ssbm/Tests/01-explain.stable.out.int128
@@ -44,13 +44,13 @@ function user.s2_1(A0:int,A1:int,A2:int,
X_17:bat[:int] := sql.bind(X_5,"sys","lineorder","lo_discount",0);
C_6:bat[:oid] := sql.tid(X_5,"sys","lineorder");
C_72 := algebra.subselect(X_17,C_6,A1,A2,true,true,false);
- (C_19,r1_22) := sql.bind(X_5,"sys","lineorder","lo_discount",2);
+ (C_19:bat[:oid],r1_22:bat[:int]) :=
sql.bind(X_5,"sys","lineorder","lo_discount",2);
C_73 := algebra.subselect(r1_22,nil:bat[:oid],A1,A2,true,true,false);
X_21:bat[:int] := sql.bind(X_5,"sys","lineorder","lo_discount",1);
C_75 := algebra.subselect(X_21,C_6,A1,A2,true,true,false);
C_22 := sql.subdelta(C_72,C_6,C_19,C_73,C_75);
C_76 := algebra.thetasubselect(X_9,C_22,A3,"<");
- (C_12,r1_12) := sql.bind(X_5,"sys","lineorder","lo_quantity",2);
+ (C_12:bat[:oid],r1_12:bat[:int]) :=
sql.bind(X_5,"sys","lineorder","lo_quantity",2);
C_77 := algebra.thetasubselect(r1_12,nil:bat[:oid],A3,"<");
X_15:bat[:int] := sql.bind(X_5,"sys","lineorder","lo_quantity",1);
C_78 := algebra.thetasubselect(X_15,C_22,A3,"<");
@@ -62,14 +62,14 @@ function user.s2_1(A0:int,A1:int,A2:int,
X_35:bat[:int] := sql.bind(X_5,"sys","dwdate","d_year",0);
C_33:bat[:oid] := sql.tid(X_5,"sys","dwdate");
C_79 := algebra.subselect(X_35,C_33,A0,A0,true,false,false);
- (C_37,r1_47) := sql.bind(X_5,"sys","dwdate","d_year",2);
+ (C_37:bat[:oid],r1_47:bat[:int]) :=
sql.bind(X_5,"sys","dwdate","d_year",2);
C_80 := algebra.subselect(r1_47,nil:bat[:oid],A0,A0,true,false,false);
X_39:bat[:int] := sql.bind(X_5,"sys","dwdate","d_year",1);
C_81 := algebra.subselect(X_39,C_33,A0,A0,true,false,false);
C_40 := sql.subdelta(C_79,C_33,C_37,C_80,C_81);
(X_41,r1_55) := algebra.subjoin(X_32,C_40,nil:BAT,nil:BAT,false,nil:lng);
X_45:bat[:int] := sql.bind(X_5,"sys","lineorder","lo_extendedprice",0);
- (C_47,r1_62) := sql.bind(X_5,"sys","lineorder","lo_extendedprice",2);
+ (C_47:bat[:oid],r1_62:bat[:int]) :=
sql.bind(X_5,"sys","lineorder","lo_extendedprice",2);
X_49:bat[:int] := sql.bind(X_5,"sys","lineorder","lo_extendedprice",1);
X_50 := sql.projectdelta(C_25,X_45,C_47,r1_62,X_49);
X_51 := algebra.projection(X_41,X_50);
diff --git a/sql/benchmarks/ssbm/Tests/02-explain.stable.out
b/sql/benchmarks/ssbm/Tests/02-explain.stable.out
--- a/sql/benchmarks/ssbm/Tests/02-explain.stable.out
+++ b/sql/benchmarks/ssbm/Tests/02-explain.stable.out
@@ -44,13 +44,13 @@ function user.s2_1(A0:int,A1:int,A2:int,
X_18:bat[:int] := sql.bind(X_6,"sys","lineorder","lo_discount",0);
C_7:bat[:oid] := sql.tid(X_6,"sys","lineorder");
C_72 := algebra.subselect(X_18,C_7,A1,A2,true,true,false);
- (C_20,r1_24) := sql.bind(X_6,"sys","lineorder","lo_discount",2);
+ (C_20:bat[:oid],r1_24:bat[:int]) :=
sql.bind(X_6,"sys","lineorder","lo_discount",2);
C_73 := algebra.subselect(r1_24,nil:bat[:oid],A1,A2,true,true,false);
X_22:bat[:int] := sql.bind(X_6,"sys","lineorder","lo_discount",1);
C_75 := algebra.subselect(X_22,C_7,A1,A2,true,true,false);
C_23 := sql.subdelta(C_72,C_7,C_20,C_73,C_75);
C_76 := algebra.subselect(X_10,C_23,A3,A4,true,true,false);
- (C_13,r1_13) := sql.bind(X_6,"sys","lineorder","lo_quantity",2);
+ (C_13:bat[:oid],r1_13:bat[:int]) :=
sql.bind(X_6,"sys","lineorder","lo_quantity",2);
C_77 := algebra.subselect(r1_13,nil:bat[:oid],A3,A4,true,true,false);
X_16:bat[:int] := sql.bind(X_6,"sys","lineorder","lo_quantity",1);
C_78 := algebra.subselect(X_16,C_23,A3,A4,true,true,false);
@@ -62,14 +62,14 @@ function user.s2_1(A0:int,A1:int,A2:int,
X_35:bat[:int] := sql.bind(X_6,"sys","dwdate","d_yearmonthnum",0);
C_33:bat[:oid] := sql.tid(X_6,"sys","dwdate");
C_79 := algebra.subselect(X_35,C_33,A0,A0,true,false,false);
- (C_37,r1_48) := sql.bind(X_6,"sys","dwdate","d_yearmonthnum",2);
+ (C_37:bat[:oid],r1_48:bat[:int]) :=
sql.bind(X_6,"sys","dwdate","d_yearmonthnum",2);
C_80 := algebra.subselect(r1_48,nil:bat[:oid],A0,A0,true,false,false);
X_39:bat[:int] := sql.bind(X_6,"sys","dwdate","d_yearmonthnum",1);
C_81 := algebra.subselect(X_39,C_33,A0,A0,true,false,false);
C_40 := sql.subdelta(C_79,C_33,C_37,C_80,C_81);
(X_41,r1_56) := algebra.subjoin(X_32,C_40,nil:BAT,nil:BAT,false,nil:lng);
X_45:bat[:int] := sql.bind(X_6,"sys","lineorder","lo_extendedprice",0);
- (C_47,r1_63) := sql.bind(X_6,"sys","lineorder","lo_extendedprice",2);
+ (C_47:bat[:oid],r1_63:bat[:int]) :=
sql.bind(X_6,"sys","lineorder","lo_extendedprice",2);
X_49:bat[:int] := sql.bind(X_6,"sys","lineorder","lo_extendedprice",1);
X_50 := sql.projectdelta(C_26,X_45,C_47,r1_63,X_49);
X_51 := algebra.projection(X_41,X_50);
diff --git a/sql/benchmarks/ssbm/Tests/02-explain.stable.out.int128
b/sql/benchmarks/ssbm/Tests/02-explain.stable.out.int128
--- a/sql/benchmarks/ssbm/Tests/02-explain.stable.out.int128
+++ b/sql/benchmarks/ssbm/Tests/02-explain.stable.out.int128
@@ -44,13 +44,13 @@ function user.s2_1(A0:int,A1:int,A2:int,
X_18:bat[:int] := sql.bind(X_6,"sys","lineorder","lo_discount",0);
C_7:bat[:oid] := sql.tid(X_6,"sys","lineorder");
C_72 := algebra.subselect(X_18,C_7,A1,A2,true,true,false);
- (C_20,r1_24) := sql.bind(X_6,"sys","lineorder","lo_discount",2);
+ (C_20:bat[:oid],r1_24:bat[:int]) :=
sql.bind(X_6,"sys","lineorder","lo_discount",2);
C_73 := algebra.subselect(r1_24,nil:bat[:oid],A1,A2,true,true,false);
X_22:bat[:int] := sql.bind(X_6,"sys","lineorder","lo_discount",1);
C_75 := algebra.subselect(X_22,C_7,A1,A2,true,true,false);
C_23 := sql.subdelta(C_72,C_7,C_20,C_73,C_75);
C_76 := algebra.subselect(X_10,C_23,A3,A4,true,true,false);
- (C_13,r1_13) := sql.bind(X_6,"sys","lineorder","lo_quantity",2);
+ (C_13:bat[:oid],r1_13:bat[:int]) :=
sql.bind(X_6,"sys","lineorder","lo_quantity",2);
C_77 := algebra.subselect(r1_13,nil:bat[:oid],A3,A4,true,true,false);
X_16:bat[:int] := sql.bind(X_6,"sys","lineorder","lo_quantity",1);
C_78 := algebra.subselect(X_16,C_23,A3,A4,true,true,false);
@@ -62,14 +62,14 @@ function user.s2_1(A0:int,A1:int,A2:int,
X_35:bat[:int] := sql.bind(X_6,"sys","dwdate","d_yearmonthnum",0);
C_33:bat[:oid] := sql.tid(X_6,"sys","dwdate");
C_79 := algebra.subselect(X_35,C_33,A0,A0,true,false,false);
- (C_37,r1_48) := sql.bind(X_6,"sys","dwdate","d_yearmonthnum",2);
+ (C_37:bat[:oid],r1_48:bat[:int]) :=
sql.bind(X_6,"sys","dwdate","d_yearmonthnum",2);
C_80 := algebra.subselect(r1_48,nil:bat[:oid],A0,A0,true,false,false);
X_39:bat[:int] := sql.bind(X_6,"sys","dwdate","d_yearmonthnum",1);
C_81 := algebra.subselect(X_39,C_33,A0,A0,true,false,false);
C_40 := sql.subdelta(C_79,C_33,C_37,C_80,C_81);
(X_41,r1_56) := algebra.subjoin(X_32,C_40,nil:BAT,nil:BAT,false,nil:lng);
X_45:bat[:int] := sql.bind(X_6,"sys","lineorder","lo_extendedprice",0);
- (C_47,r1_63) := sql.bind(X_6,"sys","lineorder","lo_extendedprice",2);
+ (C_47:bat[:oid],r1_63:bat[:int]) :=
sql.bind(X_6,"sys","lineorder","lo_extendedprice",2);
X_49:bat[:int] := sql.bind(X_6,"sys","lineorder","lo_extendedprice",1);
X_50 := sql.projectdelta(C_26,X_45,C_47,r1_63,X_49);
X_51 := algebra.projection(X_41,X_50);
diff --git a/sql/benchmarks/ssbm/Tests/03-explain.stable.out
b/sql/benchmarks/ssbm/Tests/03-explain.stable.out
--- a/sql/benchmarks/ssbm/Tests/03-explain.stable.out
+++ b/sql/benchmarks/ssbm/Tests/03-explain.stable.out
@@ -44,13 +44,13 @@ function user.s2_1(A0:int,A1:int,A2:int,
X_19:bat[:int] := sql.bind(X_7,"sys","lineorder","lo_discount",0);
C_8:bat[:oid] := sql.tid(X_7,"sys","lineorder");
C_79 := algebra.subselect(X_19,C_8,A2,A3,true,true,false);
- (C_21,r1_25) := sql.bind(X_7,"sys","lineorder","lo_discount",2);
+ (C_21:bat[:oid],r1_25:bat[:int]) :=
sql.bind(X_7,"sys","lineorder","lo_discount",2);
C_80 := algebra.subselect(r1_25,nil:bat[:oid],A2,A3,true,true,false);
X_23:bat[:int] := sql.bind(X_7,"sys","lineorder","lo_discount",1);
C_82 := algebra.subselect(X_23,C_8,A2,A3,true,true,false);
C_24 := sql.subdelta(C_79,C_8,C_21,C_80,C_82);
C_83 := algebra.subselect(X_11,C_24,A4,A5,true,true,false);
- (C_14,r1_14) := sql.bind(X_7,"sys","lineorder","lo_quantity",2);
+ (C_14:bat[:oid],r1_14:bat[:int]) :=
sql.bind(X_7,"sys","lineorder","lo_quantity",2);
C_84 := algebra.subselect(r1_14,nil:bat[:oid],A4,A5,true,true,false);
X_17:bat[:int] := sql.bind(X_7,"sys","lineorder","lo_quantity",1);
C_85 := algebra.subselect(X_17,C_24,A4,A5,true,true,false);
@@ -63,20 +63,20 @@ function user.s2_1(A0:int,A1:int,A2:int,
X_41:bat[:int] := sql.bind(X_7,"sys","dwdate","d_year",0);
C_34:bat[:oid] := sql.tid(X_7,"sys","dwdate");
C_86 := algebra.subselect(X_41,C_34,A1,A1,true,false,false);
- (C_43,r1_57) := sql.bind(X_7,"sys","dwdate","d_year",2);
+ (C_43:bat[:oid],r1_57:bat[:int]) :=
sql.bind(X_7,"sys","dwdate","d_year",2);
C_87 := algebra.subselect(r1_57,nil:bat[:oid],A1,A1,true,false,false);
X_45:bat[:int] := sql.bind(X_7,"sys","dwdate","d_year",1);
C_88 := algebra.subselect(X_45,C_34,A1,A1,true,false,false);
C_46 := sql.subdelta(C_86,C_34,C_43,C_87,C_88);
C_89 := algebra.subselect(X_36,C_46,A0,A0,true,false,false);
- (C_38,r1_49) := sql.bind(X_7,"sys","dwdate","d_weeknuminyear",2);
+ (C_38:bat[:oid],r1_49:bat[:int]) :=
sql.bind(X_7,"sys","dwdate","d_weeknuminyear",2);
C_90 := algebra.subselect(r1_49,nil:bat[:oid],A0,A0,true,false,false);
X_40:bat[:int] := sql.bind(X_7,"sys","dwdate","d_weeknuminyear",1);
C_91 := algebra.subselect(X_40,C_46,A0,A0,true,false,false);
C_47 := sql.subdelta(C_89,C_46,C_38,C_90,C_91);
(X_48,r1_66) := algebra.subjoin(X_33,C_47,nil:BAT,nil:BAT,false,nil:lng);
X_52:bat[:int] := sql.bind(X_7,"sys","lineorder","lo_extendedprice",0);
- (C_54,r1_74) := sql.bind(X_7,"sys","lineorder","lo_extendedprice",2);
+ (C_54:bat[:oid],r1_74:bat[:int]) :=
sql.bind(X_7,"sys","lineorder","lo_extendedprice",2);
X_56:bat[:int] := sql.bind(X_7,"sys","lineorder","lo_extendedprice",1);
X_57 := sql.projectdelta(C_27,X_52,C_54,r1_74,X_56);
X_58 := algebra.projection(X_48,X_57);
diff --git a/sql/benchmarks/ssbm/Tests/03-explain.stable.out.int128
b/sql/benchmarks/ssbm/Tests/03-explain.stable.out.int128
--- a/sql/benchmarks/ssbm/Tests/03-explain.stable.out.int128
+++ b/sql/benchmarks/ssbm/Tests/03-explain.stable.out.int128
@@ -44,13 +44,13 @@ function user.s2_1(A0:int,A1:int,A2:int,
X_19:bat[:int] := sql.bind(X_7,"sys","lineorder","lo_discount",0);
C_8:bat[:oid] := sql.tid(X_7,"sys","lineorder");
C_79 := algebra.subselect(X_19,C_8,A2,A3,true,true,false);
- (C_21,r1_25) := sql.bind(X_7,"sys","lineorder","lo_discount",2);
+ (C_21:bat[:oid],r1_25:bat[:int]) :=
sql.bind(X_7,"sys","lineorder","lo_discount",2);
C_80 := algebra.subselect(r1_25,nil:bat[:oid],A2,A3,true,true,false);
X_23:bat[:int] := sql.bind(X_7,"sys","lineorder","lo_discount",1);
C_82 := algebra.subselect(X_23,C_8,A2,A3,true,true,false);
C_24 := sql.subdelta(C_79,C_8,C_21,C_80,C_82);
C_83 := algebra.subselect(X_11,C_24,A4,A5,true,true,false);
- (C_14,r1_14) := sql.bind(X_7,"sys","lineorder","lo_quantity",2);
+ (C_14:bat[:oid],r1_14:bat[:int]) :=
sql.bind(X_7,"sys","lineorder","lo_quantity",2);
C_84 := algebra.subselect(r1_14,nil:bat[:oid],A4,A5,true,true,false);
X_17:bat[:int] := sql.bind(X_7,"sys","lineorder","lo_quantity",1);
C_85 := algebra.subselect(X_17,C_24,A4,A5,true,true,false);
@@ -63,20 +63,20 @@ function user.s2_1(A0:int,A1:int,A2:int,
X_41:bat[:int] := sql.bind(X_7,"sys","dwdate","d_year",0);
C_34:bat[:oid] := sql.tid(X_7,"sys","dwdate");
C_86 := algebra.subselect(X_41,C_34,A1,A1,true,false,false);
- (C_43,r1_57) := sql.bind(X_7,"sys","dwdate","d_year",2);
+ (C_43:bat[:oid],r1_57:bat[:int]) :=
sql.bind(X_7,"sys","dwdate","d_year",2);
C_87 := algebra.subselect(r1_57,nil:bat[:oid],A1,A1,true,false,false);
X_45:bat[:int] := sql.bind(X_7,"sys","dwdate","d_year",1);
C_88 := algebra.subselect(X_45,C_34,A1,A1,true,false,false);
C_46 := sql.subdelta(C_86,C_34,C_43,C_87,C_88);
C_89 := algebra.subselect(X_36,C_46,A0,A0,true,false,false);
- (C_38,r1_49) := sql.bind(X_7,"sys","dwdate","d_weeknuminyear",2);
+ (C_38:bat[:oid],r1_49:bat[:int]) :=
sql.bind(X_7,"sys","dwdate","d_weeknuminyear",2);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
