Changeset: 29d608b3ad52 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/29d608b3ad52 Modified Files: README.rst cmake/monetdb-defines.cmake cmake/monetdb-findpackages.cmake cmake/monetdb-options.cmake monetdb5/mal/mal_linker.c monetdb_config.h.in sql/backends/monet5/vaults/CMakeLists.txt sql/common/sql_types.c sql/server/CMakeLists.txt sql/server/rel_select.c sql/server/rel_updates.c sql/server/sql_parser.y tools/mserver/mserver5.c Branch: parquet Log Message:
merged with default diffs (truncated from 485409 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -789,3 +789,6 @@ 43d4a717410d6f6692a16a878640fc7e0f248725 43d4a717410d6f6692a16a878640fc7e0f248725 Jan2022_SP6_release 5c50a4071c86d1621e20a885a51cc36f2f23eec4 Sep2022_9 41ca60d96bd0198ca5d74937630a442a5fbaf1cd Sep2022_11 +41ca60d96bd0198ca5d74937630a442a5fbaf1cd Sep2022_SP1_release +e8b0e5558313f4d98bc48316368299decc55ed4e Sep2022_13 +e8b0e5558313f4d98bc48316368299decc55ed4e Sep2022_SP2_release diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,9 +1,11 @@ #[[ +# SPDX-License-Identifier: MPL-2.0 +# # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# Copyright 1997 - July 2008 CWI, August 2008 - 2022 MonetDB B.V. +# Copyright 1997 - July 2008 CWI, August 2008 - 2023 MonetDB B.V. #]] cmake_minimum_required(VERSION 3.12) diff --git a/Config.cmake.in b/Config.cmake.in --- a/Config.cmake.in +++ b/Config.cmake.in @@ -1,9 +1,11 @@ #[[ +# SPDX-License-Identifier: MPL-2.0 +# # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# Copyright 1997 - July 2008 CWI, August 2008 - 2022 MonetDB B.V. +# Copyright 1997 - July 2008 CWI, August 2008 - 2023 MonetDB B.V. #]] @PACKAGE_INIT@ diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -1,8 +1,10 @@ +# SPDX-License-Identifier: MPL-2.0 +# # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# Copyright 1997 - July 2008 CWI, August 2008 - 2022 MonetDB B.V. +# Copyright 1997 - July 2008 CWI, August 2008 - 2023 MonetDB B.V. %global name MonetDB %global version 11.46.0 @@ -80,14 +82,14 @@ Name: %{name} Version: %{version} Release: %{release} -Summary: MonetDB - Monet Database Management System +Summary: Monet Database Management System Vendor: MonetDB BV <i...@monetdb.org> Group: Applications/Databases -License: MPLv2.0 +License: MPL-2.0 URL: https://www.monetdb.org/ -BugURL: https://bugs.monetdb.org/ -Source: https://www.monetdb.org/downloads/sources/Sep2022-SP1/%{name}-%{version}.tar.bz2 +BugURL: https://github.com/MonetDB/MonetDB/issues +Source: https://www.monetdb.org/downloads/sources/Sep2022-SP2/%{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 @@ -128,6 +130,7 @@ BuildRequires: pkgconfig(zlib) BuildRequires: pkgconfig(liblz4) >= 1.8 %if %{with py3integration} BuildRequires: pkgconfig(python3) >= 3.5 +# cannot use python3dist(numpy) because of CentOS 7 BuildRequires: python3-numpy %endif %if %{with rintegration} @@ -141,12 +144,12 @@ BuildRequires: texlive-obsolete %endif %endif # optional packages: -# BuildRequires: pkgconfig(cmocka) # -DWITH_CMOCKA=ON -# BuildRequires: pkgconfig(gdal) # -DSHP=ON -# BuildRequires: pkgconfig(netcdf) # -DNETCDF=ON -# BuildRequires: pkgconfig(proj) # -DWITH_PROJ=ON -# BuildRequires: pkgconfig(snappy) # -DWITH_SNAPPY=ON -# BuildRequires: pkgconfig(valgrind) # -DWITH_VALGRIND=ON +# BuildRequires: pkgconfig(cmocka) # -DWITH_CMOCKA=ON +# BuildRequires: pkgconfig(gdal) # -DSHP=ON +# BuildRequires: pkgconfig(netcdf) # -DNETCDF=ON +# BuildRequires: pkgconfig(proj) # -DWITH_PROJ=ON +# BuildRequires: pkgconfig(snappy) # -DWITH_SNAPPY=ON +# BuildRequires: pkgconfig(valgrind) # -DWITH_VALGRIND=ON %if (0%{?fedora} >= 22) Recommends: %{name}-SQL-server5%{?_isa} = %{version}-%{release} @@ -343,7 +346,6 @@ Recommends: perl-DBD-monetdb >= 1.0 Recommends: php-monetdb >= 1.0 %endif Requires: MonetDB5-server%{?_isa} = %{version}-%{release} -Requires: python3-pymonetdb >= 1.0.6 %if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} > 7 Recommends: python3dist(lz4) Recommends: python3dist(scipy) @@ -503,17 +505,17 @@ getent group monetdb >/dev/null || group if getent passwd monetdb >/dev/null; then case $(getent passwd monetdb | cut -d: -f6) in %{_localstatedir}/MonetDB) # old value - # change home directory, but not using usermod - # usermod requires there to not be any running processes owned by the user - EDITOR='sed -i "/^monetdb:/s|:%{_localstatedir}/MonetDB:|:%{_localstatedir}/lib/monetdb:|"' - unset VISUAL - export EDITOR - /sbin/vipw > /dev/null - ;; + # change home directory, but not using usermod + # usermod requires there to not be any running processes owned by the user + EDITOR='sed -i "/^monetdb:/s|:%{_localstatedir}/MonetDB:|:%{_localstatedir}/lib/monetdb:|"' + unset VISUAL + export EDITOR + /sbin/vipw > /dev/null + ;; esac else useradd --system --gid monetdb --home-dir %{_localstatedir}/lib/monetdb \ - --shell /sbin/nologin --comment "MonetDB Server" monetdb + --shell /sbin/nologin --comment "MonetDB Server" monetdb fi exit 0 @@ -690,6 +692,7 @@ package. You probably don't need this, Summary: MonetDB - Monet Database Management System Group: Applications/Databases Requires: %{name}-client-tests = %{version}-%{release} +Requires: python3dist(pymonetdb) >= 1.0.6 BuildArch: noarch %description testing-python @@ -779,33 +782,33 @@ fi %build %cmake3 \ - -DCMAKE_INSTALL_RUNSTATEDIR=/run \ - -DRELEASE_VERSION=ON \ - -DASSERT=OFF \ - -DCINTEGRATION=%{?with_cintegration:ON}%{!?with_cintegration:OFF} \ - -DFITS=%{?with_fits:ON}%{!?with_fits:OFF} \ - -DGEOM=%{?with_geos:ON}%{!?with_geos:OFF} \ - -DINT128=%{?with_hugeint:ON}%{!?with_hugeint:OFF} \ - -DNETCDF=OFF \ - -DODBC=ON \ - -DPY3INTEGRATION=%{?with_py3integration:ON}%{!?with_py3integration:OFF} \ - -DRINTEGRATION=%{?with_rintegration:ON}%{!?with_rintegration:OFF} \ - -DSANITIZER=OFF \ - -DSHP=OFF \ - -DSTRICT=OFF \ - -DTESTING=ON \ - -DWITH_BZ2=ON \ - -DWITH_CMOCKA=OFF \ - -DWITH_CURL=ON \ - -DWITH_LZ4=ON \ - -DWITH_LZMA=ON \ - -DWITH_PCRE=ON \ - -DWITH_PROJ=OFF \ - -DWITH_READLINE=ON \ - -DWITH_SNAPPY=OFF \ - -DWITH_VALGRIND=OFF \ - -DWITH_XML2=ON \ - -DWITH_ZLIB=ON + -DCMAKE_INSTALL_RUNSTATEDIR=/run \ + -DRELEASE_VERSION=ON \ + -DASSERT=OFF \ + -DCINTEGRATION=%{?with_cintegration:ON}%{!?with_cintegration:OFF} \ + -DFITS=%{?with_fits:ON}%{!?with_fits:OFF} \ + -DGEOM=%{?with_geos:ON}%{!?with_geos:OFF} \ + -DINT128=%{?with_hugeint:ON}%{!?with_hugeint:OFF} \ + -DNETCDF=OFF \ + -DODBC=ON \ + -DPY3INTEGRATION=%{?with_py3integration:ON}%{!?with_py3integration:OFF} \ + -DRINTEGRATION=%{?with_rintegration:ON}%{!?with_rintegration:OFF} \ + -DSANITIZER=OFF \ + -DSHP=OFF \ + -DSTRICT=OFF \ + -DTESTING=ON \ + -DWITH_BZ2=ON \ + -DWITH_CMOCKA=OFF \ + -DWITH_CURL=ON \ + -DWITH_LZ4=ON \ + -DWITH_LZMA=ON \ + -DWITH_PCRE=ON \ + -DWITH_PROJ=OFF \ + -DWITH_READLINE=ON \ + -DWITH_SNAPPY=OFF \ + -DWITH_VALGRIND=OFF \ + -DWITH_XML2=ON \ + -DWITH_ZLIB=ON %cmake3_build @@ -855,6 +858,54 @@ fi %endif %changelog +* Tue Jan 24 2023 Sjoerd Mullender <sjo...@acm.org> - 11.45.13-20230124 +- Rebuilt. +- GH#7343: GDKmmap requesting 0 virtual memory +- GH#7347: A bug where an exception occurs even though it is a query with + normal syntax (Merge Table) + +* Mon Jan 23 2023 Sjoerd Mullender <sjo...@acm.org> - 11.45.13-20230124 +- sql: Fixed a regression where when there are multiple concurrent + transactions, the dependencies weren't checked properly. + +* Mon Jan 16 2023 Sjoerd Mullender <sjo...@acm.org> - 11.45.13-20230124 +- gdk: Fixed a race condition that could lead to a bat being added to the SQL + catalog but nog being made persistent, causing a subsequent restart + of the system to fail (and crash). + +* Wed Jan 4 2023 Sjoerd Mullender <sjo...@acm.org> - 11.45.13-20230124 +- odbc: A crash in the ODBC driver was fixed when certain unsupported functions + where used in a {fn ...} escape. + +* Wed Dec 21 2022 Sjoerd Mullender <sjo...@acm.org> - 11.45.13-20230124 +- odbc: Prepare of a query where the sum of the number of parameters (question + marks in the query) and the number of output columns is larger than + 100 could fail with an unexpected error. This has been fixed. + +* Fri Dec 16 2022 Sjoerd Mullender <sjo...@acm.org> - 11.45.13-20230124 +- sql: Added some error checking to prevent crashes. Errors would mainly + occur under memory pressure. + +* Wed Dec 14 2022 Sjoerd Mullender <sjo...@acm.org> - 11.45.13-20230124 +- gdk: Fixed a race condition where a hash could have been created on a + bat using the old bat count while in another thread the bat count + got updated. This would make the hash be based on too small a size, + causing failures later on. + +* Wed Dec 14 2022 Sjoerd Mullender <sjo...@acm.org> - 11.45.13-20230124 +- sql: Fixed cleanup after a failed allocation where the data being cleaned + up was unitialized but still used as pointers to memory that also had + to be freed. + +* Thu Dec 8 2022 Sjoerd Mullender <sjo...@acm.org> - 11.45.13-20230124 +- gdk: When extending a bat failed, the capacity had been updated already and + was therefore too large. This could then later cause a crash. This has + been fixed by only updating the capacity if the extend succeeded. + +* Wed Dec 7 2022 Sjoerd Mullender <sjo...@acm.org> - 11.45.13-20230124 +- sql: Fixed a double cleanup after a failed allocation in COPY INTO. The + double cleanup could cause a crash due to a race condition it enabled. + * Mon Dec 05 2022 Sjoerd Mullender <sjo...@acm.org> - 11.45.11-20221205 - Rebuilt. - GH#7342: column which datatype is double couldn't group or aggregation diff --git a/NT/mkodbcwxs.py b/NT/mkodbcwxs.py --- a/NT/mkodbcwxs.py +++ b/NT/mkodbcwxs.py @@ -1,8 +1,10 @@ +# SPDX-License-Identifier: MPL-2.0 +# # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# Copyright 1997 - July 2008 CWI, August 2008 - 2022 MonetDB B.V. +# Copyright 1997 - July 2008 CWI, August 2008 - 2023 MonetDB B.V. # python mkodbcwxs.py VERSION BITS PREFIX > PREFIX/MonetDB-ODBC-Installer.wxs # "c:\Program Files (x86)\WiX Toolset v3.10\bin\candle.exe" -nologo -arch x64/x86 PREFIX/MonetDB-ODBC-Installer.wxs diff --git a/NT/mksqlwxs.py b/NT/mksqlwxs.py --- a/NT/mksqlwxs.py +++ b/NT/mksqlwxs.py @@ -1,8 +1,10 @@ +# SPDX-License-Identifier: MPL-2.0 +# # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# Copyright 1997 - July 2008 CWI, August 2008 - 2022 MonetDB B.V. +# Copyright 1997 - July 2008 CWI, August 2008 - 2023 MonetDB B.V. # python mksqlwxs.py VERSION BITS PREFIX > PREFIX/MonetDB5-SQL-Installer.wxs # "c:\Program Files (x86)\WiX Toolset v3.10\bin\candle.exe" -nologo -arch x64/x86 PREFIX/MonetDB5-SQL-Installer.wxs diff --git a/README.rst b/README.rst --- a/README.rst +++ b/README.rst @@ -142,8 +142,10 @@ Please note that we do not accept github Copyright Notice ================ +SPDX-License-Identifier: MPL-2.0 + _______________________________________________ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
