Changeset: db8dd83cac69 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=db8dd83cac69
Modified Files:
        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/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
Branch: resultset
Log Message:

Accept new output


diffs (truncated from 3904 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
@@ -27,10 +27,10 @@ Ready.
 % .explain # table_name
 % mal # name
 % clob # type
-% 73 # length
+% 64 # length
 function user.s2_1{autoCommit=true}(A0:bte,A1:bte):void;
     X_4 := udf.fuse(A0,A1);
-    sql.exportValue(1,".L","fuse_single_value","smallint",16,0,6,X_4,"");
+    sql.resultSet(".L","fuse_single_value","smallint",16,0,X_4);
 end s2_1;
 # querylog.define("explain select fuse(1,2);","default_pipe")
 #select fuse(1,2);
@@ -46,7 +46,7 @@ end s2_1;
 % 70 # length
 function user.s3_1{autoCommit=true}(A0:sht,A1:sht):void;
     X_4 := udf.fuse(A0,A1);
-    sql.exportValue(1,".L","fuse_single_value","int",32,0,6,X_4,"");
+    sql.resultSet(".L","fuse_single_value","int",32,0,X_4);
 end s3_1;
 # querylog.define("explain select fuse(1000,2000);","default_pipe")
 #select fuse(1000,2000);
@@ -62,7 +62,7 @@ end s3_1;
 % 76 # length
 function user.s4_1{autoCommit=true}(A0:int,A1:int):void;
     X_4 := udf.fuse(A0,A1);
-    sql.exportValue(1,".L","fuse_single_value","bigint",64,0,6,X_4,"");
+    sql.resultSet(".L","fuse_single_value","bigint",64,0,X_4);
 end s4_1;
 # querylog.define("explain select fuse(1000000,2000000);","default_pipe")
 #select fuse(1000000,2000000);
@@ -95,6 +95,16 @@ end s4_1;
 % clob # type
 % 78 # length
 function user.s8_1{autoCommit=true}():void;
+    X_24 := bat.new(nil:oid,nil:str);
+    X_33 := bat.append(X_24,"sys.L");
+    X_27 := bat.new(nil:oid,nil:str);
+    X_35 := bat.append(X_27,"fuse_a");
+    X_28 := bat.new(nil:oid,nil:str);
+    X_37 := bat.append(X_28,"smallint");
+    X_29 := bat.new(nil:oid,nil:int);
+    X_39 := bat.append(X_29,16);
+    X_31 := bat.new(nil:oid,nil:int);
+    X_41 := bat.append(X_31,0);
     X_2 := sql.mvc();
     X_3:bat[:oid,:oid]  := sql.tid(X_2,"sys","udf_fuse");
     X_6:bat[:oid,:bte]  := sql.bind(X_2,"sys","udf_fuse","a",0);
@@ -108,10 +118,7 @@ function user.s8_1{autoCommit=true}():vo
     X_21 := sql.delta(X_16,X_18,r1_18,X_20);
     X_22 := algebra.leftfetchjoin(X_3,X_21);
     X_23:bat[:oid,:sht]  := batudf.fuse(X_15,X_22);
-    X_24 := sql.resultSet(1,1,X_23);
-    sql.rsColumn(X_24,"sys.L","fuse_a","smallint",16,0,X_23);
-    X_30 := io.stdout();
-    sql.exportResult(X_30,X_24);
+    sql.resultSet(X_33,X_35,X_37,X_39,X_41,X_23);
 end s8_1;
 # querylog.define("explain select fuse(a,b) from udf_fuse;","sequential_pipe")
 #explain select fuse(c,d) from udf_fuse;
@@ -120,6 +127,16 @@ end s8_1;
 % clob # type
 % 78 # length
 function user.s9_1{autoCommit=true}():void;
+    X_24 := bat.new(nil:oid,nil:str);
+    X_33 := bat.append(X_24,"sys.L");
+    X_27 := bat.new(nil:oid,nil:str);
+    X_35 := bat.append(X_27,"fuse_c");
+    X_28 := bat.new(nil:oid,nil:str);
+    X_37 := bat.append(X_28,"int");
+    X_29 := bat.new(nil:oid,nil:int);
+    X_39 := bat.append(X_29,32);
+    X_31 := bat.new(nil:oid,nil:int);
+    X_41 := bat.append(X_31,0);
     X_2 := sql.mvc();
     X_3:bat[:oid,:oid]  := sql.tid(X_2,"sys","udf_fuse");
     X_6:bat[:oid,:sht]  := sql.bind(X_2,"sys","udf_fuse","c",0);
@@ -133,10 +150,7 @@ function user.s9_1{autoCommit=true}():vo
     X_21 := sql.delta(X_16,X_18,r1_18,X_20);
     X_22 := algebra.leftfetchjoin(X_3,X_21);
     X_23:bat[:oid,:int]  := batudf.fuse(X_15,X_22);
-    X_24 := sql.resultSet(1,1,X_23);
-    sql.rsColumn(X_24,"sys.L","fuse_c","int",32,0,X_23);
-    X_30 := io.stdout();
-    sql.exportResult(X_30,X_24);
+    sql.resultSet(X_33,X_35,X_37,X_39,X_41,X_23);
 end s9_1;
 # querylog.define("explain select fuse(c,d) from udf_fuse;","sequential_pipe")
 #explain select fuse(e,f) from udf_fuse;
@@ -145,6 +159,16 @@ end s9_1;
 % clob # type
 % 78 # length
 function user.s10_1{autoCommit=true}():void;
+    X_24 := bat.new(nil:oid,nil:str);
+    X_33 := bat.append(X_24,"sys.L");
+    X_27 := bat.new(nil:oid,nil:str);
+    X_35 := bat.append(X_27,"fuse_e");
+    X_28 := bat.new(nil:oid,nil:str);
+    X_37 := bat.append(X_28,"bigint");
+    X_29 := bat.new(nil:oid,nil:int);
+    X_39 := bat.append(X_29,64);
+    X_31 := bat.new(nil:oid,nil:int);
+    X_41 := bat.append(X_31,0);
     X_2 := sql.mvc();
     X_3:bat[:oid,:oid]  := sql.tid(X_2,"sys","udf_fuse");
     X_6:bat[:oid,:int]  := sql.bind(X_2,"sys","udf_fuse","e",0);
@@ -158,10 +182,7 @@ function user.s10_1{autoCommit=true}():v
     X_21 := sql.delta(X_16,X_18,r1_18,X_20);
     X_22 := algebra.leftfetchjoin(X_3,X_21);
     X_23:bat[:oid,:lng]  := batudf.fuse(X_15,X_22);
-    X_24 := sql.resultSet(1,1,X_23);
-    sql.rsColumn(X_24,"sys.L","fuse_e","bigint",64,0,X_23);
-    X_30 := io.stdout();
-    sql.exportResult(X_30,X_24);
+    sql.resultSet(X_33,X_35,X_37,X_39,X_41,X_23);
 end s10_1;
 # querylog.define("explain select fuse(e,f) from udf_fuse;","sequential_pipe")
 #select fuse(a,b) from udf_fuse;
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
@@ -51,7 +51,7 @@ Ready.
 % 77 # length
 function user.s2_1{autoCommit=true}(A0:str):void;
     X_3 := udf.reverse(A0);
-    sql.exportValue(1,".L","reverse_single_value","clob",0,0,4,X_3,"");
+    sql.resultSet(".L","reverse_single_value","clob",0,0,X_3);
 end s2_1;
 # querylog.define("explain select reverse(\\'MonetDB\\');","default_pipe")
 #select reverse('MonetDB');
@@ -84,6 +84,16 @@ end s2_1;
 % clob # type
 % 82 # length
 function user.s6_1{autoCommit=true}():void;
+    X_17 := bat.new(nil:oid,nil:str);
+    X_26 := bat.append(X_17,"sys.L");
+    X_20 := bat.new(nil:oid,nil:str);
+    X_28 := bat.append(X_20,"reverse_x");
+    X_21 := bat.new(nil:oid,nil:str);
+    X_30 := bat.append(X_21,"clob");
+    X_22 := bat.new(nil:oid,nil:int);
+    X_32 := bat.append(X_22,0);
+    X_24 := bat.new(nil:oid,nil:int);
+    X_33 := bat.append(X_24,0);
     X_2 := sql.mvc();
     X_3:bat[:oid,:oid]  := sql.tid(X_2,"sys","udf_reverse");
     X_6:bat[:oid,:str]  := sql.bind(X_2,"sys","udf_reverse","x",0);
@@ -92,10 +102,7 @@ function user.s6_1{autoCommit=true}():vo
     X_14 := sql.delta(X_6,X_9,r1_9,X_12);
     X_15 := algebra.leftfetchjoin(X_3,X_14);
     X_16:bat[:oid,:str]  := batudf.reverse(X_15);
-    X_17 := sql.resultSet(1,1,X_16);
-    sql.rsColumn(X_17,"sys.L","reverse_x","clob",0,0,X_16);
-    X_22 := io.stdout();
-    sql.exportResult(X_22,X_17);
+    sql.resultSet(X_26,X_28,X_30,X_32,X_33,X_16);
 end s6_1;
 # querylog.define("explain select reverse(x) from 
udf_reverse;","sequential_pipe")
 #select reverse(x) from udf_reverse;
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,30 +42,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_92 := algebra.subselect(X_18,X_7,A1,A2,true,true,false);
+    X_90 := 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_93 := algebra.subselect(r1_23,nil:bat[:oid,:oid],A1,A2,true,true,false);
+    X_91 := 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_95 := algebra.subselect(X_22,X_7,A1,A2,true,true,false);
-    X_23 := sql.subdelta(X_92,X_7,X_20,X_93,X_95);
-    X_96 := algebra.thetasubselect(X_10,X_23,A3,"<");
+    X_93 := algebra.subselect(X_22,X_7,A1,A2,true,true,false);
+    X_23 := sql.subdelta(X_90,X_7,X_20,X_91,X_93);
+    X_94 := algebra.thetasubselect(X_10,X_23,A3,"<");
     (X_13,r1_13) := sql.bind(X_6,"sys","lineorder","lo_quantity",2);
-    X_97 := algebra.thetasubselect(r1_13,nil:bat[:oid,:oid],A3,"<");
+    X_95 := algebra.thetasubselect(r1_13,nil:bat[:oid,:oid],A3,"<");
     X_16:bat[:oid,:int]  := sql.bind(X_6,"sys","lineorder","lo_quantity",1);
-    X_99 := algebra.thetasubselect(X_16,X_23,A3,"<");
-    X_25 := sql.subdelta(X_96,X_23,X_13,X_97,X_99);
+    X_97 := algebra.thetasubselect(X_16,X_23,A3,"<");
+    X_25 := sql.subdelta(X_94,X_23,X_13,X_95,X_97);
     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_36:bat[:oid,:int]  := sql.bind(X_6,"sys","dwdate","d_year",0);
     X_33:bat[:oid,:oid]  := sql.tid(X_6,"sys","dwdate");
-    X_100 := algebra.subselect(X_36,X_33,A0,A0,true,true,false);
+    X_98 := algebra.subselect(X_36,X_33,A0,A0,true,true,false);
     (X_39,r1_48) := sql.bind(X_6,"sys","dwdate","d_year",2);
-    X_101 := algebra.subselect(r1_48,nil:bat[:oid,:oid],A0,A0,true,true,false);
+    X_99 := algebra.subselect(r1_48,nil:bat[:oid,:oid],A0,A0,true,true,false);
     X_42:bat[:oid,:int]  := sql.bind(X_6,"sys","dwdate","d_year",1);
-    X_103 := algebra.subselect(X_42,X_33,A0,A0,true,true,false);
-    X_44 := sql.subdelta(X_100,X_33,X_39,X_101,X_103);
+    X_101 := algebra.subselect(X_42,X_33,A0,A0,true,true,false);
+    X_44 := sql.subdelta(X_98,X_33,X_39,X_99,X_101);
     X_46 := X_44;
     (X_47,r1_59) := algebra.subjoin(X_32,X_46,nil:BAT,nil:BAT,true,nil:lng);
     X_51:bat[:oid,:int]  := 
sql.bind(X_6,"sys","lineorder","lo_extendedprice",0);
@@ -78,7 +78,7 @@ function user.s2_1{autoCommit=true}(A0:i
     X_61 := algebra.leftfetchjoin(X_47,X_60);
     X_62:bat[:oid,:hge]  := batcalc.*(X_59,X_61);
     X_63:hge  := aggr.sum(X_62);
-    sql.exportValue(1,"sys.L1","revenue","hugeint",128,0,6,X_63,"");
+    sql.resultSet("sys.L1","revenue","hugeint",128,0,X_63);
 end s2_1;
 # querylog.define("explain\nselect sum(lo_extendedprice*lo_discount) as 
revenue\n\tfrom lineorder, dwdate\n\twhere lo_orderdate = d_datekey\n\t\tand 
d_year = 1993\n\t\tand lo_discount between 1 and 3\n\t\tand lo_quantity < 
25;","sequential_pipe")
 
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,30 +42,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_92 := algebra.subselect(X_19,X_8,A1,A2,true,true,false);
+    X_90 := 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_93 := algebra.subselect(r1_25,nil:bat[:oid,:oid],A1,A2,true,true,false);
+    X_91 := 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_95 := algebra.subselect(X_23,X_8,A1,A2,true,true,false);
-    X_24 := sql.subdelta(X_92,X_8,X_21,X_93,X_95);
-    X_96 := algebra.subselect(X_11,X_24,A3,A4,true,true,false);
+    X_93 := algebra.subselect(X_23,X_8,A1,A2,true,true,false);
+    X_24 := sql.subdelta(X_90,X_8,X_21,X_91,X_93);
+    X_94 := 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_97 := algebra.subselect(r1_14,nil:bat[:oid,:oid],A3,A4,true,true,false);
+    X_95 := 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_99 := algebra.subselect(X_17,X_24,A3,A4,true,true,false);
-    X_26 := sql.subdelta(X_96,X_24,X_14,X_97,X_99);
+    X_97 := algebra.subselect(X_17,X_24,A3,A4,true,true,false);
+    X_26 := sql.subdelta(X_94,X_24,X_14,X_95,X_97);
     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_36:bat[:oid,:int]  := sql.bind(X_7,"sys","dwdate","d_yearmonthnum",0);
     X_33:bat[:oid,:oid]  := sql.tid(X_7,"sys","dwdate");
-    X_100 := algebra.subselect(X_36,X_33,A0,A0,true,true,false);
+    X_98 := algebra.subselect(X_36,X_33,A0,A0,true,true,false);
     (X_39,r1_49) := sql.bind(X_7,"sys","dwdate","d_yearmonthnum",2);
-    X_101 := algebra.subselect(r1_49,nil:bat[:oid,:oid],A0,A0,true,true,false);
+    X_99 := algebra.subselect(r1_49,nil:bat[:oid,:oid],A0,A0,true,true,false);
     X_42:bat[:oid,:int]  := sql.bind(X_7,"sys","dwdate","d_yearmonthnum",1);
-    X_103 := algebra.subselect(X_42,X_33,A0,A0,true,true,false);
-    X_44 := sql.subdelta(X_100,X_33,X_39,X_101,X_103);
+    X_101 := algebra.subselect(X_42,X_33,A0,A0,true,true,false);
+    X_44 := sql.subdelta(X_98,X_33,X_39,X_99,X_101);
     X_46 := X_44;
     (X_47,r1_60) := algebra.subjoin(X_32,X_46,nil:BAT,nil:BAT,true,nil:lng);
     X_51:bat[:oid,:int]  := 
sql.bind(X_7,"sys","lineorder","lo_extendedprice",0);
@@ -78,7 +78,7 @@ function user.s2_1{autoCommit=true}(A0:i
     X_61 := algebra.leftfetchjoin(X_47,X_60);
     X_62:bat[:oid,:hge]  := batcalc.*(X_59,X_61);
     X_63:hge  := aggr.sum(X_62);
-    sql.exportValue(1,"sys.L1","revenue","hugeint",128,0,6,X_63,"");
+    sql.resultSet("sys.L1","revenue","hugeint",128,0,X_63);
 end s2_1;
 # querylog.define("explain\nselect sum(lo_extendedprice*lo_discount) as 
revenue\n\tfrom lineorder, dwdate\n\twhere lo_orderdate = d_datekey\n\t\tand 
d_yearmonthnum = 199401\n\t\tand lo_discount between 4 and 6\n\t\tand 
lo_quantity between 26 and 35;","sequential_pipe")
 
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
@@ -42,18 +42,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_103 := algebra.subselect(X_20,X_9,A2,A3,true,true,false);
+    X_100 := 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_104 := algebra.subselect(r1_26,nil:bat[:oid,:oid],A2,A3,true,true,false);
+    X_101 := 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_106 := algebra.subselect(X_24,X_9,A2,A3,true,true,false);
-    X_25 := sql.subdelta(X_103,X_9,X_22,X_104,X_106);
-    X_107 := algebra.subselect(X_12,X_25,A4,A5,true,true,false);
+    X_103 := algebra.subselect(X_24,X_9,A2,A3,true,true,false);
+    X_25 := sql.subdelta(X_100,X_9,X_22,X_101,X_103);
+    X_104 := 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_108 := algebra.subselect(r1_15,nil:bat[:oid,:oid],A4,A5,true,true,false);
+    X_105 := 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_110 := algebra.subselect(X_18,X_25,A4,A5,true,true,false);
-    X_27 := sql.subdelta(X_107,X_25,X_15,X_108,X_110);
+    X_107 := algebra.subselect(X_18,X_25,A4,A5,true,true,false);
+    X_27 := sql.subdelta(X_104,X_25,X_15,X_105,X_107);
     X_28:bat[:oid,:oid]  := 
sql.bind_idxbat(X_8,"sys","lineorder","lineorder_lo_orderdate_fkey",0);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to