Changeset: 6aa6c1760d7d for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/6aa6c1760d7d Modified Files: cmake/monetdb-options.cmake monetdb_config.h.in Branch: samloader Log Message:
merge default diffs (truncated from 49566 to 300 lines): diff --git a/.clang-format b/.clang-format --- a/.clang-format +++ b/.clang-format @@ -40,9 +40,11 @@ ContinuationIndentWidth: 8 EnumTrailingComma: Leave ForEachMacros: - BATloop + - CAND_LOOP + - CAND_LOOP_IDX + - TIMEOUT_LOOP - TIMEOUT_LOOP_IDX - TIMEOUT_LOOP_IDX_DECL - - TIMEOUT_LOOP IfMacros: - TRC_CRITICAL_IF - TRC_ERROR_IF @@ -78,39 +80,42 @@ SpaceInEmptyParentheses: false SpacesInParens: Never SpacesInSquareBrackets: false StatementAttributeLikeMacros: - - fits_export - gdk_export - generator_export - - geom_export - - libgeom_export - mal_export - mapi_export - monetdbe_export - moptions_export - mutils_export - mvc_export - - netcdf_export - - orderidx_export - - shp_export - sql5_export - sql_export - - udf_export TypeNames: + - adapter_t - allocator + - allocator_state + - atomDesc - ATOMIC_BASE_TYPE + - ATOMIC_FLAG + - ATOMIC_PTR_TYPE - ATOMIC_TYPE - bat - BAT - BATiter - bit + - blob + - BBPrec - bte - BUN - BUN2type - BUN4type - BUN8type + - ccand_t + - component_t - date - daytime - dbl + - exception_buffer - FILE - flt - gdk_callback_func @@ -118,15 +123,20 @@ TypeNames: - Hash - Heap - hge + - inet4 + - inet6 - __int128_t + - int128_t - int16_t - int32_t - int64_t - int8_t + - layer_t - lng - log_bid - logger - log_id + - log_level_t - Mapi - MapiHdl - MapiMsg @@ -134,15 +144,19 @@ TypeNames: - MT_Cond - MT_Id - MT_Lock + - MT_RWLock - MT_Sema + - MT_TLS_t - off_t - oid - old_logger - PROPrec - ptr - QryCtx + - role_t - RTree - sht + - storage_t - str - stream - stridx_t @@ -150,11 +164,15 @@ TypeNames: - timestamp - time_t - trans + - uhge + - uint128_t - uint16_t - uint32_t - uint64_t - uint8_t - ulng - url + - uuid + - ValPtr - ValRecord - var_t diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -859,3 +859,4 @@ b4c2936c46f28ad6b3e59ed5a1a844726d521994 691e862e16ceb7f720536063ed6d3c2e3d11e33a Dec2025_SP2_release 1d742c123cb0e622d9a137b10bfbd7e4c446fde2 Dec2025_7 1d742c123cb0e622d9a137b10bfbd7e4c446fde2 Dec2025_SP3_release +bc5735402f969151c941c100a7552769c0e89a9a Dec2025_9 diff --git a/ChangeLog b/ChangeLog --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog file for devel # This file is updated with Maddlog +* Mon Sep 28 2026 Sjoerd Mullender <[email protected]> +- The example udf extension module has been removed. For example + extensions, see https://www.monetdb.org/hg/MonetDB-extend/. Note that + the udf module was not loaded automatically on startup of the server. + * Thu Sep 17 2026 Sjoerd Mullender <[email protected]> - It is now possible to use --set usr1_outputfile=... to specify a file where the output for the SIGUSR1 signal is to be written. The file diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -86,7 +86,7 @@ Group: Applications/Databases License: MPL-2.0 URL: https://www.monetdb.org/ BugURL: https://github.com/MonetDB/MonetDB/issues -Source: https://www.monetdb.org/downloads/sources/Dec2025-SP3/MonetDB-%{version}.tar.bz2 +Source: https://www.monetdb.org/downloads/sources/Dec2025-SP4/MonetDB-%{version}.tar.bz2 BuildRequires: systemd-rpm-macros BuildRequires: cmake >= 3.12 @@ -938,7 +938,6 @@ install -d -m 0775 "${RPM_BUILD_ROOT}"%{ # remove unwanted stuff rm -f "${RPM_BUILD_ROOT}"%{_libdir}/monetdb5*/lib_microbenchmark*.so -rm -f "${RPM_BUILD_ROOT}"%{_libdir}/monetdb5*/lib_udf*.so rm -f "${RPM_BUILD_ROOT}"%{_bindir}/monetdb_mtest.sh %if %{without compat} && %{with selinux} @@ -1023,6 +1022,29 @@ rm "${RPM_BUILD_ROOT}"%{_unitdir}/monetd %endif %changelog +* Tue Sep 29 2026 Sjoerd Mullender <[email protected]> - 11.55.9-20260929 +- Rebuilt. +- GH#7922: Wrong result path split between `SUM() OVER (... RANGE ...)` + and an equivalent correlated aggregate rewrite +- GH#7959: prepared statement freed twice +- GH#7960: A batch ending in a recursive CTE with a `LIKE` predicate + crashes during MAL pushselect optimization (`isLikeOp`). +- GH#7970: Redundant INNER JOIN predicate avoids a large intermediate + result before a LEFT JOIN +- GH#7971: Server crash on PREPARE when a parameter is cast to DECIMAL + without precision +- GH#7977: prepare should fail on optimization errors. +- GH#7978: memory leak on recompile of prepared statements +- GH#7979: lots of prepare statements could give: undefined function error. +- GH#7981: `NOT` over a false self-comparison returns `false` +- GH#7991: Window `GROUP_CONCAT` mishandles a NULL separator +- GH#7999: `NOT (NOT (x > c))` returns extra rows +- GH#8006: `field()` function returns multiple rows when the searched + value appears more than once +- GH#8023: Query Timeouts for many-core servers with Docker limitations +- GH#8027: `HAVING` keeps a group whose boolean is FALSE; the same boolean + prints TRUE in SELECT and is FALSE under `WHERE` on its alias + * Mon Jun 15 2026 Sjoerd Mullender <[email protected]> - 11.55.7-20260615 - Rebuilt. - GH#7729: MonetDB server (Mar2025-SP2-release) crashes at `tail_type` diff --git a/NT/mkodbcwxs.py b/NT/mkodbcwxs.py --- a/NT/mkodbcwxs.py +++ b/NT/mkodbcwxs.py @@ -7,28 +7,51 @@ # 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 -# "c:\Program Files (x86)\WiX Toolset v3.10\bin\light.exe" -nologo -sice:ICE03 -sice:ICE60 -sice:ICE82 -ext WixUIExtension PREFIX/MonetDB-ODBC-Installer.wixobj +# "c:\Program Files (x86)\WiX Toolset v3.10\bin\candle.exe" -nologo \ +# -arch x64/x86 PREFIX/MonetDB-ODBC-Installer.wxs +# "c:\Program Files (x86)\WiX Toolset v3.10\bin\light.exe" -nologo \ +# -sice:ICE03 -sice:ICE60 -sice:ICE82 -ext WixUIExtension \ +# PREFIX/MonetDB-ODBC-Installer.wixobj -import sys, os +import sys +import os # doesn't change upgradecode = {'x64': '{95ACBC8C-BC4B-4901-AF70-48B54A5C20F7}', 'x86': '{C1F69378-3F5C-4120-8224-32F07D3458F3}'} -def comp(features, id, depth, files, fid=None, name=None, args=None, sid=None, vital=None): + +def comp(features, id, depth, files, + fid=None, name=None, args=None, sid=None, vital=None): indent = ' ' * depth for f in files: - print('{}<Component Id="_{}" Guid="*">'.format(indent, id)) - print('{} <File DiskId="1"{} KeyPath="yes" Name="{}" Source="{}"{}{}'.format(indent, fid and (' Id="{}"'.format(fid)) or '', f.split('\\')[-1], f, vital and (' Vital="{}"'.format(vital)) or '', name and '>' or '/>')) + print(f'{indent}<Component Id="_{id}" Guid="*">') + print('{} <File DiskId="1"{} KeyPath="yes" Name="{}" Source="{}"{}{}' + .format(indent, f' Id="{fid}"' if fid else '', + f.split('\\')[-1], f, + f' Vital="{vital}"' if vital else '', + '>' if name else '/>')) if name: - print('{} <Shortcut Id="{}" Advertise="yes"{} Directory="ProgramMenuDir" Icon="monetdb.ico" IconIndex="0" Name="{}" WorkingDirectory="INSTALLDIR"/>'.format(indent, sid, args and (' Arguments="{}"'.format(args)) or '', name)) - print('{} </File>'.format(indent)) - print('{}</Component>'.format(indent)) - features.append('_{}'.format(id)) + print(('{} <Shortcut Id="{}" Advertise="yes"{}' + ' Directory="ProgramMenuDir" Icon="monetdb.ico"' + ' IconIndex="0" Name="{}" WorkingDirectory="INSTALLDIR"/>') + .format(indent, sid, + f' Arguments="{args}"' if args else '', + name)) + print(f'{indent} </File>') + print(f'{indent}</Component>') + features.append(f'_{id}') id += 1 return id + +vcsearch = ( + r'C:\Program Files\Microsoft Visual Studio\2022\Community\VC', + r'C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC', + r'C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC', + ) + + def main(): if len(sys.argv) != 4: print(r'Usage: mkodbcwxs.py version bits installdir') @@ -50,12 +73,9 @@ def main(): if vsdir is not None: vcdir = os.path.join(vsdir, 'VC') if vcdir is None: - if os.path.exists(r'C:\Program Files\Microsoft Visual Studio\2022\Community\VC'): - vcdir = r'C:\Program Files\Microsoft Visual Studio\2022\Community\VC' - elif os.path.exists(r'C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC'): - vcdir = r'C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC' - elif os.path.exists(r'C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC'): - vcdir = r'C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC' + for vcdir in vcsearch: + if os.path.exists(vcdir): + break else: print(r"Don't know which visual studio directory to use") return 1 @@ -63,40 +83,56 @@ def main(): features = [] print(r'<?xml version="1.0"?>') print(r'<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi";>') - print(r' <Product Id="*" Language="1033" Manufacturer="MonetDB" Name="MonetDB ODBC Driver" UpgradeCode="{}" Version="{}">'.format(upgradecode[arch], version)) - print(r' <Package Id="*" Comments="MonetDB ODBC Driver" Compressed="yes" InstallerVersion="301" Keywords="MonetDB SQL ODBC" Languages="1033" Manufacturer="MonetDB Foundation" Platform="{}"/>'.format(arch)) - print(r' <MajorUpgrade AllowDowngrades="no" DowngradeErrorMessage="A later version of [ProductName] is already installed." AllowSameVersionUpgrades="no"/>') + print(r' <Product Id="*" Language="1033" Manufacturer="MonetDB"' + fr' Name="MonetDB ODBC Driver" UpgradeCode="{upgradecode[arch]}"' + fr' Version="{version}">') + print(r' <Package Id="*" Comments="MonetDB ODBC Driver"' + r' Compressed="yes" InstallerVersion="301"' + r' Keywords="MonetDB SQL ODBC" Languages="1033"' + fr' Manufacturer="MonetDB Foundation" Platform="{arch}"/>') + print(r' <MajorUpgrade AllowDowngrades="no"' + r' DowngradeErrorMessage="A later version of [ProductName]' + r' is already installed." AllowSameVersionUpgrades="no"/>') print(r' <WixVariable Id="WixUILicenseRtf" Value="share\license.rtf"/>') print(r' <WixVariable Id="WixUIBannerBmp" Value="share\banner.bmp"/>') - # print(r' <WixVariable Id="WixUIDialogBmp" Value="backgroundRipple.bmp"/>') + # print(r' <WixVariable Id="WixUIDialogBmp"' + # r' Value="backgroundRipple.bmp"/>') print(r' <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR"/>') _______________________________________________ checkin-list mailing list -- [email protected] To unsubscribe send an email to [email protected]
