Changeset: 73a85a1bad6e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/73a85a1bad6e
Modified Files:
clients/Tests/MAL-signatures-hge.test
clients/Tests/MAL-signatures.test
monetdb5/modules/mal/calc.c
sql/common/sql_types.c
sql/server/rel_optimize_proj.c
Branch: new-avg
Log Message:
merged with default
diffs (truncated from 213914 to 300 lines):
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
[bumpversion]
-current_version = 11.46.0
+current_version = 11.48.0
commit = False
tag = False
@@ -30,4 +30,3 @@ serialize = {major},{minor},{patch}
[bumpversion:file:monetdb5/tools/libmonetdb5.rc]
parse = (?P<major>\d+),(?P<minor>\d+),(?P<patch>\d+)
serialize = {major},{minor},{patch}
-
diff --git a/.editorconfig b/.editorconfig
--- a/.editorconfig
+++ b/.editorconfig
@@ -23,3 +23,7 @@ charset = utf-8
indent_style = space
indent_size = 2
trim_trailing_whitespace = true
+
+[{clients/{mapilib,odbc},gdk}/**.{c,h}{,.in}]
+tab_width = 8
+max_line_length = 72
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
new file mode 100644
--- /dev/null
+++ b/.github/workflows/linux.yml
@@ -0,0 +1,63 @@
+name: MonetDB build and test
+
+on:
+ push:
+ branches:
+ - 'branches/*'
+ pull_request:
+ # Allows you to run this workflow manually from the Actions tab
+ workflow_dispatch:
+
+ schedule:
+ - cron: '15 1 * * *'
+
+jobs:
+ test:
+ strategy:
+ fail-fast: false # don't stop other jobs
+ matrix:
+ branch: [ master ]
+ os: [ ubuntu-latest, macos-latest ]
+ runs-on: ${{ matrix.os }}
+ steps:
+ - name: Checkout
+ uses: actions/checkout@v3
+ with:
+ ref: ${{ matrix.branch }}
+
+ - name: make MonetDB on linux
+ run: |
+ mkdir build
+ cd build
+ cmake .. -DCMAKE_INSTALL_PREFIX=$HOME/${{ matrix.branch }}
-DPY3INTEGRATION=OFF -DCMAKE_BUILD_TYPE=Release -DASSERT=OFF -DRINTEGRATION=OFF
+ make install -j3
+ if: runner.os == 'Linux'
+ -
+ name: brew packages
+ run: brew install bison
+ if: runner.os == 'macOS'
+ - name: make MonetDB on macos
+ run: |
+ 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
+ make install -j3
+ if: runner.os == 'macOS'
+ - name: ctest
+ run: |
+ cd build
+ cmake --build . --target test
+ - name: install pymonetdb
+ run: pip3 install pymonetdb
+ - name: mtest
+ run: |
+ #cd build
+ #cmake --build . --target mtest
+ PATH=$HOME/${{ matrix.branch }}/bin:$PATH $HOME/${{ matrix.branch
}}/bin/Mtest.py -r --debug=0
+ #-
+ #uses: actions/upload-artifact@v3
+ #name: Publish Linux binary wheels
+ #with:
+ #name: monetdbe-linux-wheel-${{ matrix.branch }}-${{
matrix.python-version }}
+ #path: dist/*.whl
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -787,8 +787,29 @@ 44e45c9a451f6afd933773094ec25723f713d3be
44e45c9a451f6afd933773094ec25723f713d3be Jan2022_SP5_release
43d4a717410d6f6692a16a878640fc7e0f248725 Jan2022_25
43d4a717410d6f6692a16a878640fc7e0f248725 Jan2022_SP6_release
+700e099bfee85318da09aabcd78ec7ea6e8fb6ef Jul2021_29
5c50a4071c86d1621e20a885a51cc36f2f23eec4 Sep2022_9
41ca60d96bd0198ca5d74937630a442a5fbaf1cd Sep2022_11
41ca60d96bd0198ca5d74937630a442a5fbaf1cd Sep2022_SP1_release
e8b0e5558313f4d98bc48316368299decc55ed4e Sep2022_13
e8b0e5558313f4d98bc48316368299decc55ed4e Sep2022_SP2_release
+8a95168e853382b9b89ac7b67e343788ea837f3a Jul2021_31
+8a95168e853382b9b89ac7b67e343788ea837f3a Jul2021_SP9_release
+bb95192134c0d8ef8fea525204eefcd0de099a54 Jun2023_root
+24385ee6130494440e09d31ec73f4aa2e2893e98 Jul2021_33
+05b3d9ea9165baf1d2956d5b06ad85f817ecc6d2 Jul2021_33
+05b3d9ea9165baf1d2956d5b06ad85f817ecc6d2 Jul2021_SP10_release
+ed34ab4283cbfcc57fb9d7387bc9d781c91902b1 Jan2022_27
+ed34ab4283cbfcc57fb9d7387bc9d781c91902b1 Jan2022_SP7_release
+d11af9398029c117b92a9be9efa971ac0299ffc4 Sep2022_15
+8b736d6dcfd63d0560c99fc5427b504c116b74b0 Sep2022_17
+8b736d6dcfd63d0560c99fc5427b504c116b74b0 Sep2022_SP3_release
+aba8c31c60480148cd388a09ac99b42679406258 Jun2023_1
+79dbf838f04483a2d9ccce8332090ff91b18caec Jun2023_3
+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/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -54,7 +54,6 @@ include(monetdb-toolchain)
monetdb_default_compiler_options()
include(monetdb-defines)
-monetdb_hg_revision()
# required for symbol existance tests
if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
# ChangeLog file for devel
# This file is updated with Maddlog
+* Thu Jul 27 2023 Niels Nes <ni...@cwi.nl>
+- Removed the PYTHON MAP external language option, as after a fork the
+ synchronization primitives could be in any state, leading to deadlocks.
+ During the upgrade function definitions will fallback to the normal
+ PYTHON language option.
+
+* Mon Jul 17 2023 Panagiotis Koutsourakis <kutsu...@monetdbsolutions.com>
+- Implemented direct masking for strimp construction. The strimps
+ datastructure now keeps an array of 65K 64-bit integers that is zero
+ everywhere except at the indexes that correspond to header pairs. The
+ entry for the nth pair in order has the nth bit of the bitstring
+ on. These can be used to quickly construct bitstrings.
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 <sjo...@acm.org> - 11.47.11-20230929
+- Fixed an installation issue on Debian and Ubuntu introduced in the
+ last build.
+
+* Wed Aug 30 2023 Sjoerd Mullender <sjo...@acm.org> - 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 <kutsu...@monetdbsolutions.com> -
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 <sjo...@acm.org> - 11.43.5-20220118
- A couple of concurrency issues have been fixed.
diff --git a/ChangeLog b/ChangeLog.Jun2023
copy from ChangeLog
copy to ChangeLog.Jun2023
diff --git a/ChangeLog.Sep2022 b/ChangeLog.Sep2022
deleted file mode 100644
--- a/ChangeLog.Sep2022
+++ /dev/null
@@ -1,3 +0,0 @@
-# ChangeLog file for devel
-# This file is updated with Maddlog
-
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -7,7 +7,7 @@
# Copyright 1997 - July 2008 CWI, August 2008 - 2023 MonetDB B.V.
%global name MonetDB
-%global version 11.46.0
+%global version 11.48.0
%{!?buildno: %global buildno %(date +%Y%m%d)}
# Use bcond_with to add a --with option; i.e., "without" is default.
@@ -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
@@ -82,14 +82,14 @@
Name: %{name}
Version: %{version}
Release: %{release}
-Summary: MonetDB - Monet Database Management System
+Summary: Monet Database Management System
Vendor: MonetDB BV <i...@monetdb.org>
Group: Applications/Databases
License: MPL-2.0
URL: https://www.monetdb.org/
-BugURL: https://bugs.monetdb.org/
-Source:
https://www.monetdb.org/downloads/sources/Sep2022-SP2/%{name}-%{version}.tar.bz2
+BugURL: https://github.com/MonetDB/MonetDB/issues
+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
@@ -118,7 +118,7 @@ BuildRequires: pkgconfig(readline)
BuildRequires: pkgconfig(cfitsio)
%endif
%if %{with geos}
-BuildRequires: geos-devel >= 3.4.0
+BuildRequires: geos-devel >= 3.10.0
%endif
BuildRequires: pkgconfig(libcurl)
BuildRequires: pkgconfig(liblzma)
@@ -144,12 +144,12 @@ BuildRequires: texlive-obsolete
%endif
%endif
# optional packages:
-# BuildRequires: pkgconfig(cmocka) # -DWITH_CMOCKA=ON
-# BuildRequires: pkgconfig(gdal) # -DSHP=ON
-# BuildRequires: pkgconfig(netcdf) # -DNETCDF=ON
-# BuildRequires: pkgconfig(proj) # -DWITH_PROJ=ON
-# BuildRequires: pkgconfig(snappy) # -DWITH_SNAPPY=ON
-# BuildRequires: pkgconfig(valgrind) # -DWITH_VALGRIND=ON
+# BuildRequires: pkgconfig(cmocka) # -DWITH_CMOCKA=ON
+# BuildRequires: pkgconfig(gdal) # -DSHP=ON
+# BuildRequires: pkgconfig(netcdf) # -DNETCDF=ON
+# BuildRequires: pkgconfig(proj) # -DWITH_PROJ=ON
+# BuildRequires: pkgconfig(snappy) # -DWITH_SNAPPY=ON
+# BuildRequires: pkgconfig(valgrind) # -DWITH_VALGRIND=ON
%if (0%{?fedora} >= 22)
Recommends: %{name}-SQL-server5%{?_isa} = %{version}-%{release}
@@ -366,6 +366,7 @@ developer.
%{_bindir}/ODBCStmtAttr
%{_bindir}/ODBCgetInfo
%{_bindir}/ODBCmetadata
+%{_bindir}/ODBCtester
%{_bindir}/arraytest
%{_bindir}/bincopydata
%{_bindir}/odbcsample1
@@ -431,6 +432,7 @@ install it.
Summary: Integration of MonetDB and Python, allowing use of Python from within
SQL
Group: Applications/Databases
Requires: MonetDB5-server%{?_isa} = %{version}-%{release}
+Requires: python3-numpy
%description python3
MonetDB is a database management system that is developed from a
@@ -505,17 +507,17 @@ getent group monetdb >/dev/null || group
if getent passwd monetdb >/dev/null; then
case $(getent passwd monetdb | cut -d: -f6) in
%{_localstatedir}/MonetDB) # old value
- # change home directory, but not using usermod
- # usermod requires there to not be any running processes owned by the
user
- EDITOR='sed -i
"/^monetdb:/s|:%{_localstatedir}/MonetDB:|:%{_localstatedir}/lib/monetdb:|"'
- unset VISUAL
- export EDITOR
- /sbin/vipw > /dev/null
- ;;
+ # change home directory, but not using usermod
+ # usermod requires there to not be any running processes owned by the
user
+ EDITOR='sed -i
"/^monetdb:/s|:%{_localstatedir}/MonetDB:|:%{_localstatedir}/lib/monetdb:|"'
+ unset VISUAL
+ export EDITOR
+ /sbin/vipw > /dev/null
+ ;;
esac
else
useradd --system --gid monetdb --home-dir %{_localstatedir}/lib/monetdb \
- --shell /sbin/nologin --comment "MonetDB Server" monetdb
+ --shell /sbin/nologin --comment "MonetDB Server" monetdb
fi
exit 0
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
