Changeset: 9d7781853ab2 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/9d7781853ab2
Modified Files:
.hgtags
MonetDB.spec
cmake/monetdb-findpackages.cmake
cmake/monetdb-rpm-packages.cmake
debian/changelog
debian/control
geom/monetdb5/CMakeLists.txt
geom/monetdb5/geod.c
geom/monetdb5/geom.c
geom/monetdb5/geom.h
geom/monetdb5/geomBulk.c
geom/sql/functions/Tests/All
misc/packages/deb/changelog
misc/packages/rpm/changelog
Branch: geo-update
Log Message:
Merge with default
diffs (truncated from 391977 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.43.10
+current_version = 11.44.0
commit = False
tag = False
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -752,3 +752,19 @@ 9fbec5dab8167d2189582fbe75e5f9c8bef82380
9fbec5dab8167d2189582fbe75e5f9c8bef82380 Jan2022_release
97e76b882f9fb28327393d21708fb22f2f6c22f1 Jan2022_7
f458e1c71c73d6bd9636369c1406eadb74f016bf Jan2022_9
+f458e1c71c73d6bd9636369c1406eadb74f016bf Jan2022_SP1_release
+00463fdd0d51d7ce058549a82bc74efaea6035a2 Jul2021_15
+00463fdd0d51d7ce058549a82bc74efaea6035a2 Jul2021_SP3_release
+db3cec8ea853884e857fcfb413428116cb95e786 Jul2021_17
+8c015afafb5903ea59b0e2cffac1138a0d82e007 Jul2021_19
+8c015afafb5903ea59b0e2cffac1138a0d82e007 Jul2021_SP4_release
+cab90a348501b045e19cee5cebcc44f3800bd0a8 Jul2021_21
+cab90a348501b045e19cee5cebcc44f3800bd0a8 Jul2021_SP5_release
+5872f047d97c98d3a848514438b8f97fa446855d Jan2022_11
+025239a5a6f122042798c0f1132a2c6298514e06 Jan2022_13
+025239a5a6f122042798c0f1132a2c6298514e06 Jan2022_SP2_release
+2e54857a91306cc6304825c5596f65d00595db6b Jul2021_23
+2e54857a91306cc6304825c5596f65d00595db6b Jul2021_SP6_release
+1252291e5c0ddc91ccb16d612d04e34e6a7d3bc3 Jun2020_13
+1252291e5c0ddc91ccb16d612d04e34e6a7d3bc3 Jun2020_SP2_release
+59de1ee118d4eccc072c0cf3938f90635a7db311 Jan2022_15
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -97,7 +97,7 @@ if(NOT ${CMAKE_INSTALL_PREFIX} STREQUAL
# SET(CMAKE_SKIP_RPATH TRUE)
endif()
-# required for some instalation files
+# required for some installation files
set(PROGRAM_PERMISSIONS_DEFAULT
OWNER_WRITE
OWNER_READ
@@ -183,6 +183,3 @@ add_subdirectory(documentation)
if(CMAKE_SUMMARY)
monetdb_cmake_summary()
endif()
-
-
-# vim: set ts=2:sw=2:et
diff --git a/ChangeLog b/ChangeLog
new file mode 100644
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,3 @@
+# ChangeLog file for devel
+# This file is updated with Maddlog
+
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -1,5 +1,5 @@
%global name MonetDB
-%global version 11.43.10
+%global version 11.44.0
%{!?buildno: %global buildno %(date +%Y%m%d)}
# Use bcond_with to add a --with option; i.e., "without" is default.
@@ -81,7 +81,7 @@ Group: Applications/Databases
License: MPLv2.0
URL: https://www.monetdb.org/
BugURL: https://bugs.monetdb.org/
-Source:
https://www.monetdb.org/downloads/sources/Jan2022-SP1/%{name}-%{version}.tar.bz2
+Source:
https://www.monetdb.org/downloads/sources/Jan2022-SP3/%{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
@@ -114,7 +114,6 @@ BuildRequires: geos-devel >= 3.8.0
%endif
BuildRequires: pkgconfig(libcurl)
BuildRequires: pkgconfig(liblzma)
-BuildRequires: pkgconfig(uuid)
BuildRequires: pkgconfig(libxml-2.0)
%if %{with pcre}
BuildRequires: pkgconfig(libpcre) >= 4.5
@@ -366,6 +365,7 @@ developer.
%{_bindir}/smack00
%{_bindir}/smack01
%{_bindir}/streamcat
+%{_bindir}/testcondvar
%{_bindir}/testgetinfo
%{_bindir}/testStmtAttr
%{_bindir}/malsample.pl
@@ -796,7 +796,6 @@ fi
-DWITH_PROJ=OFF \
-DWITH_READLINE=ON \
-DWITH_SNAPPY=OFF \
- -DWITH_UUID=ON \
-DWITH_VALGRIND=OFF \
-DWITH_XML2=ON \
-DWITH_ZLIB=ON
@@ -850,6 +849,79 @@ fi
%endif
%changelog
+* Fri May 20 2022 Sjoerd Mullender <[email protected]> - 11.43.15-20220520
+- Rebuilt.
+- GH#7036: Generate column names instead of labels
+
+* Thu May 19 2022 Sjoerd Mullender <[email protected]> - 11.43.15-20220520
+- gdk: All accesses to the BACKUP directory need to be protected by the
+ same lock. The lock already existed (GDKtmLock), but wasn't used
+ consistently. This is now fixed. Hopefully this makes the hot snapshot
+ code more reliable.
+
+* Tue May 10 2022 Sjoerd Mullender <[email protected]> - 11.43.15-20220520
+- gdk: When exiting, long running instructions are aborted using the same
+ mechanism that is used for query timeouts.
+
+* Mon Apr 25 2022 Sjoerd Mullender <[email protected]> - 11.43.15-20220520
+- sql: GLOBAL TEMPORARY tables are now treated like LOCAL TEMPORARY tables
+ as far as the table content is concerned. The schema information
+ stays global. This fixes an issue with concurrent access and cleanup
+ of stale data.
+
+* Thu Apr 14 2022 Sjoerd Mullender <[email protected]> - 11.43.15-20220520
+- sql: The NO CONSTRAINT option of the COPY INTO query has been removed.
+ It didn't work and it was never a good idea anyway.
+
+* Fri Apr 01 2022 Sjoerd Mullender <[email protected]> - 11.43.13-20220401
+- Rebuilt.
+- GH#7278: BUG when there is more than one field/filter in the having
+ clause
+
+* Fri Apr 1 2022 Sjoerd Mullender <[email protected]> - 11.43.13-20220401
+- gdk: Improved speed of BATappend to empty varsized bat: we now just copy
+ the heaps instead of inserting individual values.
+
+* Fri Apr 1 2022 Sjoerd Mullender <[email protected]> - 11.43.13-20220401
+- monetdb5: Improved parsing speed of blob values, especially on Windows.
+ On Windows, using the locale-aware functions isdigit and isxdigit is
+ comparatively very slow, so we avoid them.
+
+* Tue Mar 29 2022 Sjoerd Mullender <[email protected]> - 11.43.13-20220401
+- gdk: Improved speed of projection (BATproject) on varsized bats by sharing
+ the data heap (vheap).
+
+* Fri Mar 25 2022 Sjoerd Mullender <[email protected]> - 11.43.11-20220325
+- Rebuilt.
+- GH#7252: Segmentation fault on second run
+- GH#7253: Extremely slow INSERT INTO <table> SELECT
+- GH#7254: Commit with deletions is very slow
+- GH#7263: PRIMARY KEY constraint is not persistent through server restarts
+- GH#7267: Update after delete does not update some rows
+
+* Fri Mar 18 2022 Sjoerd Mullender <[email protected]> - 11.43.11-20220325
+- gdk: Fixed a race condition which could cause a too large size being written
+ for a .theap file to the BBP.dir file after the correct size file had
+ been saved to disk.
+- gdk: We now ignore the size and capacity columns in the BBP.dir file.
+ These values are essential during run time, but not useful in the
+ on-disk image of the database.
+
+* Wed Mar 9 2022 Sjoerd Mullender <[email protected]> - 11.43.11-20220325
+- gdk: Fixed a bug in the append code for msk (bit mask) bats.
+- gdk: Conversions from floating point types to integral types that involve
+ multiplication now use the "long double" as intermediate type, thereby
+ loosing as few significant bits as is feasible.
+- gdk: Found and fixed another source for the now infamous BBPcheckbats error
+ that sometimes occurs at startup of the server.
+
+* Wed Feb 16 2022 Sjoerd Mullender <[email protected]> - 11.43.11-20220325
+- clients: Improved the handling of the \r (internal pager) command in mclient.
+ It now properly counts the header of table, and when a (very) long
+ table is being printed and aborted part way in the built-in pager, not
+ all data is transferred to the client (and then discarded). Instead
+ at most 1000 rows are transferred.
+
* Mon Feb 07 2022 Sjoerd Mullender <[email protected]> - 11.43.9-20220207
- Rebuilt.
- GH#7237: SELECT with concurrent writes rarely returns corrupt data
diff --git a/NT/mkodbcwxs.py b/NT/mkodbcwxs.py
--- a/NT/mkodbcwxs.py
+++ b/NT/mkodbcwxs.py
@@ -90,7 +90,7 @@ def main():
vcpkg.format(r'bin\bz2.dll'),
vcpkg.format(r'bin\charset-1.dll'), # for iconv-2.dll
vcpkg.format(r'bin\lz4.dll'),
- vcpkg.format(r'bin\lzma.dll'),
+ vcpkg.format(r'bin\liblzma.dll'),
vcpkg.format(r'bin\zlib1.dll')])
print(r' </Directory>')
id = comp(features, id, 12,
diff --git a/NT/mksqlwxs.py b/NT/mksqlwxs.py
--- a/NT/mksqlwxs.py
+++ b/NT/mksqlwxs.py
@@ -158,7 +158,7 @@ def main():
vcpkg.format(r'bin\getopt.dll'),
vcpkg.format(r'bin\libxml2.dll'),
vcpkg.format(r'bin\lz4.dll'),
- vcpkg.format(r'bin\lzma.dll'),
+ vcpkg.format(r'bin\liblzma.dll'),
vcpkg.format(r'bin\pcre.dll'),
vcpkg.format(r'bin\zlib1.dll')])
id = comp(debug, id, 14,
diff --git a/README.rst b/README.rst
--- a/README.rst
+++ b/README.rst
@@ -86,7 +86,6 @@ WITH_LZMA Include lzma support
WITH_PCRE Include pcre support
WITH_PROJ Include proj support
WITH_READLINE Include readline support
-WITH_UUID Include uuid support
WITH_VALGRIND Include valgrind support
WITH_XML2 Include xml2 support
WITH_ZLIB Include zlib support
@@ -99,7 +98,7 @@ On Fedora, the following packages are re
``bison``, ``cmake``, ``gcc``, ``pkgconf``, ``python3``.
The following packages are optional but recommended:
-``bzip2-devel``, ``libuuid-devel``, ``pcre-devel``, ``readline-devel``,
+``bzip2-devel``, ``pcre-devel``, ``readline-devel``,
``xz-devel``, ``zlib-devel``.
The following packages are optional:
@@ -109,11 +108,10 @@ The following packages are optional:
``unixODBC-devel``, ``valgrind-devel``.
On Ubuntu and Debian the following packages are required:
-``bison``, ``cmake``, ``gcc``, ``libssl-dev``, ``pkg-config``,
-``python3``.
+``bison``, ``cmake``, ``gcc``, ``pkg-config``, ``python3``.
The following packages are optional but recommended:
-``libbz2-dev``, ``uuid-dev``, ``libpcre3-dev``, ``libreadline-dev``,
+``libbz2-dev``, ``libpcre3-dev``, ``libreadline-dev``,
``liblzma-dev``, ``zlib1g-dev``.
The following packages are optional:
diff --git a/buildtools/conf/CMakeLists.txt b/buildtools/conf/CMakeLists.txt
--- a/buildtools/conf/CMakeLists.txt
+++ b/buildtools/conf/CMakeLists.txt
@@ -20,7 +20,6 @@ if(DEVELOPMENT AND NOT WIN32)
install(FILES
Maddlog
PERMISSIONS ${PROGRAM_PERMISSIONS_DEFAULT}
- DESTINATION ${CMAKE_INSTALL_BINDIR})
+ DESTINATION ${CMAKE_INSTALL_BINDIR}
+ COMPONENT buildtools)
endif()
-
-# vim: set ts=2:sw=2:et
diff --git a/buildtools/conf/Maddlog b/buildtools/conf/Maddlog
--- a/buildtools/conf/Maddlog
+++ b/buildtools/conf/Maddlog
@@ -189,6 +189,9 @@ fi
file=ChangeLog.$RANDOM
+# make sure we get the correct day and month names
+export LC_ALL=en_US.utf-8
+
case "$CL" in
*/*)
cd "${CL%/*}"
diff --git a/clients/ChangeLog b/clients/ChangeLog
new file mode 100644
--- /dev/null
+++ b/clients/ChangeLog
@@ -0,0 +1,3 @@
+# ChangeLog file for clients
+# This file is updated with Maddlog
+
diff --git a/clients/ChangeLog-Archive b/clients/ChangeLog-Archive
--- a/clients/ChangeLog-Archive
+++ b/clients/ChangeLog-Archive
@@ -1,6 +1,13 @@
# DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
# This file contains past ChangeLog entries
+* Wed Feb 16 2022 Sjoerd Mullender <[email protected]> - 11.43.11-20220325
+- Improved the handling of the \r (internal pager) command in mclient.
+ It now properly counts the header of table, and when a (very) long
+ table is being printed and aborted part way in the built-in pager, not
+ all data is transferred to the client (and then discarded). Instead
+ at most 1000 rows are transferred.
+
* Wed Aug 11 2021 Sjoerd Mullender <[email protected]> - 11.43.1-20220103
- A new output formatting mode was added to mclient. Use -fcsv-noquote
to produce a CSV (comma-separated values) output where the quote
diff --git a/clients/NT/CMakeLists.txt b/clients/NT/CMakeLists.txt
--- a/clients/NT/CMakeLists.txt
+++ b/clients/NT/CMakeLists.txt
@@ -17,5 +17,3 @@ if(WIN32)
DESTINATION "."
COMPONENT server)
endif()
-
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]