Changeset: 78651fc263fb for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=78651fc263fb Modified Files: gdk/gdk_logger.c gdk/gdk_logger.h gdk/gdk_logger_internals.h sql/backends/monet5/rel_bin.c sql/backends/monet5/sql.c sql/backends/monet5/sql.h sql/backends/monet5/sql_cat.c sql/backends/monet5/sql_gencode.c sql/backends/monet5/sql_optimizer.c sql/backends/monet5/sql_orderidx.c sql/backends/monet5/sql_result.c sql/backends/monet5/sql_scenario.c sql/backends/monet5/sql_statement.c sql/backends/monet5/sql_statistics.c sql/backends/monet5/sql_upgrades.c sql/backends/monet5/sql_user.c sql/backends/monet5/vaults/fits/fits.c sql/backends/monet5/vaults/netcdf/netcdf.c sql/backends/monet5/vaults/shp/shp.c sql/backends/monet5/wlr.c sql/common/sql_list.c sql/common/sql_types.c sql/include/sql_catalog.h sql/include/sql_list.h sql/server/rel_distribute.c sql/server/rel_optimizer.c sql/server/rel_partition.c sql/server/rel_planner.c sql/server/rel_propagate.c sql/server/rel_psm.c sql/server/rel_rel.c sql/server/rel_schema.c sql/server/rel_select.c sql/server/rel_sequence.c sql/server/rel_updates.c sql/server/sql_mvc.c sql/server/sql_mvc.h sql/server/sql_partition.c sql/server/sql_privileges.c sql/server/sql_semantic.c sql/storage/bat/bat_logger.c sql/storage/bat/bat_logger.h sql/storage/bat/bat_storage.c sql/storage/bat/bat_storage.h sql/storage/bat/bat_table.c sql/storage/bat/bat_utils.c sql/storage/sql_catalog.c sql/storage/sql_storage.h sql/storage/store.c sql/storage/store_dependency.c sql/storage/store_sequence.c sql/storage/store_sequence.h tools/monetdbe/monetdbe.c Branch: nospare Log Message:
Merge with default branch. diffs (truncated from 18636 to 300 lines): diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ # 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 - 2020 MonetDB B.V. +# Copyright 1997 - July 2008 CWI, August 2008 - 2021 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 @@ -3,7 +3,7 @@ # 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 - 2020 MonetDB B.V. +# Copyright 1997 - July 2008 CWI, August 2008 - 2021 MonetDB B.V. #]] @PACKAGE_INIT@ diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -41,25 +41,15 @@ %global fedpkgs 1 %endif -%if %{?rhel:1}%{!?rhel:0} && 0%{?rhel} < 7 -# RedHat Enterprise Linux < 7 -# There is no macro _rundir, and no directory /run, instead use /var/run. -%global _rundir %{_localstatedir}/run -%endif - # On Fedora, the geos library is available, and so we can require it # and build the geom modules. On RedHat Enterprise Linux and # derivatives (CentOS, Scientific Linux), the geos library is not # available. However, the geos library is available in the Extra -# Packages for Enterprise Linux (EPEL). However, On RHEL 6, the geos -# library is too old for us, so we need an extra check for an -# up-to-date version of RHEL. +# Packages for Enterprise Linux (EPEL). %if %{fedpkgs} -%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7 # By default create the MonetDB-geom-MonetDB5 package on Fedora and RHEL 7 %bcond_without geos %endif -%endif # By default use PCRE for the implementation of the SQL LIKE and ILIKE # operators. Otherwise the POSIX regex functions are used. @@ -73,11 +63,8 @@ %bcond_without rintegration %endif -%if 0%{?rhel} >= 7 || 0%{?fedora} > 0 -# On RHEL 6, Python 3 is too old. On RHEL 7, Python 3 was too old -# when RHEL 7 was released, but now it is ok. +# By default, include Python 3 integration. %bcond_without py3integration -%endif %if %{fedpkgs} # By default, create the MonetDB-cfitsio package. @@ -104,13 +91,10 @@ Source: https://www.monetdb.org/download # that doesn't exist and we need systemd, so instead we just require # the macro file that contains the definitions. # We need checkpolicy and selinux-policy-devel for the SELinux policy. -%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7 -# RHEL >= 7, and all current Fedora BuildRequires: /usr/lib/rpm/macros.d/macros.systemd BuildRequires: checkpolicy BuildRequires: selinux-policy-devel BuildRequires: hardlink -%endif BuildRequires: cmake3 >= 3.12 BuildRequires: gcc BuildRequires: bison @@ -497,9 +481,7 @@ Suggests: %{name}-client%{?_isa} = %{ver %endif # versions up to 1.0.5 don't accept the queryid field in the result set Conflicts: python-pymonetdb < 1.0.6 -%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7 Requires(pre): systemd -%endif %description -n MonetDB5-server MonetDB is a database management system that is developed from a @@ -535,9 +517,7 @@ exit 0 %files -n MonetDB5-server %defattr(-,root,root) -%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7 %{_sysusersdir}/monetdb.conf -%endif %attr(2750,monetdb,monetdb) %dir %{_localstatedir}/lib/monetdb %attr(2770,monetdb,monetdb) %dir %{_localstatedir}/monetdb5 %attr(2770,monetdb,monetdb) %dir %{_localstatedir}/monetdb5/dbfarm @@ -589,9 +569,7 @@ Provides: %{name}-SQL-server5-hugeint%{? %if (0%{?fedora} >= 22) Suggests: %{name}-client%{?_isa} = %{version}-%{release} %endif -%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7 %{?systemd_requires} -%endif %description SQL-server5 MonetDB is a database management system that is developed from a @@ -602,7 +580,6 @@ accelerators. It also has an SQL front This package contains the monetdb and monetdbd programs and the systemd configuration. -%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7 %post SQL-server5 %systemd_post monetdbd.service @@ -611,7 +588,6 @@ configuration. %postun SQL-server5 %systemd_postun_with_restart monetdbd.service -%endif %files SQL-server5 %defattr(-,root,root) @@ -619,16 +595,9 @@ configuration. %{_bindir}/monetdbd %dir %attr(775,monetdb,monetdb) %{_localstatedir}/log/monetdb %dir %attr(775,monetdb,monetdb) %{_rundir}/monetdb -%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7 # RHEL >= 7, and all current Fedora %{_tmpfilesdir}/monetdbd.conf %{_unitdir}/monetdbd.service -%else -# RedHat Enterprise Linux < 7 -%exclude %{_sysconfdir}/tmpfiles.d/monetdbd.conf -# no _unitdir macro -%exclude %{_prefix}/lib/systemd/system/monetdbd.service -%endif %config(noreplace) %attr(664,monetdb,monetdb) %{_localstatedir}/monetdb5/dbfarm/.merovingian_properties %verify(not mtime) %attr(664,monetdb,monetdb) %{_localstatedir}/monetdb5/dbfarm/.merovingian_lock %config(noreplace) %attr(644,root,root) %{_sysconfdir}/logrotate.d/monetdbd @@ -716,7 +685,6 @@ developer, but if you do want to test, t %dir %{python3_sitelib}/MonetDBtesting %{python3_sitelib}/MonetDBtesting/* -%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7 %package selinux Summary: SELinux policy files for MonetDB Group: Applications/Databases @@ -779,13 +747,12 @@ fi %{_datadir}/doc/MonetDB-selinux/* %{_datadir}/selinux/*/monetdb.pp -%endif - %prep %setup -q %build %cmake3 \ + -DCMAKE_INSTALL_RUNSTATEDIR=/run \ -DRELEASE_VERSION=ON \ -DASSERT=OFF \ -DCINTEGRATION=%{?with_cintegration:ON}%{!?with_cintegration:OFF} \ @@ -824,14 +791,12 @@ for d in etc var; do mkdir "%{buildroot} rm "%{buildroot}/usr/var" "%{buildroot}/usr/etc" # move file to correct location -%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7 mkdir -p %{buildroot}%{_tmpfilesdir} %{buildroot}%{_sysusersdir} mv %{buildroot}%{_sysconfdir}/tmpfiles.d/monetdbd.conf %{buildroot}%{_tmpfilesdir} cat > %{buildroot}%{_sysusersdir}/monetdb.conf << EOF u monetdb - "MonetDB Server" /var/lib/monetdb EOF rmdir %{buildroot}%{_sysconfdir}/tmpfiles.d -%endif install -d -m 0750 %{buildroot}%{_localstatedir}/lib/monetdb install -d -m 0770 %{buildroot}%{_localstatedir}/monetdb5/dbfarm @@ -850,23 +815,12 @@ rm -f %{buildroot}%{_libdir}/monetdb5/li rm -f %{buildroot}%{_bindir}/monetdb_mtest.sh rm -rf %{buildroot}%{_datadir}/monetdb # /cmake -%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7 if [ -x /usr/sbin/hardlink ]; then /usr/sbin/hardlink -cv %{buildroot}%{_datadir}/selinux else # Fedora 31 /usr/bin/hardlink -cv %{buildroot}%{_datadir}/selinux fi -%endif - -%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7 -# fix up some paths (/var/run -> /run) -# needed because CMAKE_INSTALL_RUNSTATEDIR refers to /var/run -sed -i 's|/var/run|/run|' \ - %{buildroot}%{_tmpfilesdir}/monetdbd.conf \ - %{buildroot}%{_localstatedir}/monetdb5/dbfarm/.merovingian_properties \ - %{buildroot}%{_unitdir}/monetdbd.service -%endif %changelog * Wed Nov 18 2020 Sjoerd Mullender <sjo...@acm.org> - 11.39.7-20201118 diff --git a/NT/mkodbcwxs.py b/NT/mkodbcwxs.py --- a/NT/mkodbcwxs.py +++ b/NT/mkodbcwxs.py @@ -2,7 +2,7 @@ # 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 - 2020 MonetDB B.V. +# Copyright 1997 - July 2008 CWI, August 2008 - 2021 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 @@ -2,7 +2,7 @@ # 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 - 2020 MonetDB B.V. +# Copyright 1997 - July 2008 CWI, August 2008 - 2021 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 @@ -149,4 +149,4 @@ This Source Code Form is subject to the 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 - 2020 MonetDB B.V. +Copyright 1997 - July 2008 CWI, August 2008 - 2021 MonetDB B.V. diff --git a/buildtools/CMakeLists.txt b/buildtools/CMakeLists.txt --- a/buildtools/CMakeLists.txt +++ b/buildtools/CMakeLists.txt @@ -3,7 +3,7 @@ # 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 - 2020 MonetDB B.V. +# Copyright 1997 - July 2008 CWI, August 2008 - 2021 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 @@ -3,7 +3,7 @@ # 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 - 2020 MonetDB B.V. +# Copyright 1997 - July 2008 CWI, August 2008 - 2021 MonetDB B.V. #]] if(WIN32) diff --git a/buildtools/conf/Maddlog b/buildtools/conf/Maddlog --- a/buildtools/conf/Maddlog +++ b/buildtools/conf/Maddlog @@ -5,7 +5,7 @@ # 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 - 2020 MonetDB B.V. +# Copyright 1997 - July 2008 CWI, August 2008 - 2021 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 @@ -3,7 +3,7 @@ This Source Code Form is subject to the 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 - 2020 MonetDB B.V. +Copyright 1997 - July 2008 CWI, August 2008 - 2021 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 @@ -3,7 +3,7 @@ * 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 - 2020 MonetDB B.V. + * Copyright 1997 - July 2008 CWI, August 2008 - 2021 MonetDB B.V. */ /* diff --git a/clients/CMakeLists.txt b/clients/CMakeLists.txt _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
