Changeset: 211cb31e24c0 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=211cb31e24c0
Modified Files:
clients/Tests/exports.stable.out
sql/backends/monet5/Tests/limithack.stable.out
sql/backends/monet5/generator/Tests/generator01.stable.err
sql/backends/monet5/generator/Tests/generator04.stable.err
sql/test/BugTracker-2014/Tests/too_general_errmsg.Bug-3605.stable.err
sql/test/leaks/Tests/check1_bam.stable.out.int128
sql/test/leaks/Tests/check2_bam.stable.out.int128
sql/test/leaks/Tests/check3_bam.stable.out.int128
sql/test/leaks/Tests/check4_bam.stable.out.int128
sql/test/leaks/Tests/check5_bam.stable.out.int128
Branch: default
Log Message:
Approve output
diffs (truncated from 512 to 300 lines):
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -742,7 +742,6 @@ str ALGgroupby(bat *res, const bat *gids
str ALGhsort(bat *result, const bat *bid);
str ALGhsort_rev(bat *result, const bat *bid);
str ALGhtsort(bat *result, const bat *lid);
-str ALGindexjoin(bat *result, const bat *lid, const bat *rid);
str ALGjoin(bat *result, const bat *lid, const bat *rid);
str ALGjoin2(bat *l, bat *r, const bat *lid, const bat *rid);
str ALGjoinPath(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
diff --git a/sql/backends/monet5/Tests/limithack.stable.out
b/sql/backends/monet5/Tests/limithack.stable.out
--- a/sql/backends/monet5/Tests/limithack.stable.out
+++ b/sql/backends/monet5/Tests/limithack.stable.out
@@ -67,7 +67,7 @@ Ready.
% id, name, schema_id, query, type, system, commit_action,
readonly, temporary # name
% int, varchar, int, varchar, smallint, boolean,
smallint, boolean, tinyint # type
% 4, 15, 4, 0, 1, 5, 1, 5, 1 # length
-[ 7194, "systemfunctions", 2000, NULL, 0, true, 0,
false, 0 ]
+[ 7211, "systemfunctions", 2000, NULL, 0, true, 0,
false, 0 ]
# 17:27:34 >
# 17:27:34 > "Done."
diff --git a/sql/backends/monet5/generator/Tests/generator01.stable.err
b/sql/backends/monet5/generator/Tests/generator01.stable.err
--- a/sql/backends/monet5/generator/Tests/generator01.stable.err
+++ b/sql/backends/monet5/generator/Tests/generator01.stable.err
@@ -29,85 +29,85 @@ stderr of test 'generator01` in director
# 12:42:21 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-23485" "--port=37579"
# 12:42:21 >
-MAPI = (monetdb) /var/tmp/mtest-23026/.s.monetdb.39679
+MAPI = (monetdb) /var/tmp/mtest-28786/.s.monetdb.30361
QUERY = select * from generate_series(0,10,-2);
ERROR = !Illegal generator range
-MAPI = (monetdb) /var/tmp/mtest-23026/.s.monetdb.39679
+MAPI = (monetdb) /var/tmp/mtest-28786/.s.monetdb.30361
QUERY = select * from generate_series(10,2,2);
ERROR = !Illegal generator range
-MAPI = (monetdb) /var/tmp/mtest-23026/.s.monetdb.39679
+MAPI = (monetdb) /var/tmp/mtest-28786/.s.monetdb.30361
QUERY = select * from generate_series(0,10,0) ;
ERROR = !zero step size not allowed
-MAPI = (monetdb) /var/tmp/mtest-23026/.s.monetdb.39679
+MAPI = (monetdb) /var/tmp/mtest-28786/.s.monetdb.30361
QUERY = select * from generate_series(0,10,null) ;
ERROR = !null step size not allowed
-MAPI = (monetdb) /var/tmp/mtest-23026/.s.monetdb.39679
+MAPI = (monetdb) /var/tmp/mtest-28786/.s.monetdb.30361
QUERY = select * from generate_series(null,10,1) ;
-ERROR = !Illegal generator range
-MAPI = (monetdb) /var/tmp/mtest-23026/.s.monetdb.39679
+ERROR = !types tinyint(8,0) and timestamp(7,0) are not equal for column 'L2'
+MAPI = (monetdb) /var/tmp/mtest-28786/.s.monetdb.30361
QUERY = select * from generate_series(cast(null as tinyint),10,1) ;
ERROR = !Illegal generator range
-MAPI = (monetdb) /var/tmp/mtest-23026/.s.monetdb.39679
+MAPI = (monetdb) /var/tmp/mtest-28786/.s.monetdb.30361
QUERY = select * from generate_series(null,cast(10 as tinyint),cast(1 as
tinyint)) ;
-ERROR = !Illegal generator range
-MAPI = (monetdb) /var/tmp/mtest-23026/.s.monetdb.39679
+ERROR = !types tinyint(8,0) and timestamp(7,0) are not equal for column 'L1'
+MAPI = (monetdb) /var/tmp/mtest-28786/.s.monetdb.30361
QUERY = select * from generate_series(cast(null as tinyint),cast(10 as
tinyint),cast(1 as tinyint)) ;
ERROR = !Illegal generator range
-MAPI = (monetdb) /var/tmp/mtest-23026/.s.monetdb.39679
+MAPI = (monetdb) /var/tmp/mtest-28786/.s.monetdb.30361
QUERY = select * from generate_series(cast(null as smallint),10,1) ;
ERROR = !Illegal generator range
-MAPI = (monetdb) /var/tmp/mtest-23026/.s.monetdb.39679
+MAPI = (monetdb) /var/tmp/mtest-28786/.s.monetdb.30361
QUERY = select * from generate_series(null,cast(10 as smallint),cast(1 as
smallint)) ;
-ERROR = !Illegal generator range
-MAPI = (monetdb) /var/tmp/mtest-23026/.s.monetdb.39679
+ERROR = !types smallint(16,0) and timestamp(7,0) are not equal for column 'L1'
+MAPI = (monetdb) /var/tmp/mtest-28786/.s.monetdb.30361
QUERY = select * from generate_series(cast(null as smallint),cast(10 as
smallint),cast(1 as smallint)) ;
ERROR = !Illegal generator range
-MAPI = (monetdb) /var/tmp/mtest-23026/.s.monetdb.39679
+MAPI = (monetdb) /var/tmp/mtest-28786/.s.monetdb.30361
QUERY = select * from generate_series(cast(null as integer),10,1) ;
ERROR = !Illegal generator range
-MAPI = (monetdb) /var/tmp/mtest-23026/.s.monetdb.39679
+MAPI = (monetdb) /var/tmp/mtest-28786/.s.monetdb.30361
QUERY = select * from generate_series(null,cast(10 as integer),cast(1 as
integer)) ;
-ERROR = !Illegal generator range
-MAPI = (monetdb) /var/tmp/mtest-23026/.s.monetdb.39679
+ERROR = !types int(32,0) and timestamp(7,0) are not equal for column 'L1'
+MAPI = (monetdb) /var/tmp/mtest-28786/.s.monetdb.30361
QUERY = select * from generate_series(cast(null as integer),cast(10 as
integer),cast(1 as integer)) ;
ERROR = !Illegal generator range
-MAPI = (monetdb) /var/tmp/mtest-23026/.s.monetdb.39679
+MAPI = (monetdb) /var/tmp/mtest-28786/.s.monetdb.30361
QUERY = select * from generate_series(cast(null as bigint),10,1) ;
ERROR = !Illegal generator range
-MAPI = (monetdb) /var/tmp/mtest-23026/.s.monetdb.39679
+MAPI = (monetdb) /var/tmp/mtest-28786/.s.monetdb.30361
QUERY = select * from generate_series(null,cast(10 as bigint),cast(1 as
bigint)) ;
-ERROR = !Illegal generator range
-MAPI = (monetdb) /var/tmp/mtest-23026/.s.monetdb.39679
+ERROR = !types bigint(64,0) and timestamp(7,0) are not equal for column 'L1'
+MAPI = (monetdb) /var/tmp/mtest-28786/.s.monetdb.30361
QUERY = select * from generate_series(cast(null as bigint),cast(10 as
bigint),cast(1 as bigint)) ;
ERROR = !Illegal generator range
-MAPI = (monetdb) /var/tmp/mtest-23026/.s.monetdb.39679
+MAPI = (monetdb) /var/tmp/mtest-28786/.s.monetdb.30361
QUERY = select * from generate_series(cast(null as tinyint),cast(10 as
smallint),cast(1 as bigint)) ;
ERROR = !Illegal generator range
-MAPI = (monetdb) /var/tmp/mtest-23026/.s.monetdb.39679
+MAPI = (monetdb) /var/tmp/mtest-28786/.s.monetdb.30361
QUERY = select * from generate_series(cast(null as timestamp),10,1) ;
-ERROR = !Illegal generator range
-MAPI = (monetdb) /var/tmp/mtest-23026/.s.monetdb.39679
+ERROR = !types tinyint(8,0) and timestamp(7,0) are not equal for column 'L2'
+MAPI = (monetdb) /var/tmp/mtest-28786/.s.monetdb.30361
QUERY = select * from generate_series(null,cast(10 as timestamp),cast(1 as
interval second)) ;
-ERROR = !Illegal generator range
-MAPI = (monetdb) /var/tmp/mtest-23026/.s.monetdb.39679
+ERROR = !types tinyint(8,0) and timestamp(7,0) are not equal
+MAPI = (monetdb) /var/tmp/mtest-28786/.s.monetdb.30361
QUERY = select * from generate_series(cast(null as timestamp),cast(10 as
timestamp),cast(1 as interval second)) ;
-ERROR = !Illegal generator range
-MAPI = (monetdb) /var/tmp/mtest-23026/.s.monetdb.39679
+ERROR = !types tinyint(8,0) and timestamp(7,0) are not equal
+MAPI = (monetdb) /var/tmp/mtest-28786/.s.monetdb.30361
QUERY = select * from generate_series(10,null,1) ;
ERROR = !Illegal generator range
-MAPI = (monetdb) /var/tmp/mtest-23026/.s.monetdb.39679
+MAPI = (monetdb) /var/tmp/mtest-28786/.s.monetdb.30361
QUERY = select * from generate_series(null,10) ;
ERROR = !Illegal generator range
-MAPI = (monetdb) /var/tmp/mtest-23026/.s.monetdb.39679
+MAPI = (monetdb) /var/tmp/mtest-28786/.s.monetdb.30361
QUERY = select * from generate_series(10,null) ;
ERROR = !Illegal generator range
-MAPI = (monetdb) /var/tmp/mtest-23026/.s.monetdb.39679
+MAPI = (monetdb) /var/tmp/mtest-28786/.s.monetdb.30361
QUERY = select * from generate_series(null,-1) ;
ERROR = !Illegal generator range
-MAPI = (monetdb) /var/tmp/mtest-23026/.s.monetdb.39679
+MAPI = (monetdb) /var/tmp/mtest-28786/.s.monetdb.30361
QUERY = select * from generate_series(-1,null) ;
ERROR = !Illegal generator range
-MAPI = (monetdb) /var/tmp/mtest-23026/.s.monetdb.39679
+MAPI = (monetdb) /var/tmp/mtest-28786/.s.monetdb.30361
QUERY = select * from generate_series(0,10,-2) as v
where value <7 and value >3;
ERROR = !Illegal generator range
diff --git a/sql/backends/monet5/generator/Tests/generator04.stable.err
b/sql/backends/monet5/generator/Tests/generator04.stable.err
--- a/sql/backends/monet5/generator/Tests/generator04.stable.err
+++ b/sql/backends/monet5/generator/Tests/generator04.stable.err
@@ -29,26 +29,26 @@ stderr of test 'generator04` in director
# 21:38:52 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-14305" "--port=36294"
# 21:38:52 >
-MAPI = (monetdb) /var/tmp/mtest-5993/.s.monetdb.36135
+MAPI = (monetdb) /var/tmp/mtest-28786/.s.monetdb.30361
QUERY = select * from generate_series('a','a','c');
-ERROR = !unsupported type / unknown data type
-MAPI = (monetdb) /var/tmp/mtest-5993/.s.monetdb.36135
+ERROR = !wrong format (c)
+MAPI = (monetdb) /var/tmp/mtest-28786/.s.monetdb.30361
QUERY = select * from generate_series(false,true,false) ;
-ERROR = !unsupported type / unknown data type
-MAPI = (monetdb) /var/tmp/mtest-5993/.s.monetdb.36135
+ERROR = !types boolean(1,0) and timestamp(7,0) are not equal for column 'L1'
+MAPI = (monetdb) /var/tmp/mtest-28786/.s.monetdb.30361
QUERY = select * from generate_series(null,null,1);
ERROR = !Illegal generator range
-MAPI = (monetdb) /var/tmp/mtest-5993/.s.monetdb.36135
+MAPI = (monetdb) /var/tmp/mtest-28786/.s.monetdb.30361
QUERY = select * from generate_series(10,null,1);
ERROR = !Illegal generator range
-MAPI = (monetdb) /var/tmp/mtest-5993/.s.monetdb.36135
+MAPI = (monetdb) /var/tmp/mtest-28786/.s.monetdb.30361
QUERY = select * from generate_series(null,10,1);
-ERROR = !Illegal generator range
-MAPI = (monetdb) /var/tmp/mtest-5993/.s.monetdb.36135
+ERROR = !types tinyint(8,0) and timestamp(7,0) are not equal for column 'L2'
+MAPI = (monetdb) /var/tmp/mtest-28786/.s.monetdb.30361
QUERY = select * from generate_series(
timestamp '2008-03-01 00:00',
timestamp '2008-03-04 12:00');
-ERROR = !Timestamp step missing
+ERROR = !types timestamp(7,0) and bigint(64,0) are not equal for column 'L1'
# 21:38:52 >
# 21:38:52 > "Done."
diff --git
a/sql/test/BugTracker-2014/Tests/too_general_errmsg.Bug-3605.stable.err
b/sql/test/BugTracker-2014/Tests/too_general_errmsg.Bug-3605.stable.err
--- a/sql/test/BugTracker-2014/Tests/too_general_errmsg.Bug-3605.stable.err
+++ b/sql/test/BugTracker-2014/Tests/too_general_errmsg.Bug-3605.stable.err
@@ -30,9 +30,9 @@ stderr of test 'too_general_errmsg.Bug-3
# 09:47:07 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-8689" "--port=39443"
# 09:47:07 >
-MAPI = (monetdb) /var/tmp/mtest-8689/.s.monetdb.39443
+MAPI = (monetdb) /var/tmp/mtest-28786/.s.monetdb.30361
QUERY = select operatingday, coalesce(gepubliceerd, 0) as gepubliceerd,
coalesce(gereden, 0) as gereden, coalesce(geannuleerd, 0) as geannuleerd,
coalesce(onbekend, 0) as onbekend, coalesce(extra, 0) as extra,
coalesce(tochgezien, 0) as tochgezien from (select operatingday,
count(trip_hash) as gepubliceerd from tt where pointorder = 1 group by
operatingday) as a full outer join (select z.operatingday, count(*) as
geannuleerd from (select trip_hash, operatingday from kv17_canceled except
select trip_hash, operatingday from kv6 where kv6.messagetype = 'ARRIVAL') as u
group by u.operatingday) as e using (operatingday) full outer join (select
o.operatingday, count(trip_hash) as onbekend from (select distinct trip_hash,
operatingday from tt) as o join (select distinct trip_hash from tt where
(epoch(cast(tt.operatingday as timestamp with time zone)) +
cast(split_part(tt.targetarrivaltime, ':', 1) as int) * 3600 +
(cast(split_part(tt.targetarrivaltime, ':', 2) as int) + 10) * 60) < epoch(n
ow()) except (select trip_hash from kv6 where messagetype = 'ARRIVAL' union
all select trip_hash from kv17_canceled)) as p using (trip_hash) group by
operatingday) as f using (operatingday) order by operatingday;
-ERROR = !SELECT: no such unary operator 'epoch(timestamptz)'
+ERROR = !SELECT: no such operator 'split_part'
# 09:47:07 >
# 09:47:07 > "Done."
diff --git a/sql/test/leaks/Tests/check1_bam.stable.out.int128
b/sql/test/leaks/Tests/check1_bam.stable.out.int128
--- a/sql/test/leaks/Tests/check1_bam.stable.out.int128
+++ b/sql/test/leaks/Tests/check1_bam.stable.out.int128
@@ -41,10 +41,10 @@ Ready.
[ "oid", "bit", 45 ]
[ "oid", "bit", 45 ]
[ "oid", "bit", 327 ]
-[ "oid", "bit", 1504 ]
-[ "oid", "bit", 1504 ]
-[ "oid", "bit", 1504 ]
-[ "oid", "bte", 4222 ]
+[ "oid", "bit", 1507 ]
+[ "oid", "bit", 1507 ]
+[ "oid", "bit", 1507 ]
+[ "oid", "bte", 4228 ]
[ "oid", "int", 0 ]
[ "oid", "int", 0 ]
[ "oid", "int", 0 ]
@@ -105,16 +105,16 @@ Ready.
[ "oid", "int", 327 ]
[ "oid", "int", 327 ]
[ "oid", "int", 327 ]
-[ "oid", "int", 1504 ]
-[ "oid", "int", 1504 ]
-[ "oid", "int", 1504 ]
-[ "oid", "int", 1504 ]
-[ "oid", "int", 1504 ]
-[ "oid", "int", 4222 ]
-[ "oid", "int", 4222 ]
-[ "oid", "int", 4222 ]
-[ "oid", "int", 4222 ]
-[ "oid", "int", 4222 ]
+[ "oid", "int", 1507 ]
+[ "oid", "int", 1507 ]
+[ "oid", "int", 1507 ]
+[ "oid", "int", 1507 ]
+[ "oid", "int", 1507 ]
+[ "oid", "int", 4228 ]
+[ "oid", "int", 4228 ]
+[ "oid", "int", 4228 ]
+[ "oid", "int", 4228 ]
+[ "oid", "int", 4228 ]
[ "oid", "lng", 0 ]
[ "oid", "lng", 0 ]
[ "oid", "lng", 0 ]
@@ -236,11 +236,11 @@ Ready.
[ "oid", "str", 327 ]
[ "oid", "str", 327 ]
[ "oid", "str", 327 ]
-[ "oid", "str", 1504 ]
-[ "oid", "str", 1504 ]
-[ "oid", "str", 1504 ]
-[ "oid", "str", 4222 ]
-[ "oid", "str", 4222 ]
+[ "oid", "str", 1507 ]
+[ "oid", "str", 1507 ]
+[ "oid", "str", 1507 ]
+[ "oid", "str", 4228 ]
+[ "oid", "str", 4228 ]
[ "oid", "timestamp", 0 ]
[ "oid", "timestamp", 0 ]
[ "oid", "wrd", 0 ]
diff --git a/sql/test/leaks/Tests/check2_bam.stable.out.int128
b/sql/test/leaks/Tests/check2_bam.stable.out.int128
--- a/sql/test/leaks/Tests/check2_bam.stable.out.int128
+++ b/sql/test/leaks/Tests/check2_bam.stable.out.int128
@@ -41,10 +41,10 @@ Ready.
[ "oid", "bit", 45 ]
[ "oid", "bit", 45 ]
[ "oid", "bit", 327 ]
-[ "oid", "bit", 1504 ]
-[ "oid", "bit", 1504 ]
-[ "oid", "bit", 1504 ]
-[ "oid", "bte", 4222 ]
+[ "oid", "bit", 1507 ]
+[ "oid", "bit", 1507 ]
+[ "oid", "bit", 1507 ]
+[ "oid", "bte", 4228 ]
[ "oid", "int", 0 ]
[ "oid", "int", 0 ]
[ "oid", "int", 0 ]
@@ -105,16 +105,16 @@ Ready.
[ "oid", "int", 327 ]
[ "oid", "int", 327 ]
[ "oid", "int", 327 ]
-[ "oid", "int", 1504 ]
-[ "oid", "int", 1504 ]
-[ "oid", "int", 1504 ]
-[ "oid", "int", 1504 ]
-[ "oid", "int", 1504 ]
-[ "oid", "int", 4222 ]
-[ "oid", "int", 4222 ]
-[ "oid", "int", 4222 ]
-[ "oid", "int", 4222 ]
-[ "oid", "int", 4222 ]
+[ "oid", "int", 1507 ]
+[ "oid", "int", 1507 ]
+[ "oid", "int", 1507 ]
+[ "oid", "int", 1507 ]
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
