Changeset: 438633745652 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=438633745652 Modified Files: 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: resultset Log Message:
Approve the output diffs (truncated from 325 to 300 lines): 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-25912/.s.monetdb.34609 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)' + # 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", 46 ] [ "oid", "bit", 46 ] [ "oid", "bit", 331 ] -[ "oid", "bit", 1505 ] -[ "oid", "bit", 1505 ] -[ "oid", "bit", 1505 ] -[ "oid", "bte", 4218 ] +[ "oid", "bit", 1508 ] +[ "oid", "bit", 1508 ] +[ "oid", "bit", 1508 ] +[ "oid", "bte", 4224 ] [ "oid", "int", 0 ] [ "oid", "int", 0 ] [ "oid", "int", 0 ] @@ -105,16 +105,16 @@ Ready. [ "oid", "int", 331 ] [ "oid", "int", 331 ] [ "oid", "int", 331 ] -[ "oid", "int", 1505 ] -[ "oid", "int", 1505 ] -[ "oid", "int", 1505 ] -[ "oid", "int", 1505 ] -[ "oid", "int", 1505 ] -[ "oid", "int", 4218 ] -[ "oid", "int", 4218 ] -[ "oid", "int", 4218 ] -[ "oid", "int", 4218 ] -[ "oid", "int", 4218 ] +[ "oid", "int", 1508 ] +[ "oid", "int", 1508 ] +[ "oid", "int", 1508 ] +[ "oid", "int", 1508 ] +[ "oid", "int", 1508 ] +[ "oid", "int", 4224 ] +[ "oid", "int", 4224 ] +[ "oid", "int", 4224 ] +[ "oid", "int", 4224 ] +[ "oid", "int", 4224 ] [ "oid", "lng", 0 ] [ "oid", "lng", 0 ] [ "oid", "lng", 0 ] @@ -236,11 +236,11 @@ Ready. [ "oid", "str", 331 ] [ "oid", "str", 331 ] [ "oid", "str", 331 ] -[ "oid", "str", 1505 ] -[ "oid", "str", 1505 ] -[ "oid", "str", 1505 ] -[ "oid", "str", 4218 ] -[ "oid", "str", 4218 ] +[ "oid", "str", 1508 ] +[ "oid", "str", 1508 ] +[ "oid", "str", 1508 ] +[ "oid", "str", 4224 ] +[ "oid", "str", 4224 ] [ "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", 46 ] [ "oid", "bit", 46 ] [ "oid", "bit", 331 ] -[ "oid", "bit", 1505 ] -[ "oid", "bit", 1505 ] -[ "oid", "bit", 1505 ] -[ "oid", "bte", 4218 ] +[ "oid", "bit", 1508 ] +[ "oid", "bit", 1508 ] +[ "oid", "bit", 1508 ] +[ "oid", "bte", 4224 ] [ "oid", "int", 0 ] [ "oid", "int", 0 ] [ "oid", "int", 0 ] @@ -105,16 +105,16 @@ Ready. [ "oid", "int", 331 ] [ "oid", "int", 331 ] [ "oid", "int", 331 ] -[ "oid", "int", 1505 ] -[ "oid", "int", 1505 ] -[ "oid", "int", 1505 ] -[ "oid", "int", 1505 ] -[ "oid", "int", 1505 ] -[ "oid", "int", 4218 ] -[ "oid", "int", 4218 ] -[ "oid", "int", 4218 ] -[ "oid", "int", 4218 ] -[ "oid", "int", 4218 ] +[ "oid", "int", 1508 ] +[ "oid", "int", 1508 ] +[ "oid", "int", 1508 ] +[ "oid", "int", 1508 ] +[ "oid", "int", 1508 ] +[ "oid", "int", 4224 ] +[ "oid", "int", 4224 ] +[ "oid", "int", 4224 ] +[ "oid", "int", 4224 ] +[ "oid", "int", 4224 ] [ "oid", "lng", 0 ] [ "oid", "lng", 0 ] [ "oid", "lng", 0 ] @@ -236,11 +236,11 @@ Ready. [ "oid", "str", 331 ] [ "oid", "str", 331 ] [ "oid", "str", 331 ] -[ "oid", "str", 1505 ] -[ "oid", "str", 1505 ] -[ "oid", "str", 1505 ] -[ "oid", "str", 4218 ] -[ "oid", "str", 4218 ] +[ "oid", "str", 1508 ] +[ "oid", "str", 1508 ] +[ "oid", "str", 1508 ] +[ "oid", "str", 4224 ] +[ "oid", "str", 4224 ] [ "oid", "timestamp", 0 ] [ "oid", "timestamp", 0 ] [ "oid", "wrd", 0 ] diff --git a/sql/test/leaks/Tests/check3_bam.stable.out.int128 b/sql/test/leaks/Tests/check3_bam.stable.out.int128 --- a/sql/test/leaks/Tests/check3_bam.stable.out.int128 +++ b/sql/test/leaks/Tests/check3_bam.stable.out.int128 @@ -41,10 +41,10 @@ Ready. [ "oid", "bit", 47 ] [ "oid", "bit", 47 ] [ "oid", "bit", 333 ] -[ "oid", "bit", 1505 ] -[ "oid", "bit", 1505 ] -[ "oid", "bit", 1505 ] -[ "oid", "bte", 4218 ] +[ "oid", "bit", 1508 ] +[ "oid", "bit", 1508 ] +[ "oid", "bit", 1508 ] +[ "oid", "bte", 4224 ] [ "oid", "int", 0 ] [ "oid", "int", 0 ] [ "oid", "int", 0 ] @@ -105,16 +105,16 @@ Ready. [ "oid", "int", 333 ] [ "oid", "int", 333 ] [ "oid", "int", 333 ] -[ "oid", "int", 1505 ] -[ "oid", "int", 1505 ] -[ "oid", "int", 1505 ] -[ "oid", "int", 1505 ] -[ "oid", "int", 1505 ] -[ "oid", "int", 4218 ] -[ "oid", "int", 4218 ] -[ "oid", "int", 4218 ] -[ "oid", "int", 4218 ] -[ "oid", "int", 4218 ] +[ "oid", "int", 1508 ] +[ "oid", "int", 1508 ] +[ "oid", "int", 1508 ] +[ "oid", "int", 1508 ] +[ "oid", "int", 1508 ] +[ "oid", "int", 4224 ] +[ "oid", "int", 4224 ] +[ "oid", "int", 4224 ] +[ "oid", "int", 4224 ] +[ "oid", "int", 4224 ] [ "oid", "lng", 0 ] [ "oid", "lng", 0 ] [ "oid", "lng", 0 ] @@ -236,11 +236,11 @@ Ready. [ "oid", "str", 333 ] [ "oid", "str", 333 ] [ "oid", "str", 333 ] -[ "oid", "str", 1505 ] -[ "oid", "str", 1505 ] -[ "oid", "str", 1505 ] -[ "oid", "str", 4218 ] -[ "oid", "str", 4218 ] +[ "oid", "str", 1508 ] +[ "oid", "str", 1508 ] +[ "oid", "str", 1508 ] +[ "oid", "str", 4224 ] +[ "oid", "str", 4224 ] [ "oid", "timestamp", 0 ] [ "oid", "timestamp", 0 ] [ "oid", "wrd", 0 ] diff --git a/sql/test/leaks/Tests/check4_bam.stable.out.int128 b/sql/test/leaks/Tests/check4_bam.stable.out.int128 --- a/sql/test/leaks/Tests/check4_bam.stable.out.int128 +++ b/sql/test/leaks/Tests/check4_bam.stable.out.int128 @@ -41,10 +41,10 @@ Ready. [ "oid", "bit", 48 ] [ "oid", "bit", 48 ] [ "oid", "bit", 335 ] -[ "oid", "bit", 1505 ] -[ "oid", "bit", 1505 ] -[ "oid", "bit", 1505 ] -[ "oid", "bte", 4218 ] +[ "oid", "bit", 1508 ] +[ "oid", "bit", 1508 ] +[ "oid", "bit", 1508 ] +[ "oid", "bte", 4224 ] [ "oid", "int", 0 ] [ "oid", "int", 0 ] [ "oid", "int", 0 ] @@ -105,16 +105,16 @@ Ready. [ "oid", "int", 335 ] [ "oid", "int", 335 ] [ "oid", "int", 335 ] -[ "oid", "int", 1505 ] -[ "oid", "int", 1505 ] -[ "oid", "int", 1505 ] -[ "oid", "int", 1505 ] -[ "oid", "int", 1505 ] -[ "oid", "int", 4218 ] -[ "oid", "int", 4218 ] -[ "oid", "int", 4218 ] -[ "oid", "int", 4218 ] -[ "oid", "int", 4218 ] +[ "oid", "int", 1508 ] +[ "oid", "int", 1508 ] +[ "oid", "int", 1508 ] +[ "oid", "int", 1508 ] +[ "oid", "int", 1508 ] +[ "oid", "int", 4224 ] +[ "oid", "int", 4224 ] +[ "oid", "int", 4224 ] +[ "oid", "int", 4224 ] +[ "oid", "int", 4224 ] [ "oid", "lng", 0 ] [ "oid", "lng", 0 ] [ "oid", "lng", 0 ] @@ -236,11 +236,11 @@ Ready. [ "oid", "str", 335 ] [ "oid", "str", 335 ] [ "oid", "str", 335 ] -[ "oid", "str", 1505 ] -[ "oid", "str", 1505 ] -[ "oid", "str", 1505 ] -[ "oid", "str", 4218 ] -[ "oid", "str", 4218 ] +[ "oid", "str", 1508 ] +[ "oid", "str", 1508 ] +[ "oid", "str", 1508 ] +[ "oid", "str", 4224 ] +[ "oid", "str", 4224 ] [ "oid", "timestamp", 0 ] [ "oid", "timestamp", 0 ] [ "oid", "wrd", 0 ] diff --git a/sql/test/leaks/Tests/check5_bam.stable.out.int128 b/sql/test/leaks/Tests/check5_bam.stable.out.int128 --- a/sql/test/leaks/Tests/check5_bam.stable.out.int128 +++ b/sql/test/leaks/Tests/check5_bam.stable.out.int128 @@ -41,10 +41,10 @@ Ready. [ "oid", "bit", 48 ] [ "oid", "bit", 48 ] [ "oid", "bit", 335 ] -[ "oid", "bit", 1505 ] -[ "oid", "bit", 1505 ] -[ "oid", "bit", 1505 ] -[ "oid", "bte", 4218 ] +[ "oid", "bit", 1508 ] +[ "oid", "bit", 1508 ] +[ "oid", "bit", 1508 ] +[ "oid", "bte", 4224 ] [ "oid", "int", 0 ] [ "oid", "int", 0 ] [ "oid", "int", 0 ] @@ -105,16 +105,16 @@ Ready. [ "oid", "int", 335 ] [ "oid", "int", 335 ] [ "oid", "int", 335 ] -[ "oid", "int", 1505 ] -[ "oid", "int", 1505 ] -[ "oid", "int", 1505 ] -[ "oid", "int", 1505 ] -[ "oid", "int", 1505 ] -[ "oid", "int", 4218 ] -[ "oid", "int", 4218 ] -[ "oid", "int", 4218 ] -[ "oid", "int", 4218 ] -[ "oid", "int", 4218 ] +[ "oid", "int", 1508 ] +[ "oid", "int", 1508 ] +[ "oid", "int", 1508 ] +[ "oid", "int", 1508 ] +[ "oid", "int", 1508 ] _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
