Changeset: 9f404bccd2f6 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9f404bccd2f6
Modified Files:
        clients/Tests/MAL-signatures.stable.out
        clients/Tests/MAL-signatures.stable.out.int128
        clients/Tests/exports.stable.out
        monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
        
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.single
        sql/backends/monet5/UDF/Tests/udf-fuse.stable.out
        sql/backends/monet5/UDF/Tests/udf-reverse.stable.out
        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/ssbm/Tests/11-explain.stable.out.int128
        sql/benchmarks/ssbm/Tests/12-explain.stable.out.int128
        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/13-explain.stable.out.32bit
        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-2009/Tests/explain_gives_crash.SF-2741829.stable.out
        
sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out
        
sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out
        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-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/Tests/explain.SF-1739353.stable.out
        sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
        sql/test/Tests/setoptimizer.stable.out
        sql/test/Tests/setoptimizer.stable.out.Windows
        sql/test/mapi/Tests/sql_int128.stable.out
Branch: jit
Log Message:

Approve output


diffs (truncated from 8552 to 300 lines):

diff --git a/clients/Tests/MAL-signatures.stable.out 
b/clients/Tests/MAL-signatures.stable.out
--- a/clients/Tests/MAL-signatures.stable.out
+++ b/clients/Tests/MAL-signatures.stable.out
@@ -50801,6 +50801,12 @@ comment Evaluate constant expressions on
 
 pattern optimizer.evaluate():str 
 address OPTwrapper;
+pattern optimizer.emptybind(mod:str,fcn:str):str 
+address OPTwrapper;
+comment Evaluate empty set expressions.
+
+pattern optimizer.emptybind():str 
+address OPTwrapper;
 pattern optimizer.factorize(mod:str,fcn:str):str 
 address OPTwrapper;
 comment Turn function into a factory
@@ -51633,6 +51639,14 @@ pattern sql.export_table(fname:str,fmt:s
 address mvc_export_row_wrap;
 comment Prepare a table result set for the COPY INTO stream
 
+pattern 
sql.emptybind(mvc:int,schema:str,table:str,column:str,access:int,part_nr:int,nr_parts:int)
 (uid:bat[:oid],uval:bat[:any_1]) 
+address mvc_bind_wrap;
+pattern 
sql.emptybind(mvc:int,schema:str,table:str,column:str,access:int,part_nr:int,nr_parts:int):bat[:any_1]
 
+address mvc_bind_wrap;
+pattern sql.emptybind(mvc:int,schema:str,table:str,column:str,access:int) 
(uid:bat[:oid],uval:bat[:any_1]) 
+address mvc_bind_wrap;
+pattern 
sql.emptybind(mvc:int,schema:str,table:str,column:str,access:int):bat[:any_1] 
+address mvc_bind_wrap;
 pattern sql.evalAlgebra(cmd:str,optimize:bit):void 
 address RAstatement;
 comment Compile and execute a single 'relational algebra' statement
diff --git a/clients/Tests/MAL-signatures.stable.out.int128 
b/clients/Tests/MAL-signatures.stable.out.int128
--- a/clients/Tests/MAL-signatures.stable.out.int128
+++ b/clients/Tests/MAL-signatures.stable.out.int128
@@ -50802,6 +50802,12 @@ comment Evaluate constant expressions on
 
 pattern optimizer.evaluate():str 
 address OPTwrapper;
+pattern optimizer.emptybind(mod:str,fcn:str):str 
+address OPTwrapper;
+comment Evaluate empty set expressions.
+
+pattern optimizer.emptybind():str 
+address OPTwrapper;
 pattern optimizer.factorize(mod:str,fcn:str):str 
 address OPTwrapper;
 comment Turn function into a factory
@@ -51634,6 +51640,14 @@ pattern sql.export_table(fname:str,fmt:s
 address mvc_export_row_wrap;
 comment Prepare a table result set for the COPY INTO stream
 
+pattern 
sql.emptybind(mvc:int,schema:str,table:str,column:str,access:int,part_nr:int,nr_parts:int)
 (uid:bat[:oid],uval:bat[:any_1]) 
+address mvc_bind_wrap;
+pattern 
sql.emptybind(mvc:int,schema:str,table:str,column:str,access:int,part_nr:int,nr_parts:int):bat[:any_1]
 
+address mvc_bind_wrap;
+pattern sql.emptybind(mvc:int,schema:str,table:str,column:str,access:int) 
(uid:bat[:oid],uval:bat[:any_1]) 
+address mvc_bind_wrap;
+pattern 
sql.emptybind(mvc:int,schema:str,table:str,column:str,access:int):bat[:any_1] 
+address mvc_bind_wrap;
 pattern sql.evalAlgebra(cmd:str,optimize:bit):void 
 address RAstatement;
 comment Compile and execute a single 'relational algebra' statement
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -1550,6 +1550,7 @@ int OPTcostModelImplementation(Client cn
 int OPTdataflowImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, 
InstrPtr p);
 int OPTdeadcodeImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, 
InstrPtr pci);
 int OPTdumpQEPImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, 
InstrPtr p);
+int OPTemptybindImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, 
InstrPtr p);
 int OPTevaluateImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, 
