Changeset: 43f81fc99d03 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/43f81fc99d03 Modified Files: gdk/gdk.h gdk/gdk_bat.c monetdb5/modules/mal/batExtensions.c sql/backends/monet5/sql.c Branch: strheapvacuum Log Message:
merge with default diffs (truncated from 149342 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 @@ -196,6 +196,7 @@ functionality of MonetDB. %files devel %defattr(-,root,root) %dir %{_includedir}/monetdb +%{_includedir}/monetdb/copybinary.h %{_includedir}/monetdb/gdk*.h %{_includedir}/monetdb/matomic.h %{_includedir}/monetdb/mstring.h @@ -628,6 +629,7 @@ This package contains files needed to de %package embedded Summary: MonetDB as an embedded library Group: Applications/Databases +Requires: MonetDB5-server%{?_isa} = %{version}-%{release} %description embedded MonetDB is a database management system that is developed from a @@ -636,7 +638,8 @@ automatic index management, extensibilit accelerators. It also has an SQL front end. This package contains the library to turn MonetDB into an embeddable -library. Also see %{name}-embedded-devel to use this in a program. +library, also known as MonetDBe. Also see %{name}-embedded-devel to +use this in a program. %files embedded %{_libdir}/libmonetdbe.so.* @@ -662,6 +665,24 @@ program that uses MonetDB as an embeddab %{_includedir}/monetdb/monetdbe.h %{_libdir}/pkgconfig/monetdbe.pc +%package embedded-tests +Summary: MonetDBe tests package +Group: Applications/Databases +Requires: %{name}-embedded%{?_isa} = %{version}-%{release} + +%description embedded-tests +MonetDB is a database management system that is developed from a +main-memory perspective with use of a fully decomposed storage model, +automatic index management, extensibility of data types and search +accelerators. It also has an SQL front end. + +This package contains some test programs using the %{name}-embedded +package. You probably don't need this, unless you are a developer. + +%files embedded-tests +%defattr(-,root,root) +%{_bindir}/example_proxy + %package testing-python Summary: MonetDB - Monet Database Management System Group: Applications/Databases @@ -827,6 +848,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/NT/mksqlwxs.py b/NT/mksqlwxs.py --- a/NT/mksqlwxs.py +++ b/NT/mksqlwxs.py @@ -175,7 +175,8 @@ def main(): print(r' <Directory Id="monetdb" Name="monetdb">') id = comp(extend, id, 16, sorted([r'include\monetdb\{}'.format(x) for x in filter(lambda x: (x.startswith('gdk') or x.startswith('monet') or x.startswith('mal') or x.startswith('sql')) and x.endswith('.h'), os.listdir(os.path.join(sys.argv[3], 'include', 'monetdb')))] + - [r'include\monetdb\mapi.h', + [r'include\monetdb\copybinary.h', + r'include\monetdb\mapi.h', r'include\monetdb\matomic.h', r'include\monetdb\mel.h', r'include\monetdb\mstring.h', 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 @@ -6390,9 +6330,9 @@ stdout of test 'MAL-signatures` in direc [ "batsql", "lead", "pattern batsql.lead(X_0:bat[:any_1], X_1:bat[:any], X_2:bat[:any_1], X_3:any_2, X_4:any_3):bat[:any_1] ", "SQLlead;", "" ] [ "batsql", "max", "pattern batsql.max(X_0:bat[:any_1], X_1:any, X_2:any, X_3:int, X_4:any, X_5:any):bat[:any_1] ", "SQLmax;", "" ] [ "batsql", "min", "pattern batsql.min(X_0:bat[:any_1], X_1:any, X_2:any, X_3:int, X_4:any, X_5:any):bat[:any_1] ", "SQLmin;", "" ] -[ "batsql", "next_value", "unsafe pattern batsql.next_value(X_0:bat[:str], X_1:bat[:str]):bat[:lng] ", "mvc_bat_next_value;", "" ] -[ "batsql", "next_value", "unsafe pattern batsql.next_value(X_0:bat[:str], X_1:str):bat[:lng] ", "mvc_bat_next_value;", "" ] -[ "batsql", "next_value", "unsafe pattern batsql.next_value(X_0:str, X_1:bat[:str]):bat[:lng] ", "mvc_bat_next_value;", "" ] +[ "batsql", "next_value", "pattern batsql.next_value(X_0:bat[:str], X_1:bat[:str]):bat[:lng] ", "mvc_bat_next_value;", "" ] +[ "batsql", "next_value", "pattern batsql.next_value(X_0:bat[:str], X_1:str):bat[:lng] ", "mvc_bat_next_value;", "" ] +[ "batsql", "next_value", "pattern batsql.next_value(X_0:str, X_1:bat[:str]):bat[:lng] ", "mvc_bat_next_value;", "" ] [ "batsql", "nth_value", "pattern batsql.nth_value(X_0:any_1, X_1:bat[:lng], X_2:any, X_3:any, X_4:int, X_5:any, X_6:any):bat[:any_1] ", "SQLnth_value;", "" ] [ "batsql", "nth_value", "pattern batsql.nth_value(X_0:bat[:any_1], X_1:bat[:lng], X_2:any, X_3:any, X_4:int, X_5:any, X_6:any):bat[:any_1] ", "SQLnth_value;", "" ] [ "batsql", "nth_value", "pattern batsql.nth_value(X_0:bat[:any_1], X_1:lng, X_2:any, X_3:any, X_4:int, X_5:any, X_6:any):bat[:any_1] ", "SQLnth_value;", "" ] @@ -8399,6 +8339,7 @@ stdout of test 'MAL-signatures` in direc [ "clients", "changePassword", "pattern clients.changePassword(X_0:str, X_1:str):void ", "CLTchangePassword;", "" ] [ "clients", "changeUsername", "pattern clients.changeUsername(X_0:str, X_1:str):void ", "CLTchangeUsername;", "" ] [ "clients", "checkPermission", "pattern clients.checkPermission(X_0:str, X_1:str):void ", "CLTcheckPermission;", "" ] +[ "clients", "current_sessionid", "pattern clients.current_sessionid():int ", "CLTgetSessionID;", "" ] [ "clients", "getId", "pattern clients.getId():int ", "CLTgetClientId;", "" ] [ "clients", "getInfo", "pattern clients.getInfo() (X_0:bat[:str], X_1:bat[:str]) ", "CLTInfo;", "" ] [ "clients", "getLogins", "command clients.getLogins() (X_0:bat[:oid], X_1:bat[:str]) ", "CLTLogin;", "" ] @@ -8414,6 +8355,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;", "" ] @@ -9324,9 +9266,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;", "" ] @@ -9334,7 +9276,7 @@ stdout of test 'MAL-signatures` in direc [ "sql", "droporderindex", "unsafe pattern sql.droporderindex(X_0:str, X_1:str, X_2:str):void ", "sql_droporderindex;", "" ] [ "sql", "dump_cache", "pattern sql.dump_cache() (X_0:bat[:str], X_1:bat[:int]) ", "dump_cache;", "" ] [ "sql", "dump_opt_stats", "pattern sql.dump_opt_stats() (X_0:bat[:str], X_1:bat[:int]) ", "dump_opt_stats;", "" ] -[ "sql", "dump_trace", "pattern sql.dump_trace() (X_0:bat[:lng], X_1:bat[:str]) ", "dump_trace;", "" ] +[ "sql", "dump_trace", "pattern sql.dump_trace() (X_0:bat[:lng], X_1:bat[:str], X_2:bat[:str]) ", "dump_trace;", "" ] [ "sql", "emptybind", "pattern sql.emptybind(X_0:int, X_1:str, X_2:str, X_3:str, X_4:int) (X_5:bat[:oid], X_6:bat[:any_1]) ", "mvc_bind_wrap;", "" ] [ "sql", "emptybind", "pattern sql.emptybind(X_0:int, X_1:str, X_2:str, X_3:str, X_4:int):bat[:any_1] ", "mvc_bind_wrap;", "" ] [ "sql", "emptybind", "pattern sql.emptybind(X_0:int, X_1:str, X_2:str, X_3:str, X_4:int, X_5:int, X_6:int) (X_7:bat[:oid], X_8:bat[:any_1]) ", "mvc_bind_wrap;", "" ] @@ -9380,7 +9322,7 @@ stdout of test 'MAL-signatures` in direc [ "sql", "ms_trunc", "command sql.ms_trunc(X_0:dbl, X_1:int):dbl ", "dbl_trunc_wrap;", "" ] [ "sql", "ms_trunc", "command sql.ms_trunc(X_0:flt, X_1:int):flt ", "flt_trunc_wrap;", "" ] [ "sql", "mvc", "pattern sql.mvc():int ", "SQLmvc;", "" ] -[ "sql", "next_value", "unsafe pattern sql.next_value(X_0:str, X_1:str):lng ", "mvc_next_value;", "" ] +[ "sql", "next_value", "pattern sql.next_value(X_0:str, X_1:str):lng ", "mvc_next_value;", "" ] [ "sql", "nth_value", "pattern sql.nth_value(X_0:any_1, X_1:lng, X_2:bit, X_3:bit, X_4:int, X_5:oid, X_6:oid):any_1 ", "SQLnth_value;", "" ] [ "sql", "ntile", "pattern sql.ntile(X_0:any, X_1:any_1, X_2:bit, X_3:bit):any_1 ", "SQLntile;", "" ] [ "sql", "optimizer_updates", "pattern sql.optimizer_updates():void ", "SQLoptimizersUpdate;", "" ] @@ -9820,8 +9762,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 @@ _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
