Changeset: c6d2771a6b8a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c6d2771a6b8a
Modified Files:
        sql/benchmarks/ssbm/Tests/01-explain.stable.out
        sql/benchmarks/ssbm/Tests/02-explain.stable.out
        sql/benchmarks/ssbm/Tests/03-explain.stable.out
        sql/benchmarks/ssbm/Tests/04-explain.stable.out
        sql/benchmarks/ssbm/Tests/05-explain.stable.out
        sql/benchmarks/ssbm/Tests/06-explain.stable.out
        sql/benchmarks/ssbm/Tests/07-explain.stable.out
        sql/benchmarks/ssbm/Tests/08-explain.stable.out
        sql/benchmarks/ssbm/Tests/09-explain.stable.out
        sql/benchmarks/ssbm/Tests/10-explain.stable.out
        sql/benchmarks/ssbm/Tests/11-explain.stable.out
        sql/benchmarks/ssbm/Tests/12-explain.stable.out
        sql/benchmarks/ssbm/Tests/13-explain.stable.out
        sql/benchmarks/tpch/Tests/01-explain.stable.out
        sql/benchmarks/tpch/Tests/03-explain.stable.out
        sql/benchmarks/tpch/Tests/05-explain.stable.out
        sql/benchmarks/tpch/Tests/06-explain.stable.out
        sql/benchmarks/tpch/Tests/07-explain.stable.out
        sql/benchmarks/tpch/Tests/08-explain.stable.out
        sql/benchmarks/tpch/Tests/09-explain.stable.out
        sql/benchmarks/tpch/Tests/09-plan.stable.out
        sql/benchmarks/tpch/Tests/10-explain.stable.out
        sql/benchmarks/tpch/Tests/11-explain.stable.out
        sql/benchmarks/tpch/Tests/12-explain.stable.out
        sql/benchmarks/tpch/Tests/14-explain.stable.out
        sql/benchmarks/tpch/Tests/15-explain.stable.out
        sql/benchmarks/tpch/Tests/17-explain.stable.out
        sql/benchmarks/tpch/Tests/18-explain.stable.out
        sql/benchmarks/tpch/Tests/19-explain.stable.out
        sql/benchmarks/tpch/Tests/20-explain.stable.out
        sql/benchmarks/tpch/Tests/20-plan.stable.out
        sql/benchmarks/tpch/Tests/22-explain.stable.out
        sql/test/Tests/systemfunctions.stable.out
        sql/test/Tests/systemfunctions.stable.out.int128
        sql/test/Tests/systemfunctions_bam.stable.out
        sql/test/Tests/systemfunctions_bam.stable.out.int128
        sql/test/Tests/systemfunctions_gsl.stable.out
        sql/test/Tests/systemfunctions_gsl.stable.out.int128
        sql/test/Tests/systemfunctions_nogeom.stable.out
        sql/test/Tests/systemfunctions_nogeom.stable.out.int128
Branch: default
Log Message:

Approved recent cleanup changes.


diffs (truncated from 4708 to 300 lines):

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,43 +42,43 @@ 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_90 := algebra.subselect(X_18,X_7,A1,A2,true,true,false);
+    X_92 := 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_91 := algebra.subselect(r1_23,A1,A2,true,true,false);
+    X_93 := 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_92 := algebra.subselect(X_22,X_7,A1,A2,true,true,false);
-    X_23 := sql.subdelta(X_90,X_7,X_20,X_91,X_92);
-    X_93 := algebra.thetasubselect(X_10,X_23,A3,"<");
+    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_13,r1_13) := sql.bind(X_6,"sys","lineorder","lo_quantity",2);
-    X_94 := algebra.thetasubselect(r1_13,A3,"<");
+    X_97 := algebra.thetasubselect(r1_13,nil:bat[:oid,:oid],A3,"<");
     X_16:bat[:oid,:int]  := sql.bind(X_6,"sys","lineorder","lo_quantity",1);
-    X_95 := algebra.thetasubselect(X_16,X_23,A3,"<");
-    X_25 := sql.subdelta(X_93,X_23,X_13,X_94,X_95);
+    X_99 := algebra.thetasubselect(X_16,X_23,A3,"<");
+    X_25 := sql.subdelta(X_96,X_23,X_13,X_97,X_99);
     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_96 := algebra.subselect(X_36,X_33,A0,A0,true,true,false);
