Changeset: c263a14f6db9 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/c263a14f6db9
Modified Files:
sql/backends/monet5/rel_bin.c
sql/include/sql_relation.h
sql/rel.txt
sql/server/rel_distribute.c
sql/server/rel_dump.c
sql/server/rel_exp.c
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_propagate.c
sql/server/rel_rel.c
sql/server/rel_rel.h
sql/server/rel_rewriter.c
sql/server/rel_select.c
sql/server/rel_statistics.c
sql/server/rel_unnest.c
sql/server/sql_partition.c
Branch: balanced_union
Log Message:
Merges with default
diffs (truncated from 32853 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
@@ -3,7 +3,6 @@ name: MonetDB build and test
on:
push:
branches:
- - '*'
- 'branches/*'
pull_request:
# Allows you to run this workflow manually from the Actions tab
@@ -30,7 +29,8 @@ jobs:
run: |
mkdir build
cd build
- cmake .. -DCMAKE_INSTALL_PREFIX=$HOME/${{ matrix.branch }}
-DPY3INTEGRATION=OFF -DCMAKE_BUILD_TYPE=Release -DASSERT=OFF -DRINTEGRATION=OFF
+ cmake .. -DCMAKE_INSTALL_PREFIX=$HOME/${{ matrix.branch }}
-DPY3INTEGRATION=OFF -DCMAKE_BUILD_TYPE=Release -DASSERT=OFF -DRINTEGRATION=OFF
\
+ -DCMAKE_SUMMARY=ON
make install -j3
if: runner.os == 'Linux'
-
@@ -42,16 +42,25 @@ jobs:
mkdir build
cd build
cmake .. -DCMAKE_INSTALL_PREFIX=$HOME/${{ matrix.branch }}
-DPY3INTEGRATION=OFF -DCMAKE_BUILD_TYPE=Release -DASSERT=OFF -DRINTEGRATION=OFF
\
- -DBISON_EXECUTABLE=/usr/local/opt/bison/bin/bison
+ -DBISON_EXECUTABLE=/usr/local/opt/bison/bin/bison
-DCMAKE_SUMMARY=ON
make install -j3
if: runner.os == 'macOS'
- name: ctest
run: |
cd build
cmake --build . --target test
- #-
- #uses: actions/upload-artifact@v3
- #name: Publish Linux binary wheels
- #with:
- #name: monetdbe-linux-wheel-${{ matrix.branch }}-${{
matrix.python-version }}
- #path: dist/*.whl
+ - name: install pymonetdb
+ run: pip3 install pymonetdb
+ - name: which python
+ run:
+ head -n 1 $HOME/${{ matrix.branch }}/bin/Mtest.py
+ - name: mtest
+ run: |
+ #cd build
+ #cmake --build . --target mtest
+ PATH=$HOME/${{ matrix.branch }}/bin:$PATH $HOME/${{ matrix.branch
}}/bin/Mtest.py -r --debug=0 --ci --no-html
+ - name: Publish mtest results
+ uses: actions/upload-artifact@v3
+ with:
+ name: mtest-${{ matrix.branch }}
+ path: ${{ matrix.branch }}/mTests/*
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -809,3 +809,7 @@ 79dbf838f04483a2d9ccce8332090ff91b18caec
79dbf838f04483a2d9ccce8332090ff91b18caec Jun2023_release
573511e0e7bf2f7ab11f00b45711aab5f1aff6f2 Jun2023_5
573511e0e7bf2f7ab11f00b45711aab5f1aff6f2 Jun2023_SP1_release
+ce63ebe9a78c52ef0cbe8fd6f2159d2637f0387c Jun2023_7
+1efa83c6409769d13b2ee30e497d5f7ab42fa955 Jun2023_9
+6f88424ebfd9d82c072cf21d89070e04321983da Jun2023_11
+6f88424ebfd9d82c072cf21d89070e04321983da Jun2023_SP2_release
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 Oct 30 2023 Sjoerd Mullender <[email protected]>
+- The ranges of merge partitions are now pushed down into the low
+ level GDK operations, giving them a handle to sometimes execute more
+ efficiently.
+
* Thu Jul 27 2023 Niels Nes <[email protected]>
- Removed the PYTHON MAP external language option, as after a fork the
synchronization primitives could be in any state, leading to deadlocks.
diff --git a/ChangeLog-Archive b/ChangeLog-Archive
--- a/ChangeLog-Archive
+++ b/ChangeLog-Archive
@@ -1,6 +1,19 @@
# DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
# This file contains past ChangeLog entries
+* Fri Sep 29 2023 Sjoerd Mullender <[email protected]> - 11.47.11-20230929
+- Fixed an installation issue on Debian and Ubuntu introduced in the
+ last build.
+
+* Wed Aug 30 2023 Sjoerd Mullender <[email protected]> - 11.47.7-20230925
+- Do a lot more error checking, mostly for allocation failures. More is
+ still needed, though.
+
+* Thu Aug 10 2023 Panagiotis Koutsourakis <[email protected]> -
11.47.7-20230925
+- Improve performance of the ILIKE operator when the pattern contains only
+ ASCII characters. In this case we do not need to treat any characters as
+ UTF-8 and we can use much faster routines that perform byte comparisons.
+
* Wed Jan 12 2022 Sjoerd Mullender <[email protected]> - 11.43.5-20220118
- A couple of concurrency issues have been fixed.
diff --git a/ChangeLog.Jun2023 b/ChangeLog.Jun2023
--- a/ChangeLog.Jun2023
+++ b/ChangeLog.Jun2023
@@ -1,12 +1,3 @@
# ChangeLog file for devel
# This file is updated with Maddlog
-* Wed Aug 30 2023 Sjoerd Mullender <[email protected]>
-- Do a lot more error checking, mostly for allocation failures. More is
- still needed, though.
-
-* Thu Aug 10 2023 Panagiotis Koutsourakis <[email protected]>
-- Improve performance of the ILIKE operator when the pattern contains only
- ASCII characters. In this case we do not need to treat any characters as
- UTF-8 and we can use much faster routines that perform byte comparisons.
-
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -54,7 +54,7 @@
# derivatives (CentOS, Scientific Linux), the geos library is not
# available. However, the geos library is available in the Extra
# Packages for Enterprise Linux (EPEL).
-%if %{fedpkgs}
+%if %{fedpkgs} && (0%{?rhel} != 7) && (0%{?rhel} != 8)
# By default create the MonetDB-geom-MonetDB5 package on Fedora and RHEL 7
%bcond_without geos
%endif
@@ -89,7 +89,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/Jun2023-SP1/%{name}-%{version}.tar.bz2
+Source:
https://www.monetdb.org/downloads/sources/Jun2023-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
@@ -123,6 +123,10 @@ BuildRequires: geos-devel >= 3.10.0
BuildRequires: pkgconfig(libcurl)
BuildRequires: pkgconfig(liblzma)
BuildRequires: pkgconfig(libxml-2.0)
+%if 0%{?rhel} != 7
+BuildRequires: pkgconfig(openssl) >= 1.1.1
+%global with_openssl 1
+%endif
%if %{with pcre}
BuildRequires: pkgconfig(libpcre) >= 4.5
%endif
@@ -369,6 +373,7 @@ developer.
%{_bindir}/ODBCtester
%{_bindir}/arraytest
%{_bindir}/bincopydata
+%{_bindir}/murltest
%{_bindir}/odbcsample1
%{_bindir}/sample0
%{_bindir}/sample1
@@ -534,6 +539,7 @@ exit 0
%if %{with cintegration}
%{_libdir}/monetdb5/lib_capi.so
%endif
+%{_libdir}/monetdb5/lib_csv.so
%{_libdir}/monetdb5/lib_generator.so
%doc %{_mandir}/man1/mserver5.1.gz
%dir %{_datadir}/doc/MonetDB
@@ -804,6 +810,7 @@ fi
-DWITH_CURL=ON \
-DWITH_LZ4=ON \
-DWITH_LZMA=ON \
+ -DWITH_OPENSSL=%{?with_openssl:ON}%{!?with_openssl:OFF} \
-DWITH_PCRE=ON \
-DWITH_PROJ=OFF \
-DWITH_READLINE=ON \
@@ -860,6 +867,55 @@ fi
%endif
%changelog
+* Fri Sep 29 2023 Sjoerd Mullender <[email protected]> - 11.47.11-20230929
+- Rebuilt.
+
+* Fri Sep 29 2023 Sjoerd Mullender <[email protected]> - 11.47.11-20230929
+- MonetDB: Fixed an installation issue on Debian and Ubuntu introduced in the
+ last build.
+
+* Wed Sep 27 2023 Sjoerd Mullender <[email protected]> - 11.47.9-20230927
+- Rebuilt.
+- GH#7402: Privileges on merge table not propagated to partition tables
+
+* Mon Sep 25 2023 Sjoerd Mullender <[email protected]> - 11.47.7-20230925
+- Rebuilt.
+- GH#7094: Drop remote tables in transactions and rollback
+- GH#7303: Improve the performance of multi-column filters
+- GH#7400: VM max memory is not check correctly for cgroups v2
+- GH#7401: Column aliases used incorrectly in UNION subqueries
+
+* Fri Sep 22 2023 Sjoerd Mullender <[email protected]> - 11.47.7-20230925
+- gdk: Fixed a number of data races (race conditions).
+
+* Mon Sep 18 2023 Sjoerd Mullender <[email protected]> - 11.47.7-20230925
+- gdk: Fixed a reference counting problem when a BAT could nog be loaded,
+ e.g. because of resource limitations.
+
+* Wed Aug 30 2023 Sjoerd Mullender <[email protected]> - 11.47.7-20230925
+- gdk: Only check for virtual memory limits when creating or growing bats,
+ not for general memory allocations. There is (still) too much code
+ that doesn't properly handle failing allocations, so we need to avoid
+ those as much as possible. This has mostly an effect if there are
+ virtual memory size restrictions imposed by cgroups (memory.swap.max
+ in cgroups v2, memory.memsw.limit_in_bytes in cgroups v1).
+- gdk: The low-level commit turned out to always commit every persistent bat
+ in the system. There is no need for that, it should only commit bats
+ that were changed. This has now been fixed.
+- gdk: Implemented timeout/exit checks in a bunch more operators. Long(er)
+ running operators occasionally check whether they're taking too long
+ (past a user-specified timeout) or whether the server is exiting.
+ This is now done in more places.
+
+* Wed Aug 30 2023 Sjoerd Mullender <[email protected]> - 11.47.7-20230925
+- MonetDB: Do a lot more error checking, mostly for allocation failures. More
is
+ still needed, though.
+
+* Thu Aug 10 2023 Panagiotis Koutsourakis <[email protected]> -
11.47.7-20230925
+- MonetDB: Improve performance of the ILIKE operator when the pattern contains
only
+ ASCII characters. In this case we do not need to treat any characters as
+ UTF-8 and we can use much faster routines that perform byte comparisons.
+
* Tue Jul 18 2023 Sjoerd Mullender <[email protected]> - 11.47.5-20230718
- Rebuilt.
- GH#7388: Query results in large cross product
diff --git a/NT/mkodbcwxs.py b/NT/mkodbcwxs.py
--- a/NT/mkodbcwxs.py
+++ b/NT/mkodbcwxs.py
@@ -36,10 +36,12 @@ def main():
if sys.argv[2] == '64':
folder = r'ProgramFiles64Folder'
arch = 'x64'
+ libcrypto = '-x64'
vcpkg = r'C:\vcpkg\installed\x64-windows\{}'
else:
folder = r'ProgramFilesFolder'
arch = 'x86'
+ libcrypto = ''
vcpkg = r'C:\vcpkg\installed\x86-windows\{}'
vcdir = os.getenv('VCINSTALLDIR')
if vcdir is None:
@@ -91,6 +93,8 @@ def main():
vcpkg.format(r'bin\iconv-2.dll'),
vcpkg.format(r'bin\bz2.dll'),
vcpkg.format(r'bin\charset-1.dll'), # for iconv-2.dll
+ vcpkg.format(r'bin\libcrypto-3{}.dll'.format(libcrypto)),
+ vcpkg.format(r'bin\libssl-3{}.dll'.format(libcrypto)),
vcpkg.format(r'bin\lz4.dll'),
vcpkg.format(r'bin\liblzma.dll'),
vcpkg.format(r'bin\zlib1.dll')])
diff --git a/NT/mksqlwxs.py b/NT/mksqlwxs.py
--- a/NT/mksqlwxs.py
+++ b/NT/mksqlwxs.py
@@ -43,10 +43,12 @@ def main():
if sys.argv[2] == '64':
folder = r'ProgramFiles64Folder'
arch = 'x64'
+ libcrypto = '-x64'
vcpkg = r'C:\vcpkg\installed\x64-windows\{}'
else:
folder = r'ProgramFilesFolder'
arch = 'x86'
+ libcrypto = ''
vcpkg = r'C:\vcpkg\installed\x86-windows\{}'
vcdir = os.getenv('VCINSTALLDIR')
if vcdir is None:
@@ -158,6 +160,8 @@ def main():
vcpkg.format(r'bin\bz2.dll'),
vcpkg.format(r'bin\charset-1.dll'), # for iconv-2.dll
vcpkg.format(r'bin\getopt.dll'),
+ vcpkg.format(r'bin\libcrypto-3{}.dll'.format(libcrypto)),
+ vcpkg.format(r'bin\libssl-3{}.dll'.format(libcrypto)),
vcpkg.format(r'bin\libxml2.dll'),
vcpkg.format(r'bin\lz4.dll'),
vcpkg.format(r'bin\liblzma.dll'),
diff --git a/clients/CMakeLists.txt b/clients/CMakeLists.txt
--- a/clients/CMakeLists.txt
+++ b/clients/CMakeLists.txt
@@ -8,8 +8,8 @@
# Copyright 1997 - July 2008 CWI, August 2008 - 2023 MonetDB B.V.
#]]
+add_subdirectory(mapilib)
add_subdirectory(mapiclient)
-add_subdirectory(mapilib)
add_subdirectory(odbc)
if(TESTING)
add_subdirectory(examples)
diff --git a/clients/Tests/MAL-signatures-hge.test
b/clients/Tests/MAL-signatures-hge.test
--- a/clients/Tests/MAL-signatures-hge.test
+++ b/clients/Tests/MAL-signatures-hge.test
@@ -3494,6 +3494,26 @@ command algebra.likeselect(X_0:bat[:str]
PCRElikeselect;
Select all head values of the first input BAT for which the@tail value is
"like" the given (SQL-style) pattern and for@which the head value occurs in the
tail of the second input@BAT.@Input is a dense-headed BAT, output is a
dense-headed BAT with in@the tail the head value of the input BAT for which
the@relationship holds. The output BAT is sorted on the tail value.
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
