Changeset: fd159fa212fa for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fd159fa212fa
Modified Files:
sql/benchmarks/tpch/Tests/01-explain.stable.out.int128
sql/benchmarks/tpch/Tests/01-plan.stable.out
sql/benchmarks/tpch/Tests/03-plan.stable.out
sql/benchmarks/tpch/Tests/05-plan.stable.out
sql/benchmarks/tpch/Tests/06-plan.stable.out
sql/benchmarks/tpch/Tests/07-plan.stable.out
sql/benchmarks/tpch/Tests/08-plan.stable.out
sql/benchmarks/tpch/Tests/09-plan.stable.out
sql/benchmarks/tpch/Tests/10-plan.stable.out
sql/benchmarks/tpch/Tests/11-plan.stable.out
sql/benchmarks/tpch/Tests/14-explain.stable.out.int128
sql/benchmarks/tpch/Tests/14-plan.stable.out
sql/benchmarks/tpch/Tests/15-plan.stable.out
sql/benchmarks/tpch/Tests/17-explain.stable.out.int128
sql/benchmarks/tpch/Tests/17-plan.stable.out
sql/benchmarks/tpch/Tests/18-plan.stable.out
sql/benchmarks/tpch/Tests/19-plan.stable.out
sql/benchmarks/tpch/Tests/20-explain.stable.out.int128
sql/benchmarks/tpch/Tests/20-plan.stable.out
Branch: Dec2016
Log Message:
Approvals.
diffs (truncated from 958 to 300 lines):
diff --git a/sql/benchmarks/tpch/Tests/01-explain.stable.out.int128
b/sql/benchmarks/tpch/Tests/01-explain.stable.out.int128
--- a/sql/benchmarks/tpch/Tests/01-explain.stable.out.int128
+++ b/sql/benchmarks/tpch/Tests/01-explain.stable.out.int128
@@ -50,112 +50,112 @@ Ready.
% .explain # table_name
% mal # name
% clob # type
-% 109 # length
+% 124 # length
function user.main():void;
- X_844 := bat.new(nil:str);
- X_851 := bat.append(X_844,"sys.lineitem");
- X_861 := bat.append(X_851,"sys.lineitem");
- X_867 := bat.append(X_861,"sys.L5");
- X_877 := bat.append(X_867,"sys.L10");
- X_884 := bat.append(X_877,"sys.L13");
- X_892 := bat.append(X_884,"sys.L16");
- X_900 := bat.append(X_892,"sys.L21");
- X_910 := bat.append(X_900,"sys.L24");
- X_917 := bat.append(X_910,"sys.L27");
- X_924 := bat.append(X_917,"sys.L32");
- X_846 := bat.new(nil:str);
- X_853 := bat.append(X_846,"l_returnflag");
- X_862 := bat.append(X_853,"l_linestatus");
- X_869 := bat.append(X_862,"sum_qty");
- X_879 := bat.append(X_869,"sum_base_price");
- X_886 := bat.append(X_879,"sum_disc_price");
- X_894 := bat.append(X_886,"sum_charge");
- X_902 := bat.append(X_894,"avg_qty");
- X_912 := bat.append(X_902,"avg_price");
- X_919 := bat.append(X_912,"avg_disc");
- X_926 := bat.append(X_919,"count_order");
- X_847 := bat.new(nil:str);
- X_855 := bat.append(X_847,"char");
- X_864 := bat.append(X_855,"char");
- X_871 := bat.append(X_864,"decimal");
- X_881 := bat.append(X_871,"decimal");
- X_888 := bat.append(X_881,"decimal");
- X_896 := bat.append(X_888,"decimal");
- X_904 := bat.append(X_896,"double");
- X_914 := bat.append(X_904,"double");
- X_921 := bat.append(X_914,"double");
- X_928 := bat.append(X_921,"bigint");
- X_848 := bat.new(nil:int);
- X_857 := bat.append(X_848,1);
- X_865 := bat.append(X_857,1);
- X_873 := bat.append(X_865,39);
- X_882 := bat.append(X_873,39);
- X_889 := bat.append(X_882,39);
- X_897 := bat.append(X_889,39);
- X_906 := bat.append(X_897,53);
- X_915 := bat.append(X_906,53);
- X_922 := bat.append(X_915,53);
- X_930 := bat.append(X_922,64);
- X_850 := bat.new(nil:int);
- X_859 := bat.append(X_850,0);
- X_866 := bat.append(X_859,0);
- X_875 := bat.append(X_866,2);
- X_883 := bat.append(X_875,2);
- X_890 := bat.append(X_883,4);
- X_898 := bat.append(X_890,6);
- X_908 := bat.append(X_898,0);
- X_916 := bat.append(X_908,0);
- X_923 := bat.append(X_916,0);
- X_932 := bat.append(X_923,0);
- X_710 := sql.mvc();
- X_714:bat[:date] := sql.bind(X_710,"sys","lineitem","l_shipdate",0);
- C_711:bat[:oid] := sql.tid(X_710,"sys","lineitem");
- X_726:date := mtime.date_sub_msec_interval("1998-12-01",7776000000);
- C_727 := algebra.thetasubselect(X_714,C_711,X_726,"<=");
- X_729:bat[:str] := sql.bind(X_710,"sys","lineitem","l_linestatus",0);
- X_736 := algebra.projection(C_727,X_729);
- X_737:bat[:str] := sql.bind(X_710,"sys","lineitem","l_returnflag",0);
- X_744 := algebra.projection(C_727,X_737);
- (X_745,r1_44,r2_44) := group.subgroup(X_744);
- (X_748,r1_47,r2_47) := group.subgroupdone(X_736,X_745);
- X_751 := algebra.projection(r1_47,X_736);
- X_752 := algebra.projection(r1_47,X_744);
- X_763:bat[:lng] := sql.bind(X_710,"sys","lineitem","l_quantity",0);
- X_770 := algebra.projection(C_727,X_763);
- X_771:bat[:hge] := aggr.subsum(X_770,X_748,r1_47,true,true);
- X_775:bat[:lng] := sql.bind(X_710,"sys","lineitem","l_extendedprice",0);
- X_782 := algebra.projection(C_727,X_775);
- X_783:bat[:hge] := aggr.subsum(X_782,X_748,r1_47,true,true);
- X_793:bat[:lng] := sql.bind(X_710,"sys","lineitem","l_discount",0);
- X_800 := algebra.projection(C_727,X_793);
- X_801:bat[:lng] := batcalc.-(100:lng,X_800);
- X_803:bat[:hge] := batcalc.*(X_782,X_801);
- X_805:bat[:hge] := aggr.subsum(X_803,X_748,r1_47,true,true);
- X_813:bat[:lng] := sql.bind(X_710,"sys","lineitem","l_tax",0);
- X_820 := algebra.projection(C_727,X_813);
- X_824:bat[:lng] := batcalc.+(X_820,100:lng);
- X_827:bat[:hge] := batcalc.*(X_803,X_824);
- X_828:bat[:hge] := aggr.subsum(X_827,X_748,r1_47,true,true);
- X_830:bat[:dbl] := batcalc.dbl(2,X_770);
- X_832:bat[:dbl] := aggr.subavg(X_830,X_748,r1_47,true,true);
- X_834:bat[:dbl] := batcalc.dbl(2,X_782);
- X_835:bat[:dbl] := aggr.subavg(X_834,X_748,r1_47,true,true);
- X_837:bat[:dbl] := batcalc.dbl(2,X_800);
- X_838:bat[:dbl] := aggr.subavg(X_837,X_748,r1_47,true,true);
- X_840:bat[:lng] := aggr.subcount(X_748,X_748,r1_47,false);
- (X_753,r1_52,r2_52) := algebra.subsort(X_752,false,false);
- (X_758,r1_57,r2_57) := algebra.subsort(X_751,r1_52,r2_52,false,false);
- X_761 := algebra.projection(r1_57,X_752);
- X_762 := algebra.projection(r1_57,X_751);
- X_774 := algebra.projection(r1_57,X_771);
- X_784 := algebra.projection(r1_57,X_783);
- X_808 := algebra.projection(r1_57,X_805);
- X_829 := algebra.projection(r1_57,X_828);
- X_833 := algebra.projection(r1_57,X_832);
- X_836 := algebra.projection(r1_57,X_835);
- X_839 := algebra.projection(r1_57,X_838);
- X_842 := algebra.projection(r1_57,X_840);
-
sql.resultSet(X_924,X_926,X_928,X_930,X_932,X_761,X_762,X_774,X_784,X_808,X_829,X_833,X_836,X_839,X_842);
+ X_1247 := bat.new(nil:str);
+ X_1254 := bat.append(X_1247,"sys.lineitem");
+ X_1264 := bat.append(X_1254,"sys.lineitem");
+ X_1270 := bat.append(X_1264,"sys.L5");
+ X_1280 := bat.append(X_1270,"sys.L10");
+ X_1287 := bat.append(X_1280,"sys.L13");
+ X_1295 := bat.append(X_1287,"sys.L16");
+ X_1303 := bat.append(X_1295,"sys.L21");
+ X_1313 := bat.append(X_1303,"sys.L24");
+ X_1320 := bat.append(X_1313,"sys.L27");
+ X_1327 := bat.append(X_1320,"sys.L32");
+ X_1249 := bat.new(nil:str);
+ X_1256 := bat.append(X_1249,"l_returnflag");
+ X_1265 := bat.append(X_1256,"l_linestatus");
+ X_1272 := bat.append(X_1265,"sum_qty");
+ X_1282 := bat.append(X_1272,"sum_base_price");
+ X_1289 := bat.append(X_1282,"sum_disc_price");
+ X_1297 := bat.append(X_1289,"sum_charge");
+ X_1305 := bat.append(X_1297,"avg_qty");
+ X_1315 := bat.append(X_1305,"avg_price");
+ X_1322 := bat.append(X_1315,"avg_disc");
+ X_1329 := bat.append(X_1322,"count_order");
+ X_1250 := bat.new(nil:str);
+ X_1258 := bat.append(X_1250,"char");
+ X_1267 := bat.append(X_1258,"char");
+ X_1274 := bat.append(X_1267,"decimal");
+ X_1284 := bat.append(X_1274,"decimal");
+ X_1291 := bat.append(X_1284,"decimal");
+ X_1299 := bat.append(X_1291,"decimal");
+ X_1307 := bat.append(X_1299,"double");
+ X_1317 := bat.append(X_1307,"double");
+ X_1324 := bat.append(X_1317,"double");
+ X_1331 := bat.append(X_1324,"bigint");
+ X_1251 := bat.new(nil:int);
+ X_1260 := bat.append(X_1251,1);
+ X_1268 := bat.append(X_1260,1);
+ X_1276 := bat.append(X_1268,39);
+ X_1285 := bat.append(X_1276,39);
+ X_1292 := bat.append(X_1285,39);
+ X_1300 := bat.append(X_1292,39);
+ X_1309 := bat.append(X_1300,53);
+ X_1318 := bat.append(X_1309,53);
+ X_1325 := bat.append(X_1318,53);
+ X_1333 := bat.append(X_1325,64);
+ X_1253 := bat.new(nil:int);
+ X_1262 := bat.append(X_1253,0);
+ X_1269 := bat.append(X_1262,0);
+ X_1278 := bat.append(X_1269,2);
+ X_1286 := bat.append(X_1278,2);
+ X_1293 := bat.append(X_1286,4);
+ X_1301 := bat.append(X_1293,6);
+ X_1311 := bat.append(X_1301,0);
+ X_1319 := bat.append(X_1311,0);
+ X_1326 := bat.append(X_1319,0);
+ X_1335 := bat.append(X_1326,0);
+ X_1113 := sql.mvc();
+ X_1117:bat[:date] := sql.bind(X_1113,"sys","lineitem","l_shipdate",0);
+ C_1114:bat[:oid] := sql.tid(X_1113,"sys","lineitem");
+ X_1129:date := mtime.date_sub_msec_interval("1998-12-01",7776000000);
+ C_1130 := algebra.thetasubselect(X_1117,C_1114,X_1129,"<=");
+ X_1132:bat[:str] := sql.bind(X_1113,"sys","lineitem","l_linestatus",0);
+ X_1139 := algebra.projection(C_1130,X_1132);
+ X_1140:bat[:str] := sql.bind(X_1113,"sys","lineitem","l_returnflag",0);
+ X_1147 := algebra.projection(C_1130,X_1140);
+ (X_1148,r1_44,r2_44) := group.subgroup(X_1147);
+ (X_1151,r1_47,r2_47) := group.subgroupdone(X_1139,X_1148);
+ X_1154 := algebra.projection(r1_47,X_1139);
+ X_1155 := algebra.projection(r1_47,X_1147);
+ X_1166:bat[:lng] := sql.bind(X_1113,"sys","lineitem","l_quantity",0);
+ X_1173 := algebra.projection(C_1130,X_1166);
+ X_1174:bat[:hge] := aggr.subsum(X_1173,X_1151,r1_47,true,true);
+ X_1178:bat[:lng] := sql.bind(X_1113,"sys","lineitem","l_extendedprice",0);
+ X_1185 := algebra.projection(C_1130,X_1178);
+ X_1186:bat[:hge] := aggr.subsum(X_1185,X_1151,r1_47,true,true);
+ X_1196:bat[:lng] := sql.bind(X_1113,"sys","lineitem","l_discount",0);
+ X_1203 := algebra.projection(C_1130,X_1196);
+ X_1204:bat[:lng] := batcalc.-(100:lng,X_1203);
+ X_1206:bat[:hge] := batcalc.*(X_1185,X_1204);
+ X_1208:bat[:hge] := aggr.subsum(X_1206,X_1151,r1_47,true,true);
+ X_1216:bat[:lng] := sql.bind(X_1113,"sys","lineitem","l_tax",0);
+ X_1223 := algebra.projection(C_1130,X_1216);
+ X_1227:bat[:lng] := batcalc.+(X_1223,100:lng);
+ X_1230:bat[:hge] := batcalc.*(X_1206,X_1227);
+ X_1231:bat[:hge] := aggr.subsum(X_1230,X_1151,r1_47,true,true);
+ X_1233:bat[:dbl] := batcalc.dbl(2,X_1173);
+ X_1235:bat[:dbl] := aggr.subavg(X_1233,X_1151,r1_47,true,true);
+ X_1237:bat[:dbl] := batcalc.dbl(2,X_1185);
+ X_1238:bat[:dbl] := aggr.subavg(X_1237,X_1151,r1_47,true,true);
+ X_1240:bat[:dbl] := batcalc.dbl(2,X_1203);
+ X_1241:bat[:dbl] := aggr.subavg(X_1240,X_1151,r1_47,true,true);
+ X_1243:bat[:lng] := aggr.subcount(X_1151,X_1151,r1_47,false);
+ (X_1156,r1_52,r2_52) := algebra.subsort(X_1155,false,false);
+ (X_1161,r1_57,r2_57) := algebra.subsort(X_1154,r1_52,r2_52,false,false);
+ X_1164 := algebra.projection(r1_57,X_1155);
+ X_1165 := algebra.projection(r1_57,X_1154);
+ X_1177 := algebra.projection(r1_57,X_1174);
+ X_1187 := algebra.projection(r1_57,X_1186);
+ X_1211 := algebra.projection(r1_57,X_1208);
+ X_1232 := algebra.projection(r1_57,X_1231);
+ X_1236 := algebra.projection(r1_57,X_1235);
+ X_1239 := algebra.projection(r1_57,X_1238);
+ X_1242 := algebra.projection(r1_57,X_1241);
+ X_1245 := algebra.projection(r1_57,X_1243);
+
sql.resultSet(X_1327,X_1329,X_1331,X_1333,X_1335,X_1164,X_1165,X_1177,X_1187,X_1211,X_1232,X_1236,X_1239,X_1242,X_1245);
end user.main;
#inline actions= 0 time=5 usec
#remap actions=10 time=172 usec
diff --git a/sql/benchmarks/tpch/Tests/01-plan.stable.out
b/sql/benchmarks/tpch/Tests/01-plan.stable.out
--- a/sql/benchmarks/tpch/Tests/01-plan.stable.out
+++ b/sql/benchmarks/tpch/Tests/01-plan.stable.out
@@ -56,9 +56,9 @@ project (
| | | select (
| | | | table(sys.lineitem) [ lineitem.l_quantity NOT NULL,
lineitem.l_extendedprice NOT NULL, lineitem.l_discount NOT NULL, lineitem.l_tax
NOT NULL, lineitem.l_returnflag NOT NULL, lineitem.l_linestatus NOT NULL,
lineitem.l_shipdate NOT NULL ] COUNT
| | | ) [ lineitem.l_shipdate NOT NULL <= sys.sql_sub(date "1998-12-01",
sec_interval(4) "7776000000") ]
-| | ) [ lineitem.l_quantity NOT NULL, lineitem.l_extendedprice NOT NULL,
lineitem.l_discount NOT NULL, lineitem.l_tax NOT NULL, lineitem.l_returnflag
NOT NULL, lineitem.l_linestatus NOT NULL, sys.sql_sub(decimal(15,2)[tinyint
"1"], lineitem.l_discount NOT NULL) as L21.L21,
sys.sql_mul(lineitem.l_extendedprice NOT NULL, L21.L21) as L22.L22,
sys.sql_add(lineitem.l_tax NOT NULL, decimal(15,2)[tinyint "1"]) as L23.L23,
sys.sql_mul(L22.L22, L23.L23) as L24.L24, double[lineitem.l_quantity NOT NULL]
as L25.L25, double[lineitem.l_extendedprice NOT NULL] as L26.L26,
double[lineitem.l_discount NOT NULL] as L27.L27 ]
-| ) [ lineitem.l_returnflag NOT NULL, lineitem.l_linestatus NOT NULL ] [
lineitem.l_returnflag NOT NULL, lineitem.l_linestatus NOT NULL, sys.sum no nil
(lineitem.l_quantity NOT NULL) NOT NULL as L1.L1, sys.sum no nil
(lineitem.l_extendedprice NOT NULL) NOT NULL as L3.L3, sys.sum no nil (L22.L22)
as L5.L5, sys.sum no nil (L24.L24) as L7.L7, sys.avg no nil (L25.L25) as
L11.L11, sys.avg no nil (L26.L26) as L13.L13, sys.avg no nil (L27.L27) as
L15.L15, sys.count() NOT NULL as L17.L17 ]
-) [ lineitem.l_returnflag NOT NULL, lineitem.l_linestatus NOT NULL, L1 NOT
NULL as L2.sum_qty, L3 NOT NULL as L4.sum_base_price, L5 as L6.sum_disc_price,
L7 as L10.sum_charge, L11 as L12.avg_qty, L13 as L14.avg_price, L15 as
L16.avg_disc, L17 NOT NULL as L20.count_order ] [ lineitem.l_returnflag ASC NOT
NULL, lineitem.l_linestatus ASC NOT NULL ]
+| | ) [ lineitem.l_quantity NOT NULL, lineitem.l_extendedprice NOT NULL,
lineitem.l_discount NOT NULL, lineitem.l_tax NOT NULL, lineitem.l_returnflag
NOT NULL, lineitem.l_linestatus NOT NULL, sys.sql_sub(decimal(15,2)[tinyint
"1"], lineitem.l_discount NOT NULL) as L35.L35,
sys.sql_mul(lineitem.l_extendedprice NOT NULL, L35.L35) as L36.L36,
sys.sql_add(lineitem.l_tax NOT NULL, decimal(15,2)[tinyint "1"]) as L37.L37,
sys.sql_mul(L36.L36, L37.L37) as L40.L40, double[lineitem.l_quantity NOT NULL]
as L41.L41, double[lineitem.l_extendedprice NOT NULL] as L42.L42,
double[lineitem.l_discount NOT NULL] as L43.L43 ]
+| ) [ lineitem.l_returnflag NOT NULL, lineitem.l_linestatus NOT NULL ] [
lineitem.l_returnflag NOT NULL, lineitem.l_linestatus NOT NULL, sys.sum no nil
(lineitem.l_quantity NOT NULL) NOT NULL as L4.L4, sys.sum no nil
(lineitem.l_extendedprice NOT NULL) NOT NULL as L7.L7, sys.sum no nil (L36.L36)
as L12.L12, sys.sum no nil (L40.L40) as L15.L15, sys.avg no nil (L41.L41) as
L20.L20, sys.avg no nil (L42.L42) as L23.L23, sys.avg no nil (L43.L43) as
L26.L26, sys.count() NOT NULL as L31.L31 ]
+) [ lineitem.l_returnflag NOT NULL, lineitem.l_linestatus NOT NULL, L4 NOT
NULL as L5.sum_qty, L7 NOT NULL as L10.sum_base_price, L12 as
L13.sum_disc_price, L15 as L16.sum_charge, L20 as L21.avg_qty, L23 as
L24.avg_price, L26 as L27.avg_disc, L31 NOT NULL as L32.count_order ] [
lineitem.l_returnflag ASC NOT NULL, lineitem.l_linestatus ASC NOT NULL ]
# 22:46:28 >
# 22:46:28 > "Done."
diff --git a/sql/benchmarks/tpch/Tests/03-plan.stable.out
b/sql/benchmarks/tpch/Tests/03-plan.stable.out
--- a/sql/benchmarks/tpch/Tests/03-plan.stable.out
+++ b/sql/benchmarks/tpch/Tests/03-plan.stable.out
@@ -51,7 +51,7 @@ Ready.
% .plan # table_name
% rel # name
% clob # type
-% 319 # length
+% 325 # length
top N (
| project (
| | group by (
@@ -69,9 +69,9 @@ top N (
| | | | | | table(sys.lineitem) [ lineitem.l_orderkey NOT NULL HASHCOL ,
lineitem.l_extendedprice NOT NULL, lineitem.l_discount NOT NULL,
lineitem.l_shipdate NOT NULL, lineitem.%lineitem_l_orderkey_fkey NOT NULL
JOINIDX sys.lineitem.lineitem_l_orderkey_fkey ] COUNT
| | | | | ) [ lineitem.l_shipdate NOT NULL > date "1995-03-15" ]
| | | | ) [ lineitem.%lineitem_l_orderkey_fkey NOT NULL = orders.%TID% NOT
NULL JOINIDX sys.lineitem.lineitem_l_orderkey_fkey ]
-| | | ) [ orders.o_orderdate NOT NULL, orders.o_shippriority NOT NULL,
lineitem.l_orderkey NOT NULL HASHCOL , lineitem.l_extendedprice NOT NULL,
lineitem.l_discount NOT NULL, sys.sql_sub(decimal(15,2)[tinyint "1"],
lineitem.l_discount NOT NULL) as L3.L3, sys.sql_mul(lineitem.l_extendedprice
NOT NULL, L3.L3) as L4.L4 ]
-| | ) [ lineitem.l_orderkey NOT NULL HASHCOL , orders.o_shippriority NOT NULL,
orders.o_orderdate NOT NULL ] [ lineitem.l_orderkey NOT NULL HASHCOL ,
orders.o_orderdate NOT NULL, orders.o_shippriority NOT NULL, sys.sum no nil
(L4.L4) as L1.L1 ]
-| ) [ lineitem.l_orderkey NOT NULL, L1 as L2.revenue, orders.o_orderdate NOT
NULL, orders.o_shippriority NOT NULL ] [ L2.revenue, orders.o_orderdate ASC NOT
NULL ]
+| | | ) [ orders.o_orderdate NOT NULL, orders.o_shippriority NOT NULL,
lineitem.l_orderkey NOT NULL HASHCOL , lineitem.l_extendedprice NOT NULL,
lineitem.l_discount NOT NULL, sys.sql_sub(decimal(15,2)[tinyint "1"],
lineitem.l_discount NOT NULL) as L13.L13, sys.sql_mul(lineitem.l_extendedprice
NOT NULL, L13.L13) as L14.L14 ]
+| | ) [ lineitem.l_orderkey NOT NULL HASHCOL , orders.o_shippriority NOT NULL,
orders.o_orderdate NOT NULL ] [ lineitem.l_orderkey NOT NULL HASHCOL ,
orders.o_orderdate NOT NULL, orders.o_shippriority NOT NULL, sys.sum no nil
(L14.L14) as L3.L3 ]
+| ) [ lineitem.l_orderkey NOT NULL, L3 as L4.revenue, orders.o_orderdate NOT
NULL, orders.o_shippriority NOT NULL ] [ L4.revenue, orders.o_orderdate ASC NOT
NULL ]
) [ bigint "10" ]
# 22:46:29 >
diff --git a/sql/benchmarks/tpch/Tests/05-plan.stable.out
b/sql/benchmarks/tpch/Tests/05-plan.stable.out
--- a/sql/benchmarks/tpch/Tests/05-plan.stable.out
+++ b/sql/benchmarks/tpch/Tests/05-plan.stable.out
@@ -52,7 +52,7 @@ Ready.
% .plan # table_name
% rel # name
% clob # type
-% 241 # length
+% 247 # length
project (
| group by (
| | project (
@@ -76,9 +76,9 @@ project (
| | | | | table(sys.region) [ region.r_name NOT NULL, region.%TID% NOT NULL ]
COUNT
| | | | ) [ region.r_name NOT NULL = char(25) "ASIA" ]
| | | ) [ nation.%nation_n_regionkey_fkey NOT NULL = region.%TID% NOT NULL
JOINIDX sys.nation.nation_n_regionkey_fkey ]
-| | ) [ lineitem.l_extendedprice NOT NULL, lineitem.l_discount NOT NULL,
nation.n_name NOT NULL, sys.sql_sub(decimal(15,2)[tinyint "1"],
lineitem.l_discount NOT NULL) as L3.L3, sys.sql_mul(lineitem.l_extendedprice
NOT NULL, L3.L3) as L4.L4 ]
-| ) [ nation.n_name NOT NULL ] [ nation.n_name NOT NULL, sys.sum no nil
(L4.L4) as L1.L1 ]
-) [ nation.n_name NOT NULL, L1 as L2.revenue ] [ L2.revenue ]
+| | ) [ lineitem.l_extendedprice NOT NULL, lineitem.l_discount NOT NULL,
nation.n_name NOT NULL, sys.sql_sub(decimal(15,2)[tinyint "1"],
lineitem.l_discount NOT NULL) as L14.L14, sys.sql_mul(lineitem.l_extendedprice
NOT NULL, L14.L14) as L15.L15 ]
+| ) [ nation.n_name NOT NULL ] [ nation.n_name NOT NULL, sys.sum no nil
(L15.L15) as L3.L3 ]
+) [ nation.n_name NOT NULL, L3 as L4.revenue ] [ L4.revenue ]
# 22:46:29 >
# 22:46:29 > "Done."
diff --git a/sql/benchmarks/tpch/Tests/06-plan.stable.out
b/sql/benchmarks/tpch/Tests/06-plan.stable.out
--- a/sql/benchmarks/tpch/Tests/06-plan.stable.out
+++ b/sql/benchmarks/tpch/Tests/06-plan.stable.out
@@ -44,9 +44,9 @@ project (
| | | select (
| | | | table(sys.lineitem) [ lineitem.l_quantity NOT NULL,
lineitem.l_extendedprice NOT NULL, lineitem.l_discount NOT NULL,
lineitem.l_shipdate NOT NULL ] COUNT
| | | ) [ date "1994-01-01" <= lineitem.l_shipdate NOT NULL < sys.sql_add(date
"1994-01-01", month_interval "12"),
decimal(15,2)[sys.sql_sub(decimal(3,2)[decimal(2,2) "6"], decimal(3,2) "1")] <=
lineitem.l_discount NOT NULL <=
decimal(15,2)[sys.sql_add(decimal(3,2)[decimal(2,2) "6"], decimal(3,2) "1")],
lineitem.l_quantity NOT NULL < decimal(15,2)[tinyint "24"] ]
-| | ) [ lineitem.l_extendedprice NOT NULL, lineitem.l_discount NOT NULL,
sys.sql_mul(lineitem.l_extendedprice NOT NULL, lineitem.l_discount NOT NULL) as
L3.L3 ]
-| ) [ ] [ sys.sum no nil (L3.L3) as L1.L1 ]
-) [ L1 as L2.revenue ]
+| | ) [ lineitem.l_extendedprice NOT NULL, lineitem.l_discount NOT NULL,
sys.sql_mul(lineitem.l_extendedprice NOT NULL, lineitem.l_discount NOT NULL) as
L6.L6 ]
+| ) [ ] [ sys.sum no nil (L6.L6) as L3.L3 ]
+) [ L3 as L4.revenue ]
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
