Changeset: 528e54251e30 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=528e54251e30
Modified Files:
sql/benchmarks/ssbm/Tests/04-explain.stable.out
sql/benchmarks/ssbm/Tests/04-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/05-explain.stable.out
sql/benchmarks/ssbm/Tests/05-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/06-explain.stable.out
sql/benchmarks/ssbm/Tests/06-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/07-explain.stable.out
sql/benchmarks/ssbm/Tests/07-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/08-explain.stable.out
sql/benchmarks/ssbm/Tests/08-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/09-explain.stable.out
sql/benchmarks/ssbm/Tests/09-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/10-explain.stable.out
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/02-explain.stable.out
sql/benchmarks/tpch/Tests/03-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/07-explain.stable.out
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/15-explain.stable.out.int128
sql/benchmarks/tpch/Tests/16-explain.stable.out
sql/benchmarks/tpch/Tests/16-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/18-explain.stable.out
sql/benchmarks/tpch/Tests/18-explain.stable.out.int128
sql/benchmarks/tpch/Tests/19-explain.stable.out
sql/benchmarks/tpch/Tests/19-explain.stable.out.int128
sql/benchmarks/tpch/Tests/20-explain.stable.out
sql/benchmarks/tpch/Tests/20-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/20-explain.stable.out.int128
sql/benchmarks/tpch/Tests/21-explain.stable.out
sql/benchmarks/tpch/Tests/21-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/22-explain.stable.out.int128
Branch: mosaic
Log Message:
Approve output
diffs (truncated from 1650 to 300 lines):
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
@@ -98,12 +98,12 @@ function user.s2_1(A0:str,A1:str):void;
X_53:bat[:oid] := algebra.projectionpath(X_45,X_26,X_52);
C_54:bat[:oid] := sql.tid(X_3,"sys","dwdate");
(X_56,r1_70) := algebra.subjoin(X_53,C_54,nil:BAT,nil:BAT,false,nil:lng);
- X_146:bat[:oid] := algebra.projectionpath(X_56,X_45);
+ X_147:bat[:oid] := algebra.projectionpath(X_56,X_45);
X_58:bat[:str] := sql.bind(X_3,"sys","part","p_brand1",0);
(C_60,r1_78) := sql.bind(X_3,"sys","part","p_brand1",2);
X_62:bat[:str] := sql.bind(X_3,"sys","part","p_brand1",1);
X_63 := sql.projectdelta(C_23,X_58,C_60,r1_78,X_62);
- X_64:bat[:str] := algebra.projectionpath(X_146,r1_32,X_63);
+ X_64:bat[:str] := algebra.projectionpath(X_147,r1_32,X_63);
X_65:bat[:int] := sql.bind(X_3,"sys","dwdate","d_year",0);
(C_67,r1_89) := sql.bind(X_3,"sys","dwdate","d_year",2);
X_69:bat[:int] := sql.bind(X_3,"sys","dwdate","d_year",1);
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
@@ -98,12 +98,12 @@ function user.s2_1(A0:str,A1:str):void;
X_53:bat[:oid] := algebra.projectionpath(X_45,X_26,X_52);
C_54:bat[:oid] := sql.tid(X_3,"sys","dwdate");
(X_56,r1_70) := algebra.subjoin(X_53,C_54,nil:BAT,nil:BAT,false,nil:lng);
- X_146:bat[:oid] := algebra.projectionpath(X_56,X_45);
+ X_147:bat[:oid] := algebra.projectionpath(X_56,X_45);
X_58:bat[:str] := sql.bind(X_3,"sys","part","p_brand1",0);
(C_60,r1_78) := sql.bind(X_3,"sys","part","p_brand1",2);
X_62:bat[:str] := sql.bind(X_3,"sys","part","p_brand1",1);
X_63 := sql.projectdelta(C_23,X_58,C_60,r1_78,X_62);
- X_64:bat[:str] := algebra.projectionpath(X_146,r1_32,X_63);
+ X_64:bat[:str] := algebra.projectionpath(X_147,r1_32,X_63);
X_65:bat[:int] := sql.bind(X_3,"sys","dwdate","d_year",0);
(C_67,r1_89) := sql.bind(X_3,"sys","dwdate","d_year",2);
X_69:bat[:int] := sql.bind(X_3,"sys","dwdate","d_year",1);
@@ -117,7 +117,7 @@ function user.s2_1(A0:str,A1:str):void;
(C_88,r1_113) := sql.bind(X_3,"sys","lineorder","lo_revenue",2);
X_90:bat[:int] := sql.bind(X_3,"sys","lineorder","lo_revenue",1);
X_91 := sql.projectdelta(C_4,X_86,C_88,r1_113,X_90);
- X_92:bat[:int] := algebra.projectionpath(X_146,X_26,X_91);
+ X_92:bat[:int] := algebra.projectionpath(X_147,X_26,X_91);
X_93:bat[:hge] := aggr.subsum(X_92,X_75,r1_98,true,true);
(X_80,r1_103,r2_103) := algebra.subsort(X_79,false,false);
(X_83,r1_106,r2_106) := algebra.subsort(X_78,r1_103,r2_103,false,false);
diff --git a/sql/benchmarks/ssbm/Tests/05-explain.stable.out
b/sql/benchmarks/ssbm/Tests/05-explain.stable.out
--- a/sql/benchmarks/ssbm/Tests/05-explain.stable.out
+++ b/sql/benchmarks/ssbm/Tests/05-explain.stable.out
@@ -100,9 +100,9 @@ function user.s2_1(A0:str,A1:str,A2:str)
X_54:bat[:oid] := algebra.projectionpath(X_46,X_27,X_53);
C_55:bat[:oid] := sql.tid(X_4,"sys","dwdate");
(X_57,r1_72) := algebra.subjoin(X_54,C_55,nil:BAT,nil:BAT,false,nil:lng);
- X_142:bat[:oid] := algebra.projectionpath(X_57,X_46);
+ X_143:bat[:oid] := algebra.projectionpath(X_57,X_46);
X_59 := sql.projectdelta(C_24,X_19,C_21,r1_22,X_23);
- X_60:bat[:str] := algebra.projectionpath(X_142,r1_34,X_59);
+ X_60:bat[:str] := algebra.projectionpath(X_143,r1_34,X_59);
X_61:bat[:int] := sql.bind(X_4,"sys","dwdate","d_year",0);
(C_63,r1_84) := sql.bind(X_4,"sys","dwdate","d_year",2);
X_65:bat[:int] := sql.bind(X_4,"sys","dwdate","d_year",1);
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
@@ -100,9 +100,9 @@ function user.s2_1(A0:str,A1:str,A2:str)
X_54:bat[:oid] := algebra.projectionpath(X_46,X_27,X_53);
C_55:bat[:oid] := sql.tid(X_4,"sys","dwdate");
(X_57,r1_72) := algebra.subjoin(X_54,C_55,nil:BAT,nil:BAT,false,nil:lng);
- X_142:bat[:oid] := algebra.projectionpath(X_57,X_46);
+ X_143:bat[:oid] := algebra.projectionpath(X_57,X_46);
X_59 := sql.projectdelta(C_24,X_19,C_21,r1_22,X_23);
- X_60:bat[:str] := algebra.projectionpath(X_142,r1_34,X_59);
+ X_60:bat[:str] := algebra.projectionpath(X_143,r1_34,X_59);
X_61:bat[:int] := sql.bind(X_4,"sys","dwdate","d_year",0);
(C_63,r1_84) := sql.bind(X_4,"sys","dwdate","d_year",2);
X_65:bat[:int] := sql.bind(X_4,"sys","dwdate","d_year",1);
@@ -116,7 +116,7 @@ function user.s2_1(A0:str,A1:str,A2:str)
(C_84,r1_106) := sql.bind(X_4,"sys","lineorder","lo_revenue",2);
X_86:bat[:int] := sql.bind(X_4,"sys","lineorder","lo_revenue",1);
X_87 := sql.projectdelta(C_5,X_82,C_84,r1_106,X_86);
- X_88:bat[:int] := algebra.projectionpath(X_142,X_27,X_87);
+ X_88:bat[:int] := algebra.projectionpath(X_143,X_27,X_87);
X_89:bat[:hge] := aggr.subsum(X_88,X_71,r1_93,true,true);
(X_76,r1_98,r2_98) := algebra.subsort(X_75,false,false);
(X_79,r1_101,r2_101) := algebra.subsort(X_74,r1_98,r2_98,false,false);
diff --git a/sql/benchmarks/ssbm/Tests/06-explain.stable.out
b/sql/benchmarks/ssbm/Tests/06-explain.stable.out
--- a/sql/benchmarks/ssbm/Tests/06-explain.stable.out
+++ b/sql/benchmarks/ssbm/Tests/06-explain.stable.out
@@ -100,9 +100,9 @@ function user.s2_1(A0:str,A1:str):void;
X_53:bat[:oid] := algebra.projectionpath(X_45,X_26,X_52);
C_54:bat[:oid] := sql.tid(X_3,"sys","dwdate");
(X_56,r1_70) := algebra.subjoin(X_53,C_54,nil:BAT,nil:BAT,false,nil:lng);
- X_141:bat[:oid] := algebra.projectionpath(X_56,X_45);
+ X_142:bat[:oid] := algebra.projectionpath(X_56,X_45);
X_58 := sql.projectdelta(C_23,X_18,C_20,r1_21,X_22);
- X_59:bat[:str] := algebra.projectionpath(X_141,r1_32,X_58);
+ X_59:bat[:str] := algebra.projectionpath(X_142,r1_32,X_58);
X_60:bat[:int] := sql.bind(X_3,"sys","dwdate","d_year",0);
(C_62,r1_82) := sql.bind(X_3,"sys","dwdate","d_year",2);
X_64:bat[:int] := sql.bind(X_3,"sys","dwdate","d_year",1);
diff --git a/sql/benchmarks/ssbm/Tests/06-explain.stable.out.int128
b/sql/benchmarks/ssbm/Tests/06-explain.stable.out.int128
--- a/sql/benchmarks/ssbm/Tests/06-explain.stable.out.int128
+++ b/sql/benchmarks/ssbm/Tests/06-explain.stable.out.int128
@@ -100,9 +100,9 @@ function user.s2_1(A0:str,A1:str):void;
X_53:bat[:oid] := algebra.projectionpath(X_45,X_26,X_52);
C_54:bat[:oid] := sql.tid(X_3,"sys","dwdate");
(X_56,r1_70) := algebra.subjoin(X_53,C_54,nil:BAT,nil:BAT,false,nil:lng);
- X_141:bat[:oid] := algebra.projectionpath(X_56,X_45);
+ X_142:bat[:oid] := algebra.projectionpath(X_56,X_45);
X_58 := sql.projectdelta(C_23,X_18,C_20,r1_21,X_22);
- X_59:bat[:str] := algebra.projectionpath(X_141,r1_32,X_58);
+ X_59:bat[:str] := algebra.projectionpath(X_142,r1_32,X_58);
X_60:bat[:int] := sql.bind(X_3,"sys","dwdate","d_year",0);
(C_62,r1_82) := sql.bind(X_3,"sys","dwdate","d_year",2);
X_64:bat[:int] := sql.bind(X_3,"sys","dwdate","d_year",1);
@@ -116,7 +116,7 @@ function user.s2_1(A0:str,A1:str):void;
(C_83,r1_104) := sql.bind(X_3,"sys","lineorder","lo_revenue",2);
X_85:bat[:int] := sql.bind(X_3,"sys","lineorder","lo_revenue",1);
X_86 := sql.projectdelta(C_4,X_81,C_83,r1_104,X_85);
- X_87:bat[:int] := algebra.projectionpath(X_141,X_26,X_86);
+ X_87:bat[:int] := algebra.projectionpath(X_142,X_26,X_86);
X_88:bat[:hge] := aggr.subsum(X_87,X_70,r1_91,true,true);
(X_75,r1_96,r2_96) := algebra.subsort(X_74,false,false);
(X_78,r1_99,r2_99) := algebra.subsort(X_73,r1_96,r2_96,false,false);
diff --git a/sql/benchmarks/ssbm/Tests/07-explain.stable.out
b/sql/benchmarks/ssbm/Tests/07-explain.stable.out
--- a/sql/benchmarks/ssbm/Tests/07-explain.stable.out
+++ b/sql/benchmarks/ssbm/Tests/07-explain.stable.out
@@ -111,12 +111,12 @@ function user.s2_1(A0:str,A1:str,A2:int,
C_167 := algebra.subselect(X_62,C_56,A2,A3,true,true,false);
C_63 := sql.subdelta(C_165,C_56,C_60,C_166,C_167);
(X_64,r1_86) := algebra.subjoin(X_55,C_63,nil:BAT,nil:BAT,false,nil:lng);
- X_168:bat[:oid] := algebra.projectionpath(X_64,X_47);
+ X_169:bat[:oid] := algebra.projectionpath(X_64,X_47);
X_66:bat[:int] := sql.bind(X_5,"sys","lineorder","lo_revenue",0);
(C_68,r1_93) := sql.bind(X_5,"sys","lineorder","lo_revenue",2);
X_70:bat[:int] := sql.bind(X_5,"sys","lineorder","lo_revenue",1);
X_71 := sql.projectdelta(C_6,X_66,C_68,r1_93,X_70);
- X_72:bat[:int] := algebra.projectionpath(X_168,X_28,X_71);
+ X_72:bat[:int] := algebra.projectionpath(X_169,X_28,X_71);
X_73:bat[:str] := sql.bind(X_5,"sys","supplier","s_nation",0);
(C_75,r1_103) := sql.bind(X_5,"sys","supplier","s_nation",2);
X_77:bat[:str] := sql.bind(X_5,"sys","supplier","s_nation",1);
@@ -126,7 +126,7 @@ function user.s2_1(A0:str,A1:str,A2:int,
(C_82,r1_113) := sql.bind(X_5,"sys","customer","c_nation",2);
X_84:bat[:str] := sql.bind(X_5,"sys","customer","c_nation",1);
X_85 := sql.projectdelta(C_25,X_80,C_82,r1_113,X_84);
- X_86:bat[:str] := algebra.projectionpath(X_168,r1_34,X_85);
+ X_86:bat[:str] := algebra.projectionpath(X_169,r1_34,X_85);
X_87 := sql.projectdelta(C_63,X_58,C_60,r1_74,X_62);
X_88 := algebra.projection(r1_86,X_87);
(X_89,r1_124,r2_124) := group.subgroup(X_88);
@@ -136,9 +136,9 @@ function user.s2_1(A0:str,A1:str,A2:int,
X_99 := algebra.projection(r1_130,X_88);
(X_100,r1_137,r2_137) := algebra.subsort(X_99,false,false);
(X_103,r1_142,r2_142) := algebra.subsort(X_98,r1_137,r2_137,true,false);
- X_169:bat[:oid] := algebra.projectionpath(r1_142,r1_130);
- X_106:bat[:str] := algebra.projectionpath(X_169,X_86);
- X_107:bat[:str] := algebra.projectionpath(X_169,X_79);
+ X_170:bat[:oid] := algebra.projectionpath(r1_142,r1_130);
+ X_106:bat[:str] := algebra.projectionpath(X_170,X_86);
+ X_107:bat[:str] := algebra.projectionpath(X_170,X_79);
X_108 := algebra.projection(r1_142,X_99);
X_109 := algebra.projection(r1_142,X_98);
sql.resultSet(X_140,X_142,X_144,X_146,X_148,X_106,X_107,X_108,X_109);
diff --git a/sql/benchmarks/ssbm/Tests/07-explain.stable.out.int128
b/sql/benchmarks/ssbm/Tests/07-explain.stable.out.int128
--- a/sql/benchmarks/ssbm/Tests/07-explain.stable.out.int128
+++ b/sql/benchmarks/ssbm/Tests/07-explain.stable.out.int128
@@ -111,12 +111,12 @@ function user.s2_1(A0:str,A1:str,A2:int,
C_168 := algebra.subselect(X_62,C_56,A2,A3,true,true,false);
C_63 := sql.subdelta(C_166,C_56,C_60,C_167,C_168);
(X_64,r1_86) := algebra.subjoin(X_55,C_63,nil:BAT,nil:BAT,false,nil:lng);
- X_168:bat[:oid] := algebra.projectionpath(X_64,X_47);
+ X_169:bat[:oid] := algebra.projectionpath(X_64,X_47);
X_66:bat[:int] := sql.bind(X_5,"sys","lineorder","lo_revenue",0);
(C_68,r1_93) := sql.bind(X_5,"sys","lineorder","lo_revenue",2);
X_70:bat[:int] := sql.bind(X_5,"sys","lineorder","lo_revenue",1);
X_71 := sql.projectdelta(C_6,X_66,C_68,r1_93,X_70);
- X_72:bat[:int] := algebra.projectionpath(X_168,X_28,X_71);
+ X_72:bat[:int] := algebra.projectionpath(X_169,X_28,X_71);
X_73:bat[:str] := sql.bind(X_5,"sys","supplier","s_nation",0);
(C_75,r1_103) := sql.bind(X_5,"sys","supplier","s_nation",2);
X_77:bat[:str] := sql.bind(X_5,"sys","supplier","s_nation",1);
@@ -126,7 +126,7 @@ function user.s2_1(A0:str,A1:str,A2:int,
(C_82,r1_113) := sql.bind(X_5,"sys","customer","c_nation",2);
X_84:bat[:str] := sql.bind(X_5,"sys","customer","c_nation",1);
X_85 := sql.projectdelta(C_25,X_80,C_82,r1_113,X_84);
- X_86:bat[:str] := algebra.projectionpath(X_168,r1_34,X_85);
+ X_86:bat[:str] := algebra.projectionpath(X_169,r1_34,X_85);
X_87 := sql.projectdelta(C_63,X_58,C_60,r1_74,X_62);
X_88 := algebra.projection(r1_86,X_87);
(X_89,r1_124,r2_124) := group.subgroup(X_88);
@@ -136,9 +136,9 @@ function user.s2_1(A0:str,A1:str,A2:int,
X_99 := algebra.projection(r1_130,X_88);
(X_100,r1_137,r2_137) := algebra.subsort(X_99,false,false);
(X_103,r1_142,r2_142) := algebra.subsort(X_98,r1_137,r2_137,true,false);
- X_169:bat[:oid] := algebra.projectionpath(r1_142,r1_130);
- X_106:bat[:str] := algebra.projectionpath(X_169,X_86);
- X_107:bat[:str] := algebra.projectionpath(X_169,X_79);
+ X_170:bat[:oid] := algebra.projectionpath(r1_142,r1_130);
+ X_106:bat[:str] := algebra.projectionpath(X_170,X_86);
+ X_107:bat[:str] := algebra.projectionpath(X_170,X_79);
X_108 := algebra.projection(r1_142,X_99);
X_109 := algebra.projection(r1_142,X_98);
sql.resultSet(X_140,X_142,X_144,X_146,X_148,X_106,X_107,X_108,X_109);
diff --git a/sql/benchmarks/ssbm/Tests/08-explain.stable.out
b/sql/benchmarks/ssbm/Tests/08-explain.stable.out
--- a/sql/benchmarks/ssbm/Tests/08-explain.stable.out
+++ b/sql/benchmarks/ssbm/Tests/08-explain.stable.out
@@ -111,12 +111,12 @@ function user.s2_1(A0:str,A1:str,A2:int,
C_167 := algebra.subselect(X_62,C_56,A2,A3,true,true,false);
C_63 := sql.subdelta(C_165,C_56,C_60,C_166,C_167);
(X_64,r1_86) := algebra.subjoin(X_55,C_63,nil:BAT,nil:BAT,false,nil:lng);
- X_168:bat[:oid] := algebra.projectionpath(X_64,X_47);
+ X_169:bat[:oid] := algebra.projectionpath(X_64,X_47);
X_66:bat[:int] := sql.bind(X_5,"sys","lineorder","lo_revenue",0);
(C_68,r1_93) := sql.bind(X_5,"sys","lineorder","lo_revenue",2);
X_70:bat[:int] := sql.bind(X_5,"sys","lineorder","lo_revenue",1);
X_71 := sql.projectdelta(C_6,X_66,C_68,r1_93,X_70);
- X_72:bat[:int] := algebra.projectionpath(X_168,X_28,X_71);
+ X_72:bat[:int] := algebra.projectionpath(X_169,X_28,X_71);
X_73:bat[:str] := sql.bind(X_5,"sys","supplier","s_city",0);
(C_75,r1_103) := sql.bind(X_5,"sys","supplier","s_city",2);
X_77:bat[:str] := sql.bind(X_5,"sys","supplier","s_city",1);
@@ -126,7 +126,7 @@ function user.s2_1(A0:str,A1:str,A2:int,
(C_82,r1_113) := sql.bind(X_5,"sys","customer","c_city",2);
X_84:bat[:str] := sql.bind(X_5,"sys","customer","c_city",1);
X_85 := sql.projectdelta(C_25,X_80,C_82,r1_113,X_84);
- X_86:bat[:str] := algebra.projectionpath(X_168,r1_34,X_85);
+ X_86:bat[:str] := algebra.projectionpath(X_169,r1_34,X_85);
X_87 := sql.projectdelta(C_63,X_58,C_60,r1_74,X_62);
X_88 := algebra.projection(r1_86,X_87);
(X_89,r1_124,r2_124) := group.subgroup(X_88);
@@ -136,9 +136,9 @@ function user.s2_1(A0:str,A1:str,A2:int,
X_99 := algebra.projection(r1_130,X_88);
(X_100,r1_137,r2_137) := algebra.subsort(X_99,false,false);
(X_103,r1_142,r2_142) := algebra.subsort(X_98,r1_137,r2_137,true,false);
- X_169:bat[:oid] := algebra.projectionpath(r1_142,r1_130);
- X_106:bat[:str] := algebra.projectionpath(X_169,X_86);
- X_107:bat[:str] := algebra.projectionpath(X_169,X_79);
+ X_170:bat[:oid] := algebra.projectionpath(r1_142,r1_130);
+ X_106:bat[:str] := algebra.projectionpath(X_170,X_86);
+ X_107:bat[:str] := algebra.projectionpath(X_170,X_79);
X_108 := algebra.projection(r1_142,X_99);
X_109 := algebra.projection(r1_142,X_98);
sql.resultSet(X_140,X_142,X_144,X_146,X_148,X_106,X_107,X_108,X_109);
diff --git a/sql/benchmarks/ssbm/Tests/08-explain.stable.out.int128
b/sql/benchmarks/ssbm/Tests/08-explain.stable.out.int128
--- a/sql/benchmarks/ssbm/Tests/08-explain.stable.out.int128
+++ b/sql/benchmarks/ssbm/Tests/08-explain.stable.out.int128
@@ -111,12 +111,12 @@ function user.s2_1(A0:str,A1:str,A2:int,
C_168 := algebra.subselect(X_62,C_56,A2,A3,true,true,false);
C_63 := sql.subdelta(C_166,C_56,C_60,C_167,C_168);
(X_64,r1_86) := algebra.subjoin(X_55,C_63,nil:BAT,nil:BAT,false,nil:lng);
- X_168:bat[:oid] := algebra.projectionpath(X_64,X_47);
+ X_169:bat[:oid] := algebra.projectionpath(X_64,X_47);
X_66:bat[:int] := sql.bind(X_5,"sys","lineorder","lo_revenue",0);
(C_68,r1_93) := sql.bind(X_5,"sys","lineorder","lo_revenue",2);
X_70:bat[:int] := sql.bind(X_5,"sys","lineorder","lo_revenue",1);
X_71 := sql.projectdelta(C_6,X_66,C_68,r1_93,X_70);
- X_72:bat[:int] := algebra.projectionpath(X_168,X_28,X_71);
+ X_72:bat[:int] := algebra.projectionpath(X_169,X_28,X_71);
X_73:bat[:str] := sql.bind(X_5,"sys","supplier","s_city",0);
(C_75,r1_103) := sql.bind(X_5,"sys","supplier","s_city",2);
X_77:bat[:str] := sql.bind(X_5,"sys","supplier","s_city",1);
@@ -126,7 +126,7 @@ function user.s2_1(A0:str,A1:str,A2:int,
(C_82,r1_113) := sql.bind(X_5,"sys","customer","c_city",2);
X_84:bat[:str] := sql.bind(X_5,"sys","customer","c_city",1);
X_85 := sql.projectdelta(C_25,X_80,C_82,r1_113,X_84);
- X_86:bat[:str] := algebra.projectionpath(X_168,r1_34,X_85);
+ X_86:bat[:str] := algebra.projectionpath(X_169,r1_34,X_85);
X_87 := sql.projectdelta(C_63,X_58,C_60,r1_74,X_62);
X_88 := algebra.projection(r1_86,X_87);
(X_89,r1_124,r2_124) := group.subgroup(X_88);
@@ -136,9 +136,9 @@ function user.s2_1(A0:str,A1:str,A2:int,
X_99 := algebra.projection(r1_130,X_88);
(X_100,r1_137,r2_137) := algebra.subsort(X_99,false,false);
(X_103,r1_142,r2_142) := algebra.subsort(X_98,r1_137,r2_137,true,false);
- X_169:bat[:oid] := algebra.projectionpath(r1_142,r1_130);
- X_106:bat[:str] := algebra.projectionpath(X_169,X_86);
- X_107:bat[:str] := algebra.projectionpath(X_169,X_79);
+ X_170:bat[:oid] := algebra.projectionpath(r1_142,r1_130);
+ X_106:bat[:str] := algebra.projectionpath(X_170,X_86);
+ X_107:bat[:str] := algebra.projectionpath(X_170,X_79);
X_108 := algebra.projection(r1_142,X_99);
X_109 := algebra.projection(r1_142,X_98);
sql.resultSet(X_140,X_142,X_144,X_146,X_148,X_106,X_107,X_108,X_109);
diff --git a/sql/benchmarks/ssbm/Tests/09-explain.stable.out
b/sql/benchmarks/ssbm/Tests/09-explain.stable.out
--- a/sql/benchmarks/ssbm/Tests/09-explain.stable.out
+++ b/sql/benchmarks/ssbm/Tests/09-explain.stable.out
@@ -137,16 +137,16 @@ function user.s2_1(A0:str,A1:str,A2:str,
C_189 := algebra.subselect(X_82,C_76,A6,A7,true,true,false);
C_83 := sql.subdelta(C_187,C_76,C_80,C_188,C_189);
(X_84,r1_120) := algebra.subjoin(X_75,C_83,nil:BAT,nil:BAT,false,nil:lng);
- X_190:bat[:oid] := algebra.projectionpath(X_84,X_67);
+ X_191:bat[:oid] := algebra.projectionpath(X_84,X_67);
X_86:bat[:int] := sql.bind(X_9,"sys","lineorder","lo_revenue",0);
(C_88,r1_124) := sql.bind(X_9,"sys","lineorder","lo_revenue",2);
X_90:bat[:int] := sql.bind(X_9,"sys","lineorder","lo_revenue",1);
X_91 := sql.projectdelta(C_10,X_86,C_88,r1_124,X_90);
- X_92:bat[:int] := algebra.projectionpath(X_190,X_40,X_91);
+ X_92:bat[:int] := algebra.projectionpath(X_191,X_40,X_91);
X_93 := sql.projectdelta(X_66,X_53,C_55,r1_67,X_57);
X_94:bat[:str] := algebra.projectionpath(X_84,r1_90,X_93);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
