Changeset: b05e874f476f for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/b05e874f476f Modified Files: clients/mapiclient/dump.c clients/odbc/driver/SQLPrepare.c clients/odbc/tests/ODBCmetadata.c cmake/monetdb-findpackages.cmake monetdb5/mal/mal.c monetdb5/mal/mal_embedded.c monetdb5/modules/atoms/CMakeLists.txt monetdb5/modules/atoms/json.c monetdb5/modules/mal/batExtensions.c monetdb5/modules/mal/tablet.c monetdb5/modules/mal/tablet.h monetdb5/optimizer/opt_emptybind.c monetdb5/optimizer/opt_support.c sql/backends/monet5/CMakeLists.txt sql/backends/monet5/rel_bin.c sql/backends/monet5/rel_physical.c sql/backends/monet5/rel_predicates.c sql/backends/monet5/sql.c sql/backends/monet5/sql_cat.c sql/backends/monet5/sql_execute.c sql/backends/monet5/sql_gencode.c sql/backends/monet5/sql_gencode.h sql/backends/monet5/sql_rank.c sql/backends/monet5/sql_result.c sql/backends/monet5/sql_result.h sql/backends/monet5/sql_statement.c sql/backends/monet5/sql_statement.h sql/backends/monet5/sql_upgrades.c sql/backends/monet5/vaults/CMakeLists.txt sql/backends/monet5/vaults/csv/csv.c sql/backends/monet5/vaults/monetdb/CMakeLists.txt sql/backends/monet5/vaults/monetdb/monetdb.c sql/backends/monet5/vaults/odbc/odbc_loader.c sql/common/sql_types.c sql/include/sql_catalog.h sql/include/sql_keyword.h sql/include/sql_relation.h sql/scripts/40_json.sql sql/server/CMakeLists.txt sql/server/rel_basetable.c sql/server/rel_basetable.h sql/server/rel_distribute.c sql/server/rel_dump.c sql/server/rel_exp.c sql/server/rel_exp.h sql/server/rel_optimize_others.c sql/server/rel_optimize_proj.c sql/server/rel_optimize_sel.c sql/server/rel_optimizer.c sql/server/rel_optimizer_private.h sql/server/rel_prop.c sql/server/rel_prop.h sql/server/rel_propagate.c sql/server/rel_psm.c sql/server/rel_rel.c sql/server/rel_rel.h sql/server/rel_rewriter.c sql/server/rel_rewriter.h sql/server/rel_schema.c sql/server/rel_select.c sql/server/rel_statistics.c sql/server/rel_unnest.c sql/server/rel_updates.c sql/server/sql_mvc.c sql/server/sql_mvc.h sql/server/sql_parser.y sql/server/sql_partition.c sql/server/sql_privileges.c sql/server/sql_scan.c sql/server/sql_scan.h sql/server/sql_semantic.c sql/server/sql_semantic.h sql/server/sql_symbol.c sql/server/sql_symbol.h sql/server/sql_tokens.h sql/storage/bat/bat_logger.c sql/storage/bat/bat_storage.c sql/storage/bat/bat_table.c sql/storage/bat/res_table.c sql/storage/sql_catalog.c sql/storage/sql_storage.h sql/storage/store.c sql/storage/store_sequence.c sql/storage/store_sequence.h testing/sqllogictest.py testing/sqltest.py tools/monetdbe/monetdbe.c tools/mserver/mserver5.c Branch: nested Log Message:
merge with default diffs (truncated from 15587 to 300 lines): diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,9 +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 2024, 2025 MonetDB Foundation; -# Copyright August 2008 - 2023 MonetDB B.V.; -# Copyright 1997 - July 2008 CWI. +# For copyright information, see the file debian/copyright. #]] cmake_minimum_required(VERSION 3.12) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -46,7 +46,7 @@ 4. **Irresponsible communication.** Fail Tensions can occur between community members even when they are trying their best to collaborate. Not every conflict represents a code of conduct violation, and this Code of Conduct reinforces encouraged behaviors and norms that can help avoid conflicts and minimize harm. -When an incident does occur, it is important to report it promptly. To report a possible violation, you can send an email to [email protected] (a small group of people) or [email protected] (one person). +When an incident does occur, it is important to report it promptly. To report a possible violation, you can send an email to [email protected]. Community Moderators take reports of violations seriously and will make every effort to respond in a timely manner. They will investigate all reports of code of conduct violations, reviewing messages, logs, and recordings, or interviewing witnesses and other participants. Community Moderators will keep investigation and enforcement actions as transparent as possible while prioritizing safety and confidentiality. In order to honor these values, enforcement actions are carried out in private with the involved parties, but communicating to the whole community may be part of a mutually agreed upon resolution. diff --git a/Config.cmake.in b/Config.cmake.in --- a/Config.cmake.in +++ b/Config.cmake.in @@ -5,9 +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 2024, 2025 MonetDB Foundation; -# Copyright August 2008 - 2023 MonetDB B.V.; -# Copyright 1997 - July 2008 CWI. +# For copyright information, see the file debian/copyright. #]] @PACKAGE_INIT@ diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -4,9 +4,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 2024, 2025 MonetDB Foundation; -# Copyright August 2008 - 2023 MonetDB B.V.; -# Copyright 1997 - July 2008 CWI. +# For copyright information, see the file debian/copyright. %global version 11.56.0 @@ -1522,6 +1520,20 @@ rm "${RPM_BUILD_ROOT}"%{_unitdir}/monetd using the arena allocator. - sql: Unused helper function mapiuri_database() has been removed from rel_remote.h. +- mapilib: msettings can now be allocated with a custom memory allocator using + msettings_create_with() and msettings_clone_with(). This is used in + the SQL module to allocate them using the arena allocator. +- mapilib: The msettings objects no longer keep track of 'ignored' settings. + Function msetting_set_ignored has been removed. +- mapilib: Function msetting_as_string() has been changed to never return a newly + allocated string. To make this possible the user now has to pass in + a small scratch buffer that will be used if the setting is a number. + (booleans and strings can use existing strings). +- mapilib: Functions msettings_parse_url() and msettings_validate() have been + modified to return any error message instead of setting it through a + pointer parameter. +- mapilib: Function msettings_write_url() has been added to render an msettings + object as a URL string. * Mon Jan 13 2025 Sjoerd Mullender <[email protected]> - 11.53.1-20250317 - monetdb5: Removed function bat.attach since it wasn't used. diff --git a/NT/mkodbcwxs.py b/NT/mkodbcwxs.py --- a/NT/mkodbcwxs.py +++ b/NT/mkodbcwxs.py @@ -4,9 +4,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 2024, 2025 MonetDB Foundation; -# Copyright August 2008 - 2023 MonetDB B.V.; -# Copyright 1997 - July 2008 CWI. +# For copyright information, see the file debian/copyright. # 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 @@ -4,9 +4,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 2024, 2025 MonetDB Foundation; -# Copyright August 2008 - 2023 MonetDB B.V.; -# Copyright 1997 - July 2008 CWI. +# For copyright information, see the file debian/copyright. # python mksqlwxs.py VERSION BITS PREFIX > PREFIX/MonetDB-SQL-Installer.wxs # "c:\Program Files (x86)\WiX Toolset v3.10\bin\candle.exe" -nologo -arch x64/x86 PREFIX/MonetDB-SQL-Installer.wxs diff --git a/README.rst b/README.rst --- a/README.rst +++ b/README.rst @@ -143,12 +143,16 @@ Please note that we do not accept github Copyright Notice ================ +.. When updating copyright year, also update debian/copyright. + 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 2024, 2025 MonetDB Foundation; +Copyright 2024 - 2026 MonetDB Foundation; Copyright August 2008 - 2023 MonetDB B.V.; Copyright 1997 - July 2008 CWI. + +Also see the file ``debian/copyright``. diff --git a/buildtools/CMakeLists.txt b/buildtools/CMakeLists.txt --- a/buildtools/CMakeLists.txt +++ b/buildtools/CMakeLists.txt @@ -5,9 +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 2024, 2025 MonetDB Foundation; -# Copyright August 2008 - 2023 MonetDB B.V.; -# Copyright 1997 - July 2008 CWI. +# For copyright information, see the file debian/copyright. #]] 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 @@ -5,9 +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 2024, 2025 MonetDB Foundation; -# Copyright August 2008 - 2023 MonetDB B.V.; -# Copyright 1997 - July 2008 CWI. +# For copyright information, see the file debian/copyright. #]] if(WIN32) diff --git a/buildtools/conf/Maddlog b/buildtools/conf/Maddlog --- a/buildtools/conf/Maddlog +++ b/buildtools/conf/Maddlog @@ -7,9 +7,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 2024, 2025 MonetDB Foundation; -# Copyright August 2008 - 2023 MonetDB B.V.; -# Copyright 1997 - July 2008 CWI. +# For copyright information, see the file debian/copyright. 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 @@ -5,9 +5,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 2024, 2025 MonetDB Foundation; -Copyright August 2008 - 2023 MonetDB B.V.; -Copyright 1997 - July 2008 CWI. +For copyright information, see the file debian/copyright. --> <!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 @@ -5,9 +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 2024, 2025 MonetDB Foundation; - * Copyright August 2008 - 2023 MonetDB B.V.; - * Copyright 1997 - July 2008 CWI. + * For copyright information, see the file debian/copyright. */ /* diff --git a/clients/CMakeLists.txt b/clients/CMakeLists.txt --- a/clients/CMakeLists.txt +++ b/clients/CMakeLists.txt @@ -5,9 +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 2024, 2025 MonetDB Foundation; -# Copyright August 2008 - 2023 MonetDB B.V.; -# Copyright 1997 - July 2008 CWI. +# For copyright information, see the file debian/copyright. #]] add_subdirectory(mapilib) diff --git a/clients/ChangeLog b/clients/ChangeLog deleted file mode 100644 --- a/clients/ChangeLog +++ /dev/null @@ -1,3 +0,0 @@ -# ChangeLog file for clients -# This file is updated with Maddlog - diff --git a/clients/ChangeLog.Dec2025 b/clients/ChangeLog.Dec2025 deleted file mode 100644 --- a/clients/ChangeLog.Dec2025 +++ /dev/null @@ -1,3 +0,0 @@ -# ChangeLog file for clients -# This file is updated with Maddlog - diff --git a/clients/NT/CMakeLists.txt b/clients/NT/CMakeLists.txt --- a/clients/NT/CMakeLists.txt +++ b/clients/NT/CMakeLists.txt @@ -5,9 +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 2024, 2025 MonetDB Foundation; -# Copyright August 2008 - 2023 MonetDB B.V.; -# Copyright 1997 - July 2008 CWI. +# For copyright information, see the file debian/copyright. #]] # These files have to be installed in the root of the project. But you diff --git a/clients/NT/mclient.bat b/clients/NT/mclient.bat --- a/clients/NT/mclient.bat +++ b/clients/NT/mclient.bat @@ -4,9 +4,7 @@ @REM License, v. 2.0. If a copy of the MPL was not distributed with this @REM file, You can obtain one at http://mozilla.org/MPL/2.0/. @REM -@REM Copyright 2024, 2025 MonetDB Foundation; -@REM Copyright August 2008 - 2023 MonetDB B.V.; -@REM Copyright 1997 - July 2008 CWI. +@REM For copyright information, see the file debian/copyright. @echo off rem figure out the folder name diff --git a/clients/NT/msqldump.bat b/clients/NT/msqldump.bat --- a/clients/NT/msqldump.bat +++ b/clients/NT/msqldump.bat @@ -4,9 +4,7 @@ @REM License, v. 2.0. If a copy of the MPL was not distributed with this @REM file, You can obtain one at http://mozilla.org/MPL/2.0/. @REM -@REM Copyright 2024, 2025 MonetDB Foundation; -@REM Copyright August 2008 - 2023 MonetDB B.V.; -@REM Copyright 1997 - July 2008 CWI. +@REM For copyright information, see the file debian/copyright. @rem figure out the folder name @set MONETDB=%~dp0 diff --git a/clients/examples/C/CMakeLists.txt b/clients/examples/C/CMakeLists.txt --- a/clients/examples/C/CMakeLists.txt +++ b/clients/examples/C/CMakeLists.txt @@ -5,9 +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 2024, 2025 MonetDB Foundation; -# Copyright August 2008 - 2023 MonetDB B.V.; -# Copyright 1997 - July 2008 CWI. +# For copyright information, see the file debian/copyright. #]] add_executable(sample0 diff --git a/clients/examples/C/backrefencode.c b/clients/examples/C/backrefencode.c --- a/clients/examples/C/backrefencode.c +++ b/clients/examples/C/backrefencode.c @@ -5,9 +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 2024, 2025 MonetDB Foundation; - * Copyright August 2008 - 2023 MonetDB B.V.; - * Copyright 1997 - July 2008 CWI. + * For copyright information, see the file debian/copyright. */ #include "monetdb_config.h" diff --git a/clients/examples/C/bincopybackref.c b/clients/examples/C/bincopybackref.c --- a/clients/examples/C/bincopybackref.c +++ b/clients/examples/C/bincopybackref.c @@ -5,9 +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/. _______________________________________________ checkin-list mailing list -- [email protected] To unsubscribe send an email to [email protected]
