Changeset: ed27e59c574f for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/ed27e59c574f Modified Files: .hgtags MonetDB.spec clients/Tests/MAL-signatures-hge.test clients/Tests/MAL-signatures.test clients/Tests/exports.stable.out cmake/monetdb-defines.cmake cmake/monetdb-findpackages.cmake cmake/monetdb-options.cmake cmake/monetdb-rpm-packages.cmake debian/changelog debian/control gdk/CMakeLists.txt gdk/gdk.h gdk/gdk_align.c gdk/gdk_bat.c gdk/gdk_batop.c gdk/gdk_bbp.c gdk/gdk_private.h gdk/gdk_storage.c geom/lib/libgeom.c geom/lib/libgeom.h geom/monetdb5/CMakeLists.txt geom/monetdb5/geom.c geom/monetdb5/geom.h geom/monetdb5/geomBulk.c geom/monetdb5/geom_upgrade.c geom/sql/40_geom.sql geom/sql/functions/Tests/All misc/packages/deb/changelog misc/packages/rpm/changelog monetdb5/optimizer/opt_mitosis.c monetdb5/optimizer/opt_prelude.c monetdb5/optimizer/opt_prelude.h monetdb_config.h.in sql/backends/monet5/sql_upgrades.c sql/backends/monet5/vaults/shp/75_shp.sql sql/backends/monet5/vaults/shp/shp.c sql/backends/monet5/vaults/shp/shp.h sql/common/sql_list.c sql/storage/objectset.c Branch: geo-update Log Message:
merged with default diffs (truncated from 471977 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -790,3 +790,5 @@ 43d4a717410d6f6692a16a878640fc7e0f248725 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 @@ -84,10 +86,10 @@ Summary: MonetDB - Monet Database Manage 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 +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} @@ -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) @@ -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 @@ -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 @@ -141,8 +141,10 @@ Please note that we do not accept github Copyright Notice ================ +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. diff --git a/buildtools/CMakeLists.txt b/buildtools/CMakeLists.txt --- a/buildtools/CMakeLists.txt +++ b/buildtools/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. #]] add_subdirectory(conf) diff --git a/buildtools/conf/CMakeLists.txt b/buildtools/conf/CMakeLists.txt --- a/buildtools/conf/CMakeLists.txt +++ b/buildtools/conf/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. #]] if(WIN32) diff --git a/buildtools/conf/Maddlog b/buildtools/conf/Maddlog --- a/buildtools/conf/Maddlog +++ b/buildtools/conf/Maddlog @@ -1,11 +1,13 @@ #!/usr/bin/env bash # -*-shell-script-*- +# 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. usage() { cat >&2 <<-EOF diff --git a/buildtools/conf/website.html b/buildtools/conf/website.html --- a/buildtools/conf/website.html +++ b/buildtools/conf/website.html @@ -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. --> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> diff --git a/buildtools/coverity_model.c b/buildtools/coverity_model.c --- a/buildtools/coverity_model.c +++ b/buildtools/coverity_model.c @@ -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. */ /* diff --git a/clients/CMakeLists.txt b/clients/CMakeLists.txt --- a/clients/CMakeLists.txt +++ b/clients/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. #]] add_subdirectory(mapiclient) diff --git a/clients/NT/CMakeLists.txt b/clients/NT/CMakeLists.txt --- a/clients/NT/CMakeLists.txt +++ b/clients/NT/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 _______________________________________________ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
