Changeset: 60e5746a185a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/60e5746a185a
Modified Files:
sql/backends/monet5/rel_bin.c
sql/include/sql_catalog.h
sql/server/rel_schema.c
sql/server/sql_parser.y
sql/server/sql_partition.c
sql/server/sql_tokens.h
Branch: literal_features
Log Message:
Merge with default
diffs (truncated from 121999 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.48.0
+current_version = 11.50.0
commit = False
tag = False
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -43,7 +43,7 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
with:
ref: ${{ github.ref }}
@@ -129,7 +129,7 @@ jobs:
- name: Tar files
run: tar -cvf mtests.tar mTests
- name: Publish mtest results
- uses: actions/upload-artifact@v3
+ uses: actions/upload-artifact@v4
with:
name: mtest-${{ github.sha }}-${{ matrix.os }}-${{ matrix.c_compiler
}}
path: mtests.tar
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -815,3 +815,8 @@ 6f88424ebfd9d82c072cf21d89070e04321983da
6f88424ebfd9d82c072cf21d89070e04321983da Jun2023_SP2_release
e6eb06773c17035954ac5d001cfe1f09ff3425cc Jun2023_13
5683fd900f28d65ad7c98d1ed1efd992023a7fa4 Jun2023_15
+c5b17681b55e6ca155db28be59913699e561502a Dec2023_root
+c9e6096e7519636a4e840c7a0c2e27cccb7dc0fe Jun2023_17
+c9e6096e7519636a4e840c7a0c2e27cccb7dc0fe Jun2023_SP3_release
+1230526af30f40eeea30fb87c47c3e414920561f Dec2023_1
+1230526af30f40eeea30fb87c47c3e414920561f Dec2023_release
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,7 +5,9 @@
# 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 1997 - July 2008 CWI, August 2008 - 2023 MonetDB B.V.
+# Copyright 2024 MonetDB Foundation;
+# Copyright August 2008 - 2023 MonetDB B.V.;
+# Copyright 1997 - July 2008 CWI.
#]]
cmake_minimum_required(VERSION 3.12)
diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,20 +1,3 @@
# ChangeLog file for devel
# This file is updated with Maddlog
-* Mon Oct 30 2023 Sjoerd Mullender <sjo...@acm.org>
-- 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 <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,28 @@
# DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
# This file contains past ChangeLog entries
+* Fri Dec 1 2023 Sjoerd Mullender <sjo...@acm.org> - 11.49.1-20231221
+- All binary packages are now signed with a new key with key fingerprint
+ DBCE 5625 94D7 1959 7B54 CE85 3F1A D47F 5521 A603.
+
+* Mon Oct 30 2023 Sjoerd Mullender <sjo...@acm.org> - 11.49.1-20231221
+- 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 <ni...@cwi.nl> - 11.49.1-20231221
+- 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> -
11.49.1-20231221
+- 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.
+
* 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.
diff --git a/ChangeLog b/ChangeLog.Dec2023
copy from ChangeLog
copy to ChangeLog.Dec2023
--- a/ChangeLog
+++ b/ChangeLog.Dec2023
@@ -1,20 +1,3 @@
# ChangeLog file for devel
# This file is updated with Maddlog
-* Mon Oct 30 2023 Sjoerd Mullender <sjo...@acm.org>
-- 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 <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.Jun2023 b/ChangeLog.Jun2023
deleted file mode 100644
--- a/ChangeLog.Jun2023
+++ /dev/null
@@ -1,3 +0,0 @@
-# ChangeLog file for devel
-# This file is updated with Maddlog
-
diff --git a/Config.cmake.in b/Config.cmake.in
--- a/Config.cmake.in
+++ b/Config.cmake.in
@@ -5,7 +5,9 @@
# 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 1997 - July 2008 CWI, August 2008 - 2023 MonetDB B.V.
+# Copyright 2024 MonetDB Foundation;
+# Copyright August 2008 - 2023 MonetDB B.V.;
+# Copyright 1997 - July 2008 CWI.
#]]
@PACKAGE_INIT@
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -4,10 +4,12 @@
# 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 1997 - July 2008 CWI, August 2008 - 2023 MonetDB B.V.
+# Copyright 2024 MonetDB Foundation;
+# Copyright August 2008 - 2023 MonetDB B.V.;
+# Copyright 1997 - July 2008 CWI.
%global name MonetDB
-%global version 11.48.0
+%global version 11.50.0
%{!?buildno: %global buildno %(date +%Y%m%d)}
# Use bcond_with to add a --with option; i.e., "without" is default.
@@ -83,20 +85,24 @@ Name: %{name}
Version: %{version}
Release: %{release}
Summary: Monet Database Management System
-Vendor: MonetDB BV <i...@monetdb.org>
+Vendor: MonetDB Foundation <i...@monetdb.org>
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-SP3/%{name}-%{version}.tar.bz2
+Source:
https://www.monetdb.org/downloads/sources/Dec2023/%{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
# that doesn't exist and we need systemd, so instead we just require
# the macro file that contains the definitions.
# We need checkpolicy and selinux-policy-devel for the SELinux policy.
-BuildRequires: /usr/lib/rpm/macros.d/macros.systemd
+%if 0%{?rhel} != 7
+BuildRequires: systemd-rpm-macros
+%else
+BuildRequires: systemd
+%endif
BuildRequires: checkpolicy
BuildRequires: selinux-policy-devel
BuildRequires: hardlink
@@ -139,13 +145,6 @@ BuildRequires: python3-numpy
%endif
%if %{with rintegration}
BuildRequires: pkgconfig(libR)
-%if (0%{?fedora} == 32)
-# work around a packaging bug on Fedora 32 (18 Nov 2020)
-# problem is things like:
-# file /etc/texlive/web2c/updmap.cfg conflicts between attempted installs of
texlive-tetex-7:20190410-12.fc32.noarch and
texlive-texlive-scripts-7:20200327-16.fc32.noarch
-# texlive-tetex is obsoleted by texlive-obsolete
-BuildRequires: texlive-obsolete
-%endif
%endif
# optional packages:
# BuildRequires: pkgconfig(cmocka) # -DWITH_CMOCKA=ON
@@ -220,6 +219,8 @@ accelerators. It also has an SQL front
This package contains a shared library (libstream) which is needed by
various other components.
+%ldconfig_scriptlets stream
+
%files stream
%license COPYING
%defattr(-,root,root)
@@ -250,9 +251,35 @@ library.
%{_includedir}/monetdb/stream_socket.h
%{_libdir}/pkgconfig/monetdb-stream.pc
+%package client-lib
+Summary: MonetDB - Monet Database Management System Client Programs
+Group: Applications/Databases
+%if (0%{?fedora} >= 22)
+Recommends: %{name}-SQL-server5%{?_isa} = %{version}-%{release}
+Recommends: MonetDB5-server%{?_isa} = %{version}-%{release}
+%endif
+
+%description client-lib
+MonetDB is a database management system that is developed from a
+main-memory perspective with use of a fully decomposed storage model,
+automatic index management, extensibility of data types and search
+accelerators. It also has an SQL front end.
+
+This package contains libmapi.so, the main client library used by both
+mclient, msqldump and by the ODBC driver. If you want to use MonetDB,
+you will very likely need this package.
+
+%ldconfig_scriptlets client-lib
+
+%files client-lib
+%license COPYING
+%defattr(-,root,root)
+%{_libdir}/libmapi.so.*
+
%package client
Summary: MonetDB - Monet Database Management System Client Programs
Group: Applications/Databases
+Requires: %{name}-client-lib%{?_isa} = %{version}-%{release}
%if (0%{?fedora} >= 22)
Recommends: %{name}-SQL-server5%{?_isa} = %{version}-%{release}
Recommends: MonetDB5-server%{?_isa} = %{version}-%{release}
@@ -274,14 +301,13 @@ MonetDB, you will very likely need this
%defattr(-,root,root)
%{_bindir}/mclient
%{_bindir}/msqldump
-%{_libdir}/libmapi.so.*
-%doc %{_mandir}/man1/mclient.1.gz
-%doc %{_mandir}/man1/msqldump.1.gz
+%{_mandir}/man1/mclient.1*
+%{_mandir}/man1/msqldump.1*
%package client-devel
Summary: MonetDB - Monet Database Management System Client Programs
Group: Applications/Databases
-Requires: %{name}-client%{?_isa} = %{version}-%{release}
+Requires: %{name}-client-lib%{?_isa} = %{version}-%{release}
Requires: %{name}-stream-devel%{?_isa} = %{version}-%{release}
%description client-devel
@@ -298,12 +324,13 @@ This package contains the files needed t
%dir %{_includedir}/monetdb
%{_libdir}/libmapi.so
%{_includedir}/monetdb/mapi*.h
+%{_includedir}/monetdb/msettings.h
%{_libdir}/pkgconfig/monetdb-mapi.pc
%package client-odbc
Summary: MonetDB ODBC driver
Group: Applications/Databases
-Requires: %{name}-client%{?_isa} = %{version}-%{release}
+Requires: %{name}-client-lib%{?_isa} = %{version}-%{release}
Requires(post): %{_bindir}/odbcinst
Requires(postun): %{_bindir}/odbcinst
@@ -477,11 +504,40 @@ format.
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
