Changeset: ece5385231cc for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ece5385231cc
Modified Files:
sql/benchmarks/ssbm/Tests/01-13.stable.out
sql/benchmarks/ssbm/Tests/01.stable.out
sql/benchmarks/ssbm/Tests/02.stable.out
sql/benchmarks/ssbm/Tests/03.stable.out
sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out
sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out
sql/test/BugTracker-2016/Tests/column_alias_in_where_clause.Bug-3947.stable.out
sql/test/pg_regress/Tests/float8.stable.err
sql/test/pg_regress/Tests/int4.stable.out
Branch: Dec2016
Log Message:
Approved non 128 bit output.
diffs (truncated from 368 to 300 lines):
diff --git a/sql/benchmarks/ssbm/Tests/01-13.stable.out
b/sql/benchmarks/ssbm/Tests/01-13.stable.out
--- a/sql/benchmarks/ssbm/Tests/01-13.stable.out
+++ b/sql/benchmarks/ssbm/Tests/01-13.stable.out
@@ -36,7 +36,7 @@ Ready.
# and lo_quantity < 25;
% sys.L4 # table_name
% revenue # name
-% hugeint # type
+% bigint # type
% 10 # length
[ 4199635969 ]
@@ -52,7 +52,7 @@ Ready.
# and lo_quantity between 26 and 35;
% sys.L4 # table_name
% revenue # name
-% hugeint # type
+% bigint # type
% 9 # length
[ 927530712 ]
@@ -68,7 +68,7 @@ Ready.
# and lo_quantity between 36 and 40;
% sys.L4 # table_name
% revenue # name
-% hugeint # type
+% bigint # type
% 9 # length
[ 213477639 ]
@@ -85,8 +85,8 @@ Ready.
# and s_region = 'AMERICA'
# group by d_year, p_brand1
# order by d_year, p_brand1;
-% sys.L2, sys.dwdate, sys.part # table_name
-% L1, d_year, p_brand1 # name
+% sys.L3, sys.dwdate, sys.part # table_name
+% L2, d_year, p_brand1 # name
% bigint, int, clob # type
% 8, 4, 9 # length
[ 35741623, 1992, "MFGR#1211" ]
@@ -260,8 +260,8 @@ Ready.
# and s_region = 'ASIA'
# group by d_year, p_brand1
# order by d_year, p_brand1;
-% sys.L2, sys.dwdate, sys.part # table_name
-% L1, d_year, p_brand1 # name
+% sys.L3, sys.dwdate, sys.part # table_name
+% L2, d_year, p_brand1 # name
% bigint, int, clob # type
% 8, 4, 9 # length
[ 10306232, 1992, "MFGR#2221" ]
@@ -325,8 +325,8 @@ Ready.
# and s_region = 'EUROPE'
# group by d_year, p_brand1
# order by d_year, p_brand1;
-% sys.L2, sys.dwdate, sys.part # table_name
-% L1, d_year, p_brand1 # name
+% sys.L3, sys.dwdate, sys.part # table_name
+% L2, d_year, p_brand1 # name
% bigint, int, clob # type
% 8, 4, 9 # length
[ 2535744, 1992, "MFGR#2221" ]
diff --git a/sql/benchmarks/ssbm/Tests/01.stable.out
b/sql/benchmarks/ssbm/Tests/01.stable.out
--- a/sql/benchmarks/ssbm/Tests/01.stable.out
+++ b/sql/benchmarks/ssbm/Tests/01.stable.out
@@ -31,7 +31,7 @@ Ready.
# and lo_quantity < 25;
% sys.L4 # table_name
% revenue # name
-% hugeint # type
+% bigint # type
% 10 # length
[ 4199635969 ]
diff --git a/sql/benchmarks/ssbm/Tests/02.stable.out
b/sql/benchmarks/ssbm/Tests/02.stable.out
--- a/sql/benchmarks/ssbm/Tests/02.stable.out
+++ b/sql/benchmarks/ssbm/Tests/02.stable.out
@@ -31,7 +31,7 @@ Ready.
# and lo_quantity between 26 and 35;
% sys.L4 # table_name
% revenue # name
-% hugeint # type
+% bigint # type
% 9 # length
[ 927530712 ]
diff --git a/sql/benchmarks/ssbm/Tests/03.stable.out
b/sql/benchmarks/ssbm/Tests/03.stable.out
--- a/sql/benchmarks/ssbm/Tests/03.stable.out
+++ b/sql/benchmarks/ssbm/Tests/03.stable.out
@@ -31,7 +31,7 @@ Ready.
# and lo_quantity between 36 and 40;
% sys.L4 # table_name
% revenue # name
-% hugeint # type
+% bigint # type
% 9 # length
[ 213477639 ]
diff --git a/sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out
b/sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out
--- a/sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out
+++ b/sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out
@@ -60,11 +60,11 @@ function user.s8_1():void;
X_33 := bat.new(nil:int);
X_42 := bat.append(X_33,32:int);
X_52 := bat.append(X_42,64:int);
- X_60 := bat.append(X_52,64:int);
+ X_60 := bat.append(X_52,63:int);
X_35 := bat.new(nil:int);
X_44 := bat.append(X_35,0:int);
X_54 := bat.append(X_44,0:int);
- X_61 := bat.append(X_54,0:int);
+ X_62 := bat.append(X_54,0:int);
X_3 := sql.mvc();
C_4:bat[:oid] := sql.tid(X_3,"sys","dbg");
X_7:bat[:int] := sql.bind(X_3,"sys","dbg","a",0:int);
@@ -77,7 +77,7 @@ function user.s8_1():void;
X_15 := bat.setKey(X_14,true);
X_22:bat[:lng] := batcalc./(X_20,2:bte);
X_26:bat[:lng] := batcalc.*(X_22,2:bte);
- sql.resultSet(X_55,X_57,X_59,X_60,X_61,X_15,X_20,X_26);
+ sql.resultSet(X_55,X_57,X_59,X_60,X_62,X_15,X_20,X_26);
end user.s8_1;
#inline actions= 0 time=4 usec
#remap actions= 2 time=57 usec
@@ -146,11 +146,11 @@ function user.s20_1():void;
X_33 := bat.new(nil:int);
X_42 := bat.append(X_33,32:int);
X_52 := bat.append(X_42,64:int);
- X_60 := bat.append(X_52,64:int);
+ X_60 := bat.append(X_52,63:int);
X_35 := bat.new(nil:int);
X_44 := bat.append(X_35,0:int);
X_54 := bat.append(X_44,0:int);
- X_61 := bat.append(X_54,0:int);
+ X_62 := bat.append(X_54,0:int);
X_3 := sql.mvc();
C_4:bat[:oid] := sql.tid(X_3,"sys","dbg");
X_7:bat[:int] := sql.bind(X_3,"sys","dbg","a",0:int);
@@ -163,7 +163,7 @@ function user.s20_1():void;
X_15 := bat.setKey(X_14,true);
X_22:bat[:lng] := batcalc./(X_20,2:bte);
X_26:bat[:lng] := batcalc.*(X_22,2:bte);
- sql.resultSet(X_55,X_57,X_59,X_60,X_61,X_15,X_20,X_26);
+ sql.resultSet(X_55,X_57,X_59,X_60,X_62,X_15,X_20,X_26);
end user.s20_1;
#inline actions= 0 time=1 usec
#remap actions= 2 time=40 usec
diff --git a/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out
b/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out
--- a/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out
+++ b/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out
@@ -48,41 +48,43 @@ Ready.
% clob # type
% 194 # length
function user.s6_1():void;
- X_0:void := querylog.define("explain\nselect t1.subject as id1, t2.subject
as id2\nfrom treeitems t1, treeitems t2\nwhere t2.pre between t1.pre and t1.pre
+ t1.size;","default_pipe",35:int);
-barrier X_80 := language.dataflow();
- X_35 := bat.new(nil:str);
- X_42 := bat.append(X_35,"sys.L2");
- X_52 := bat.append(X_42,"sys.L4");
+ X_0:void := querylog.define("explain\nselect t1.subject as id1, t2.subject
as id2\nfrom treeitems t1, treeitems t2\nwhere t2.pre between t1.pre and t1.pre
+ t1.size;","default_pipe",37:int);
+barrier X_82 := language.dataflow();
X_37 := bat.new(nil:str);
- X_44 := bat.append(X_37,"id1");
- X_54 := bat.append(X_44,"id2");
- X_38 := bat.new(nil:str);
- X_46 := bat.append(X_38,"int");
- X_56 := bat.append(X_46,"int");
- X_39 := bat.new(nil:int);
- X_48 := bat.append(X_39,32:int);
- X_57 := bat.append(X_48,32:int);
+ X_44 := bat.append(X_37,"sys.L2");
+ X_54 := bat.append(X_44,"sys.L4");
+ X_39 := bat.new(nil:str);
+ X_46 := bat.append(X_39,"id1");
+ X_56 := bat.append(X_46,"id2");
+ X_40 := bat.new(nil:str);
+ X_48 := bat.append(X_40,"int");
+ X_58 := bat.append(X_48,"int");
X_41 := bat.new(nil:int);
- X_50 := bat.append(X_41,0:int);
- X_58 := bat.append(X_50,0:int);
+ X_50 := bat.append(X_41,32:int);
+ X_59 := bat.append(X_50,32:int);
+ X_43 := bat.new(nil:int);
+ X_52 := bat.append(X_43,0:int);
+ X_60 := bat.append(X_52,0:int);
X_3 := sql.mvc();
C_4:bat[:oid] := sql.tid(X_3,"sys","treeitems");
X_7:bat[:lng] := sql.bind(X_3,"sys","treeitems","pre",0:int);
X_10 := algebra.projection(C_4,X_7);
- X_14:bat[:lng] := sql.bind(X_3,"sys","treeitems","size",0:int);
- X_16 := algebra.projection(C_4,X_14);
- X_17:bat[:lng] := batcalc.+(X_10,X_16);
- (X_20,r1_21) :=
algebra.subrangejoin(X_10,X_10,X_17,nil:BAT,nil:BAT,true,true,nil:lng);
- X_27:bat[:int] := sql.bind(X_3,"sys","treeitems","subject",0:int);
- X_29 := algebra.projection(C_4,X_27);
- X_30 := algebra.projection(r1_21,X_29);
- X_33 := algebra.projection(X_20,X_29);
+ X_14 := batcalc.lng(X_10);
+ X_15:bat[:lng] := sql.bind(X_3,"sys","treeitems","size",0:int);
+ X_17 := algebra.projection(C_4,X_15);
+ X_18 := batcalc.lng(X_17);
+ X_19:bat[:lng] := batcalc.+(X_14,X_18);
+ (X_22,r1_23) :=
algebra.subrangejoin(X_10,X_10,X_19,nil:BAT,nil:BAT,true,true,nil:lng);
+ X_29:bat[:int] := sql.bind(X_3,"sys","treeitems","subject",0:int);
+ X_31 := algebra.projection(C_4,X_29);
+ X_32 := algebra.projection(r1_23,X_31);
+ X_35 := algebra.projection(X_22,X_31);
language.pass(X_10);
language.pass(X_10);
language.pass(C_4);
- language.pass(X_29);
-exit X_80;
- sql.resultSet(X_52,X_54,X_56,X_57,X_58,X_30,X_33);
+ language.pass(X_31);
+exit X_82;
+ sql.resultSet(X_54,X_56,X_58,X_59,X_60,X_32,X_35);
end user.s6_1;
#inline actions= 0 time=3 usec
#remap actions= 1 time=31 usec
diff --git
a/sql/test/BugTracker-2016/Tests/column_alias_in_where_clause.Bug-3947.stable.out
b/sql/test/BugTracker-2016/Tests/column_alias_in_where_clause.Bug-3947.stable.out
---
a/sql/test/BugTracker-2016/Tests/column_alias_in_where_clause.Bug-3947.stable.out
+++
b/sql/test/BugTracker-2016/Tests/column_alias_in_where_clause.Bug-3947.stable.out
@@ -88,13 +88,13 @@ Ready.
#SELECT a AS "A", b * b AS "B", c AS "C" FROM t_alias WHERE "b" * b >99;
% sys.L2, sys.L4, sys.L6 # table_name
% A, B, C # name
-% int, hugeint, varchar # type
+% int, bigint, varchar # type
% 1, 3, 4 # length
[ 1, 100, "tien" ]
#SELECT * FROM (SELECT a AS "A", b * b AS "B", c AS "C" FROM t_alias) T1 WHERE
"B" >99;
% sys.t1, sys.t1, sys.t1 # table_name
% A, B, C # name
-% int, hugeint, varchar # type
+% int, bigint, varchar # type
% 1, 3, 4 # length
[ 1, 100, "tien" ]
#SELECT a AS "A", b AS "B", c AS "C" FROM t_alias WHERE "c" LIKE '%en';
@@ -141,7 +141,7 @@ Ready.
#SELECT a*b AS "A*B", c AS "C" FROM t_alias GROUP BY "C", "A*B";
% sys.L2, sys.t_alias # table_name
% A*B, C # name
-% hugeint, varchar # type
+% bigint, varchar # type
% 2, 4 # length
[ 10, "tien" ]
[ 22, "elf" ]
diff --git a/sql/test/pg_regress/Tests/float8.stable.err
b/sql/test/pg_regress/Tests/float8.stable.err
--- a/sql/test/pg_regress/Tests/float8.stable.err
+++ b/sql/test/pg_regress/Tests/float8.stable.err
@@ -112,8 +112,8 @@ QUERY = SELECT '' AS bad, f.f1 * '1e200'
ERROR = !overflow in calculation -1.2345678901234e+200*9.9999999999999997e+199.
MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989
QUERY = SELECT '' AS bad, f.f1 ^ '1e200' from FLOAT8_TBL f;
-ERROR = !decimal (1e20) doesn't have format (18.0)
-MAPI = (monetdb) /var/tmp/mtest-4855/.s.monetdb.34828
+ERROR = !decimal (1e200) doesn't have format (18.0)
+MAPI = (monetdb) /var/tmp/mtest-19622/.s.monetdb.32578
QUERY = SELECT '' AS bad, f.f1 / '0.0' from FLOAT8_TBL f;
ERROR = !division by zero.
MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989
diff --git a/sql/test/pg_regress/Tests/int4.stable.out
b/sql/test/pg_regress/Tests/int4.stable.out
--- a/sql/test/pg_regress/Tests/int4.stable.out
+++ b/sql/test/pg_regress/Tests/int4.stable.out
@@ -168,7 +168,7 @@ Ready.
#SELECT '' AS five, i.f1, i.f1 * cast('2' as integer) AS x FROM INT4_TBL i;
% .L2, sys.i, sys.L6 # table_name
% five, f1, x # name
-% char, int, hugeint # type
+% char, int, bigint # type
% 0, 11, 11 # length
[ "", 0, 0 ]
[ "", 123456, 246912 ]
@@ -179,7 +179,7 @@ Ready.
#WHERE abs(f1) < 1073741824;
% .L2, sys.i, sys.L6 # table_name
% five, f1, x # name
-% char, int, hugeint # type
+% char, int, bigint # type
% 0, 7, 7 # length
[ "", 0, 0 ]
[ "", 123456, 246912 ]
@@ -290,72 +290,72 @@ Ready.
#--
#-- variations on unary minus parsing
#SELECT -2+3 AS one;
-% .L # table_name
+% .L2 # table_name
% one # name
% tinyint # type
% 1 # length
[ 1 ]
#SELECT 4-2 AS two;
-% .L # table_name
+% .L2 # table_name
% two # name
% tinyint # type
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
