Changeset: 9fbf6dda9468 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/9fbf6dda9468
Modified Files:
clients/Tests/MAL-signatures-hge.test
clients/Tests/MAL-signatures.test
clients/Tests/exports.stable.out
clients/odbc/tests/ODBCmetadata.c
monetdb5/modules/atoms/CMakeLists.txt
monetdb5/modules/mal/tablet.c
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql.c
sql/backends/monet5/sql_statement.c
sql/backends/monet5/sql_statement.h
sql/storage/bat/bat_storage.c
sql/storage/store.c
Branch: nilmask
Log Message:
merged with default
diffs (truncated from 18988 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.50.0
+current_version = 11.52.0
commit = False
tag = False
diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -44,6 +44,7 @@ GPATH
GRTAGS
TAGS
tags
+cscope.*
*.pyo
*.rej
*.orig
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -827,3 +827,4 @@ d656785f49ee62c19705722aa6b7c171904c64d5
d656785f49ee62c19705722aa6b7c171904c64d5 Dec2023_SP2_release
9a694c41042503a22d6c92aeab5bc4ca1912b62e Dec2023_9
9a694c41042503a22d6c92aeab5bc4ca1912b62e Dec2023_SP3_release
+e1e9e22bf3d734dc50b56151c657a57c18f56561 Aug2024_root
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -118,8 +118,14 @@ if(WIN32)
${CMAKE_CURRENT_BINARY_DIR}/unistd.h)
endif()
-add_library(monetdb_config_header
- INTERFACE)
+add_library(monetdb_config_header INTERFACE)
+
+if (CTAGS_PATH)
+ add_dependencies(monetdb_config_header tags)
+endif()
+if (CSCOPE_PATH)
+ add_dependencies(monetdb_config_header cscope)
+endif()
target_include_directories(monetdb_config_header
INTERFACE
diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,14 +1,3 @@
# ChangeLog file for devel
# This file is updated with Maddlog
-* Wed May 8 2024 Sjoerd Mullender <sjo...@acm.org>
-- The shared library (.dll aka .so files) now have the version number
- as part of the name. This should allow the building of compatibility
- versions that can be installed in parallel to the latest version.
-- Some of the Debian/Ubuntu packages have been renamed. The old monetdb5
- names have been changed to plain monetdb, and libmonetdb5-server-*
- packages have been renamed monetdb-*.
-- The names of some of the provided RPM files have been changed.
- References to the old MonetDB5 name have been removed. All packages
- are now just MonetDB.
-
diff --git a/ChangeLog b/ChangeLog.Aug2024
copy from ChangeLog
copy to ChangeLog.Aug2024
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -8,7 +8,7 @@
# Copyright August 2008 - 2023 MonetDB B.V.;
# Copyright 1997 - July 2008 CWI.
-%global version 11.50.0
+%global version 11.52.0
%bcond_with compat
@@ -417,6 +417,7 @@ developer.
%{_bindir}/arraytest
%{_bindir}/bincopydata
%{_bindir}/murltest
+%{_bindir}/odbcconnect
%{_bindir}/odbcsample1
%{_bindir}/sample0
%{_bindir}/sample1
@@ -914,62 +915,62 @@ sed -i 's/1\.2/1.1/' misc/selinux/monetd
%cmake3_build
%install
-mkdir -p "%{buildroot}/usr"
-for d in etc var; do mkdir "%{buildroot}/$d"; ln -s ../$d
"%{buildroot}/usr/$d"; done
+mkdir -p "${RPM_BUILD_ROOT}"/usr
+for d in etc var; do mkdir "${RPM_BUILD_ROOT}"/$d; ln -s ../$d
"${RPM_BUILD_ROOT}"/usr/$d; done
%cmake3_install
-rm "%{buildroot}/usr/var" "%{buildroot}/usr/etc"
+rm "${RPM_BUILD_ROOT}"/usr/var "${RPM_BUILD_ROOT}"/usr/etc
# move file to correct location
-mkdir -p %{buildroot}%{_tmpfilesdir} %{buildroot}%{_sysusersdir}
-mv %{buildroot}%{_sysconfdir}/tmpfiles.d/monetdbd.conf
%{buildroot}%{_tmpfilesdir}
-cat > %{buildroot}%{_sysusersdir}/monetdb.conf << EOF
+mkdir -p "${RPM_BUILD_ROOT}"%{_tmpfilesdir} "${RPM_BUILD_ROOT}"%{_sysusersdir}
+mv "${RPM_BUILD_ROOT}"%{_sysconfdir}/tmpfiles.d/monetdbd.conf
"${RPM_BUILD_ROOT}"%{_tmpfilesdir}
+cat > "${RPM_BUILD_ROOT}"%{_sysusersdir}/monetdb.conf << EOF
u monetdb - "MonetDB Server" /var/lib/monetdb
EOF
-rmdir %{buildroot}%{_sysconfdir}/tmpfiles.d
+rmdir "${RPM_BUILD_ROOT}"%{_sysconfdir}/tmpfiles.d
-install -d -m 0750 %{buildroot}%{_localstatedir}/lib/monetdb
-install -d -m 0770 %{buildroot}%{_localstatedir}/monetdb5/dbfarm
-install -d -m 0775 %{buildroot}%{_localstatedir}/log/monetdb
-install -d -m 0775 %{buildroot}%{_rundir}/monetdb
+install -d -m 0750 "${RPM_BUILD_ROOT}"%{_localstatedir}/lib/monetdb
+install -d -m 0770 "${RPM_BUILD_ROOT}"%{_localstatedir}/monetdb5/dbfarm
+install -d -m 0775 "${RPM_BUILD_ROOT}"%{_localstatedir}/log/monetdb
+install -d -m 0775 "${RPM_BUILD_ROOT}"%{_rundir}/monetdb
# remove unwanted stuff
-rm -f %{buildroot}%{_libdir}/monetdb5*/lib_opt_sql_append.so
-rm -f %{buildroot}%{_libdir}/monetdb5*/lib_microbenchmark*.so
-rm -f %{buildroot}%{_libdir}/monetdb5*/lib_udf*.so
-rm -f %{buildroot}%{_bindir}/monetdb_mtest.sh
-rm -rf %{buildroot}%{_datadir}/monetdb # /cmake
+rm -f "${RPM_BUILD_ROOT}"%{_libdir}/monetdb5*/lib_opt_sql_append.so
+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
+rm -rf "${RPM_BUILD_ROOT}"%{_datadir}/monetdb # /cmake
if [ -x /usr/sbin/hardlink ]; then
- /usr/sbin/hardlink -cv %{buildroot}%{_datadir}/selinux
+ /usr/sbin/hardlink -cv "${RPM_BUILD_ROOT}"%{_datadir}/selinux
else
# Fedora 31
- /usr/bin/hardlink -cv %{buildroot}%{_datadir}/selinux
+ /usr/bin/hardlink -cv "${RPM_BUILD_ROOT}"%{_datadir}/selinux
fi
# update shebang lines for Python scripts
%if %{?py3_shebang_fix:1}%{!?py3_shebang_fix:0}
# Fedora has py3_shebang_fix macro
- %{py3_shebang_fix} %{buildroot}%{_bindir}/*.py
+ %{py3_shebang_fix} "${RPM_BUILD_ROOT}"%{_bindir}/*.py
%else
# EPEL does not, but we can use the script directly
- /usr/bin/pathfix.py -pni "%{__python3} -s" %{buildroot}%{_bindir}/*.py
+ /usr/bin/pathfix.py -pni "%{__python3} -s"
"${RPM_BUILD_ROOT}"%{_bindir}/*.py
%endif
%if %{with compat}
# delete files that are not going to be installed in compat packages
-rm
%{buildroot}%{_bindir}/{M{convert.py,test.py,z.py},bincopydata,example_proxy,m{alsample.pl,client,ktest.py,onetdb{,d},s{erver5,qldump},urltest},s{ample{0,1,4},hutdowntest,mack0{0,1},ql{logictest.py,sample.p{hp,l}},treamcat},testcondvar}
-rm -r %{buildroot}%{_datadir}/doc/MonetDB*
-rm %{buildroot}%{_datadir}/selinux/*/monetdb.pp
-rm -r %{buildroot}%{_includedir}/monetdb
-rm %{buildroot}%{_libdir}/*.so %{buildroot}%{_libdir}/libmonetdbe.so.*
-rm -r %{buildroot}%{_libdir}/pkgconfig
-rm -r %{buildroot}%{_localstatedir}/lib/monetdb
%{buildroot}%{_localstatedir}/monetdb5
-rm -r %{buildroot}%{_mandir}/man1
-rm -r %{buildroot}%{python3_sitelib}/MonetDBtesting
-rm %{buildroot}%{_sysconfdir}/logrotate.d/monetdbd
-rm %{buildroot}%{_sysusersdir}/monetdb.conf
-rm %{buildroot}%{_tmpfilesdir}/monetdbd.conf
-rm %{buildroot}%{_unitdir}/monetdbd.service
+rm
"${RPM_BUILD_ROOT}"%{_bindir}/{M{convert.py,test.py,z.py},bincopydata,example_proxy,m{alsample.pl,client,ktest.py,onetdb{,d},s{erver5,qldump},urltest},s{ample{0,1,4},hutdowntest,mack0{0,1},ql{logictest.py,sample.p{hp,l}},treamcat},testcondvar}
+rm -r "${RPM_BUILD_ROOT}"%{_datadir}/doc/MonetDB*
+rm "${RPM_BUILD_ROOT}"%{_datadir}/selinux/*/monetdb.pp
+rm -r "${RPM_BUILD_ROOT}"%{_includedir}/monetdb
+rm "${RPM_BUILD_ROOT}"%{_libdir}/*.so
"${RPM_BUILD_ROOT}"%{_libdir}/libmonetdbe.so.*
+rm -r "${RPM_BUILD_ROOT}"%{_libdir}/pkgconfig
+rm -r "${RPM_BUILD_ROOT}"%{_localstatedir}/lib/monetdb
"${RPM_BUILD_ROOT}"%{_localstatedir}/monetdb5
+rm -r "${RPM_BUILD_ROOT}"%{_mandir}/man1
+rm -r "${RPM_BUILD_ROOT}"%{python3_sitelib}/MonetDBtesting
+rm "${RPM_BUILD_ROOT}"%{_sysconfdir}/logrotate.d/monetdbd
+rm "${RPM_BUILD_ROOT}"%{_sysusersdir}/monetdb.conf
+rm "${RPM_BUILD_ROOT}"%{_tmpfilesdir}/monetdbd.conf
+rm "${RPM_BUILD_ROOT}"%{_unitdir}/monetdbd.service
%endif
%changelog
diff --git a/clients/ChangeLog b/clients/ChangeLog
--- a/clients/ChangeLog
+++ b/clients/ChangeLog
@@ -1,25 +1,3 @@
# ChangeLog file for clients
# This file is updated with Maddlog
-* Thu Jan 25 2024 Sjoerd Mullender <sjo...@acm.org>
-- Msqldump now accepts --output and --outputdir options. When the
- --outputdir option is used, the dump is placed in the file dump.sql in
- the specified directory and all tables are dumped to separate CSV files.
- In this way it is feasible to edit the dump script by hand if needed,
- even for a large database.
-
-* Wed Jan 24 2024 Sjoerd Mullender <sjo...@acm.org>
-- The --table (-t) option of msqldump now accepts SQL-style % wildcard
- characters to dump all tables that match the pattern. E.g. -t
- %test%.%test% dumps all tables with 'test' in both the schema and
- table name.
-
-* Wed Jan 10 2024 Sjoerd Mullender <sjo...@acm.org>
-- Implemented interrupt handling in mclient. When using mclient
- interactively, an interrupt (usually control-C) stops whatever the
- client is doing. When editing a line, the line is discarded; when
- editing a second or later line of a query, the whole query is discarded;
- when a query is being executed, the server is asked to stop the query
- at its earliest convenience. Stopping a running query can only be
- done with an up-to-date server. All of this does not work on Windows.
-
diff --git a/clients/ChangeLog b/clients/ChangeLog.Aug2024
copy from clients/ChangeLog
copy to clients/ChangeLog.Aug2024
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
@@ -44949,36 +44949,6 @@ pattern generator.join(X_0:bat[:sht], X_
VLTgenerator_join;
(empty)
generator
-join
-pattern generator.join(X_0:bat[:bte], X_1:bat[:bte], X_2:bat[:bte], X_3:bit,
X_4:bit) (X_5:bat[:oid], X_6:bat[:oid])
-VLTgenerator_rangejoin;
-(empty)
-generator
-join
-pattern generator.join(X_0:bat[:dbl], X_1:bat[:dbl], X_2:bat[:dbl], X_3:bit,
X_4:bit) (X_5:bat[:oid], X_6:bat[:oid])
-VLTgenerator_rangejoin;
-Overloaded range join operation
-generator
-join
-pattern generator.join(X_0:bat[:flt], X_1:bat[:flt], X_2:bat[:flt], X_3:bit,
X_4:bit) (X_5:bat[:oid], X_6:bat[:oid])
-VLTgenerator_rangejoin;
-(empty)
-generator
-join
-pattern generator.join(X_0:bat[:int], X_1:bat[:int], X_2:bat[:int], X_3:bit,
X_4:bit) (X_5:bat[:oid], X_6:bat[:oid])
-VLTgenerator_rangejoin;
-(empty)
-generator
-join
-pattern generator.join(X_0:bat[:lng], X_1:bat[:lng], X_2:bat[:lng], X_3:bit,
X_4:bit) (X_5:bat[:oid], X_6:bat[:oid])
-VLTgenerator_rangejoin;
-(empty)
-generator
-join
-pattern generator.join(X_0:bat[:sht], X_1:bat[:sht], X_2:bat[:sht], X_3:bit,
X_4:bit) (X_5:bat[:oid], X_6:bat[:oid])
-VLTgenerator_rangejoin;
-(empty)
-generator
parameters
pattern generator.parameters(X_0:bte, X_1:bte):bat[:bte]
VLTgenerator_noop;
@@ -45109,6 +45079,36 @@ pattern generator.projection(X_0:bat[:oi
VLTgenerator_projection;
Overloaded projection operation
generator
+rangejoin
+pattern generator.rangejoin(X_0:bat[:bte], X_1:bat[:bte], X_2:bat[:bte],
X_3:bat[:oid], X_4:bat[:oid], X_5:bit, X_6:bit, X_7:bit, X_8:bit, X_9:lng)
(X_10:bat[:oid], X_11:bat[:oid])
+VLTgenerator_rangejoin;
+(empty)
+generator
+rangejoin
+pattern generator.rangejoin(X_0:bat[:dbl], X_1:bat[:dbl], X_2:bat[:dbl],
X_3:bat[:oid], X_4:bat[:oid], X_5:bit, X_6:bit, X_7:bit, X_8:bit, X_9:lng)
(X_10:bat[:oid], X_11:bat[:oid])
+VLTgenerator_rangejoin;
+Overloaded range join operation
+generator
+rangejoin
+pattern generator.rangejoin(X_0:bat[:flt], X_1:bat[:flt], X_2:bat[:flt],
X_3:bat[:oid], X_4:bat[:oid], X_5:bit, X_6:bit, X_7:bit, X_8:bit, X_9:lng)
(X_10:bat[:oid], X_11:bat[:oid])
+VLTgenerator_rangejoin;
+(empty)
+generator
+rangejoin
+pattern generator.rangejoin(X_0:bat[:int], X_1:bat[:int], X_2:bat[:int],
X_3:bat[:oid], X_4:bat[:oid], X_5:bit, X_6:bit, X_7:bit, X_8:bit, X_9:lng)
(X_10:bat[:oid], X_11:bat[:oid])
+VLTgenerator_rangejoin;
+(empty)
+generator
+rangejoin
+pattern generator.rangejoin(X_0:bat[:lng], X_1:bat[:lng], X_2:bat[:lng],
X_3:bat[:oid], X_4:bat[:oid], X_5:bit, X_6:bit, X_7:bit, X_8:bit, X_9:lng)
(X_10:bat[:oid], X_11:bat[:oid])
+VLTgenerator_rangejoin;
+(empty)
+generator
+rangejoin
+pattern generator.rangejoin(X_0:bat[:sht], X_1:bat[:sht], X_2:bat[:sht],
X_3:bat[:oid], X_4:bat[:oid], X_5:bit, X_6:bit, X_7:bit, X_8:bit, X_9:lng)
(X_10:bat[:oid], X_11:bat[:oid])
+VLTgenerator_rangejoin;
+(empty)
+generator
select
pattern generator.select(X_0:bat[:bte], X_1:bat[:oid], X_2:bte, X_3:bte,
X_4:bit, X_5:bit, X_6:bit):bat[:oid]
VLTgenerator_subselect;
@@ -48979,6 +48979,11 @@ pattern sql.bind_idxbat(X_0:int, X_1:str
mvc_bind_idxbat_wrap;
Bind the 'schema.table.index' BAT with access kind:@0 - base table@1 -
inserts@2 - updates
sql
+check
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
