Changeset: 50ab49161298 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=50ab49161298
Added Files:
sql/test/BugTracker-2016/Tests/storagemodel.stable.out.int128
Modified Files:
sql/backends/monet5/UDF/Tests/udf-fuse.stable.out
sql/backends/monet5/UDF/Tests/udf-reverse.stable.out
sql/backends/monet5/generator/Tests/generator03.stable.out
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/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-explain.stable.out
sql/benchmarks/tpch/Tests/06-plan.stable.out
sql/benchmarks/tpch/Tests/07-plan.stable.out
sql/benchmarks/tpch/Tests/08-explain.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-explain.stable.out
sql/benchmarks/tpch/Tests/11-plan.stable.out
sql/benchmarks/tpch/Tests/14-explain.stable.out
sql/benchmarks/tpch/Tests/14-plan.stable.out
sql/benchmarks/tpch/Tests/15-plan.stable.out
sql/benchmarks/tpch/Tests/17-explain.stable.out
sql/benchmarks/tpch/Tests/17-plan.stable.out
sql/benchmarks/tpch/Tests/19-explain.stable.out
sql/benchmarks/tpch/Tests/19-plan.stable.out
sql/test/BugDay_2005-10-06_2.9.3/Tests/huge_expression_and_column_name.SF-921173.stable.out
sql/test/BugDay_2005-10-06_2.9.3/Tests/max_min_sum_null.SF-1123132.stable.out
sql/test/BugTracker-2008/Tests/extract_bug.SF-2075266.stable.out
sql/test/BugTracker-2009/Tests/arithmetic-small-values-null.SF-2921310.stable.out
sql/test/BugTracker-2009/Tests/avg-bug.SF-2132666.stable.out
sql/test/BugTracker-2009/Tests/bit_and.SF-2850341.stable.out
sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out
sql/test/BugTracker-2011/Tests/non-stable-select-bug.Bug-2894.stable.out
sql/test/BugTracker-2012/Tests/large-number-operation-strange-results.Bug-2929.stable.out
sql/test/BugTracker-2013/Tests/aggregates-typing-issues.Bug-3277.stable.out
sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out
sql/test/BugTracker-2014/Tests/groupby.Bug-3421.stable.out
sql/test/BugTracker-2014/Tests/hexadecimal_literals.Bug-3621.stable.out
sql/test/BugTracker-2014/Tests/union_with_subqueries.Bug-3518.stable.out
sql/test/BugTracker-2015/Tests/incorrect_result_type.Bug-3687.stable.out
sql/test/BugTracker-2016/Tests/cast_and_floor.Bug-6071.sql
sql/test/BugTracker-2016/Tests/cast_and_floor.Bug-6071.stable.out
sql/test/BugTracker-2016/Tests/storagemodel.stable.out
sql/test/BugTracker/Tests/case_with_aggr.SF-1876779.stable.out
sql/test/BugTracker/Tests/groupby_with_alias.SF-1520575.stable.out
sql/test/SQLite_regress/sqllogictest/Tests/select1.test.stable.out
sql/test/SQLite_regress/sqllogictest/Tests/select2.test.stable.out
sql/test/SQLite_regress/sqllogictest/Tests/select3.test.stable.out
sql/test/Tests/zones.stable.out
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade/Tests/upgrade.stable.out
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
sql/test/leaks/Tests/check0.stable.out
sql/test/leaks/Tests/check1.stable.out
sql/test/leaks/Tests/check2.stable.out
sql/test/leaks/Tests/check3.stable.out
sql/test/leaks/Tests/check4.stable.out
sql/test/leaks/Tests/check5.stable.out
sql/test/leaks/Tests/drop3.stable.out
sql/test/leaks/Tests/select1.stable.out
sql/test/leaks/Tests/select2.stable.out
sql/test/leaks/Tests/temp1.stable.out
sql/test/leaks/Tests/temp2.stable.out
sql/test/leaks/Tests/temp3.stable.out
sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
Branch: Jun2016
Log Message:
Approvals.
diffs (truncated from 28971 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
@@ -31,11 +31,11 @@ Ready.
function user.s2_1(A0:bte,A1:bte):void;
X_11:void := querylog.define("explain select
fuse(1,2);","sequential_pipe",5);
X_3:sht := udf.fuse(A0,A1);
- sql.resultSet(".L","fuse_single_value","smallint",16,0,7,X_3);
+ sql.resultSet(".L1","L1","smallint",16,0,7,X_3);
end user.s2_1;
#select fuse(1,2);
-% .L # table_name
-% fuse_single_value # name
+% .L1 # table_name
+% L1 # name
% smallint # type
% 3 # length
[ 258 ]
@@ -47,11 +47,11 @@ end user.s2_1;
function user.s4_1(A0:sht,A1:sht):void;
X_11:void := querylog.define("explain select
fuse(1000,2000);","sequential_pipe",5);
X_3:int := udf.fuse(A0,A1);
- sql.resultSet(".L","fuse_single_value","int",32,0,7,X_3);
+ sql.resultSet(".L1","L1","int",32,0,7,X_3);
end user.s4_1;
#select fuse(1000,2000);
-% .L # table_name
-% fuse_single_value # name
+% .L1 # table_name
+% L1 # name
% int # type
% 8 # length
[ 65538000 ]
@@ -63,11 +63,11 @@ end user.s4_1;
function user.s6_1(A0:int,A1:int):void;
X_11:void := querylog.define("explain select
fuse(1000000,2000000);","sequential_pipe",5);
X_3:lng := udf.fuse(A0,A1);
- sql.resultSet(".L","fuse_single_value","bigint",64,0,7,X_3);
+ sql.resultSet(".L1","L1","bigint",64,0,7,X_3);
end user.s6_1;
#select fuse(1000000,2000000);
-% .L # table_name
-% fuse_single_value # name
+% .L1 # table_name
+% L1 # name
% bigint # type
% 16 # length
[ 4294967298000000 ]
@@ -97,9 +97,9 @@ end user.s6_1;
function user.s14_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_32 := bat.append(X_24,"sys.L1");
X_27 := bat.new(nil:oid,nil:str);
- X_34 := bat.append(X_27,"fuse_a");
+ X_34 := bat.append(X_27,"L1");
X_28 := bat.new(nil:oid,nil:str);
X_36 := bat.append(X_28,"smallint");
X_29 := bat.new(nil:oid,nil:int);
@@ -129,9 +129,9 @@ end user.s14_1;
function user.s15_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_32 := bat.append(X_24,"sys.L1");
X_27 := bat.new(nil:oid,nil:str);
- X_34 := bat.append(X_27,"fuse_c");
+ X_34 := bat.append(X_27,"L1");
X_28 := bat.new(nil:oid,nil:str);
X_36 := bat.append(X_28,"int");
X_29 := bat.new(nil:oid,nil:int);
@@ -161,9 +161,9 @@ end user.s15_1;
function user.s16_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_32 := bat.append(X_24,"sys.L1");
X_27 := bat.new(nil:oid,nil:str);
- X_34 := bat.append(X_27,"fuse_e");
+ X_34 := bat.append(X_27,"L1");
X_28 := bat.new(nil:oid,nil:str);
X_36 := bat.append(X_28,"bigint");
X_29 := bat.new(nil:oid,nil:int);
@@ -186,8 +186,8 @@ function user.s16_1():void;
sql.resultSet(X_32,X_34,X_36,X_38,X_40,X_22);
end user.s16_1;
#select fuse(a,b) from udf_fuse;
-% sys.L # table_name
-% fuse_a # name
+% sys.L1 # table_name
+% L1 # name
% smallint # type
% 4 # length
[ 258 ]
@@ -195,8 +195,8 @@ end user.s16_1;
[ 1286 ]
[ 1800 ]
#select fuse(c,d) from udf_fuse;
-% sys.L # table_name
-% fuse_c # name
+% sys.L1 # table_name
+% L1 # name
% int # type
% 9 # length
[ 65538000 ]
@@ -204,8 +204,8 @@ end user.s16_1;
[ 327686000 ]
[ 458760000 ]
#select fuse(e,f) from udf_fuse;
-% sys.L # table_name
-% fuse_e # name
+% sys.L1 # table_name
+% L1 # name
% bigint # type
% 17 # length
[ 4294967298000000 ]
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
@@ -52,11 +52,11 @@ Ready.
function user.s2_1(A0:str):void;
X_9:void := querylog.define("explain select
reverse(\\'MonetDB\\');","sequential_pipe",5);
X_2:str := udf.reverse(A0);
- sql.resultSet(".L","reverse_single_value","clob",0,0,4,X_2);
+ sql.resultSet(".L1","L1","clob",0,0,4,X_2);
end user.s2_1;
#select reverse('MonetDB');
-% .L # table_name
-% reverse_single_value # name
+% .L1 # table_name
+% L1 # name
% clob # type
% 7 # length
[ "BDtenoM" ]
@@ -86,9 +86,9 @@ end user.s2_1;
function user.s10_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_25 := bat.append(X_17,"sys.L1");
X_20 := bat.new(nil:oid,nil:str);
- X_27 := bat.append(X_20,"reverse_x");
+ X_27 := bat.append(X_20,"L1");
X_21 := bat.new(nil:oid,nil:str);
X_29 := bat.append(X_21,"clob");
X_22 := bat.new(nil:oid,nil:int);
@@ -106,8 +106,8 @@ function user.s10_1():void;
sql.resultSet(X_25,X_27,X_29,X_31,X_32,X_15);
end user.s10_1;
#select reverse(x) from udf_reverse;
-% sys.L # table_name
-% reverse_x # name
+% sys.L1 # table_name
+% L1 # name
% clob # type
% 30 # length
[ "BDtenoM" ]
diff --git a/sql/backends/monet5/generator/Tests/generator03.stable.out
b/sql/backends/monet5/generator/Tests/generator03.stable.out
--- a/sql/backends/monet5/generator/Tests/generator03.stable.out
+++ b/sql/backends/monet5/generator/Tests/generator03.stable.out
@@ -24,9 +24,9 @@ Ready.
# 09:47:33 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-9611" "--port=33175"
# 09:47:33 >
-#select cast( '2008-03-01 00:00' as timestamp);
-% .L # table_name
-% single_value # name
+#select timestamp '2008-03-01 00:00';
+% .L1 # table_name
+% L1 # name
% timestamp # type
% 26 # length
[ 2008-03-01 00:00:00.000000 ]
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
@@ -78,7 +78,7 @@ function user.s2_1(A0:int,A1:int,A2:int,
X_54 := algebra.projection(X_41,X_53);
X_55:bat[:lng] := batcalc.*(X_52,X_54);
X_56:lng := aggr.sum(X_55);
- sql.resultSet("sys.L1","revenue","bigint",64,0,7,X_56);
+ sql.resultSet("sys.L2","revenue","bigint",64,0,7,X_56);
end user.s2_1;
# 23:10:45 >
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
@@ -78,7 +78,7 @@ function user.s2_1(A0:int,A1:int,A2:int,
X_54 := algebra.projection(X_41,X_53);
X_55:bat[:lng] := batcalc.*(X_52,X_54);
X_56:lng := aggr.sum(X_55);
- sql.resultSet("sys.L1","revenue","bigint",64,0,7,X_56);
+ sql.resultSet("sys.L2","revenue","bigint",64,0,7,X_56);
end user.s2_1;
# 23:10:45 >
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
@@ -85,7 +85,7 @@ function user.s2_1(A0:int,A1:int,A2:int,
X_61 := algebra.projection(X_48,X_60);
X_62:bat[:lng] := batcalc.*(X_59,X_61);
X_63:lng := aggr.sum(X_62);
- sql.resultSet("sys.L1","revenue","bigint",64,0,7,X_63);
+ sql.resultSet("sys.L2","revenue","bigint",64,0,7,X_63);
end user.s2_1;
# 23:10:45 >
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
@@ -49,14 +49,14 @@ Ready.
% .plan # table_name
% rel # name
% clob # type
-% 945 # length
+% 951 # length
project (
| group by (
| | 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_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 L2.L2, sys.sum no nil
(sys.sql_mul(lineitem.l_extendedprice NOT NULL,
sys.sql_sub(decimal(15,2)[tinyint "1"], lineitem.l_discount NOT NULL))) as
L3.L3, sys.sum no nil (sys.sql_mul(sys.sql_mul(lineitem.l_extendedprice NOT
NULL, sys.sql_sub(decimal(15,2)[tinyint "1"], lineitem.l_discount NOT NULL)),
sys.sql_add(decimal(15,2)[tinyint "1"], lineitem.l_tax NOT NULL))) as L4.L4,
sys.avg no nil (double[lineitem.l_quantity NOT NULL] as lineitem.l_quantity) as
L5.L5, sys.avg no nil (double[lineitem.l_extendedprice NOT NULL] as
lineitem.l_extendedprice) as L6.L6, sys.avg no nil (double[lineitem.l_discount
NOT NULL] as lineitem.l_discount) as L7.L7, sys.count() NOT NULL as L10.L10 ]
-) [ lineitem.l_returnflag NOT NULL, lineitem.l_linestatus NOT NULL, L1 NOT
NULL as L1.sum_qty, L2 NOT NULL as L2.sum_base_price, L3 as L3.sum_disc_price,
L4 as L4.sum_charge, L5 as L5.avg_qty, L6 as L6.avg_price, L7 as L7.avg_disc,
L10 NOT NULL as L10.count_order ] [ lineitem.l_returnflag ASC NOT NULL,
lineitem.l_linestatus ASC NOT NULL ]
+| ) [ 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
(sys.sql_mul(lineitem.l_extendedprice NOT NULL,
sys.sql_sub(decimal(15,2)[tinyint "1"], lineitem.l_discount NOT NULL))) as
L5.L5, sys.sum no nil (sys.sql_mul(sys.sql_mul(lineitem.l_extendedprice NOT
NULL, sys.sql_sub(decimal(15,2)[tinyint "1"], lineitem.l_discount NOT NULL)),
sys.sql_add(decimal(15,2)[tinyint "1"], lineitem.l_tax NOT NULL))) as L7.L7,
sys.avg no nil (double[lineitem.l_quantity NOT NULL] as lineitem.l_quantity) as
L11.L11, sys.avg no nil (double[lineitem.l_extendedprice NOT NULL] as
lineitem.l_extendedprice) as L13.L13, sys.avg no nil
(double[lineitem.l_discount NOT NULL] as lineitem.l_discount) 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 ]
# 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
@@ -69,7 +69,7 @@ top N (
| | | | ) [ 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 ]
| | ) [ 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
(sys.sql_mul(lineitem.l_extendedprice NOT NULL,
sys.sql_sub(decimal(15,2)[tinyint "1"], lineitem.l_discount NOT NULL))) as
L1.L1 ]
-| ) [ lineitem.l_orderkey NOT NULL, L1 as L1.revenue, orders.o_orderdate NOT
NULL, orders.o_shippriority NOT NULL ] [ L1.revenue, orders.o_orderdate ASC NOT
NULL ]
+| ) [ 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 ]
) [ wrd "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
@@ -76,7 +76,7 @@ project (
| | | ) [ 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 ]
| ) [ nation.n_name NOT NULL ] [ nation.n_name NOT NULL, sys.sum no nil
(sys.sql_mul(lineitem.l_extendedprice NOT NULL,
sys.sql_sub(decimal(15,2)[tinyint "1"], lineitem.l_discount NOT NULL))) as
L1.L1 ]
-) [ nation.n_name NOT NULL, L1 as L1.revenue ] [ L1.revenue ]
+) [ nation.n_name NOT NULL, L1 as L2.revenue ] [ L2.revenue ]
# 22:46:29 >
# 22:46:29 > "Done."
diff --git a/sql/benchmarks/tpch/Tests/06-explain.stable.out
b/sql/benchmarks/tpch/Tests/06-explain.stable.out
--- a/sql/benchmarks/tpch/Tests/06-explain.stable.out
+++ b/sql/benchmarks/tpch/Tests/06-explain.stable.out
@@ -79,7 +79,7 @@ function user.s2_1(A0:date,A1:date,A2:in
X_53 := sql.projectdelta(C_45,X_23,C_25,r1_28,X_27);
X_54:bat[:lng] := batcalc.*(X_52,X_53);
X_55:lng := aggr.sum(X_54);
- sql.resultSet("sys.L1","revenue","decimal",19,4,10,X_55);
+ sql.resultSet("sys.L2","revenue","decimal",19,4,10,X_55);
end user.s2_1;
# 22:53:26 >
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,7 +44,7 @@ project (
| | | 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"] ]
| ) [ ] [ sys.sum no nil (sys.sql_mul(lineitem.l_extendedprice NOT NULL,
lineitem.l_discount NOT NULL)) as L1.L1 ]
-) [ L1 as L1.revenue ]
+) [ L1 as L2.revenue ]
# 22:46:30 >
# 22:46:30 > "Done."
diff --git a/sql/benchmarks/tpch/Tests/07-plan.stable.out
b/sql/benchmarks/tpch/Tests/07-plan.stable.out
--- a/sql/benchmarks/tpch/Tests/07-plan.stable.out
+++ b/sql/benchmarks/tpch/Tests/07-plan.stable.out
@@ -84,8 +84,8 @@ project (
| | | | ) [ customer.%customer_c_nationkey_fkey NOT NULL = n2.%TID% NOT NULL
JOINIDX sys.customer.customer_c_nationkey_fkey ]
| | | ) [ (n1.n_name NOT NULL = char(25) "FRANCE", n2.n_name NOT NULL =
char(25) "GERMANY") or (n1.n_name NOT NULL = char(25) "GERMANY", n2.n_name NOT
NULL = char(25) "FRANCE") ]
| | ) [ n1.n_name NOT NULL as shipping.supp_nation, n2.n_name NOT NULL as
shipping.cust_nation, sys.year(lineitem.l_shipdate NOT NULL) as
shipping.l_year, sys.sql_mul(lineitem.l_extendedprice NOT NULL,
sys.sql_sub(decimal(15,2)[tinyint "1"], lineitem.l_discount NOT NULL)) as
shipping.volume ]
-| ) [ shipping.supp_nation NOT NULL, shipping.cust_nation NOT NULL,
shipping.l_year ] [ shipping.supp_nation NOT NULL, shipping.cust_nation NOT
NULL, shipping.l_year, sys.sum no nil (shipping.volume) as L1.L1 ]
-) [ shipping.supp_nation NOT NULL, shipping.cust_nation NOT NULL,
shipping.l_year, L1 as L1.revenue ] [ shipping.supp_nation ASC NOT NULL,
shipping.cust_nation ASC NOT NULL, shipping.l_year ASC ]
+| ) [ shipping.supp_nation NOT NULL, shipping.cust_nation NOT NULL,
shipping.l_year ] [ shipping.supp_nation NOT NULL, shipping.cust_nation NOT
NULL, shipping.l_year, sys.sum no nil (shipping.volume) as L5.L5 ]
+) [ shipping.supp_nation NOT NULL, shipping.cust_nation NOT NULL,
shipping.l_year, L5 as L6.revenue ] [ shipping.supp_nation ASC NOT NULL,
shipping.cust_nation ASC NOT NULL, shipping.l_year ASC ]
# 22:46:30 >
# 22:46:30 > "Done."
diff --git a/sql/benchmarks/tpch/Tests/08-explain.stable.out
b/sql/benchmarks/tpch/Tests/08-explain.stable.out
--- a/sql/benchmarks/tpch/Tests/08-explain.stable.out
+++ b/sql/benchmarks/tpch/Tests/08-explain.stable.out
@@ -62,7 +62,7 @@ function user.s2_1(A0:str,A1:bte,A2:bte,
X_199:void := querylog.define("explain select\n o_year,\n sum(case\n when
nation = \\'BRAZIL\\' then volume\n else 0\n end) / sum(volume) as
mkt_share\nfrom\n (\n select\n extract(year from o_orderdate) as o_year,\n
l_extendedprice * (1 - l_discount) as volume,\n n2.n_name as nation\n from\n
part,\n supplier,\n lineitem,\n orders,\n customer,\n nation n1,\n nation n2,\n
region\n where\n p_partkey = l_partkey\n and s_suppkey = l_suppkey\n and
l_orderkey = o_orderkey\n and o_custkey = c_custkey\n and c_nationkey =
n1.n_nationkey\n and n1.n_regionkey = r_regionkey\n and r_name =
\\'AMERICA\\'\n and s_nationkey = n2.n_nationkey\n and o_orderdate between date
\\'1995-01-01\\' and date \\'1996-12-31\\'\n and p_type = \\'ECONOMY ANODIZED
STEEL\\'\n ) as all_nations\ngroup by\n o_year\norder by\n
o_year;","sequential_pipe",133);
X_174 := bat.new(nil:oid,nil:str);
X_182 := bat.append(X_174,"sys.all_nations");
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
