Changeset: 9b90cd14fb1d for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9b90cd14fb1d Modified Files: sql/backends/monet5/rel_bin.c sql/test/BugTracker-2017/Tests/crash_after_oidx_on_sys_statistics.Bug-6251.sql sql/test/BugTracker-2017/Tests/crash_after_oidx_on_sys_statistics.Bug-6251.stable.out sql/test/BugTracker-2019/Tests/view-where-cast-error.Bug-6712.stable.err sql/test/BugTracker-2019/Tests/view-where-cast-error.Bug-6712.stable.out Branch: Nov2019 Log Message:
Merge with Apr2019 branch diffs (76 lines): diff --git a/sql/test/BugTracker-2017/Tests/crash_after_oidx_on_sys_statistics.Bug-6251.sql b/sql/test/BugTracker-2017/Tests/crash_after_oidx_on_sys_statistics.Bug-6251.sql --- a/sql/test/BugTracker-2017/Tests/crash_after_oidx_on_sys_statistics.Bug-6251.sql +++ b/sql/test/BugTracker-2017/Tests/crash_after_oidx_on_sys_statistics.Bug-6251.sql @@ -2,16 +2,16 @@ DELETE FROM sys.statistics; -- fill sys.statistics ANALYZE sys.statistics; -SELECT /*column_id,*/ type, width, /*stamp,*/ "sample", count, "unique", nils, /*minval,*/ /*maxval,*/ sorted, revsorted FROM sys.statistics ORDER BY column_id; +SELECT /*column_id,*/ "type", width, /*stamp,*/ "sample", "count", "unique", nils, /*minval,*/ /*maxval,*/ sorted, revsorted FROM sys.statistics WHERE "type" <> 'timestamp' ORDER BY column_id; -- update the values of: sample, count, unique, nils, minval, maxval, sorted, revsorted of sys.statistics ANALYZE sys.statistics; -SELECT /*column_id,*/ type, width, /*stamp,*/ "sample", count, "unique", nils, /*minval,*/ /*maxval,*/ sorted, revsorted FROM sys.statistics ORDER BY column_id; +SELECT /*column_id,*/ "type", width, /*stamp,*/ "sample", "count", "unique", nils, /*minval,*/ /*maxval,*/ sorted, revsorted FROM sys.statistics WHERE "type" <> 'timestamp' ORDER BY column_id; -- ALTER TABLE sys.statistics SET READ ONLY; CREATE ORDERED INDEX stat_oidx ON sys.statistics (width); -SELECT /*column_id,*/ type, width, /*stamp,*/ "sample", count, "unique", nils, /*minval,*/ /*maxval,*/ sorted, revsorted FROM sys.statistics ORDER BY column_id; +SELECT /*column_id,*/ "type", width, /*stamp,*/ "sample", "count", "unique", nils, /*minval,*/ /*maxval,*/ sorted, revsorted FROM sys.statistics WHERE "type" <> 'timestamp' ORDER BY column_id; -- now mserver5 is crashed !! -- ALTER TABLE sys.statistics SET READ WRITE; diff --git a/sql/test/BugTracker-2017/Tests/crash_after_oidx_on_sys_statistics.Bug-6251.stable.out b/sql/test/BugTracker-2017/Tests/crash_after_oidx_on_sys_statistics.Bug-6251.stable.out --- a/sql/test/BugTracker-2017/Tests/crash_after_oidx_on_sys_statistics.Bug-6251.stable.out +++ b/sql/test/BugTracker-2017/Tests/crash_after_oidx_on_sys_statistics.Bug-6251.stable.out @@ -16,10 +16,6 @@ stdout of test 'crash_after_oidx_on_sys_ # Listening for connection requests on mapi:monetdb://toulouse.da.cwi.nl:32740/ # Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-1294/.s.monetdb.32740 # MonetDB/GIS module loaded -# MonetDB/SQL module loaded -# MonetDB/Python module loaded -# MonetDB/R module loaded - # SQL catalog created, loading sql scripts once # loading sql script: 09_like.sql # loading sql script: 10_math.sql @@ -71,11 +67,10 @@ stdout of test 'crash_after_oidx_on_sys_ % sys.statistics, sys.statistics, sys.statistics, sys.statistics, sys.statistics, sys.statistics, sys.statistics, sys.statistics # table_name % type, width, sample, count, unique, nils, sorted, revsorted # name % clob, int, bigint, bigint, bigint, bigint, boolean, boolean # type -% 9, 1, 1, 1, 1, 1, 5, 5 # length +% 7, 1, 1, 1, 1, 1, 5, 5 # length [ "int", 4, 0, 0, 0, 0, true, true ] [ "clob", 1, 0, 0, 0, 0, true, true ] [ "int", 4, 0, 0, 0, 0, true, true ] -[ "timestamp", 8, 0, 0, 0, 0, true, true ] [ "bigint", 8, 0, 0, 0, 0, true, true ] [ "bigint", 8, 0, 0, 0, 0, true, true ] [ "bigint", 8, 0, 0, 0, 0, true, true ] @@ -88,11 +83,10 @@ stdout of test 'crash_after_oidx_on_sys_ % sys.statistics, sys.statistics, sys.statistics, sys.statistics, sys.statistics, sys.statistics, sys.statistics, sys.statistics # table_name % type, width, sample, count, unique, nils, sorted, revsorted # name % clob, int, bigint, bigint, bigint, bigint, boolean, boolean # type -% 9, 1, 2, 2, 2, 2, 5, 5 # length +% 7, 1, 2, 2, 2, 2, 5, 5 # length [ "int", 4, 12, 12, 12, 0, true, false ] [ "clob", 1, 12, 12, 5, 0, false, false ] [ "int", 4, 12, 12, 3, 0, false, false ] -[ "timestamp", 8, 12, 12, 12, 0, true, false ] [ "bigint", 8, 12, 12, 1, 0, true, true ] [ "bigint", 8, 12, 12, 1, 0, true, true ] [ "bigint", 8, 12, 12, 1, 0, true, true ] @@ -106,11 +100,10 @@ stdout of test 'crash_after_oidx_on_sys_ % sys.statistics, sys.statistics, sys.statistics, sys.statistics, sys.statistics, sys.statistics, sys.statistics, sys.statistics # table_name % type, width, sample, count, unique, nils, sorted, revsorted # name % clob, int, bigint, bigint, bigint, bigint, boolean, boolean # type -% 9, 1, 2, 2, 2, 2, 5, 5 # length +% 7, 1, 2, 2, 2, 2, 5, 5 # length [ "int", 4, 12, 12, 12, 0, true, false ] [ "clob", 1, 12, 12, 5, 0, false, false ] [ "int", 4, 12, 12, 3, 0, false, false ] -[ "timestamp", 8, 12, 12, 12, 0, true, false ] [ "bigint", 8, 12, 12, 1, 0, true, true ] [ "bigint", 8, 12, 12, 1, 0, true, true ] [ "bigint", 8, 12, 12, 1, 0, true, true ] _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
