Changeset: a6033db785ad for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a6033db785ad
Modified Files:
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.single
sql/benchmarks/ssbm/Tests/01-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/02-explain.stable.out.int128
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/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/05-explain.stable.out.int128
sql/benchmarks/tpch/Tests/06-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/12-explain.stable.out.int128
sql/benchmarks/tpch/Tests/14-explain.stable.out.int128
sql/benchmarks/tpch/Tests/17-explain.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/nil_2dec_lng.Bug-3592.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/Tests/setoptimizer.stable.err
sql/test/Tests/setoptimizer.stable.out
sql/test/Tests/setoptimizer.stable.out.Windows
sql/test/Users/Tests/dropManyUsers.Bug-3764.stable.out
sql/test/mergetables/Tests/mergequery.stable.out
Branch: profiler
Log Message:
Approve test output
diffs (truncated from 2701 to 300 lines):
diff --git
a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err
--- a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err
+++ b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err
@@ -30,16 +30,16 @@ stderr of test 'opt_sql_append` in direc
# 22:58:57 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=rome"
"--port=36275"
# 22:58:57 >
-MAPI = (monetdb) /var/tmp/mtest-28239/.s.monetdb.30808
+MAPI = (monetdb) /var/tmp/mtest-22696/.s.monetdb.33688
QUERY = explain copy into ttt from '\tmp/xyz';
ERROR = !COPY INTO: filename must have absolute path: \tmp/xyz
-MAPI = (monetdb) /var/tmp/mtest-28239/.s.monetdb.30808
+MAPI = (monetdb) /var/tmp/mtest-22696/.s.monetdb.33688
QUERY = explain copy into ttt from 'a:\tmp/xyz';
ERROR = !COPY INTO: filename must have absolute path: a:\tmp/xyz
-MAPI = (monetdb) /var/tmp/mtest-28239/.s.monetdb.30808
+MAPI = (monetdb) /var/tmp/mtest-22696/.s.monetdb.33688
QUERY = explain copy into ttt from '\tmp/xyz';
ERROR = !COPY INTO: filename must have absolute path: \tmp/xyz
-MAPI = (monetdb) /var/tmp/mtest-28239/.s.monetdb.30808
+MAPI = (monetdb) /var/tmp/mtest-22696/.s.monetdb.33688
QUERY = explain copy into ttt from 'Z:/tmp/xyz';
ERROR = !COPY INTO: filename must have absolute path: Z:/tmp/xyz
diff --git
a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
--- a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
+++ b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
@@ -55,8 +55,8 @@ Ready.
% .L # table_name
% def # name
% clob # type
-% 491 # length
-[
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.aliases();optimizer.pushselect();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.joinPath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.garbageCollector();"
]
+% 512 # length
+[
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.aliases();optimizer.pushselect();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.joinPath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.garbageCollector();"
]
#explain copy into ttt from '/tmp/xyz';
% .explain # table_name
% mal # name
@@ -64,10 +64,10 @@ Ready.
% 133 # length
function user.s4_1{autoCommit=true}():void;
X_26:void := querylog.define("explain copy into ttt from
\\'/tmp/xyz\\';","default_pipe",12);
-barrier X_35 := language.dataflow();
+barrier X_36 := language.dataflow();
X_2 := sql.mvc();
(X_12:bat[:oid,:int],X_13:bat[:oid,:int],X_14:bat[:oid,:int]) :=
sql.copy_from(nil,"|","\\n",nil:str,"null","/tmp/xyz",-1,0,0,0);
-exit X_35;
+exit X_36;
X_15 := sql.append(X_2,"sys","ttt","a",X_12);
X_19 := sql.append(X_15,"sys","ttt","b",X_13);
X_21 := sql.append(X_19,"sys","ttt","c",X_14);
@@ -89,8 +89,8 @@ end user.s4_1;
% .L # table_name
% def # name
% clob # type
-% 514 # length
-[
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.aliases();optimizer.pushselect();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.joinPath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.sql_append();optimizer.garbageCollector();"
]
+% 535 # length
+[
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.aliases();optimizer.pushselect();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.joinPath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.sql_append();optimizer.garbageCollector();"
]
#explain copy into ttt from '/tmp/xyz';
% .explain # table_name
% mal # name
@@ -98,10 +98,10 @@ end user.s4_1;
% 133 # length
function user.s12_1{autoCommit=true}():void;
X_26:void := querylog.define("explain copy into ttt from
\\'/tmp/xyz\\';","user_1",12);
-barrier X_36 := language.dataflow();
+barrier X_37 := language.dataflow();
X_2 := sql.mvc();
(X_12:bat[:oid,:int],X_13:bat[:oid,:int],X_14:bat[:oid,:int]) :=
sql.copy_from(nil,"|","\\n",nil:str,"null","/tmp/xyz",-1,0,0,0);
-exit X_36;
+exit X_37;
X_15 := sql.append(X_2,"sys","ttt","a",X_12);
X_19 := sql.append(X_15,"sys","ttt","b",X_13);
X_23 := aggr.count(X_14);
diff --git
a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.single
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.single
---
a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.single
+++
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.single
@@ -55,8 +55,8 @@ Ready.
% .L # table_name
% def # name
% clob # type
-% 491 # length
-[
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.aliases();optimizer.pushselect();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.joinPath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.garbageCollector();"
]
+% 512 # length
+[
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.aliases();optimizer.pushselect();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.joinPath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.garbageCollector();"
]
#explain copy into ttt from '/tmp/xyz';
% .explain # table_name
% mal # name
@@ -87,8 +87,8 @@ end user.s4_1;
% .L # table_name
% def # name
% clob # type
-% 514 # length
-[
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.aliases();optimizer.pushselect();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.joinPath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.sql_append();optimizer.garbageCollector();"
]
+% 535 # length
+[
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.aliases();optimizer.pushselect();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.joinPath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.sql_append();optimizer.garbageCollector();"
]
#explain copy into ttt from '/tmp/xyz';
% .explain # table_name
% mal # name
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
@@ -43,30 +43,30 @@ function user.s2_1{autoCommit=true}(A0:i
X_10:bat[:oid,:int] := sql.bind(X_6,"sys","lineorder","lo_quantity",0);
X_18:bat[:oid,:int] := sql.bind(X_6,"sys","lineorder","lo_discount",0);
X_7:bat[:oid,:oid] := sql.tid(X_6,"sys","lineorder");
- X_88 := algebra.subselect(X_18,X_7,A1,A2,true,true,false);
+ X_89 := algebra.subselect(X_18,X_7,A1,A2,true,true,false);
(X_20,r1_23) := sql.bind(X_6,"sys","lineorder","lo_discount",2);
- X_89 := algebra.subselect(r1_23,nil:bat[:oid,:oid],A1,A2,true,true,false);
+ X_90 := algebra.subselect(r1_23,nil:bat[:oid,:oid],A1,A2,true,true,false);
X_22:bat[:oid,:int] := sql.bind(X_6,"sys","lineorder","lo_discount",1);
- X_91 := algebra.subselect(X_22,X_7,A1,A2,true,true,false);
- X_23 := sql.subdelta(X_88,X_7,X_20,X_89,X_91);
- X_92 := algebra.thetasubselect(X_10,X_23,A3,"<");
+ X_92 := algebra.subselect(X_22,X_7,A1,A2,true,true,false);
+ X_23 := sql.subdelta(X_89,X_7,X_20,X_90,X_92);
+ X_93 := algebra.thetasubselect(X_10,X_23,A3,"<");
(X_13,r1_13) := sql.bind(X_6,"sys","lineorder","lo_quantity",2);
- X_93 := algebra.thetasubselect(r1_13,nil:bat[:oid,:oid],A3,"<");
+ X_94 := algebra.thetasubselect(r1_13,nil:bat[:oid,:oid],A3,"<");
X_16:bat[:oid,:int] := sql.bind(X_6,"sys","lineorder","lo_quantity",1);
- X_94 := algebra.thetasubselect(X_16,X_23,A3,"<");
- X_25 := sql.subdelta(X_92,X_23,X_13,X_93,X_94);
+ X_95 := algebra.thetasubselect(X_16,X_23,A3,"<");
+ X_25 := sql.subdelta(X_93,X_23,X_13,X_94,X_95);
X_27:bat[:oid,:oid] :=
sql.bind_idxbat(X_6,"sys","lineorder","lineorder_lo_orderdate_fkey",0);
(X_29,r1_36) :=
sql.bind_idxbat(X_6,"sys","lineorder","lineorder_lo_orderdate_fkey",2);
X_31:bat[:oid,:oid] :=
sql.bind_idxbat(X_6,"sys","lineorder","lineorder_lo_orderdate_fkey",1);
X_32 := sql.projectdelta(X_25,X_27,X_29,r1_36,X_31);
X_35:bat[:oid,:int] := sql.bind(X_6,"sys","dwdate","d_year",0);
X_33:bat[:oid,:oid] := sql.tid(X_6,"sys","dwdate");
- X_95 := algebra.subselect(X_35,X_33,A0,A0,true,false,false);
+ X_96 := algebra.subselect(X_35,X_33,A0,A0,true,false,false);
(X_37,r1_46) := sql.bind(X_6,"sys","dwdate","d_year",2);
- X_96 := algebra.subselect(r1_46,nil:bat[:oid,:oid],A0,A0,true,false,false);
+ X_97 := algebra.subselect(r1_46,nil:bat[:oid,:oid],A0,A0,true,false,false);
X_39:bat[:oid,:int] := sql.bind(X_6,"sys","dwdate","d_year",1);
- X_97 := algebra.subselect(X_39,X_33,A0,A0,true,false,false);
- X_40 := sql.subdelta(X_95,X_33,X_37,X_96,X_97);
+ X_98 := algebra.subselect(X_39,X_33,A0,A0,true,false,false);
+ X_40 := sql.subdelta(X_96,X_33,X_37,X_97,X_98);
(X_41,r1_55) := algebra.subjoin(X_32,X_40,nil:BAT,nil:BAT,false,nil:lng);
X_45:bat[:oid,:int] :=
sql.bind(X_6,"sys","lineorder","lo_extendedprice",0);
(X_47,r1_62) := sql.bind(X_6,"sys","lineorder","lo_extendedprice",2);
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
@@ -43,30 +43,30 @@ function user.s2_1{autoCommit=true}(A0:i
X_11:bat[:oid,:int] := sql.bind(X_7,"sys","lineorder","lo_quantity",0);
X_19:bat[:oid,:int] := sql.bind(X_7,"sys","lineorder","lo_discount",0);
X_8:bat[:oid,:oid] := sql.tid(X_7,"sys","lineorder");
- X_88 := algebra.subselect(X_19,X_8,A1,A2,true,true,false);
+ X_89 := algebra.subselect(X_19,X_8,A1,A2,true,true,false);
(X_21,r1_25) := sql.bind(X_7,"sys","lineorder","lo_discount",2);
- X_89 := algebra.subselect(r1_25,nil:bat[:oid,:oid],A1,A2,true,true,false);
+ X_90 := algebra.subselect(r1_25,nil:bat[:oid,:oid],A1,A2,true,true,false);
X_23:bat[:oid,:int] := sql.bind(X_7,"sys","lineorder","lo_discount",1);
- X_91 := algebra.subselect(X_23,X_8,A1,A2,true,true,false);
- X_24 := sql.subdelta(X_88,X_8,X_21,X_89,X_91);
- X_92 := algebra.subselect(X_11,X_24,A3,A4,true,true,false);
+ X_92 := algebra.subselect(X_23,X_8,A1,A2,true,true,false);
+ X_24 := sql.subdelta(X_89,X_8,X_21,X_90,X_92);
+ X_93 := algebra.subselect(X_11,X_24,A3,A4,true,true,false);
(X_14,r1_14) := sql.bind(X_7,"sys","lineorder","lo_quantity",2);
- X_93 := algebra.subselect(r1_14,nil:bat[:oid,:oid],A3,A4,true,true,false);
+ X_94 := algebra.subselect(r1_14,nil:bat[:oid,:oid],A3,A4,true,true,false);
X_17:bat[:oid,:int] := sql.bind(X_7,"sys","lineorder","lo_quantity",1);
- X_94 := algebra.subselect(X_17,X_24,A3,A4,true,true,false);
- X_26 := sql.subdelta(X_92,X_24,X_14,X_93,X_94);
+ X_95 := algebra.subselect(X_17,X_24,A3,A4,true,true,false);
+ X_26 := sql.subdelta(X_93,X_24,X_14,X_94,X_95);
X_27:bat[:oid,:oid] :=
sql.bind_idxbat(X_7,"sys","lineorder","lineorder_lo_orderdate_fkey",0);
(X_29,r1_37) :=
sql.bind_idxbat(X_7,"sys","lineorder","lineorder_lo_orderdate_fkey",2);
X_31:bat[:oid,:oid] :=
sql.bind_idxbat(X_7,"sys","lineorder","lineorder_lo_orderdate_fkey",1);
X_32 := sql.projectdelta(X_26,X_27,X_29,r1_37,X_31);
X_35:bat[:oid,:int] := sql.bind(X_7,"sys","dwdate","d_yearmonthnum",0);
X_33:bat[:oid,:oid] := sql.tid(X_7,"sys","dwdate");
- X_95 := algebra.subselect(X_35,X_33,A0,A0,true,false,false);
+ X_96 := algebra.subselect(X_35,X_33,A0,A0,true,false,false);
(X_37,r1_47) := sql.bind(X_7,"sys","dwdate","d_yearmonthnum",2);
- X_96 := algebra.subselect(r1_47,nil:bat[:oid,:oid],A0,A0,true,false,false);
+ X_97 := algebra.subselect(r1_47,nil:bat[:oid,:oid],A0,A0,true,false,false);
X_39:bat[:oid,:int] := sql.bind(X_7,"sys","dwdate","d_yearmonthnum",1);
- X_97 := algebra.subselect(X_39,X_33,A0,A0,true,false,false);
- X_40 := sql.subdelta(X_95,X_33,X_37,X_96,X_97);
+ X_98 := algebra.subselect(X_39,X_33,A0,A0,true,false,false);
+ X_40 := sql.subdelta(X_96,X_33,X_37,X_97,X_98);
(X_41,r1_56) := algebra.subjoin(X_32,X_40,nil:BAT,nil:BAT,false,nil:lng);
X_45:bat[:oid,:int] :=
sql.bind(X_7,"sys","lineorder","lo_extendedprice",0);
(X_47,r1_63) := sql.bind(X_7,"sys","lineorder","lo_extendedprice",2);
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
@@ -43,18 +43,18 @@ function user.s2_1{autoCommit=true}(A0:i
X_12:bat[:oid,:int] := sql.bind(X_8,"sys","lineorder","lo_quantity",0);
X_20:bat[:oid,:int] := sql.bind(X_8,"sys","lineorder","lo_discount",0);
X_9:bat[:oid,:oid] := sql.tid(X_8,"sys","lineorder");
- X_97 := algebra.subselect(X_20,X_9,A2,A3,true,true,false);
+ X_98 := algebra.subselect(X_20,X_9,A2,A3,true,true,false);
(X_22,r1_26) := sql.bind(X_8,"sys","lineorder","lo_discount",2);
- X_98 := algebra.subselect(r1_26,nil:bat[:oid,:oid],A2,A3,true,true,false);
+ X_99 := algebra.subselect(r1_26,nil:bat[:oid,:oid],A2,A3,true,true,false);
X_24:bat[:oid,:int] := sql.bind(X_8,"sys","lineorder","lo_discount",1);
- X_100 := algebra.subselect(X_24,X_9,A2,A3,true,true,false);
- X_25 := sql.subdelta(X_97,X_9,X_22,X_98,X_100);
- X_101 := algebra.subselect(X_12,X_25,A4,A5,true,true,false);
+ X_101 := algebra.subselect(X_24,X_9,A2,A3,true,true,false);
+ X_25 := sql.subdelta(X_98,X_9,X_22,X_99,X_101);
+ X_102 := algebra.subselect(X_12,X_25,A4,A5,true,true,false);
(X_15,r1_15) := sql.bind(X_8,"sys","lineorder","lo_quantity",2);
- X_102 := algebra.subselect(r1_15,nil:bat[:oid,:oid],A4,A5,true,true,false);
+ X_103 := algebra.subselect(r1_15,nil:bat[:oid,:oid],A4,A5,true,true,false);
X_18:bat[:oid,:int] := sql.bind(X_8,"sys","lineorder","lo_quantity",1);
- X_103 := algebra.subselect(X_18,X_25,A4,A5,true,true,false);
- X_27 := sql.subdelta(X_101,X_25,X_15,X_102,X_103);
+ X_104 := algebra.subselect(X_18,X_25,A4,A5,true,true,false);
+ X_27 := sql.subdelta(X_102,X_25,X_15,X_103,X_104);
X_28:bat[:oid,:oid] :=
sql.bind_idxbat(X_8,"sys","lineorder","lineorder_lo_orderdate_fkey",0);
(X_30,r1_38) :=
sql.bind_idxbat(X_8,"sys","lineorder","lineorder_lo_orderdate_fkey",2);
X_32:bat[:oid,:oid] :=
sql.bind_idxbat(X_8,"sys","lineorder","lineorder_lo_orderdate_fkey",1);
@@ -62,18 +62,18 @@ function user.s2_1{autoCommit=true}(A0:i
X_36:bat[:oid,:int] := sql.bind(X_8,"sys","dwdate","d_weeknuminyear",0);
X_41:bat[:oid,:int] := sql.bind(X_8,"sys","dwdate","d_year",0);
X_34:bat[:oid,:oid] := sql.tid(X_8,"sys","dwdate");
- X_104 := algebra.subselect(X_41,X_34,A1,A1,true,false,false);
+ X_105 := algebra.subselect(X_41,X_34,A1,A1,true,false,false);
(X_43,r1_56) := sql.bind(X_8,"sys","dwdate","d_year",2);
- X_105 :=
algebra.subselect(r1_56,nil:bat[:oid,:oid],A1,A1,true,false,false);
+ X_106 :=
algebra.subselect(r1_56,nil:bat[:oid,:oid],A1,A1,true,false,false);
X_45:bat[:oid,:int] := sql.bind(X_8,"sys","dwdate","d_year",1);
- X_106 := algebra.subselect(X_45,X_34,A1,A1,true,false,false);
- X_46 := sql.subdelta(X_104,X_34,X_43,X_105,X_106);
- X_107 := algebra.subselect(X_36,X_46,A0,A0,true,false,false);
+ X_107 := algebra.subselect(X_45,X_34,A1,A1,true,false,false);
+ X_46 := sql.subdelta(X_105,X_34,X_43,X_106,X_107);
+ X_108 := algebra.subselect(X_36,X_46,A0,A0,true,false,false);
(X_38,r1_48) := sql.bind(X_8,"sys","dwdate","d_weeknuminyear",2);
- X_108 :=
algebra.subselect(r1_48,nil:bat[:oid,:oid],A0,A0,true,false,false);
+ X_109 :=
algebra.subselect(r1_48,nil:bat[:oid,:oid],A0,A0,true,false,false);
X_40:bat[:oid,:int] := sql.bind(X_8,"sys","dwdate","d_weeknuminyear",1);
- X_109 := algebra.subselect(X_40,X_46,A0,A0,true,false,false);
- X_47 := sql.subdelta(X_107,X_46,X_38,X_108,X_109);
+ X_110 := algebra.subselect(X_40,X_46,A0,A0,true,false,false);
+ X_47 := sql.subdelta(X_108,X_46,X_38,X_109,X_110);
(X_48,r1_66) := algebra.subjoin(X_33,X_47,nil:BAT,nil:BAT,false,nil:lng);
X_52:bat[:oid,:int] :=
sql.bind(X_8,"sys","lineorder","lo_extendedprice",0);
(X_54,r1_74) := sql.bind(X_8,"sys","lineorder","lo_extendedprice",2);
diff --git a/sql/benchmarks/ssbm/Tests/04-explain.stable.out.int128
b/sql/benchmarks/ssbm/Tests/04-explain.stable.out.int128
--- a/sql/benchmarks/ssbm/Tests/04-explain.stable.out.int128
+++ b/sql/benchmarks/ssbm/Tests/04-explain.stable.out.int128
@@ -70,12 +70,12 @@ function user.s2_1{autoCommit=true}(A0:s
X_16 := sql.projectdelta(X_5,X_8,X_11,r1_11,X_14);
X_19:bat[:oid,:str] := sql.bind(X_4,"sys","part","p_category",0);
X_17:bat[:oid,:oid] := sql.tid(X_4,"sys","part");
- X_167 := algebra.subselect(X_19,X_17,A0,A0,true,false,false);
+ X_168 := algebra.subselect(X_19,X_17,A0,A0,true,false,false);
(X_21,r1_22) := sql.bind(X_4,"sys","part","p_category",2);
- X_168 :=
algebra.subselect(r1_22,nil:bat[:oid,:oid],A0,A0,true,false,false);
+ X_169 :=
algebra.subselect(r1_22,nil:bat[:oid,:oid],A0,A0,true,false,false);
X_23:bat[:oid,:str] := sql.bind(X_4,"sys","part","p_category",1);
- X_170 := algebra.subselect(X_23,X_17,A0,A0,true,false,false);
- X_24 := sql.subdelta(X_167,X_17,X_21,X_168,X_170);
+ X_171 := algebra.subselect(X_23,X_17,A0,A0,true,false,false);
+ X_24 := sql.subdelta(X_168,X_17,X_21,X_169,X_171);
(X_26,r1_32) := algebra.subjoin(X_16,X_24,nil:BAT,nil:BAT,false,nil:lng);
X_30:bat[:oid,:oid] :=
sql.bind_idxbat(X_4,"sys","lineorder","lineorder_lo_suppkey_fkey",0);
(X_32,r1_39) :=
sql.bind_idxbat(X_4,"sys","lineorder","lineorder_lo_suppkey_fkey",2);
@@ -84,12 +84,12 @@ function user.s2_1{autoCommit=true}(A0:s
X_36 := algebra.leftfetchjoin(X_26,X_35);
X_39:bat[:oid,:str] := sql.bind(X_4,"sys","supplier","s_region",0);
X_37:bat[:oid,:oid] := sql.tid(X_4,"sys","supplier");
- X_171 := algebra.subselect(X_39,X_37,A1,A1,true,false,false);
+ X_172 := algebra.subselect(X_39,X_37,A1,A1,true,false,false);
(X_41,r1_49) := sql.bind(X_4,"sys","supplier","s_region",2);
- X_172 :=
algebra.subselect(r1_49,nil:bat[:oid,:oid],A1,A1,true,false,false);
+ X_173 :=
algebra.subselect(r1_49,nil:bat[:oid,:oid],A1,A1,true,false,false);
X_43:bat[:oid,:str] := sql.bind(X_4,"sys","supplier","s_region",1);
- X_173 := algebra.subselect(X_43,X_37,A1,A1,true,false,false);
- X_44 := sql.subdelta(X_171,X_37,X_41,X_172,X_173);
+ X_174 := algebra.subselect(X_43,X_37,A1,A1,true,false,false);
+ X_44 := sql.subdelta(X_172,X_37,X_41,X_173,X_174);
(X_45,r1_58) := algebra.subjoin(X_36,X_44,nil:BAT,nil:BAT,false,nil:lng);
X_47:bat[:oid,:oid] :=
sql.bind_idxbat(X_4,"sys","lineorder","lineorder_lo_orderdate_fkey",0);
(X_49,r1_62) :=
sql.bind_idxbat(X_4,"sys","lineorder","lineorder_lo_orderdate_fkey",2);
diff --git a/sql/benchmarks/ssbm/Tests/05-explain.stable.out.int128
b/sql/benchmarks/ssbm/Tests/05-explain.stable.out.int128
--- a/sql/benchmarks/ssbm/Tests/05-explain.stable.out.int128
+++ b/sql/benchmarks/ssbm/Tests/05-explain.stable.out.int128
@@ -72,12 +72,12 @@ function user.s2_1{autoCommit=true}(A0:s
X_17 := sql.projectdelta(X_6,X_9,X_12,r1_12,X_15);
X_20:bat[:oid,:str] := sql.bind(X_5,"sys","part","p_brand1",0);
X_18:bat[:oid,:oid] := sql.tid(X_5,"sys","part");
- X_161 := algebra.subselect(X_20,X_18,A0,A1,true,true,false);
+ X_162 := algebra.subselect(X_20,X_18,A0,A1,true,true,false);
(X_22,r1_23) := sql.bind(X_5,"sys","part","p_brand1",2);
- X_162 := algebra.subselect(r1_23,nil:bat[:oid,:oid],A0,A1,true,true,false);
+ X_163 := algebra.subselect(r1_23,nil:bat[:oid,:oid],A0,A1,true,true,false);
X_24:bat[:oid,:str] := sql.bind(X_5,"sys","part","p_brand1",1);
- X_164 := algebra.subselect(X_24,X_18,A0,A1,true,true,false);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