InstrPtr pci);
 int OPTfactorizeImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, 
InstrPtr pci);
 int OPTgarbageCollectorImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr 
stk, InstrPtr pci);
@@ -2055,6 +2056,7 @@ str divRef;
 void dumpExceptionsToStream(stream *out, str msg);
 void dumpHelpTable(stream *f, Module s, str text, int flag);
 void dumpSearchTable(stream *f, str text);
+str emptybindRef;
 str eqRef;
 str escape_str(str *retval, str s);
 str evalFile(Client c, str fname, int listing);
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
-% 541 # length
-[ 
"optimizer.inline();optimizer.candidates();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.pushselect();optimizer.aliases();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.deadcode();optimizer.reorder();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.garbageCollector();"
      ]
+% 563 # length
+[ 
"optimizer.inline();optimizer.candidates();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptybind();optimizer.pushselect();optimizer.aliases();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.deadcode();optimizer.reorder();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
@@ -89,8 +89,8 @@ end user.s4_1;
 % .L # table_name
 % def # name
 % clob # type
-% 564 # length
-[ 
"optimizer.inline();optimizer.candidates();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.pushselect();optimizer.aliases();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.deadcode();optimizer.reorder();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.sql_append();optimizer.garbageCollector();"
       ]
+% 586 # length
+[ 
"optimizer.inline();optimizer.candidates();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptybind();optimizer.pushselect();optimizer.aliases();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.deadcode();optimizer.reorder();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/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
-% 541 # length
-[ 
"optimizer.inline();optimizer.candidates();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.pushselect();optimizer.aliases();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.deadcode();optimizer.reorder();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.garbageCollector();"
      ]
+% 563 # length
+[ 
"optimizer.inline();optimizer.candidates();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptybind();optimizer.pushselect();optimizer.aliases();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.deadcode();optimizer.reorder();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
-% 564 # length
-[ 
"optimizer.inline();optimizer.candidates();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.pushselect();optimizer.aliases();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.deadcode();optimizer.reorder();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.sql_append();optimizer.garbageCollector();"
       ]
+% 586 # length
+[ 
"optimizer.inline();optimizer.candidates();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptybind();optimizer.pushselect();optimizer.aliases();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.deadcode();optimizer.reorder();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/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
@@ -95,31 +95,25 @@ end user.s4_1;
 % clob # type
 % 97 # length
 function user.s8_1():void;
-    X_41:void := querylog.define("explain select fuse(a,b) from 
udf_fuse;","sequential_pipe",27);
-    X_24 := bat.new(nil:oid,nil:str);
-    X_32 := bat.append(X_24,"sys.L");
-    X_27 := bat.new(nil:oid,nil:str);
-    X_34 := bat.append(X_27,"fuse_a");
-    X_28 := bat.new(nil:oid,nil:str);
-    X_36 := bat.append(X_28,"smallint");
-    X_29 := bat.new(nil:oid,nil:int);
-    X_38 := bat.append(X_29,16);
-    X_31 := bat.new(nil:oid,nil:int);
-    X_40 := bat.append(X_31,0);
+    X_31:void := querylog.define("explain select fuse(a,b) from 
udf_fuse;","sequential_pipe",21);
+    X_14 := bat.new(nil:oid,nil:str);
+    X_22 := bat.append(X_14,"sys.L");
+    X_17 := bat.new(nil:oid,nil:str);
+    X_24 := bat.append(X_17,"fuse_a");
+    X_18 := bat.new(nil:oid,nil:str);
+    X_26 := bat.append(X_18,"smallint");
+    X_19 := bat.new(nil:oid,nil:int);
+    X_28 := bat.append(X_19,16);
+    X_21 := bat.new(nil:oid,nil:int);
+    X_30 := bat.append(X_21,0);
     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);
-    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);
-    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);
-    X_22:bat[:sht] := batudf.fuse(X_14,X_21);
-    sql.resultSet(X_32,X_34,X_36,X_38,X_40,X_22);
+    X_8 := algebra.projection(C_2,X_5);
+    X_9:bat[:bte] := sql.bind(X_1,"sys","udf_fuse","b",0);
+    X_11 := algebra.projection(C_2,X_9);
+    X_12:bat[:sht] := batudf.fuse(X_8,X_11);
+    sql.resultSet(X_22,X_24,X_26,X_28,X_30,X_12);
 end user.s8_1;
 #explain select fuse(c,d) from udf_fuse;
 % .explain # table_name
@@ -127,31 +121,25 @@ end user.s8_1;
 % clob # type
 % 97 # length
 function user.s9_1():void;
-    X_41:void := querylog.define("explain select fuse(c,d) from 
udf_fuse;","sequential_pipe",27);
-    X_24 := bat.new(nil:oid,nil:str);
-    X_32 := bat.append(X_24,"sys.L");
-    X_27 := bat.new(nil:oid,nil:str);
-    X_34 := bat.append(X_27,"fuse_c");
-    X_28 := bat.new(nil:oid,nil:str);
-    X_36 := bat.append(X_28,"int");
-    X_29 := bat.new(nil:oid,nil:int);
-    X_38 := bat.append(X_29,32);
-    X_31 := bat.new(nil:oid,nil:int);
-    X_40 := bat.append(X_31,0);
+    X_31:void := querylog.define("explain select fuse(c,d) from 
udf_fuse;","sequential_pipe",21);
+    X_14 := bat.new(nil:oid,nil:str);
+    X_22 := bat.append(X_14,"sys.L");
+    X_17 := bat.new(nil:oid,nil:str);
+    X_24 := bat.append(X_17,"fuse_c");
+    X_18 := bat.new(nil:oid,nil:str);
+    X_26 := bat.append(X_18,"int");
+    X_19 := bat.new(nil:oid,nil:int);
+    X_28 := bat.append(X_19,32);
+    X_21 := bat.new(nil:oid,nil:int);
+    X_30 := bat.append(X_21,0);
     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);
-    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);
-    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);
-    X_22:bat[:int] := batudf.fuse(X_14,X_21);
-    sql.resultSet(X_32,X_34,X_36,X_38,X_40,X_22);
+    X_8 := algebra.projection(C_2,X_5);
+    X_9:bat[:sht] := sql.bind(X_1,"sys","udf_fuse","d",0);
+    X_11 := algebra.projection(C_2,X_9);
+    X_12:bat[:int] := batudf.fuse(X_8,X_11);
+    sql.resultSet(X_22,X_24,X_26,X_28,X_30,X_12);
 end user.s9_1;
 #explain select fuse(e,f) from udf_fuse;
 % .explain # table_name
@@ -159,31 +147,25 @@ end user.s9_1;
 % clob # type
 % 97 # length
 function user.s10_1():void;
-    X_41:void := querylog.define("explain select fuse(e,f) from 
udf_fuse;","sequential_pipe",27);
-    X_24 := bat.new(nil:oid,nil:str);
-    X_32 := bat.append(X_24,"sys.L");
-    X_27 := bat.new(nil:oid,nil:str);
-    X_34 := bat.append(X_27,"fuse_e");
-    X_28 := bat.new(nil:oid,nil:str);
-    X_36 := bat.append(X_28,"bigint");
-    X_29 := bat.new(nil:oid,nil:int);
-    X_38 := bat.append(X_29,64);
-    X_31 := bat.new(nil:oid,nil:int);
-    X_40 := bat.append(X_31,0);
+    X_31:void := querylog.define("explain select fuse(e,f) from 
udf_fuse;","sequential_pipe",21);
+    X_14 := bat.new(nil:oid,nil:str);
+    X_22 := bat.append(X_14,"sys.L");
+    X_17 := bat.new(nil:oid,nil:str);
+    X_24 := bat.append(X_17,"fuse_e");
+    X_18 := bat.new(nil:oid,nil:str);
+    X_26 := bat.append(X_18,"bigint");
+    X_19 := bat.new(nil:oid,nil:int);
+    X_28 := bat.append(X_19,64);
+    X_21 := bat.new(nil:oid,nil:int);
+    X_30 := bat.append(X_21,0);
     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);
-    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);
-    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);
-    X_22:bat[:lng] := batudf.fuse(X_14,X_21);
-    sql.resultSet(X_32,X_34,X_36,X_38,X_40,X_22);
+    X_8 := algebra.projection(C_2,X_5);
+    X_9:bat[:int] := sql.bind(X_1,"sys","udf_fuse","f",0);
+    X_11 := algebra.projection(C_2,X_9);
+    X_12:bat[:lng] := batudf.fuse(X_8,X_11);
+    sql.resultSet(X_22,X_24,X_26,X_28,X_30,X_12);
 end user.s10_1;
 #select fuse(a,b) from udf_fuse;
 % sys.L # table_name
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
@@ -84,26 +84,23 @@ end user.s2_1;
 % clob # type
 % 101 # length
 function user.s6_1():void;
-    X_33:void := querylog.define("explain select reverse(x) from 
udf_reverse;","sequential_pipe",22);
-    X_17 := bat.new(nil:oid,nil:str);
-    X_25 := bat.append(X_17,"sys.L");
-    X_20 := bat.new(nil:oid,nil:str);
-    X_27 := bat.append(X_20,"reverse_x");
-    X_21 := bat.new(nil:oid,nil:str);
-    X_29 := bat.append(X_21,"clob");
-    X_22 := bat.new(nil:oid,nil:int);
-    X_31 := bat.append(X_22,0);
-    X_24 := bat.new(nil:oid,nil:int);
-    X_32 := bat.append(X_24,0);
+    X_27:void := querylog.define("explain select reverse(x) from 
udf_reverse;","sequential_pipe",19);
+    X_11 := bat.new(nil:oid,nil:str);
+    X_19 := bat.append(X_11,"sys.L");
+    X_14 := bat.new(nil:oid,nil:str);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to