Changeset: 22b98efe171a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/22b98efe171a
Modified Files:
clients/Tests/MAL-signatures-hge.test
clients/Tests/MAL-signatures.test
clients/Tests/exports.stable.out
clients/mapiclient/dump.c
monetdb5/mal/mal_embedded.c
monetdb5/modules/atoms/CMakeLists.txt
monetdb5/modules/atoms/json.c
monetdb5/modules/mal/tablet.c
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/sql.c
sql/backends/monet5/sql_cat.c
sql/backends/monet5/sql_execute.c
sql/backends/monet5/sql_gencode.c
sql/backends/monet5/sql_rank.c
sql/backends/monet5/sql_result.c
sql/backends/monet5/sql_statement.c
sql/backends/monet5/sql_statement.h
sql/backends/monet5/sql_upgrades.c
sql/backends/monet5/vaults/csv/csv.c
sql/backends/monet5/vaults/odbc/odbc_loader.c
sql/common/sql_types.c
sql/include/sql_catalog.h
sql/include/sql_relation.h
sql/server/CMakeLists.txt
sql/server/rel_basetable.c
sql/server/rel_distribute.c
sql/server/rel_dump.c
sql/server/rel_exp.c
sql/server/rel_exp.h
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_propagate.c
sql/server/rel_rel.c
sql/server/rel_rewriter.c
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_privileges.c
sql/server/sql_scan.c
sql/server/sql_semantic.c
sql/storage/bat/bat_logger.c
sql/storage/bat/bat_storage.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
sql/test/BugTracker-2024/Tests/7605_full_3_level_name_support.test
sql/test/emptydb/Tests/check.stable.out
sql/test/emptydb/Tests/check.stable.out.32bit
sql/test/emptydb/Tests/check.stable.out.int128
sql/test/prepare/Tests/sqlancer_prepare.test
sql/test/strings/Tests/contains_join.test
testing/sqltest.py
tools/monetdbe/monetdbe.c
tools/mserver/mserver5.c
Branch: nested
Log Message:
merged with default
diffs (truncated from 38859 to 300 lines):
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -24,7 +24,7 @@ jobs:
- os: macos-latest
c_compiler: clang
- os: macos-latest
- c_compiler: gcc-12
+ c_compiler: gcc-14
- os: ubuntu-latest
c_compiler: gcc
- os: ubuntu-latest
@@ -109,7 +109,7 @@ jobs:
- name: choco packages
run: |
choco install winflexbison3
- vcpkg install libiconv bzip2 libxml2 pcre zlib getopt
+ vcpkg install libiconv bzip2 libxml2 pcre2 zlib getopt
if: runner.os == 'Windows'
- name: make MonetDB on Windows
@@ -124,7 +124,7 @@ jobs:
- name: ctest
run: |
cd build
- cmake --build . --target ${{ runner.os == 'Windows' && 'RUN_TESTS'
|| 'test' }}
+ CTEST_OUTPUT_ON_FAILURE=1 cmake --build . --target ${{ runner.os ==
'Windows' && 'RUN_TESTS' || 'test' }}
if: runner.os != 'Windows'
- name: mtest
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -845,3 +845,6 @@ 53b71d71caccc81358785cb852a186500fc95b08
77b1be95dc79fe61215a34b84ed67e7097323977 Mar2025_7
6d5be335a6c739e61682366f7a84b67b0cfc0be6 Mar2025_9
6d5be335a6c739e61682366f7a84b67b0cfc0be6 Mar2025_SP1_release
+a63e11c1fd1b2dfba2a0ed8a985455286bc023d3 Mar2025_11
+00d41c24cb9d5c43bd35e9e02e6a739a65c02810 Mar2025_13
+00d41c24cb9d5c43bd35e9e02e6a739a65c02810 Mar2025_SP2_release
diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog file for devel
# This file is updated with Maddlog
+* Tue Sep 16 2025 Sjoerd Mullender <[email protected]>
+- This server is no longer compatible with the MonetDB Stethoscope.
+
* Mon Apr 28 2025 Niels Nes <[email protected]>
- Changed the way complex AND and OR expressions are handled. The new
expression tree uses 2 new cmp flag (cmp_con/cmp_dis), both expressions
diff --git a/ChangeLog-Archive b/ChangeLog-Archive
--- a/ChangeLog-Archive
+++ b/ChangeLog-Archive
@@ -1,6 +1,12 @@
# DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
# This file contains past ChangeLog entries
+* Wed Aug 13 2025 Sjoerd Mullender <[email protected]> - 11.53.11-20250821
+- It is now relatively easy to configure the location of the database farm
+ (aka dbfarm) directory when using systemd. Just create an override
+ file for the monetdbd service and add an Environment entry for DBFARM
+ pointing to the new directory.
+
* Thu May 8 2025 Sjoerd Mullender <[email protected]> - 11.53.5-20250627
- It is now possible to specify an idle timeout using --set
idle_timeout=<seconds> (see mserver5 manual page) which gets triggered
diff --git a/ChangeLog.Mar2025 b/ChangeLog.Mar2025
--- a/ChangeLog.Mar2025
+++ b/ChangeLog.Mar2025
@@ -1,7 +1,3 @@
# ChangeLog file for devel
# This file is updated with Maddlog
-* Tue Jul 8 2025 Niels Nes <[email protected]>
-- Fixed issue #7655, now the segments keep the number of deleted
- rows. Only search for reuse when deleted rows are available.
-
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -95,7 +95,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/Mar2025-SP1/MonetDB-%{version}.tar.bz2
+Source:
https://www.monetdb.org/downloads/sources/Mar2025-SP2/MonetDB-%{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
@@ -140,7 +140,7 @@ BuildRequires: pkgconfig(openssl) >= 1.1
%global with_openssl 1
%endif
%if %{with pcre}
-BuildRequires: pkgconfig(libpcre) >= 4.5
+BuildRequires: pkgconfig(libpcre2-8)
%endif
BuildRequires: pkgconfig(zlib)
BuildRequires: pkgconfig(liblz4) >= 1.8
@@ -1057,6 +1057,66 @@ rm "${RPM_BUILD_ROOT}"%{_unitdir}/monetd
%endif
%changelog
+* Mon Sep 01 2025 Sjoerd Mullender <[email protected]> - 11.53.13-20250901
+- Rebuilt.
+- GH#7692: Illegal argument on range select with equality
+- GH#7693: Obscure failure when running mserver5 on an older monetdbd
+ release
+
+* Thu Aug 28 2025 Sjoerd Mullender <[email protected]> - 11.53.13-20250901
+- clients: We now try to figure out the size of the terminal window on Windows.
+ This means that mclient will, by default, format tabular output to
+ not wrap long lines, like is already done on Unix/Linux.
+
+* Thu Aug 21 2025 Sjoerd Mullender <[email protected]> - 11.53.11-20250821
+- Rebuilt.
+- GH#7643: Unable to process field with split_part(). Facing Issue
+ "client4681: exp_bin: CRITICAL: Could not find (null).rate"
+- GH#7647: 'mat.packIncrement' undefined
+- GH#7648: Unexpected Right Join Assertion Error
+- GH#7649: Unexpected Inner Join Crash
+- GH#7650: Unexpected Right Join Crash
+- GH#7655: slow concurrent insert
+- GH#7656: Primary key reported as being a foreign key to itself
+- GH#7657: MonetDB Mar2025-SP1 crashes at `sqlparse()` with a crafted
+ MERGE statement
+- GH#7659: MonetDB Mar2025-SP1 crashes at `rel_select_add_exp()` with a
+ crafted CREATE TRIGGER statement
+- GH#7660: MonetDB Mar2025-SP1 crashes at `subrel_bin()` with a COPY
+ statement
+- GH#7661: MonetDB Mar2025-SP1 crashes at `dlist_length()` with a crafted
+ CREATE TRIGGER statement
+- GH#7671: MonetDB Mar2025-SP1 crashes at `BLOBlength()`
+- GH#7675: Debian service start on new install not getting environment
+ variables from /etc/default/monetdb-sql
+- GH#7680: `UNION ALL` doesn't work as expected
+- GH#7681: Describe table feature not working correctly
+- GH#7682: replacing a login trigger crashes server
+- GH#7683: wrong Driver= and Setup= libary paths stored in
+ /etc/odbcinst.ini after installation of MonetDB ODBC driver on ubuntu
+- GH#7686: DELETE FROM empty table should always be a no-op
+- GH#7688: exists with nulls gives incorrect result
+
+* Wed Aug 13 2025 Sjoerd Mullender <[email protected]> - 11.53.11-20250821
+- MonetDB: It is now relatively easy to configure the location of the database
farm
+ (aka dbfarm) directory when using systemd. Just create an override
+ file for the monetdbd service and add an Environment entry for DBFARM
+ pointing to the new directory.
+
+* Tue Aug 5 2025 Sjoerd Mullender <[email protected]> - 11.53.11-20250821
+- gdk: The SIGUSR1 output now displays counts for memory sizes in a
+ human-readable format next to the original byte counts.
+
+* Fri Aug 1 2025 Sjoerd Mullender <[email protected]> - 11.53.11-20250821
+- monetdb5: The PCRE module has been ported to the PCRE2 version of the
library.
+ The main difference is in the regexp_replace function which now no
+ longer accepts \ to introduce replacements. Only $ is accepted (it
+ was already accepted before).
+
+* Tue Jul 8 2025 Niels Nes <[email protected]> - 11.53.11-20250821
+- sql: Fixed issue #7655, now the segments keep the number of deleted
+ rows. Only search for reuse when deleted rows are available.
+
* Fri Jul 04 2025 Sjoerd Mullender <[email protected]> - 11.53.9-20250704
- Rebuilt.
- GH#7629: monetdbd causes SELinux denial
diff --git a/NT/mksqlwxs.py b/NT/mksqlwxs.py
--- a/NT/mksqlwxs.py
+++ b/NT/mksqlwxs.py
@@ -102,12 +102,12 @@ def main():
print(r' </DirectorySearch>')
print(r' </Property>')
print(r' <Property Id="GEOMMALEXISTS">')
- print(rf' <DirectorySearch Id="CheckFileDir3"
Path="[INSTALLDIR]\lib\monetdb5-{version}" Depth="0">')
+ print(r' <DirectorySearch Id="CheckFileDir3"
Path="[INSTALLDIR]\lib\monetdb5" Depth="0">')
print(r' <FileSearch Id="CheckFile3" Name="geom.mal"/>')
print(r' </DirectorySearch>')
print(r' </Property>')
print(r' <Property Id="GEOMLIBEXISTS">')
- print(rf' <DirectorySearch Id="CheckFileDir4"
Path="[INSTALLDIR]\lib\monetdb5-{version}" Depth="0">')
+ print(r' <DirectorySearch Id="CheckFileDir4"
Path="[INSTALLDIR]\lib\monetdb5" Depth="0">')
print(r' <FileSearch Id="CheckFile4" Name="_geom.dll"/>')
print(r' </DirectorySearch>')
print(r' </Property>')
@@ -169,7 +169,7 @@ def main():
vcpkg.format(r'bin\libxml2.dll'),
vcpkg.format(r'bin\lz4.dll'),
vcpkg.format(r'bin\liblzma.dll'),
- vcpkg.format(r'bin\pcre.dll'),
+ vcpkg.format(r'bin\pcre2-8.dll'),
vcpkg.format(r'bin\zlib1.dll')])
id = comp(debug, id, 14,
[r'bin\mclient.pdb',
@@ -230,7 +230,7 @@ def main():
vcpkg.format(r'lib\libxml2.lib'),
vcpkg.format(r'lib\lz4.lib'),
vcpkg.format(r'lib\lzma.lib'),
- vcpkg.format(r'lib\pcre.lib'),
+ vcpkg.format(r'lib\pcre2-8.lib'),
vcpkg.format(r'lib\zlib.lib')])
print(r' </Directory>')
print(r' <Directory Id="share" Name="share">')
diff --git a/README.rst b/README.rst
--- a/README.rst
+++ b/README.rst
@@ -100,7 +100,7 @@ On Fedora, the following packages are re
``bison``, ``cmake``, ``gcc``, ``pkgconf``, ``python3``.
The following packages are optional but recommended:
-``bzip2-devel``, ``lz4-devel``, ``openssl-devel``, ``pcre-devel``,
+``bzip2-devel``, ``lz4-devel``, ``openssl-devel``, ``pcre2-devel``,
``readline-devel``, ``xz-devel``, ``zlib-devel``.
The following packages are optional:
@@ -113,7 +113,7 @@ On Ubuntu and Debian the following packa
``bison``, ``cmake``, ``gcc``, ``pkg-config``, ``python3``.
The following packages are optional but recommended:
-``libbz2-dev``, ``liblz4-dev``, ``libpcre3-dev``, ``libreadline-dev``,
+``libbz2-dev``, ``liblz4-dev``, ``libpcre2-dev``, ``libreadline-dev``,
``liblzma-dev``, ``libssl-dev``, ``zlib1g-dev``.
The following packages are optional:
diff --git a/clients/ChangeLog-Archive b/clients/ChangeLog-Archive
--- a/clients/ChangeLog-Archive
+++ b/clients/ChangeLog-Archive
@@ -1,6 +1,11 @@
# DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
# This file contains past ChangeLog entries
+* Thu Aug 28 2025 Sjoerd Mullender <[email protected]> - 11.53.13-20250901
+- We now try to figure out the size of the terminal window on Windows.
+ This means that mclient will, by default, format tabular output to
+ not wrap long lines, like is already done on Unix/Linux.
+
* Tue Jun 3 2025 Sjoerd Mullender <[email protected]> - 11.53.5-20250627
- When connecting to a database, if there are multiple monetdbd servers
running, mclient will try them all, and also both UNIX domain
diff --git a/clients/ChangeLog.Mar2025 b/clients/ChangeLog.Mar2025
--- a/clients/ChangeLog.Mar2025
+++ b/clients/ChangeLog.Mar2025
@@ -1,3 +1,9 @@
# ChangeLog file for clients
# This file is updated with Maddlog
+* Thu Sep 11 2025 Sjoerd Mullender <[email protected]>
+- Changed the --describe (-D) option of msqldump to really mean (as it
+ says in the manual) do a dump without the data. Before, the output
+ looked like a dump, but could not necessarily be fed back into an
+ mserver5, i.e. it wasn't really a dump without data.
+
diff --git a/clients/NT/CMakeLists.txt b/clients/NT/CMakeLists.txt
--- a/clients/NT/CMakeLists.txt
+++ b/clients/NT/CMakeLists.txt
@@ -15,13 +15,9 @@
# generator does not allow for absolute install paths. That is why we use
# the "." as a relative path.
if(WIN32)
- configure_file(mclient.bat.in
- ${CMAKE_CURRENT_BINARY_DIR}/mclient.bat @ONLY)
- configure_file(msqldump.bat.in
- ${CMAKE_CURRENT_BINARY_DIR}/msqldump.bat @ONLY)
install(FILES
- ${CMAKE_CURRENT_BINARY_DIR}/mclient.bat
- ${CMAKE_CURRENT_BINARY_DIR}/msqldump.bat
+ mclient.bat
+ msqldump.bat
DESTINATION "."
COMPONENT server)
endif()
diff --git a/clients/NT/mclient.bat.in b/clients/NT/mclient.bat
rename from clients/NT/mclient.bat.in
rename to clients/NT/mclient.bat
--- a/clients/NT/mclient.bat.in
+++ b/clients/NT/mclient.bat
@@ -16,7 +16,7 @@ rem remove the final backslash from the
set MONETDB=%MONETDB:~0,-1%
rem extend the search path with our EXE and DLL folders
-set PATH=%MONETDB%\bin;%MONETDB%\lib\monetdb5-@MONETDB_VERSION@;%PATH%
+set PATH=%MONETDB%\bin;%MONETDB%\lib\monetdb5;%PATH%
if not "%1"=="/STARTED-FROM-MENU" goto skip
shift
diff --git a/clients/NT/msqldump.bat.in b/clients/NT/msqldump.bat
rename from clients/NT/msqldump.bat.in
rename to clients/NT/msqldump.bat
--- a/clients/NT/msqldump.bat.in
+++ b/clients/NT/msqldump.bat
@@ -15,7 +15,7 @@
@set MONETDB=%MONETDB:~0,-1%
@rem extend the search path with our EXE and DLL folders
-@set PATH=%MONETDB%\bin;%MONETDB%\lib\monetdb5-@MONETDB_VERSION@;%PATH%
+@set PATH=%MONETDB%\bin;%MONETDB%\lib\monetdb5;%PATH%
@rem start the real client
@"%MONETDB%\bin\msqldump.exe" %*
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
