Changeset: 9cd862535dd6 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/9cd862535dd6
Branch: Jul2021_prof_ext
Log Message:
Merge with Jul2021.
diffs (truncated from 678 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.41.24
+current_version = 11.41.26
commit = False
tag = False
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -832,3 +832,4 @@ 2e54857a91306cc6304825c5596f65d00595db6b
2e54857a91306cc6304825c5596f65d00595db6b Jul2021_SP6_release
1252291e5c0ddc91ccb16d612d04e34e6a7d3bc3 Jun2020_13
1252291e5c0ddc91ccb16d612d04e34e6a7d3bc3 Jun2020_SP2_release
+38ba6e40ba9148c762fe4a4b40f4937f86e516b6 Jul2021_25
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -1,5 +1,5 @@
%global name MonetDB
-%global version 11.41.24
+%global version 11.41.26
%{!?buildno: %global buildno %(date +%Y%m%d)}
# Use bcond_with to add a --with option; i.e., "without" is default.
@@ -84,7 +84,7 @@ Group: Applications/Databases
License: MPLv2.0
URL: https://www.monetdb.org/
BugURL: https://bugs.monetdb.org/
-Source:
https://www.monetdb.org/downloads/sources/Jul2021-SP6/%{name}-%{version}.tar.bz2
+Source:
https://www.monetdb.org/downloads/sources/Jul2021-SP7/%{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
@@ -846,6 +846,56 @@ else
fi
%changelog
+* Tue Aug 02 2022 Sjoerd Mullender <[email protected]> - 11.41.25-20220802
+- Rebuilt.
+
+* Tue Aug 2 2022 Sjoerd Mullender <[email protected]> - 11.41.25-20220802
+- gdk: When destroying a bat, make sure there are no files left over in
+ the BACKUP directory since they can cause problems when the bat id
+ gets reused.
+
+* Thu Jul 28 2022 Sjoerd Mullender <[email protected]> - 11.41.25-20220802
+- gdk: Fixed an off-by-one error in the logger which caused older log files
+ to stick around longer in the write-ahead log than necessary.
+- gdk: When an empty BAT is committed, skip writing (and synchronizing to
+ disk) the heap (tail and theap) files and write 0 for their sizes to
+ the BBP.dir file. When reading the BBP.dir file, if an empty BAT is
+ encountered, set the sizes of those files to 0. This fixes potential
+ issues during startup of the server (BBPcheckbats reporting errors).
+
+* Thu Jun 23 2022 Sjoerd Mullender <[email protected]> - 11.41.25-20220802
+- merovingian: When multiple identical messages are written to the log, write
the
+ first one, and combine subsequent ones in a single message.
+
+* Wed Jun 22 2022 Sjoerd Mullender <[email protected]> - 11.41.25-20220802
+- gdk: Make sure heap files of transient bats get deleted when the bat is
+ destroyed. If the bat was a partial view (sharing the vheap but not
+ the tail), the tail file wasn't deleted.
+- gdk: Various changes were made to satisfy newer compilers.
+- gdk: The batDirtydesc and batDirtyflushed Boolean values have been deprecated
+ and are no longer used. They were both holdovers from long ago.
+- gdk: Various race conditions (data races) have been fixed.
+
+* Wed Jun 22 2022 Sjoerd Mullender <[email protected]> - 11.41.25-20220802
+- merovingian: Fixed a leak where the log file wasn't closed when it was
reopened
+ after a log rotation (SIGHUP signal).
+- merovingian: Try to deal more gracefully with "inherited" mserver5 processes.
+ This includes not complaining about an "impossible state", and allowing
+ such processes to be stopped by the monetdbd process.
+- merovingian: When a transient failure occurs during processing of a new
connection to
+ the monetdbd server, sleep for half a second so that if the transient
+ failure occurs again, the log file doesn't get swamped with error
+ messages.
+
+* Wed Jun 22 2022 Sjoerd Mullender <[email protected]> - 11.41.25-20220802
+- monetdb5: Various race conditions (data races) have been fixed.
+
+* Thu May 19 2022 Sjoerd Mullender <[email protected]> - 11.41.25-20220802
+- 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.
+
* Mon Apr 25 2022 Sjoerd Mullender <[email protected]> - 11.41.23-20220425
- Rebuilt.
diff --git a/clients/mapilib/mapi.rc b/clients/mapilib/mapi.rc
--- a/clients/mapilib/mapi.rc
+++ b/clients/mapilib/mapi.rc
@@ -6,8 +6,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_U
#define sversion(major,minor,patch) #major "." #minor "." #patch "\0"
1 VERSIONINFO
- FILEVERSION version(11,41,24)
- PRODUCTVERSION version(11,41,24)
+ FILEVERSION version(11,41,26)
+ PRODUCTVERSION version(11,41,26)
FILEFLAGSMASK 0x3fL
FILEFLAGS 0
FILEOS VOS_NT_WINDOWS32
@@ -21,14 +21,14 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "MonetDB B.V.\0"
VALUE "FileDescription", "MonetDB Application Interface DLL\0"
- VALUE "FileVersion", sversion(11,41,24)
+ VALUE "FileVersion", sversion(11,41,26)
VALUE "InternalName", "Mapi\0"
VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2021\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "Mapi.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB Client Libraries\0"
- VALUE "ProductVersion", sversion(11,41,24)
+ VALUE "ProductVersion", sversion(11,41,26)
VALUE "SpecialBuild", "\0"
END
END
diff --git a/clients/odbc/driver/driver.rc b/clients/odbc/driver/driver.rc
--- a/clients/odbc/driver/driver.rc
+++ b/clients/odbc/driver/driver.rc
@@ -6,8 +6,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_U
#define sversion(major,minor,patch) #major "." #minor "." #patch "\0"
1 VERSIONINFO
- FILEVERSION version(11,41,24)
- PRODUCTVERSION version(11,41,24)
+ FILEVERSION version(11,41,26)
+ PRODUCTVERSION version(11,41,26)
FILEFLAGSMASK 0x3fL
FILEFLAGS 0
FILEOS VOS_NT_WINDOWS32
@@ -21,14 +21,14 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "MonetDB B.V.\0"
VALUE "FileDescription", "MonetDB ODBC Driver DLL\0"
- VALUE "FileVersion", sversion(11,41,24)
+ VALUE "FileVersion", sversion(11,41,26)
VALUE "InternalName", "MonetODBC\0"
VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2021\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "MonetODBC.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB SQL Server\0"
- VALUE "ProductVersion", sversion(11,41,24)
+ VALUE "ProductVersion", sversion(11,41,26)
VALUE "SpecialBuild", "\0"
END
END
diff --git a/clients/odbc/winsetup/setup.rc b/clients/odbc/winsetup/setup.rc
--- a/clients/odbc/winsetup/setup.rc
+++ b/clients/odbc/winsetup/setup.rc
@@ -65,8 +65,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION version(11,41,24)
- PRODUCTVERSION version(11,41,24)
+ FILEVERSION version(11,41,26)
+ PRODUCTVERSION version(11,41,26)
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -83,12 +83,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "MonetDB B.V."
VALUE "FileDescription", "MonetDB ODBC Setup DLL"
- VALUE "FileVersion", sversion(11,41,24)
+ VALUE "FileVersion", sversion(11,41,26)
VALUE "InternalName", "MonetODBCs.dll"
VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2021"
VALUE "OriginalFilename", "MonetODBCs.dll"
VALUE "ProductName", "MonetDB SQL Server"
- VALUE "ProductVersion", sversion(11,41,24)
+ VALUE "ProductVersion", sversion(11,41,26)
END
END
BLOCK "VarFileInfo"
diff --git a/cmake/monetdb-versions.cmake b/cmake/monetdb-versions.cmake
--- a/cmake/monetdb-versions.cmake
+++ b/cmake/monetdb-versions.cmake
@@ -8,7 +8,7 @@
set(MONETDB_VERSION_MAJOR "11")
set(MONETDB_VERSION_MINOR "41")
-set(MONETDB_VERSION_PATCH "24")
+set(MONETDB_VERSION_PATCH "26")
if(RELEASE_VERSION)
set(MONETDB_RELEASE "unreleased")
@@ -51,23 +51,23 @@ set(MONETDB_VERSION "${MONETDB_VERSION_M
# version of the GDK library (subdirectory gdk; also includes
# common/options and common/utils)
-set(GDK_VERSION_CURRENT "23")
-set(GDK_VERSION_MINOR "0")
-set(GDK_VERSION_PATCH "9")
+set(GDK_VERSION_CURRENT "24")
+set(GDK_VERSION_MINOR "1")
+set(GDK_VERSION_PATCH "0")
math(EXPR GDK_VERSION_MAJOR "${GDK_VERSION_CURRENT} - ${GDK_VERSION_MINOR}")
set(GDK_VERSION
"${GDK_VERSION_MAJOR}.${GDK_VERSION_MINOR}.${GDK_VERSION_PATCH}")
# version of the MAPI library (subdirectory clients/mapilib)
set(MAPI_VERSION_CURRENT "13")
set(MAPI_VERSION_MINOR "0")
-set(MAPI_VERSION_PATCH "1")
+set(MAPI_VERSION_PATCH "2")
math(EXPR MAPI_VERSION_MAJOR "${MAPI_VERSION_CURRENT} - ${MAPI_VERSION_MINOR}")
set(MAPI_VERSION
"${MAPI_VERSION_MAJOR}.${MAPI_VERSION_MINOR}.${MAPI_VERSION_PATCH}")
# version of the MONETDB5 library (subdirectory monetdb5, not including extras
or sql)
set(MONETDB5_VERSION_CURRENT "31")
set(MONETDB5_VERSION_MINOR "0")
-set(MONETDB5_VERSION_PATCH "6")
+set(MONETDB5_VERSION_PATCH "7")
math(EXPR MONETDB5_VERSION_MAJOR "${MONETDB5_VERSION_CURRENT} -
${MONETDB5_VERSION_MINOR}")
set(MONETDB5_VERSION
"${MONETDB5_VERSION_MAJOR}.${MONETDB5_VERSION_MINOR}.${MONETDB5_VERSION_PATCH}")
@@ -81,6 +81,6 @@ set(MONETDBE_VERSION "${MONETDBE_VERSION
# version of the STREAM library (subdirectory common/stream)
set(STREAM_VERSION_CURRENT "15")
set(STREAM_VERSION_MINOR "0")
-set(STREAM_VERSION_PATCH "1")
+set(STREAM_VERSION_PATCH "2")
math(EXPR STREAM_VERSION_MAJOR "${STREAM_VERSION_CURRENT} -
${STREAM_VERSION_MINOR}")
set(STREAM_VERSION
"${STREAM_VERSION_MAJOR}.${STREAM_VERSION_MINOR}.${STREAM_VERSION_PATCH}")
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,77 @@
+monetdb (11.41.25) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender <[email protected]> Tue, 02 Aug 2022 14:32:47 +0200
+
+monetdb (11.41.25) unstable; urgency=low
+
+ * gdk: When destroying a bat, make sure there are no files left over in
+ the BACKUP directory since they can cause problems when the bat id
+ gets reused.
+
+ -- Sjoerd Mullender <[email protected]> Tue, 2 Aug 2022 14:32:47 +0200
+
+monetdb (11.41.25) unstable; urgency=low
+
+ * gdk: Fixed an off-by-one error in the logger which caused older log files
+ to stick around longer in the write-ahead log than necessary.
+ * gdk: When an empty BAT is committed, skip writing (and synchronizing to
+ disk) the heap (tail and theap) files and write 0 for their sizes to
+ the BBP.dir file. When reading the BBP.dir file, if an empty BAT is
+ encountered, set the sizes of those files to 0. This fixes potential
+ issues during startup of the server (BBPcheckbats reporting errors).
+
+ -- Sjoerd Mullender <[email protected]> Thu, 28 Jul 2022 14:32:47 +0200
+
+monetdb (11.41.25) unstable; urgency=low
+
+ * merovingian: When multiple identical messages are written to the log,
write the
+ first one, and combine subsequent ones in a single message.
+
+ -- Sjoerd Mullender <[email protected]> Thu, 23 Jun 2022 14:32:47 +0200
+
+monetdb (11.41.25) unstable; urgency=low
+
+ * gdk: Make sure heap files of transient bats get deleted when the bat is
+ destroyed. If the bat was a partial view (sharing the vheap but not
+ the tail), the tail file wasn't deleted.
+ * gdk: Various changes were made to satisfy newer compilers.
+ * gdk: The batDirtydesc and batDirtyflushed Boolean values have been
deprecated
+ and are no longer used. They were both holdovers from long ago.
+ * gdk: Various race conditions (data races) have been fixed.
+
+ -- Sjoerd Mullender <[email protected]> Wed, 22 Jun 2022 14:32:47 +0200
+
+monetdb (11.41.25) unstable; urgency=low
+
+ * merovingian: Fixed a leak where the log file wasn't closed when it was
reopened
+ after a log rotation (SIGHUP signal).
+ * merovingian: Try to deal more gracefully with "inherited" mserver5
processes.
+ This includes not complaining about an "impossible state", and allowing
+ such processes to be stopped by the monetdbd process.
+ * merovingian: When a transient failure occurs during processing of a new
connection to
+ the monetdbd server, sleep for half a second so that if the transient
+ failure occurs again, the log file doesn't get swamped with error
+ messages.
+
+ -- Sjoerd Mullender <[email protected]> Wed, 22 Jun 2022 14:32:47 +0200
+
+monetdb (11.41.25) unstable; urgency=low
+
+ * monetdb5: Various race conditions (data races) have been fixed.
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