+    X_100 := 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_97 := algebra.subselect(r1_48,A0,A0,true,true,false);
+    X_101 := 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_98 := algebra.subselect(X_42,X_33,A0,A0,true,true,false);
-    X_44 := sql.subdelta(X_96,X_33,X_39,X_97,X_98);
+    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_46 := X_44;
-    (X_47,r1_59) := algebra.join(X_32,X_46);
-    X_49:bat[:oid,:int]  := 
sql.bind(X_6,"sys","lineorder","lo_extendedprice",0);
-    (X_52,r1_64) := sql.bind(X_6,"sys","lineorder","lo_extendedprice",2);
-    X_54:bat[:oid,:int]  := 
sql.bind(X_6,"sys","lineorder","lo_extendedprice",1);
-    X_55 := sql.projectdelta(X_25,X_49,X_52,r1_64,X_54);
-    X_56 := algebra.leftfetchjoin(X_47,X_55);
-    X_57 := batcalc.lng(X_56);
-    X_58 := sql.projectdelta(X_25,X_18,X_20,r1_23,X_22);
-    X_59 := algebra.leftfetchjoin(X_47,X_58);
-    X_60:bat[:oid,:lng]  := batcalc.*(X_57,X_59);
-    X_61:lng  := aggr.sum(X_60);
-    sql.exportValue(1,"sys.L1","revenue","bigint",53,0,6,X_61,"");
+    (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);
+    (X_54,r1_66) := sql.bind(X_6,"sys","lineorder","lo_extendedprice",2);
+    X_56:bat[:oid,:int]  := 
sql.bind(X_6,"sys","lineorder","lo_extendedprice",1);
+    X_57 := sql.projectdelta(X_25,X_51,X_54,r1_66,X_56);
+    X_58 := algebra.leftfetchjoin(X_47,X_57);
+    X_59 := batcalc.lng(X_58);
+    X_60 := sql.projectdelta(X_25,X_18,X_20,r1_23,X_22);
+    X_61 := algebra.leftfetchjoin(X_47,X_60);
+    X_62:bat[:oid,:lng]  := batcalc.*(X_59,X_61);
+    X_63:lng  := aggr.sum(X_62);
+    sql.exportValue(1,"sys.L1","revenue","bigint",53,0,6,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 
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,43 +42,43 @@ 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_90 := algebra.subselect(X_19,X_8,A1,A2,true,true,false);
+    X_92 := 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_91 := algebra.subselect(r1_25,A1,A2,true,true,false);
+    X_93 := 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_92 := algebra.subselect(X_23,X_8,A1,A2,true,true,false);
-    X_24 := sql.subdelta(X_90,X_8,X_21,X_91,X_92);
-    X_93 := algebra.subselect(X_11,X_24,A3,A4,true,true,false);
+    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_14,r1_14) := sql.bind(X_7,"sys","lineorder","lo_quantity",2);
-    X_94 := algebra.subselect(r1_14,A3,A4,true,true,false);
+    X_97 := 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_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_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_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_96 := algebra.subselect(X_36,X_33,A0,A0,true,true,false);
+    X_100 := 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_97 := algebra.subselect(r1_49,A0,A0,true,true,false);
+    X_101 := 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_98 := algebra.subselect(X_42,X_33,A0,A0,true,true,false);
-    X_44 := sql.subdelta(X_96,X_33,X_39,X_97,X_98);
+    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_46 := X_44;
-    (X_47,r1_60) := algebra.join(X_32,X_46);
-    X_49:bat[:oid,:int]  := 
sql.bind(X_7,"sys","lineorder","lo_extendedprice",0);
-    (X_52,r1_65) := sql.bind(X_7,"sys","lineorder","lo_extendedprice",2);
-    X_54:bat[:oid,:int]  := 
sql.bind(X_7,"sys","lineorder","lo_extendedprice",1);
-    X_55 := sql.projectdelta(X_26,X_49,X_52,r1_65,X_54);
-    X_56 := algebra.leftfetchjoin(X_47,X_55);
-    X_57 := batcalc.lng(X_56);
-    X_58 := sql.projectdelta(X_26,X_19,X_21,r1_25,X_23);
-    X_59 := algebra.leftfetchjoin(X_47,X_58);
-    X_60:bat[:oid,:lng]  := batcalc.*(X_57,X_59);
-    X_61:lng  := aggr.sum(X_60);
-    sql.exportValue(1,"sys.L1","revenue","bigint",53,0,6,X_61,"");
+    (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);
+    (X_54,r1_67) := sql.bind(X_7,"sys","lineorder","lo_extendedprice",2);
+    X_56:bat[:oid,:int]  := 
sql.bind(X_7,"sys","lineorder","lo_extendedprice",1);
+    X_57 := sql.projectdelta(X_26,X_51,X_54,r1_67,X_56);
+    X_58 := algebra.leftfetchjoin(X_47,X_57);
+    X_59 := batcalc.lng(X_58);
+    X_60 := sql.projectdelta(X_26,X_19,X_21,r1_25,X_23);
+    X_61 := algebra.leftfetchjoin(X_47,X_60);
+    X_62:bat[:oid,:lng]  := batcalc.*(X_59,X_61);
+    X_63:lng  := aggr.sum(X_62);
+    sql.exportValue(1,"sys.L1","revenue","bigint",53,0,6,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 
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
@@ -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_101 := algebra.subselect(X_20,X_9,A2,A3,true,true,false);
+    X_103 := 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_102 := algebra.subselect(r1_26,A2,A3,true,true,false);
+    X_104 := 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_103 := algebra.subselect(X_24,X_9,A2,A3,true,true,false);
-    X_25 := sql.subdelta(X_101,X_9,X_22,X_102,X_103);
-    X_104 := algebra.subselect(X_12,X_25,A4,A5,true,true,false);
+    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_15,r1_15) := sql.bind(X_8,"sys","lineorder","lo_quantity",2);
-    X_105 := algebra.subselect(r1_15,A4,A5,true,true,false);
+    X_108 := 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_106 := algebra.subselect(X_18,X_25,A4,A5,true,true,false);
-    X_27 := sql.subdelta(X_104,X_25,X_15,X_105,X_106);
+    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_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);
@@ -61,31 +61,31 @@ function user.s2_1{autoCommit=true}(A0:i
     X_37:bat[:oid,:int]  := sql.bind(X_8,"sys","dwdate","d_weeknuminyear",0);
     X_45:bat[:oid,:int]  := sql.bind(X_8,"sys","dwdate","d_year",0);
     X_34:bat[:oid,:oid]  := sql.tid(X_8,"sys","dwdate");
-    X_107 := algebra.subselect(X_45,X_34,A1,A1,true,true,false);
+    X_111 := algebra.subselect(X_45,X_34,A1,A1,true,true,false);
     (X_47,r1_60) := sql.bind(X_8,"sys","dwdate","d_year",2);
-    X_108 := algebra.subselect(r1_60,A1,A1,true,true,false);
+    X_112 := algebra.subselect(r1_60,nil:bat[:oid,:oid],A1,A1,true,true,false);
     X_49:bat[:oid,:int]  := sql.bind(X_8,"sys","dwdate","d_year",1);
-    X_109 := algebra.subselect(X_49,X_34,A1,A1,true,true,false);
-    X_50 := sql.subdelta(X_107,X_34,X_47,X_108,X_109);
-    X_110 := algebra.subselect(X_37,X_50,A0,A0,true,true,false);
+    X_114 := algebra.subselect(X_49,X_34,A1,A1,true,true,false);
+    X_50 := sql.subdelta(X_111,X_34,X_47,X_112,X_114);
+    X_115 := algebra.subselect(X_37,X_50,A0,A0,true,true,false);
     (X_40,r1_50) := sql.bind(X_8,"sys","dwdate","d_weeknuminyear",2);
-    X_111 := algebra.subselect(r1_50,A0,A0,true,true,false);
+    X_116 := algebra.subselect(r1_50,nil:bat[:oid,:oid],A0,A0,true,true,false);
     X_43:bat[:oid,:int]  := sql.bind(X_8,"sys","dwdate","d_weeknuminyear",1);
-    X_112 := algebra.subselect(X_43,X_50,A0,A0,true,true,false);
-    X_53 := sql.subdelta(X_110,X_50,X_40,X_111,X_112);
+    X_118 := algebra.subselect(X_43,X_50,A0,A0,true,true,false);
+    X_53 := sql.subdelta(X_115,X_50,X_40,X_116,X_118);
     X_54 := X_53;
-    (X_55,r1_71) := algebra.join(X_33,X_54);
-    X_57:bat[:oid,:int]  := 
sql.bind(X_8,"sys","lineorder","lo_extendedprice",0);
-    (X_60,r1_76) := sql.bind(X_8,"sys","lineorder","lo_extendedprice",2);
-    X_63:bat[:oid,:int]  := 
sql.bind(X_8,"sys","lineorder","lo_extendedprice",1);
-    X_64 := sql.projectdelta(X_27,X_57,X_60,r1_76,X_63);
-    X_65 := algebra.leftfetchjoin(X_55,X_64);
-    X_66 := batcalc.lng(X_65);
-    X_67 := sql.projectdelta(X_27,X_20,X_22,r1_26,X_24);
-    X_68 := algebra.leftfetchjoin(X_55,X_67);
-    X_69:bat[:oid,:lng]  := batcalc.*(X_66,X_68);
-    X_70:lng  := aggr.sum(X_69);
-    sql.exportValue(1,"sys.L1","revenue","bigint",53,0,6,X_70,"");
+    (X_55,r1_71) := algebra.subjoin(X_33,X_54,nil:BAT,nil:BAT,true,nil:lng);
+    X_59:bat[:oid,:int]  := 
sql.bind(X_8,"sys","lineorder","lo_extendedprice",0);
+    (X_62,r1_78) := sql.bind(X_8,"sys","lineorder","lo_extendedprice",2);
+    X_65:bat[:oid,:int]  := 
sql.bind(X_8,"sys","lineorder","lo_extendedprice",1);
+    X_66 := sql.projectdelta(X_27,X_59,X_62,r1_78,X_65);
+    X_67 := algebra.leftfetchjoin(X_55,X_66);
+    X_68 := batcalc.lng(X_67);
+    X_69 := sql.projectdelta(X_27,X_20,X_22,r1_26,X_24);
+    X_70 := algebra.leftfetchjoin(X_55,X_69);
+    X_71:bat[:oid,:lng]  := batcalc.*(X_68,X_70);
+    X_72:lng  := aggr.sum(X_71);
+    sql.exportValue(1,"sys.L1","revenue","bigint",53,0,6,X_72,"");
 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_weeknuminyear = 6 and d_year = 1994\n\t\tand lo_discount between 5 and 
7\n\t\tand lo_quantity between 36 and 40;","sequential_pipe")
 
diff --git a/sql/benchmarks/ssbm/Tests/04-explain.stable.out 
b/sql/benchmarks/ssbm/Tests/04-explain.stable.out
--- a/sql/benchmarks/ssbm/Tests/04-explain.stable.out
+++ b/sql/benchmarks/ssbm/Tests/04-explain.stable.out
@@ -49,69 +49,69 @@ 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_160 := algebra.subselect(X_19,X_17,A0,A0,true,true,false);
+    X_165 := algebra.subselect(X_19,X_17,A0,A0,true,true,false);
     (X_21,r1_22) := sql.bind(X_4,"sys","part","p_category",2);
-    X_161 := algebra.subselect(r1_22,A0,A0,true,true,false);
+    X_166 := algebra.subselect(r1_22,nil:bat[:oid,:oid],A0,A0,true,true,false);
     X_23:bat[:oid,:str]  := sql.bind(X_4,"sys","part","p_category",1);
-    X_162 := algebra.subselect(X_23,X_17,A0,A0,true,true,false);
-    X_24 := sql.subdelta(X_160,X_17,X_21,X_161,X_162);
+    X_168 := algebra.subselect(X_23,X_17,A0,A0,true,true,false);
+    X_24 := sql.subdelta(X_165,X_17,X_21,X_166,X_168);
     X_26 := X_24;
-    (X_27,r1_31) := algebra.join(X_16,X_26);
-    X_29:bat[:oid,:oid]  := 
sql.bind_idxbat(X_4,"sys","lineorder","lineorder_lo_suppkey_fkey",0);
-    (X_31,r1_35) := 
sql.bind_idxbat(X_4,"sys","lineorder","lineorder_lo_suppkey_fkey",2);
-    X_33:bat[:oid,:oid]  := 
sql.bind_idxbat(X_4,"sys","lineorder","lineorder_lo_suppkey_fkey",1);
-    X_34 := sql.projectdelta(X_5,X_29,X_31,r1_35,X_33);
-    X_35 := algebra.leftfetchjoin(X_27,X_34);
-    X_39:bat[:oid,:str]  := sql.bind(X_4,"sys","supplier","s_region",0);
-    X_36:bat[:oid,:oid]  := sql.tid(X_4,"sys","supplier");
-    X_163 := algebra.subselect(X_39,X_36,A1,A1,true,true,false);
-    (X_42,r1_47) := sql.bind(X_4,"sys","supplier","s_region",2);
-    X_164 := algebra.subselect(r1_47,A1,A1,true,true,false);
-    X_45:bat[:oid,:str]  := sql.bind(X_4,"sys","supplier","s_region",1);
-    X_165 := algebra.subselect(X_45,X_36,A1,A1,true,true,false);
-    X_47 := sql.subdelta(X_163,X_36,X_42,X_164,X_165);
-    X_49 := X_47;
-    (X_50,r1_58) := algebra.join(X_35,X_49);
-    X_166 := algebra.leftfetchjoin(X_50,X_27);
-    X_52:bat[:oid,:oid]  := 
sql.bind_idxbat(X_4,"sys","lineorder","lineorder_lo_orderdate_fkey",0);
-    (X_55,r1_63) := 
sql.bind_idxbat(X_4,"sys","lineorder","lineorder_lo_orderdate_fkey",2);
-    X_57:bat[:oid,:oid]  := 
sql.bind_idxbat(X_4,"sys","lineorder","lineorder_lo_orderdate_fkey",1);
-    X_58 := sql.projectdelta(X_5,X_52,X_55,r1_63,X_57);
-    X_59:bat[:oid,:oid]  := algebra.leftfetchjoin(X_166,X_58);
-    X_60:bat[:oid,:oid]  := sql.tid(X_4,"sys","dwdate");
-    (X_62,r1_72) := algebra.join(X_59,X_60);
-    X_167 := algebra.leftfetchjoin(X_62,X_50);
-    X_64:bat[:oid,:str]  := sql.bind(X_4,"sys","part","p_brand1",0);
-    (X_68,r1_78) := sql.bind(X_4,"sys","part","p_brand1",2);
-    X_70:bat[:oid,:str]  := sql.bind(X_4,"sys","part","p_brand1",1);
-    X_71 := sql.projectdelta(X_24,X_64,X_68,r1_78,X_70);
-    X_72:bat[:oid,:str]  := algebra.leftfetchjoinPath(X_167,r1_31,X_71);
-    X_73:bat[:oid,:int]  := sql.bind(X_4,"sys","dwdate","d_year",0);
-    (X_76,r1_90) := sql.bind(X_4,"sys","dwdate","d_year",2);
-    X_79:bat[:oid,:int]  := sql.bind(X_4,"sys","dwdate","d_year",1);
-    X_81 := sql.projectdelta(X_60,X_73,X_76,r1_90,X_79);
-    X_82 := algebra.leftfetchjoin(r1_72,X_81);
-    (X_83,r1_98,r2_98) := group.subgroup(X_82);
-    (X_86,r1_101,r2_101) := group.subgroupdone(X_72,X_83);
-    X_89 := algebra.leftfetchjoin(r1_101,X_72);
-    X_90 := algebra.leftfetchjoin(r1_101,X_82);
-    X_98:bat[:oid,:int]  := sql.bind(X_4,"sys","lineorder","lo_revenue",0);
-    (X_102,r1_117) := sql.bind(X_4,"sys","lineorder","lo_revenue",2);
-    X_104:bat[:oid,:int]  := sql.bind(X_4,"sys","lineorder","lo_revenue",1);
-    X_105 := sql.projectdelta(X_5,X_98,X_102,r1_117,X_104);
-    X_106:bat[:oid,:int]  := algebra.leftfetchjoinPath(X_167,X_27,X_105);
-    X_107:bat[:oid,:lng]  := aggr.subsum(X_106,X_86,r1_101,true,true);
-    (X_91,r1_106,r2_106) := algebra.subsort(X_90,false,false);
-    (X_95,r1_110,r2_110) := algebra.subsort(X_89,r1_106,r2_106,false,false);
-    X_109 := algebra.leftfetchjoin(r1_110,X_107);
-    X_111 := algebra.leftfetchjoin(r1_110,X_89);
-    X_110 := algebra.leftfetchjoin(r1_110,X_90);
-    X_112 := sql.resultSet(3,1,X_109);
-    sql.rsColumn(X_112,"sys.L1","L1","bigint",32,0,X_109);
-    sql.rsColumn(X_112,"sys.dwdate","d_year","int",32,0,X_110);
-    sql.rsColumn(X_112,"sys.part","p_brand1","clob",0,0,X_111);
-    X_129 := io.stdout();
-    sql.exportResult(X_129,X_112);
+    (X_27,r1_31) := algebra.subjoin(X_16,X_26,nil:BAT,nil:BAT,true,nil:lng);
+    X_31:bat[:oid,:oid]  := 
sql.bind_idxbat(X_4,"sys","lineorder","lineorder_lo_suppkey_fkey",0);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to