Changeset: 8a0828829707 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8a0828829707
Modified Files:
sql/backends/monet5/UDF/cudf/Tests/udf-fuse.stable.out
sql/backends/monet5/UDF/cudf/Tests/udf-reverse.stable.out
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.int128
sql/benchmarks/ssbm/Tests/05-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/06-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/07-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/08-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/09-explain.stable.out.int128
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.int128
sql/benchmarks/tpch/Tests/02-explain.stable.out
sql/benchmarks/tpch/Tests/03-explain.stable.out.int128
sql/benchmarks/tpch/Tests/04-explain.stable.out
sql/benchmarks/tpch/Tests/05-explain.stable.out.int128
sql/benchmarks/tpch/Tests/06-explain.stable.out.int128
sql/benchmarks/tpch/Tests/07-explain.stable.out.int128
sql/benchmarks/tpch/Tests/08-explain.stable.out.int128
sql/benchmarks/tpch/Tests/09-explain.stable.out.int128
sql/benchmarks/tpch/Tests/10-explain.stable.out.int128
sql/benchmarks/tpch/Tests/11-explain.stable.out.int128
sql/benchmarks/tpch/Tests/12-explain.stable.out.int128
sql/benchmarks/tpch/Tests/13-explain.stable.out
sql/benchmarks/tpch/Tests/14-explain.stable.out.int128
sql/benchmarks/tpch/Tests/15-explain.stable.out.int128
sql/benchmarks/tpch/Tests/16-explain.stable.out
sql/benchmarks/tpch/Tests/17-explain.stable.out.int128
sql/benchmarks/tpch/Tests/18-explain.stable.out.int128
sql/benchmarks/tpch/Tests/19-explain.stable.out.int128
sql/benchmarks/tpch/Tests/20-explain.stable.out.int128
sql/benchmarks/tpch/Tests/21-explain.stable.out
sql/benchmarks/tpch/Tests/22-explain.stable.out.int128
sql/test/BugTracker-2009/Tests/POWER_vs_prod.SF-2596114.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-2011/Tests/crash_on_alias.Bug-2798.stable.out.int128
sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out
sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.int128
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-2015/Tests/useless_casts.Bug-3756.stable.out
sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.out
sql/test/BugTracker-2016/Tests/querylog.stable.err
sql/test/BugTracker-2016/Tests/querylog.stable.out
sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
sql/test/mergetables/Tests/mergequery.stable.out
sql/test/remote/Tests/partition_elim.stable.out
Branch: default
Log Message:
Approve output
diffs (truncated from 6654 to 300 lines):
diff --git a/sql/backends/monet5/UDF/cudf/Tests/udf-fuse.stable.out
b/sql/backends/monet5/UDF/cudf/Tests/udf-fuse.stable.out
--- a/sql/backends/monet5/UDF/cudf/Tests/udf-fuse.stable.out
+++ b/sql/backends/monet5/UDF/cudf/Tests/udf-fuse.stable.out
@@ -107,17 +107,17 @@ function user.s8_1():void;
X_31 := bat.new(nil:int);
X_40 := bat.append(X_31,0);
X_0 := sql.mvc();
- X_1:bat[:oid] := sql.tid(X_0,"sys","udf_fuse");
+ C_1:bat[:oid] := sql.tid(X_0,"sys","udf_fuse");
X_4:bat[:bte] := sql.bind(X_0,"sys","udf_fuse","a",0);
- (X_7,r1_8) := sql.bind(X_0,"sys","udf_fuse","a",2);
+ (C_7,r1_8) := sql.bind(X_0,"sys","udf_fuse","a",2);
X_10:bat[:bte] := sql.bind(X_0,"sys","udf_fuse","a",1);
- X_12 := sql.delta(X_4,X_7,r1_8,X_10);
- X_13 := algebra.projection(X_1,X_12);
+ X_12 := sql.delta(X_4,C_7,r1_8,X_10);
+ X_13 := algebra.projection(C_1,X_12);
X_14:bat[:bte] := sql.bind(X_0,"sys","udf_fuse","b",0);
- (X_16,r1_17) := sql.bind(X_0,"sys","udf_fuse","b",2);
+ (C_16,r1_17) := sql.bind(X_0,"sys","udf_fuse","b",2);
X_18:bat[:bte] := sql.bind(X_0,"sys","udf_fuse","b",1);
- X_19 := sql.delta(X_14,X_16,r1_17,X_18);
- X_20 := algebra.projection(X_1,X_19);
+ X_19 := sql.delta(X_14,C_16,r1_17,X_18);
+ X_20 := algebra.projection(C_1,X_19);
X_21:bat[:sht] := batudf.fuse(X_13,X_20);
sql.resultSet(X_32,X_34,X_36,X_38,X_40,X_21);
end user.s8_1;
@@ -139,17 +139,17 @@ function user.s9_1():void;
X_31 := bat.new(nil:int);
X_40 := bat.append(X_31,0);
X_0 := sql.mvc();
- X_1:bat[:oid] := sql.tid(X_0,"sys","udf_fuse");
+ C_1:bat[:oid] := sql.tid(X_0,"sys","udf_fuse");
X_4:bat[:sht] := sql.bind(X_0,"sys","udf_fuse","c",0);
- (X_7,r1_8) := sql.bind(X_0,"sys","udf_fuse","c",2);
+ (C_7,r1_8) := sql.bind(X_0,"sys","udf_fuse","c",2);
X_10:bat[:sht] := sql.bind(X_0,"sys","udf_fuse","c",1);
- X_12 := sql.delta(X_4,X_7,r1_8,X_10);
- X_13 := algebra.projection(X_1,X_12);
+ X_12 := sql.delta(X_4,C_7,r1_8,X_10);
+ X_13 := algebra.projection(C_1,X_12);
X_14:bat[:sht] := sql.bind(X_0,"sys","udf_fuse","d",0);
- (X_16,r1_17) := sql.bind(X_0,"sys","udf_fuse","d",2);
+ (C_16,r1_17) := sql.bind(X_0,"sys","udf_fuse","d",2);
X_18:bat[:sht] := sql.bind(X_0,"sys","udf_fuse","d",1);
- X_19 := sql.delta(X_14,X_16,r1_17,X_18);
- X_20 := algebra.projection(X_1,X_19);
+ X_19 := sql.delta(X_14,C_16,r1_17,X_18);
+ X_20 := algebra.projection(C_1,X_19);
X_21:bat[:int] := batudf.fuse(X_13,X_20);
sql.resultSet(X_32,X_34,X_36,X_38,X_40,X_21);
end user.s9_1;
@@ -171,17 +171,17 @@ function user.s10_1():void;
X_31 := bat.new(nil:int);
X_40 := bat.append(X_31,0);
X_0 := sql.mvc();
- X_1:bat[:oid] := sql.tid(X_0,"sys","udf_fuse");
+ C_1:bat[:oid] := sql.tid(X_0,"sys","udf_fuse");
X_4:bat[:int] := sql.bind(X_0,"sys","udf_fuse","e",0);
- (X_7,r1_8) := sql.bind(X_0,"sys","udf_fuse","e",2);
+ (C_7,r1_8) := sql.bind(X_0,"sys","udf_fuse","e",2);
X_10:bat[:int] := sql.bind(X_0,"sys","udf_fuse","e",1);
- X_12 := sql.delta(X_4,X_7,r1_8,X_10);
- X_13 := algebra.projection(X_1,X_12);
+ X_12 := sql.delta(X_4,C_7,r1_8,X_10);
+ X_13 := algebra.projection(C_1,X_12);
X_14:bat[:int] := sql.bind(X_0,"sys","udf_fuse","f",0);
- (X_16,r1_17) := sql.bind(X_0,"sys","udf_fuse","f",2);
+ (C_16,r1_17) := sql.bind(X_0,"sys","udf_fuse","f",2);
X_18:bat[:int] := sql.bind(X_0,"sys","udf_fuse","f",1);
- X_19 := sql.delta(X_14,X_16,r1_17,X_18);
- X_20 := algebra.projection(X_1,X_19);
+ X_19 := sql.delta(X_14,C_16,r1_17,X_18);
+ X_20 := algebra.projection(C_1,X_19);
X_21:bat[:lng] := batudf.fuse(X_13,X_20);
sql.resultSet(X_32,X_34,X_36,X_38,X_40,X_21);
end user.s10_1;
diff --git a/sql/backends/monet5/UDF/cudf/Tests/udf-reverse.stable.out
b/sql/backends/monet5/UDF/cudf/Tests/udf-reverse.stable.out
--- a/sql/backends/monet5/UDF/cudf/Tests/udf-reverse.stable.out
+++ b/sql/backends/monet5/UDF/cudf/Tests/udf-reverse.stable.out
@@ -96,12 +96,12 @@ function user.s6_1():void;
X_24 := bat.new(nil:int);
X_32 := bat.append(X_24,0);
X_0 := sql.mvc();
- X_1:bat[:oid] := sql.tid(X_0,"sys","udf_reverse");
+ C_1:bat[:oid] := sql.tid(X_0,"sys","udf_reverse");
X_4:bat[:str] := sql.bind(X_0,"sys","udf_reverse","x",0);
- (X_7,r1_8) := sql.bind(X_0,"sys","udf_reverse","x",2);
+ (C_7,r1_8) := sql.bind(X_0,"sys","udf_reverse","x",2);
X_10:bat[:str] := sql.bind(X_0,"sys","udf_reverse","x",1);
- X_12 := sql.delta(X_4,X_7,r1_8,X_10);
- X_13 := algebra.projection(X_1,X_12);
+ X_12 := sql.delta(X_4,C_7,r1_8,X_10);
+ X_13 := algebra.projection(C_1,X_12);
X_14:bat[:str] := batudf.reverse(X_13);
sql.resultSet(X_25,X_27,X_29,X_31,X_32,X_14);
end user.s6_1;
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
@@ -42,39 +42,39 @@ function user.s2_1(A0:int,A1:int,A2:int,
X_0 := sql.mvc();
X_4:bat[:int] := sql.bind(X_0,"sys","lineorder","lo_quantity",0);
X_15:bat[:int] := sql.bind(X_0,"sys","lineorder","lo_discount",0);
- X_1:bat[:oid] := sql.tid(X_0,"sys","lineorder");
- X_93 := algebra.subselect(X_15,X_1,A1,A2,true,true,false);
- (X_17,r1_22) := sql.bind(X_0,"sys","lineorder","lo_discount",2);
- X_94 := algebra.subselect(r1_22,nil:bat[:oid],A1,A2,true,true,false);
+ C_1:bat[:oid] := sql.tid(X_0,"sys","lineorder");
+ C_93 := algebra.subselect(X_15,C_1,A1,A2,true,true,false);
+ (C_17,r1_22) := sql.bind(X_0,"sys","lineorder","lo_discount",2);
+ C_94 := algebra.subselect(r1_22,nil:bat[:oid],A1,A2,true,true,false);
X_19:bat[:int] := sql.bind(X_0,"sys","lineorder","lo_discount",1);
- X_96 := algebra.subselect(X_19,X_1,A1,A2,true,true,false);
- X_24 := sql.subdelta(X_93,X_1,X_17,X_94,X_96);
- X_97 := algebra.thetasubselect(X_4,X_24,A3,"<");
- (X_7,r1_12) := sql.bind(X_0,"sys","lineorder","lo_quantity",2);
- X_98 := algebra.thetasubselect(r1_12,nil:bat[:oid],A3,"<");
+ C_96 := algebra.subselect(X_19,C_1,A1,A2,true,true,false);
+ C_24 := sql.subdelta(C_93,C_1,C_17,C_94,C_96);
+ C_97 := algebra.thetasubselect(X_4,C_24,A3,"<");
+ (C_7,r1_12) := sql.bind(X_0,"sys","lineorder","lo_quantity",2);
+ C_98 := algebra.thetasubselect(r1_12,nil:bat[:oid],A3,"<");
X_10:bat[:int] := sql.bind(X_0,"sys","lineorder","lo_quantity",1);
- X_100 := algebra.thetasubselect(X_10,X_24,A3,"<");
- X_28 := sql.subdelta(X_97,X_24,X_7,X_98,X_100);
+ C_100 := algebra.thetasubselect(X_10,C_24,A3,"<");
+ C_28 := sql.subdelta(C_97,C_24,C_7,C_98,C_100);
X_30:bat[:oid] :=
sql.bind_idxbat(X_0,"sys","lineorder","lineorder_lo_orderdate_fkey",0);
(X_32,r1_37) :=
sql.bind_idxbat(X_0,"sys","lineorder","lineorder_lo_orderdate_fkey",2);
X_34:bat[:oid] :=
sql.bind_idxbat(X_0,"sys","lineorder","lineorder_lo_orderdate_fkey",1);
- X_37 := sql.projectdelta(X_28,X_30,X_32,r1_37,X_34);
+ X_37 := sql.projectdelta(C_28,X_30,X_32,r1_37,X_34);
X_40:bat[:int] := sql.bind(X_0,"sys","dwdate","d_year",0);
- X_38:bat[:oid] := sql.tid(X_0,"sys","dwdate");
- X_101 := algebra.subselect(X_40,X_38,A0,A0,true,false,false);
- (X_42,r1_47) := sql.bind(X_0,"sys","dwdate","d_year",2);
- X_102 := algebra.subselect(r1_47,nil:bat[:oid],A0,A0,true,false,false);
+ C_38:bat[:oid] := sql.tid(X_0,"sys","dwdate");
+ C_101 := algebra.subselect(X_40,C_38,A0,A0,true,false,false);
+ (C_42,r1_47) := sql.bind(X_0,"sys","dwdate","d_year",2);
+ C_102 := algebra.subselect(r1_47,nil:bat[:oid],A0,A0,true,false,false);
X_44:bat[:int] := sql.bind(X_0,"sys","dwdate","d_year",1);
- X_104 := algebra.subselect(X_44,X_38,A0,A0,true,false,false);
- X_48 := sql.subdelta(X_101,X_38,X_42,X_102,X_104);
- (X_50,r1_55) := algebra.subjoin(X_37,X_48,nil:BAT,nil:BAT,false,nil:lng);
+ C_104 := algebra.subselect(X_44,C_38,A0,A0,true,false,false);
+ C_48 := sql.subdelta(C_101,C_38,C_42,C_102,C_104);
+ (X_50,r1_55) := algebra.subjoin(X_37,C_48,nil:BAT,nil:BAT,false,nil:lng);
X_55:bat[:int] := sql.bind(X_0,"sys","lineorder","lo_extendedprice",0);
- (X_57,r1_62) := sql.bind(X_0,"sys","lineorder","lo_extendedprice",2);
+ (C_57,r1_62) := sql.bind(X_0,"sys","lineorder","lo_extendedprice",2);
X_59:bat[:int] := sql.bind(X_0,"sys","lineorder","lo_extendedprice",1);
- X_62 := sql.projectdelta(X_28,X_55,X_57,r1_62,X_59);
+ X_62 := sql.projectdelta(C_28,X_55,C_57,r1_62,X_59);
X_63 := algebra.projection(X_50,X_62);
X_64 := batcalc.lng(X_63);
- X_65 := sql.projectdelta(X_28,X_15,X_17,r1_22,X_19);
+ X_65 := sql.projectdelta(C_28,X_15,C_17,r1_22,X_19);
X_66 := algebra.projection(X_50,X_65);
X_67:bat[:lng] := batcalc.*(X_64,X_66);
X_70:lng := aggr.sum(X_67);
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
@@ -42,39 +42,39 @@ function user.s2_1(A0:int,A1:int,A2:int,
X_0 := sql.mvc();
X_4:bat[:int] := sql.bind(X_0,"sys","lineorder","lo_quantity",0);
X_15:bat[:int] := sql.bind(X_0,"sys","lineorder","lo_discount",0);
- X_1:bat[:oid] := sql.tid(X_0,"sys","lineorder");
- X_93 := algebra.subselect(X_15,X_1,A1,A2,true,true,false);
- (X_17,r1_22) := sql.bind(X_0,"sys","lineorder","lo_discount",2);
- X_94 := algebra.subselect(r1_22,nil:bat[:oid],A1,A2,true,true,false);
+ C_1:bat[:oid] := sql.tid(X_0,"sys","lineorder");
+ C_93 := algebra.subselect(X_15,C_1,A1,A2,true,true,false);
+ (C_17,r1_22) := sql.bind(X_0,"sys","lineorder","lo_discount",2);
+ C_94 := algebra.subselect(r1_22,nil:bat[:oid],A1,A2,true,true,false);
X_19:bat[:int] := sql.bind(X_0,"sys","lineorder","lo_discount",1);
- X_96 := algebra.subselect(X_19,X_1,A1,A2,true,true,false);
- X_24 := sql.subdelta(X_93,X_1,X_17,X_94,X_96);
- X_97 := algebra.thetasubselect(X_4,X_24,A3,"<");
- (X_7,r1_12) := sql.bind(X_0,"sys","lineorder","lo_quantity",2);
- X_98 := algebra.thetasubselect(r1_12,nil:bat[:oid],A3,"<");
+ C_96 := algebra.subselect(X_19,C_1,A1,A2,true,true,false);
+ C_24 := sql.subdelta(C_93,C_1,C_17,C_94,C_96);
+ C_97 := algebra.thetasubselect(X_4,C_24,A3,"<");
+ (C_7,r1_12) := sql.bind(X_0,"sys","lineorder","lo_quantity",2);
+ C_98 := algebra.thetasubselect(r1_12,nil:bat[:oid],A3,"<");
X_10:bat[:int] := sql.bind(X_0,"sys","lineorder","lo_quantity",1);
- X_100 := algebra.thetasubselect(X_10,X_24,A3,"<");
- X_28 := sql.subdelta(X_97,X_24,X_7,X_98,X_100);
+ C_100 := algebra.thetasubselect(X_10,C_24,A3,"<");
+ C_28 := sql.subdelta(C_97,C_24,C_7,C_98,C_100);
X_30:bat[:oid] :=
sql.bind_idxbat(X_0,"sys","lineorder","lineorder_lo_orderdate_fkey",0);
(X_32,r1_37) :=
sql.bind_idxbat(X_0,"sys","lineorder","lineorder_lo_orderdate_fkey",2);
X_34:bat[:oid] :=
sql.bind_idxbat(X_0,"sys","lineorder","lineorder_lo_orderdate_fkey",1);
- X_37 := sql.projectdelta(X_28,X_30,X_32,r1_37,X_34);
+ X_37 := sql.projectdelta(C_28,X_30,X_32,r1_37,X_34);
X_40:bat[:int] := sql.bind(X_0,"sys","dwdate","d_year",0);
- X_38:bat[:oid] := sql.tid(X_0,"sys","dwdate");
- X_101 := algebra.subselect(X_40,X_38,A0,A0,true,false,false);
- (X_42,r1_47) := sql.bind(X_0,"sys","dwdate","d_year",2);
- X_102 := algebra.subselect(r1_47,nil:bat[:oid],A0,A0,true,false,false);
+ C_38:bat[:oid] := sql.tid(X_0,"sys","dwdate");
+ C_101 := algebra.subselect(X_40,C_38,A0,A0,true,false,false);
+ (C_42,r1_47) := sql.bind(X_0,"sys","dwdate","d_year",2);
+ C_102 := algebra.subselect(r1_47,nil:bat[:oid],A0,A0,true,false,false);
X_44:bat[:int] := sql.bind(X_0,"sys","dwdate","d_year",1);
- X_104 := algebra.subselect(X_44,X_38,A0,A0,true,false,false);
- X_48 := sql.subdelta(X_101,X_38,X_42,X_102,X_104);
- (X_50,r1_55) := algebra.subjoin(X_37,X_48,nil:BAT,nil:BAT,false,nil:lng);
+ C_104 := algebra.subselect(X_44,C_38,A0,A0,true,false,false);
+ C_48 := sql.subdelta(C_101,C_38,C_42,C_102,C_104);
+ (X_50,r1_55) := algebra.subjoin(X_37,C_48,nil:BAT,nil:BAT,false,nil:lng);
X_55:bat[:int] := sql.bind(X_0,"sys","lineorder","lo_extendedprice",0);
- (X_57,r1_62) := sql.bind(X_0,"sys","lineorder","lo_extendedprice",2);
+ (C_57,r1_62) := sql.bind(X_0,"sys","lineorder","lo_extendedprice",2);
X_59:bat[:int] := sql.bind(X_0,"sys","lineorder","lo_extendedprice",1);
- X_62 := sql.projectdelta(X_28,X_55,X_57,r1_62,X_59);
+ X_62 := sql.projectdelta(C_28,X_55,C_57,r1_62,X_59);
X_63 := algebra.projection(X_50,X_62);
X_64 := batcalc.lng(X_63);
- X_65 := sql.projectdelta(X_28,X_15,X_17,r1_22,X_19);
+ X_65 := sql.projectdelta(C_28,X_15,C_17,r1_22,X_19);
X_66 := algebra.projection(X_50,X_65);
X_67:bat[:lng] := batcalc.*(X_64,X_66);
X_70:lng := aggr.sum(X_67);
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
@@ -42,39 +42,39 @@ function user.s2_1(A0:int,A1:int,A2:int,
X_0 := sql.mvc();
X_4:bat[:int] := sql.bind(X_0,"sys","lineorder","lo_quantity",0);
X_16:bat[:int] := sql.bind(X_0,"sys","lineorder","lo_discount",0);
- X_1:bat[:oid] := sql.tid(X_0,"sys","lineorder");
- X_93 := algebra.subselect(X_16,X_1,A1,A2,true,true,false);
- (X_18,r1_24) := sql.bind(X_0,"sys","lineorder","lo_discount",2);
- X_94 := algebra.subselect(r1_24,nil:bat[:oid],A1,A2,true,true,false);
+ C_1:bat[:oid] := sql.tid(X_0,"sys","lineorder");
+ C_93 := algebra.subselect(X_16,C_1,A1,A2,true,true,false);
+ (C_18,r1_24) := sql.bind(X_0,"sys","lineorder","lo_discount",2);
+ C_94 := algebra.subselect(r1_24,nil:bat[:oid],A1,A2,true,true,false);
X_20:bat[:int] := sql.bind(X_0,"sys","lineorder","lo_discount",1);
- X_96 := algebra.subselect(X_20,X_1,A1,A2,true,true,false);
- X_25 := sql.subdelta(X_93,X_1,X_18,X_94,X_96);
- X_97 := algebra.subselect(X_4,X_25,A3,A4,true,true,false);
- (X_7,r1_13) := sql.bind(X_0,"sys","lineorder","lo_quantity",2);
- X_98 := algebra.subselect(r1_13,nil:bat[:oid],A3,A4,true,true,false);
+ C_96 := algebra.subselect(X_20,C_1,A1,A2,true,true,false);
+ C_25 := sql.subdelta(C_93,C_1,C_18,C_94,C_96);
+ C_97 := algebra.subselect(X_4,C_25,A3,A4,true,true,false);
+ (C_7,r1_13) := sql.bind(X_0,"sys","lineorder","lo_quantity",2);
+ C_98 := algebra.subselect(r1_13,nil:bat[:oid],A3,A4,true,true,false);
X_10:bat[:int] := sql.bind(X_0,"sys","lineorder","lo_quantity",1);
- X_100 := algebra.subselect(X_10,X_25,A3,A4,true,true,false);
- X_29 := sql.subdelta(X_97,X_25,X_7,X_98,X_100);
+ C_100 := algebra.subselect(X_10,C_25,A3,A4,true,true,false);
+ C_29 := sql.subdelta(C_97,C_25,C_7,C_98,C_100);
X_30:bat[:oid] :=
sql.bind_idxbat(X_0,"sys","lineorder","lineorder_lo_orderdate_fkey",0);
(X_32,r1_38) :=
sql.bind_idxbat(X_0,"sys","lineorder","lineorder_lo_orderdate_fkey",2);
X_34:bat[:oid] :=
sql.bind_idxbat(X_0,"sys","lineorder","lineorder_lo_orderdate_fkey",1);
- X_37 := sql.projectdelta(X_29,X_30,X_32,r1_38,X_34);
+ X_37 := sql.projectdelta(C_29,X_30,X_32,r1_38,X_34);
X_40:bat[:int] := sql.bind(X_0,"sys","dwdate","d_yearmonthnum",0);
- X_38:bat[:oid] := sql.tid(X_0,"sys","dwdate");
- X_101 := algebra.subselect(X_40,X_38,A0,A0,true,false,false);
- (X_42,r1_48) := sql.bind(X_0,"sys","dwdate","d_yearmonthnum",2);
- X_102 := algebra.subselect(r1_48,nil:bat[:oid],A0,A0,true,false,false);
+ C_38:bat[:oid] := sql.tid(X_0,"sys","dwdate");
+ C_101 := algebra.subselect(X_40,C_38,A0,A0,true,false,false);
+ (C_42,r1_48) := sql.bind(X_0,"sys","dwdate","d_yearmonthnum",2);
+ C_102 := algebra.subselect(r1_48,nil:bat[:oid],A0,A0,true,false,false);
X_44:bat[:int] := sql.bind(X_0,"sys","dwdate","d_yearmonthnum",1);
- X_104 := algebra.subselect(X_44,X_38,A0,A0,true,false,false);
- X_48 := sql.subdelta(X_101,X_38,X_42,X_102,X_104);
- (X_50,r1_56) := algebra.subjoin(X_37,X_48,nil:BAT,nil:BAT,false,nil:lng);
+ C_104 := algebra.subselect(X_44,C_38,A0,A0,true,false,false);
+ C_48 := sql.subdelta(C_101,C_38,C_42,C_102,C_104);
+ (X_50,r1_56) := algebra.subjoin(X_37,C_48,nil:BAT,nil:BAT,false,nil:lng);
X_55:bat[:int] := sql.bind(X_0,"sys","lineorder","lo_extendedprice",0);
- (X_57,r1_63) := sql.bind(X_0,"sys","lineorder","lo_extendedprice",2);
+ (C_57,r1_63) := sql.bind(X_0,"sys","lineorder","lo_extendedprice",2);
X_59:bat[:int] := sql.bind(X_0,"sys","lineorder","lo_extendedprice",1);
- X_62 := sql.projectdelta(X_29,X_55,X_57,r1_63,X_59);
+ X_62 := sql.projectdelta(C_29,X_55,C_57,r1_63,X_59);
X_63 := algebra.projection(X_50,X_62);
X_64 := batcalc.lng(X_63);
- X_65 := sql.projectdelta(X_29,X_16,X_18,r1_24,X_20);
+ X_65 := sql.projectdelta(C_29,X_16,C_18,r1_24,X_20);
X_66 := algebra.projection(X_50,X_65);
X_67:bat[:lng] := batcalc.*(X_64,X_66);
X_70:lng := aggr.sum(X_67);
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
@@ -42,39 +42,39 @@ function user.s2_1(A0:int,A1:int,A2:int,
X_0 := sql.mvc();
X_4:bat[:int] := sql.bind(X_0,"sys","lineorder","lo_quantity",0);
X_16:bat[:int] := sql.bind(X_0,"sys","lineorder","lo_discount",0);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
