Changeset: 159b210a3d13 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/159b210a3d13 Modified Files: clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/exports.stable.out gdk/gdk_aggr.c gdk/gdk_group.c monetdb5/modules/mal/pcre.c sql/backends/monet5/sql.c sql/backends/monet5/sql_rank.c sql/test/SQLancer/Tests/sqlancer08.test sql/test/SQLancer/Tests/sqlancer10.test Branch: pushcands Log Message:
Merge with default branch. diffs (truncated from 16147 to 300 lines): diff --git a/.hgignore b/.hgignore --- a/.hgignore +++ b/.hgignore @@ -47,6 +47,7 @@ tags *.pyo *.rej *.orig +compile_commands.json # package building on Mac OS X MacOSX/build diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -801,3 +801,5 @@ 17d27ad30941c81e4bc700300912e84e9b9a8c37 6b71a8cc3498561815ac88d6c652922359efd13a Oct2020_15 6b71a8cc3498561815ac88d6c652922359efd13a Oct2020_SP4_release 02fd591b7d3311d566007e1bfb0c59682b17f12c Jul2021_root +5cb19dc0880d1fb4799cd0f8019d1c2b430c503e Oct2020_17 +5cb19dc0880d1fb4799cd0f8019d1c2b430c503e Oct2020_SP5_release diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -84,7 +84,7 @@ Group: Applications/Databases License: MPLv2.0 URL: https://www.monetdb.org/ BugURL: https://bugs.monetdb.org/ -Source: https://www.monetdb.org/downloads/sources/Oct2020-SP4/%{name}-%{version}.tar.bz2 +Source: https://www.monetdb.org/downloads/sources/Oct2020-SP5/%{name}-%{version}.tar.bz2 # The Fedora packaging document says we need systemd-rpm-macros for # the _unitdir and _tmpfilesdir macros to exist; however on RHEL 7 @@ -827,6 +827,40 @@ else fi %changelog +* Mon May 03 2021 Sjoerd Mullender <sjo...@acm.org> - 11.39.17-20210503 +- Rebuilt. +- GH#3336: DB files not removed if all rows are deleted, even after restart +- GH#7104: Monetdbe NTILE function does not produce correct ordering +- GH#7108: Monetdb crashes on query execution +- GH#7109: MERGE Statement incorrectly reports that input relation matches + multiple rows +- GH#7110: Monetdb Query parsing consistency issues in the latest release + (Remote Table) + +* Mon May 3 2021 Sjoerd Mullender <sjo...@acm.org> - 11.39.17-20210503 +- gdk: A bug that would very occasionally produce an error "strPut: incorrectly + encoded UTF-8", even when no incorrectly coded characters are used + at all, has been fixed. It was the result of a rare combination of + strings having been added to the column that caused essentially an + off-by-one type of error to occur. + +* Mon May 3 2021 Sjoerd Mullender <sjo...@acm.org> - 11.39.17-20210503 +- merovingian: When stopping monetdbd using the `monetdbd stop' command, this command + now waits for 5 seconds longer than the exittimeout value before it + kills the monetdbd daemon instead of only 30 seconds total (or until + that daemon stops earlier). This gives the daemon enough time to + terminate the mserver5 processes that it is managing. If exittimeout + is negative, the daemon and the monetdbd process initiating the stop + wait indefinitely until the mserver5 processes have stopped. + +* Mon May 3 2021 Sjoerd Mullender <sjo...@acm.org> - 11.39.17-20210503 +- sql: A bug where a sequence of TRUNCATE TABLE and COPY INTO the just + truncated table would result in success being reported to both queries, + but the table still being empty afterwards, has been fixed. + +* Fri Apr 23 2021 Sjoerd Mullender <sjo...@acm.org> - 11.39.17-20210503 +- NT: Added the monetdbe library to the Windows installer. + * Fri Apr 02 2021 Sjoerd Mullender <sjo...@acm.org> - 11.39.15-20210402 - Rebuilt. - GH#6786: function json.isvalid(js json) is not useful, could be removed diff --git a/NT/ChangeLog-Archive b/NT/ChangeLog-Archive new file mode 100644 --- /dev/null +++ b/NT/ChangeLog-Archive @@ -0,0 +1,6 @@ +# DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY +# This file contains past ChangeLog entries + +* Fri Apr 23 2021 Sjoerd Mullender <sjo...@acm.org> - 11.39.17-20210503 +- Added the monetdbe library to the Windows installer. + diff --git a/NT/ChangeLog.Oct2020 b/NT/ChangeLog.Oct2020 --- a/NT/ChangeLog.Oct2020 +++ b/NT/ChangeLog.Oct2020 @@ -1,6 +1,3 @@ # ChangeLog file for NT # This file is updated with Maddlog -* Fri Apr 23 2021 Sjoerd Mullender <sjo...@acm.org> -- Added the monetdbe library to the Windows installer. - diff --git a/clients/Tests/MAL-signatures.stable.out b/clients/Tests/MAL-signatures.stable.out --- a/clients/Tests/MAL-signatures.stable.out +++ b/clients/Tests/MAL-signatures.stable.out @@ -1,65 +1,5 @@ stdout of test 'MAL-signatures` in directory 'clients` itself: - -# 21:44:50 > -# 21:44:50 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=33053" "--set" "mapi_usock=/var/tmp/mtest-13793/.s.monetdb.33053" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/home/sjoerd/Monet-devel/var/MonetDB/mTests_clients" "--set" "mal_listing=2" "--set" "embedded_r=yes" -# 21:44:50 > - -# MonetDB 5 server v11.32.0 -# This is an unreleased version -# Serving database 'mTests_clients', using 8 threads -# Compiled for x86_64-unknown-linux-gnu/64bit -# Found 15.386 GiB available main-memory. -# Copyright (c) 1993 - July 2008 CWI. -# Copyright (c) August 2008 - 2018 MonetDB B.V., all rights reserved -# Visit https://www.monetdb.org/ for further information -# Listening for connection requests on mapi:monetdb://xps13:39285/ -# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-1158/.s.monetdb.39285 -# MonetDB/GIS module loaded -# SQL catalog created, loading sql scripts once -# loading sql script: 09_like.sql -# loading sql script: 10_math.sql -# loading sql script: 11_times.sql -# loading sql script: 12_url.sql -# loading sql script: 13_date.sql -# loading sql script: 14_inet.sql -# loading sql script: 15_querylog.sql -# loading sql script: 16_tracelog.sql -# loading sql script: 17_temporal.sql -# loading sql script: 18_index.sql -# loading sql script: 20_vacuum.sql -# loading sql script: 21_dependency_functions.sql -# loading sql script: 22_clients.sql -# loading sql script: 23_skyserver.sql -# loading sql script: 24_zorder.sql -# loading sql script: 25_debug.sql -# loading sql script: 26_sysmon.sql -# loading sql script: 27_rejects.sql -# loading sql script: 39_analytics.sql -# loading sql script: 40_geom.sql -# loading sql script: 40_json.sql -# loading sql script: 41_md5sum.sql -# loading sql script: 45_uuid.sql -# loading sql script: 46_gsl.sql -# loading sql script: 46_profiler.sql -# loading sql script: 51_sys_schema_extension.sql -# loading sql script: 72_fits.sql -# loading sql script: 74_netcdf.sql -# loading sql script: 75_shp.sql -# loading sql script: 75_storagemodel.sql -# loading sql script: 80_statistics.sql -# loading sql script: 80_udf.sql -# loading sql script: 85_bam.sql -# loading sql script: 90_generator.sql -# loading sql script: 99_system.sql -# MonetDB/SQL module loaded -# MonetDB/Python2 module loaded -# MonetDB/R module loaded - -# 16:19:19 > -# 16:19:19 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-28001" "--port=38663" -# 16:19:19 > - #select * from sys.malfunctions() order by module, "function", address, signature, comment; % .%1, .%1, .%1, .%1, .%1 # table_name % module, function, signature, address, comment # name @@ -7112,6 +7052,7 @@ stdout of test 'MAL-signatures` in direc [ "clients", "ripemd160sum", "command clients.ripemd160sum(X_0:str):str ", "CLTripemd160sum;", "" ] [ "clients", "setListing", "pattern clients.setListing(X_0:int):int ", "CLTsetListing;", "" ] [ "clients", "setPassword", "pattern clients.setPassword(X_0:str, X_1:str):void ", "CLTsetPassword;", "" ] +[ "clients", "setQryTimeoutMicro", "pattern clients.setQryTimeoutMicro(X_0:lng):void ", "CLTqueryTimeoutMicro;", "" ] [ "clients", "setScenario", "pattern clients.setScenario(X_0:str):str ", "CLTsetScenario;", "" ] [ "clients", "setmemorylimit", "pattern clients.setmemorylimit(X_0:int):void ", "CLTsetmemorylimit;", "" ] [ "clients", "setmemorylimit", "pattern clients.setmemorylimit(X_0:int, X_1:int):void ", "CLTsetmemorylimit;", "" ] @@ -8010,9 +7951,9 @@ stdout of test 'MAL-signatures` in direc [ "sql", "db_users", "pattern sql.db_users():bat[:str] ", "db_users_wrap;", "" ] [ "sql", "delete", "unsafe pattern sql.delete(X_0:int, X_1:str, X_2:str, X_3:any):int ", "mvc_delete_wrap;", "" ] [ "sql", "delta", "command sql.delta(X_0:bat[:any_3], X_1:bat[:oid], X_2:bat[:any_3]):bat[:any_3] ", "DELTAbat;", "" ] -[ "sql", "deltas", "pattern sql.deltas(X_0:str) (X_1:bat[:int], X_2:bat[:bit], X_3:bat[:lng], X_4:bat[:lng], X_5:bat[:lng], X_6:bat[:lng], X_7:bat[:int]) ", "mvc_delta_values;", "" ] -[ "sql", "deltas", "pattern sql.deltas(X_0:str, X_1:str) (X_2:bat[:int], X_3:bat[:bit], X_4:bat[:lng], X_5:bat[:lng], X_6:bat[:lng], X_7:bat[:lng], X_8:bat[:int]) ", "mvc_delta_values;", "" ] -[ "sql", "deltas", "pattern sql.deltas(X_0:str, X_1:str, X_2:str) (X_3:bat[:int], X_4:bat[:bit], X_5:bat[:lng], X_6:bat[:lng], X_7:bat[:lng], X_8:bat[:lng], X_9:bat[:int]) ", "mvc_delta_values;", "" ] +[ "sql", "deltas", "pattern sql.deltas(X_0:str) (X_1:bat[:int], X_2:bat[:lng], X_3:bat[:lng], X_4:bat[:lng], X_5:bat[:lng], X_6:bat[:lng], X_7:bat[:int]) ", "mvc_delta_values;", "" ] +[ "sql", "deltas", "pattern sql.deltas(X_0:str, X_1:str) (X_2:bat[:int], X_3:bat[:lng], X_4:bat[:lng], X_5:bat[:lng], X_6:bat[:lng], X_7:bat[:lng], X_8:bat[:int]) ", "mvc_delta_values;", "" ] +[ "sql", "deltas", "pattern sql.deltas(X_0:str, X_1:str, X_2:str) (X_3:bat[:int], X_4:bat[:lng], X_5:bat[:lng], X_6:bat[:lng], X_7:bat[:lng], X_8:bat[:lng], X_9:bat[:int]) ", "mvc_delta_values;", "" ] [ "sql", "dense_rank", "pattern sql.dense_rank(X_0:any_1, X_1:bit, X_2:bit):int ", "SQLdense_rank;", "" ] [ "sql", "diff", "pattern sql.diff(X_0:any_1):bit ", "SQLdiff;", "" ] [ "sql", "diff", "pattern sql.diff(X_0:bit, X_1:any_1):bit ", "SQLdiff;", "" ] @@ -8502,8 +8443,3 @@ stdout of test 'MAL-signatures` in direc [ "xml", "subaggr", "command xml.subaggr(X_0:bat[:xml], X_1:bat[:oid], X_2:bat[:any_1], X_3:bat[:oid], X_4:bit):bat[:xml] ", "AGGRsubxmlcand;", "" ] [ "xml", "text", "command xml.text(X_0:xml):str ", "XMLxmltext;", "" ] [ "xml", "xml", "command xml.xml(X_0:str):xml ", "XMLstr2xml;", "" ] - -# 14:47:14 > -# 14:47:14 > "Done." -# 14:47:14 > - diff --git a/clients/Tests/MAL-signatures.stable.out.int128 b/clients/Tests/MAL-signatures.stable.out.int128 --- a/clients/Tests/MAL-signatures.stable.out.int128 +++ b/clients/Tests/MAL-signatures.stable.out.int128 @@ -1,69 +1,5 @@ stdout of test 'MAL-signatures` in directory 'clients` itself: - -# 21:44:50 > -# 21:44:50 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=33053" "--set" "mapi_usock=/var/tmp/mtest-13793/.s.monetdb.33053" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/home/sjoerd/Monet-devel/var/MonetDB/mTests_clients" "--set" "mal_listing=2" "--set" "embedded_r=yes" -# 21:44:50 > - -# MonetDB 5 server v11.20.0 -# This is an unreleased version -# Serving database 'mTests_clients', using 8 threads -# Compiled for x86_64-unknown-linux-gnu/64bit with 128bit integers -# Found 15.386 GiB available main-memory. -# Copyright (c) 1993 - July 2008 CWI. -# Copyright (c) August 2008 - 2018 MonetDB B.V., all rights reserved -# Visit https://www.monetdb.org/ for further information -# Listening for connection requests on mapi:monetdb://xps13:39285/ -# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-1158/.s.monetdb.39285 -# MonetDB/GIS module loaded -# SQL catalog created, loading sql scripts once -# loading sql script: 09_like.sql -# loading sql script: 10_math.sql -# loading sql script: 11_times.sql -# loading sql script: 12_url.sql -# loading sql script: 13_date.sql -# loading sql script: 14_inet.sql -# loading sql script: 15_querylog.sql -# loading sql script: 16_tracelog.sql -# loading sql script: 17_temporal.sql -# loading sql script: 18_index.sql -# loading sql script: 20_vacuum.sql -# loading sql script: 21_dependency_functions.sql -# loading sql script: 22_clients.sql -# loading sql script: 23_skyserver.sql -# loading sql script: 24_zorder.sql -# loading sql script: 25_debug.sql -# loading sql script: 26_sysmon.sql -# loading sql script: 27_rejects.sql -# loading sql script: 39_analytics.sql -# loading sql script: 39_analytics_hge.sql -# loading sql script: 40_geom.sql -# loading sql script: 40_json.sql -# loading sql script: 40_json_hge.sql -# loading sql script: 41_md5sum.sql -# loading sql script: 45_uuid.sql -# loading sql script: 46_gsl.sql -# loading sql script: 46_profiler.sql -# loading sql script: 51_sys_schema_extension.sql -# loading sql script: 72_fits.sql -# loading sql script: 74_netcdf.sql -# loading sql script: 75_shp.sql -# loading sql script: 75_storagemodel.sql -# loading sql script: 80_statistics.sql -# loading sql script: 80_udf.sql -# loading sql script: 80_udf_hge.sql -# loading sql script: 85_bam.sql -# loading sql script: 90_generator.sql -# loading sql script: 90_generator_hge.sql -# loading sql script: 99_system.sql -# MonetDB/SQL module loaded -# MonetDB/Python2 module loaded -# MonetDB/R module loaded - -# 16:10:29 > -# 16:10:29 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-29643" "--port=32888" -# 16:10:29 > - #select * from sys.malfunctions() order by module, "function", address, signature, comment; % .%1, .%1, .%1, .%1, .%1 # table_name % module, function, signature, address, comment # name @@ -9999,6 +9935,7 @@ stdout of test 'MAL-signatures` in direc [ "clients", "ripemd160sum", "command clients.ripemd160sum(X_0:str):str ", "CLTripemd160sum;", "" ] [ "clients", "setListing", "pattern clients.setListing(X_0:int):int ", "CLTsetListing;", "" ] [ "clients", "setPassword", "pattern clients.setPassword(X_0:str, X_1:str):void ", "CLTsetPassword;", "" ] +[ "clients", "setQryTimeoutMicro", "pattern clients.setQryTimeoutMicro(X_0:lng):void ", "CLTqueryTimeoutMicro;", "" ] [ "clients", "setScenario", "pattern clients.setScenario(X_0:str):str ", "CLTsetScenario;", "" ] [ "clients", "setmemorylimit", "pattern clients.setmemorylimit(X_0:int):void ", "CLTsetmemorylimit;", "" ] [ "clients", "setmemorylimit", "pattern clients.setmemorylimit(X_0:int, X_1:int):void ", "CLTsetmemorylimit;", "" ] @@ -10916,9 +10853,9 @@ stdout of test 'MAL-signatures` in direc [ "sql", "db_users", "pattern sql.db_users():bat[:str] ", "db_users_wrap;", "" ] [ "sql", "delete", "unsafe pattern sql.delete(X_0:int, X_1:str, X_2:str, X_3:any):int ", "mvc_delete_wrap;", "" ] [ "sql", "delta", "command sql.delta(X_0:bat[:any_3], X_1:bat[:oid], X_2:bat[:any_3]):bat[:any_3] ", "DELTAbat;", "" ] -[ "sql", "deltas", "pattern sql.deltas(X_0:str) (X_1:bat[:int], X_2:bat[:bit], X_3:bat[:lng], X_4:bat[:lng], X_5:bat[:lng], X_6:bat[:lng], X_7:bat[:int]) ", "mvc_delta_values;", "" ] -[ "sql", "deltas", "pattern sql.deltas(X_0:str, X_1:str) (X_2:bat[:int], X_3:bat[:bit], X_4:bat[:lng], X_5:bat[:lng], X_6:bat[:lng], X_7:bat[:lng], X_8:bat[:int]) ", "mvc_delta_values;", "" ] -[ "sql", "deltas", "pattern sql.deltas(X_0:str, X_1:str, X_2:str) (X_3:bat[:int], X_4:bat[:bit], X_5:bat[:lng], X_6:bat[:lng], X_7:bat[:lng], X_8:bat[:lng], X_9:bat[:int]) ", "mvc_delta_values;", "" ] +[ "sql", "deltas", "pattern sql.deltas(X_0:str) (X_1:bat[:int], X_2:bat[:lng], X_3:bat[:lng], X_4:bat[:lng], X_5:bat[:lng], X_6:bat[:lng], X_7:bat[:int]) ", "mvc_delta_values;", "" ] +[ "sql", "deltas", "pattern sql.deltas(X_0:str, X_1:str) (X_2:bat[:int], X_3:bat[:lng], X_4:bat[:lng], X_5:bat[:lng], X_6:bat[:lng], X_7:bat[:lng], X_8:bat[:int]) ", "mvc_delta_values;", "" ] +[ "sql", "deltas", "pattern sql.deltas(X_0:str, X_1:str, X_2:str) (X_3:bat[:int], X_4:bat[:lng], X_5:bat[:lng], X_6:bat[:lng], X_7:bat[:lng], X_8:bat[:lng], X_9:bat[:int]) ", "mvc_delta_values;", "" ] [ "sql", "dense_rank", "pattern sql.dense_rank(X_0:any_1, X_1:bit, X_2:bit):int ", "SQLdense_rank;", "" ] [ "sql", "diff", "pattern sql.diff(X_0:any_1):bit ", "SQLdiff;", "" ] [ "sql", "diff", "pattern sql.diff(X_0:bit, X_1:any_1):bit ", "SQLdiff;", "" ] @@ -11425,8 +11362,3 @@ stdout of test 'MAL-signatures` in direc [ "xml", "subaggr", "command xml.subaggr(X_0:bat[:xml], X_1:bat[:oid], X_2:bat[:any_1], X_3:bat[:oid], X_4:bit):bat[:xml] ", "AGGRsubxmlcand;", "" ] [ "xml", "text", "command xml.text(X_0:xml):str ", "XMLxmltext;", "" ] [ "xml", "xml", "command xml.xml(X_0:str):xml ", "XMLstr2xml;", "" ] - -# 12:57:40 > -# 12:57:40 > "Done." -# 12:57:40 > - 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 @@ -369,10 +369,12 @@ int MT_rename(const char *old, const cha _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
