MonetDB: sql_profiler - Merge with default.
Changeset: 5d7e8652fef9 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/5d7e8652fef9
Branch: sql_profiler
Log Message:
Merge with default.
diffs (truncated from 557 to 300 lines):
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -810,6 +810,7 @@ typedef struct BAT {
MT_Lock theaplock; /* lock protecting heap reference changes */
MT_RWLock thashlock;/* lock specifically for hash management */
MT_Lock batIdxLock; /* lock to manipulate other indexes/properties
*/
+ Heap *oldtail; /* old tail heap, to be destroyed after commit
*/
} BAT;
/* macros to hide complexity of the BAT structure */
diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -3502,45 +3502,13 @@ do_backup(const char *srcdir, const char
{
gdk_return ret = GDK_SUCCEED;
char extnew[16];
- bool istail = strncmp(ext, "tail", 4) == 0;
if (h->wasempty) {
return GDK_SUCCEED;
}
/* direct mmap is unprotected (readonly usage, or has WAL
-* protection); however, if we're backing up for subcommit
-* and a backup already exists in the main backup directory
-* (see GDKupgradevarheap), move the file */
- if (subcommit) {
- strcpy_len(extnew, ext, sizeof(extnew));
- char *p = extnew + strlen(extnew) - 1;
- if (*p == 'l') {
- p++;
- p[1] = 0;
- }
- bool exists;
- for (;;) {
- exists = file_exists(h->farmid, BAKDIR, nme, extnew);
- if (exists)
- break;
- if (!istail)
- break;
- if (*p == '1')
- break;
- if (*p == '2')
- *p = '1';
-#if SIZEOF_VAR_T == 8
- else if (*p != '4')
- *p = '4';
-#endif
- else
- *p = '2';
- }
- if (exists &&
- file_move(h->farmid, BAKDIR, SUBDIR, nme, extnew) !=
GDK_SUCCEED)
- return GDK_FAIL;
- }
+* protection) */
if (h->storage != STORE_MMAP) {
/* STORE_PRIV saves into X.new files. Two cases could
* happen. The first is when a valid X.new exists
@@ -3552,75 +3520,21 @@ do_backup(const char *srcdir, const char
* these we write X.new.kill files in the backup
* directory (see heap_move). */
gdk_return mvret = GDK_SUCCEED;
- bool exists;
-
- if (istail) {
- exists = file_exists(h->farmid, BAKDIR, nme,
"tail.new") ||
-#if SIZEOF_VAR_T == 8
- file_exists(h->farmid, BAKDIR, nme,
"tail4.new") ||
-#endif
- file_exists(h->farmid, BAKDIR, nme,
"tail2.new") ||
- file_exists(h->farmid, BAKDIR, nme,
"tail1.new") ||
- file_exists(h->farmid, BAKDIR, nme, "tail") ||
-#if SIZEOF_VAR_T == 8
- file_exists(h->farmid, BAKDIR, nme, "tail4") ||
-#endif
- file_exists(h->farmid, BAKDIR, nme, "tail2") ||
- file_exists(h->farmid, BAKDIR, nme, "tail1");
- } else {
- exists = file_exists(h->farmid, BAKDIR, nme,
"theap.new") ||
- file_exists(h->farmid, BAKDIR, nme, "theap");
- }
strconcat_len(extnew, sizeof(extnew), ext, ".new", NULL);
- if (dirty && !exists) {
+ if (dirty &&
+ !file_exists(h->farmid, BAKDIR, nme, extnew) &&
+ !file_exists(h->farmid, BAKDIR, nme, ext)) {
/* if the heap is dirty and there is no heap
* file (with or without .new extension) in
* the BAKDIR, move the heap (preferably with
* .new extension) to the correct backup
* directory */
- if (istail) {
- if (file_exists(h->farmid, srcdir, nme,
"tail.new"))
- mvret = heap_move(h, srcdir,
- subcommit ? SUBDIR :
BAKDIR,
- nme, "tail.new");
-#if SIZEOF_VAR_T == 8
- else if (file_exists(h->farmid, srcdir, nme,
"tail4.new"))
- mvret = heap_move(h, srcdir,
- subcommit ? SUBDIR :
BAKDIR,
-
MonetDB: Jul2021 - Changelog blurb.
Changeset: f123a10bb634 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/f123a10bb634 Modified Files: gdk/ChangeLog.Jul2021 Branch: Jul2021 Log Message: Changelog blurb. diffs (15 lines): diff --git a/gdk/ChangeLog.Jul2021 b/gdk/ChangeLog.Jul2021 --- a/gdk/ChangeLog.Jul2021 +++ b/gdk/ChangeLog.Jul2021 @@ -1,6 +1,11 @@ # ChangeLog file for GDK # This file is updated with Maddlog +* Tue Aug 2 2022 Sjoerd Mullender +- 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 - 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. ___ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: Jan2022 - Merge with Jul2021 branch.
Changeset: bfc2e3e26ac5 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/bfc2e3e26ac5 Modified Files: gdk/ChangeLog.Jan2022 Branch: Jan2022 Log Message: Merge with Jul2021 branch. diffs (15 lines): diff --git a/gdk/ChangeLog.Jan2022 b/gdk/ChangeLog.Jan2022 --- a/gdk/ChangeLog.Jan2022 +++ b/gdk/ChangeLog.Jan2022 @@ -1,6 +1,11 @@ # ChangeLog file for GDK # This file is updated with Maddlog +* Tue Aug 2 2022 Sjoerd Mullender +- 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 - 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. ___ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: Jul2021 - Pre-release version number update.
Changeset: 6c928c8e0b8e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/6c928c8e0b8e
Modified Files:
.bumpversion.cfg
MonetDB.spec
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
cmake/monetdb-versions.cmake
gdk/libbat.rc
monetdb5/tools/libmonetdb5.rc
Branch: Jul2021
Log Message:
Pre-release version number update.
diffs (189 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.25
commit = False
tag = False
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.25
%{!?buildno: %global buildno %(date +%Y%m%d)}
# Use bcond_with to add a --with option; i.e., "without" is default.
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,25)
+ PRODUCTVERSION version(11,41,25)
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,25)
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,25)
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,25)
+ PRODUCTVERSION version(11,41,25)
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,25)
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,25)
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,25)
+ PRODUCTVERSION version(11,41,25)
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,25)
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,25)
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,10 +8,10 @@
set(MONETDB_VERSION_MAJOR "11")
set(MONETDB_VERSION_MINOR "41")
-set(MONETDB_VERSION_PATCH "24")
+set(MONETDB_VERSION_PATCH "25")
if(RELEASE_VERSION)
- set(MONETDB_RELEASE "unreleased")
+ set(MONETDB_RELEASE "Jul2021-SP7")
endif()
set(MONETDB_VERSION
"${MONETDB_VERSION_MAJOR}.${MONETDB_VERSION_MINOR}.${MONETDB_VERSION_PATCH}")
diff --git a/gdk/libbat.rc b/gdk/libbat.rc
--- a/gdk/libbat.rc
+++ b/gdk/libbat.rc
@@ -6,8 +6,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG
MonetDB: Jan2022 - Merge with Jul2021 branch, not changing any f...
Changeset: 821faa1abf5b for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/821faa1abf5b Modified Files: .bumpversion.cfg MonetDB.spec clients/mapilib/mapi.rc clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc cmake/monetdb-versions.cmake gdk/libbat.rc monetdb5/tools/libmonetdb5.rc Branch: Jan2022 Log Message: Merge with Jul2021 branch, not changing any files. ___ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: Jul2021 - Updated library versions.
Changeset: 1e0400f4bcb0 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/1e0400f4bcb0
Modified Files:
cmake/monetdb-versions.cmake
Branch: Jul2021
Log Message:
Updated library versions.
diffs (40 lines):
diff --git a/cmake/monetdb-versions.cmake b/cmake/monetdb-versions.cmake
--- a/cmake/monetdb-versions.cmake
+++ b/cmake/monetdb-versions.cmake
@@ -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}")
___
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: Jul2021 - Moved contents of ChangeLog.Jul2021 to MonetD...
Changeset: 38ba6e40ba91 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/38ba6e40ba91
Modified Files:
MonetDB.spec
debian/changelog
gdk/ChangeLog-Archive
gdk/ChangeLog.Jul2021
misc/packages/deb/changelog
misc/packages/rpm/changelog
monetdb5/ChangeLog-Archive
monetdb5/ChangeLog.Jul2021
tools/merovingian/ChangeLog-Archive
tools/merovingian/ChangeLog.Jul2021
Branch: Jul2021
Log Message:
Moved contents of ChangeLog.Jul2021 to MonetDB.spec, debian/changelog and
ChangeLog-Archive.
diffs (truncated from 433 to 300 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -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 - 11.41.25-20220802
+- Rebuilt.
+
+* Tue Aug 2 2022 Sjoerd Mullender - 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 - 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 - 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 - 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 - 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 - 11.41.25-20220802
+- monetdb5: Various race conditions (data races) have been fixed.
+
+* Thu May 19 2022 Sjoerd Mullender - 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 - 11.41.23-20220425
- Rebuilt.
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 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 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 re
MonetDB: Jul2021 - Setting tag Jul2021_25 for the release build.
Changeset: 3ef3e6aa2f26 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/3ef3e6aa2f26 Modified Files: .hgtags Branch: Jul2021 Log Message: Setting tag Jul2021_25 for the release build. diffs (8 lines): 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 ___ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: Jan2022 - Merge with Jul2021 branch.
Changeset: 965a7133c4a9 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/965a7133c4a9 Modified Files: .hgtags MonetDB.spec cmake/monetdb-versions.cmake debian/changelog gdk/ChangeLog-Archive misc/packages/deb/changelog misc/packages/rpm/changelog monetdb5/ChangeLog-Archive tools/merovingian/ChangeLog-Archive Branch: Jan2022 Log Message: Merge with Jul2021 branch. diffs (8 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -769,3 +769,4 @@ 1252291e5c0ddc91ccb16d612d04e34e6a7d3bc3 1252291e5c0ddc91ccb16d612d04e34e6a7d3bc3 Jun2020_SP2_release 59de1ee118d4eccc072c0cf3938f90635a7db311 Jan2022_15 59de1ee118d4eccc072c0cf3938f90635a7db311 Jan2022_SP3_release +38ba6e40ba9148c762fe4a4b40f4937f86e516b6 Jul2021_25 ___ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: Jul2021 - Post release build.
Changeset: e3afdb38ab1a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/e3afdb38ab1a
Modified Files:
.bumpversion.cfg
MonetDB.spec
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
cmake/monetdb-versions.cmake
gdk/libbat.rc
monetdb5/tools/libmonetdb5.rc
Branch: Jul2021
Log Message:
Post release build.
diffs (189 lines):
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
[bumpversion]
-current_version = 11.41.25
+current_version = 11.41.26
commit = False
tag = False
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.25
+%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.
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,25)
- PRODUCTVERSION version(11,41,25)
+ 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,25)
+ 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,25)
+ 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,25)
- PRODUCTVERSION version(11,41,25)
+ 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,25)
+ 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,25)
+ 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,25)
- PRODUCTVERSION version(11,41,25)
+ 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,25)
+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,25)
+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,10 +8,10 @@
set(MONETDB_VERSION_MAJOR "11")
set(MONETDB_VERSION_MINOR "41")
-set(MONETDB_VERSION_PATCH "25")
+set(MONETDB_VERSION_PATCH "26")
if(RELEASE_VERSION)
- set(MONETDB_RELEASE "Jul2021-SP7")
+ set(MONETDB_RELEASE "unreleased")
endif()
set(MONETDB_VERSION
"${MONETDB_VERSION_MAJOR}.${MONETDB_VERSION_MINOR}.${MONETDB_VERSION_PATCH}")
diff --git a/gdk/libbat.rc b/gdk/libbat.rc
--- a/gdk/libbat.rc
+++ b/gdk/libbat.rc
@@ -6,8 +6,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_U
#de
MonetDB: Jan2022 - Merge with Jul2021 branch, not changing any f...
Changeset: c7fb76461c54 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/c7fb76461c54 Modified Files: .bumpversion.cfg MonetDB.spec clients/mapilib/mapi.rc clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc cmake/monetdb-versions.cmake gdk/libbat.rc monetdb5/tools/libmonetdb5.rc Branch: Jan2022 Log Message: Merge with Jul2021 branch, not changing any files.. ___ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: sql_profiler - Fix typo.
Changeset: 3e9588f8b1b5 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/3e9588f8b1b5
Modified Files:
monetdb5/mal/mal_profiler.c
monetdb5/mal/mal_profiler.h
sql/backends/monet5/sql_scenario.c
sql/server/sql_mvc.c
sql/storage/sql_storage.h
Branch: sql_profiler
Log Message:
Fix typo.
diffs (77 lines):
diff --git a/monetdb5/mal/mal_profiler.c b/monetdb5/mal/mal_profiler.c
--- a/monetdb5/mal/mal_profiler.c
+++ b/monetdb5/mal/mal_profiler.c
@@ -184,7 +184,7 @@ logadd(struct logbuf *logbuf, const char
* Profiling a generic event follows the same implementation of ProfilerEvent.
*/
static str
-prepare_generic_event(str face, struct GenericEvent e, int state)
+prepare_generic_event(str phase, struct GenericEvent e, int state)
{
struct logbuf logbuf = {0};
lng clk = GDKusec();
@@ -208,7 +208,7 @@ prepare_generic_event(str face, struct G
clk,
mclk,
THRgettid(),
- face,
+ phase,
state ? "done" : "start",
e.cid ? *e.cid : 0,
e.tid ? *e.tid : 0,
diff --git a/monetdb5/mal/mal_profiler.h b/monetdb5/mal/mal_profiler.h
--- a/monetdb5/mal/mal_profiler.h
+++ b/monetdb5/mal/mal_profiler.h
@@ -35,7 +35,7 @@ mal_export str openProfilerStream(Client
mal_export str closeProfilerStream(Client cntxt);
mal_export void profilerEvent(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci, int start);
-mal_export void generic_event(str face, struct GenericEvent e, int state);
+mal_export void generic_event(str phase, struct GenericEvent e, int state);
mal_export void sqlProfilerEvent(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
mal_export str startProfiler(Client cntxt);
diff --git a/sql/backends/monet5/sql_scenario.c
b/sql/backends/monet5/sql_scenario.c
--- a/sql/backends/monet5/sql_scenario.c
+++ b/sql/backends/monet5/sql_scenario.c
@@ -1223,9 +1223,9 @@ SQLparser(Client c)
if(malProfileMode > 0)
generic_event("rel_to_mal",
-(struct GenericEvent)
-{ &c->idx,
&(c->curprg->def->tag), NULL, NULL, c->query? 0 : 1 },
-1);
+ (struct GenericEvent)
+ { &c->idx,
&(c->curprg->def->tag), NULL, NULL, c->query? 0 : 1 },
+ 1);
} else {
char *q_copy = sa_strdup(m->sa, c->query);
diff --git a/sql/server/sql_mvc.c b/sql/server/sql_mvc.c
--- a/sql/server/sql_mvc.c
+++ b/sql/server/sql_mvc.c
@@ -125,10 +125,10 @@ mvc_fix_depend(mvc *m, sql_column *depid
}
static void
-generic_event_wrapper(str face, ulng tid, int rc, int state)
+generic_event_wrapper(str phase, ulng tid, int rc, int state)
{
if(malProfileMode > 0)
- generic_event(face,
+ generic_event(phase,
(struct GenericEvent)
{ NULL, NULL, &tid, NULL, rc },
state);
diff --git a/sql/storage/sql_storage.h b/sql/storage/sql_storage.h
--- a/sql/storage/sql_storage.h
+++ b/sql/storage/sql_storage.h
@@ -331,7 +331,7 @@ extern res_table *res_tables_remove(res_
sql_export void res_tables_destroy(res_table *results);
extern res_table *res_tables_find(res_table *results, int res_id);
-typedef void (*generic_event_wrapper_fptr) (str face, ulng tid, int rc, int
state);
+typedef void (*generic_event_wrapper_fptr) (str phase, ulng tid, int rc, int
state);
extern struct sqlstore *store_init(int debug, store_type store, int readonly,
int singleuser, generic_event_wrapper_fptr event_wrapper);
extern void store_exit(struct sqlstore *store);
___
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: Jun2020_prof_ext - Patch with non-mal events for profiler.
Changeset: 9487a5a71fa8 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/9487a5a71fa8
Modified Files:
clients/Tests/exports.stable.out
monetdb5/mal/mal.c
monetdb5/mal/mal_client.c
monetdb5/mal/mal_import.c
monetdb5/mal/mal_interpreter.h
monetdb5/mal/mal_private.h
monetdb5/mal/mal_profiler.c
monetdb5/mal/mal_profiler.h
monetdb5/mal/mal_runtime.c
monetdb5/mal/mal_runtime.h
sql/backends/monet5/sql.c
sql/backends/monet5/sql_scenario.c
sql/server/sql_mvc.c
sql/storage/sql_storage.h
sql/storage/store.c
Branch: Jun2020_prof_ext
Log Message:
Patch with non-mal events for profiler.
diffs (truncated from 798 to 300 lines):
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -2172,6 +2172,7 @@ str fstrcmp_impl(dbl *ret, str *string1,
void garbageCollector(Client cntxt, MalBlkPtr mb, MalStkPtr stk, int flag);
void garbageElement(Client cntxt, ValPtr v);
str generatorRef;
+void generic_event(str face, struct GenericEvent e, int state);
MALfcn getAddress(str fcnname);
str getArgDefault(MalBlkPtr mb, InstrPtr p, int idx);
ptr getArgReference(MalStkPtr stk, InstrPtr pci, int k);
@@ -2538,6 +2539,7 @@ void runtimeProfileBegin(Client cntxt, M
void runtimeProfileExit(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci, RuntimeProfile prof);
void runtimeProfileFinish(Client cntxt, MalBlkPtr mb, MalStkPtr stk);
void runtimeProfileInit(Client cntxt, MalBlkPtr mb, MalStkPtr stk);
+oid runtimeProfileSetTag(Client cntxt);
int safetyBarrier(InstrPtr p, InstrPtr q);
str sampleRef;
str schedulerRef;
diff --git a/monetdb5/mal/mal.c b/monetdb5/mal/mal.c
--- a/monetdb5/mal/mal.c
+++ b/monetdb5/mal/mal.c
@@ -45,6 +45,40 @@ MT_Lock mal_copyLock = MT_LOCK_INITI
MT_Lock mal_delayLock = MT_LOCK_INITIALIZER("mal_delayLock");
MT_Lock mal_oltpLock = MT_LOCK_INITIALIZER("mal_oltpLock");
+static pthread_key_t tl_client_key;
+
+static int
+initialize_tl_client_key(void)
+{
+ static bool initialized = false;
+ if (initialized)
+ return 0;
+
+ if (pthread_key_create(&tl_client_key, NULL) != 0)
+ return -1;
+
+ initialized = true;
+ return 0;
+}
+
+Client
+getClientContext(void)
+{
+ return (Client) pthread_getspecific(tl_client_key);
+}
+
+/* declared in mal_private.h so only the MAL interpreter core can access it */
+Client
+setClientContext(Client cntxt)
+{
+ Client old = getClientContext();
+
+ if (pthread_setspecific(tl_client_key, cntxt) != 0)
+ GDKfatal("Failed to set thread local Client context");
+
+ return old;
+}
+
/*
* Initialization of the MAL context
*/
@@ -53,6 +87,9 @@ int mal_init(void){
/* Any error encountered here terminates the process
* with a message sent to stderr
*/
+ if (initialize_tl_client_key() != 0)
+ return -1;
+
if (!MCinit())
return -1;
#ifndef NDEBUG
diff --git a/monetdb5/mal/mal_client.c b/monetdb5/mal/mal_client.c
--- a/monetdb5/mal/mal_client.c
+++ b/monetdb5/mal/mal_client.c
@@ -46,6 +46,7 @@
#include "mal_private.h"
#include "mal_runtime.h"
#include "mal_authorize.h"
+#include "mal_profiler.h"
#include "mapi_prompt.h"
int MAL_MAXCLIENTS = 0;
@@ -199,6 +200,18 @@ MCexitClient(Client c)
c->fdout = NULL;
c->fdin = NULL;
}
+
+ if(malProfileMode > 0)
+ generic_event("client_connection",
+ (struct GenericEvent)
+ { &c->idx,
+ NULL,
+ NULL,
+ NULL,
+ 0 },
+ 1);
+
+ setClientContext(NULL);
}
static Client
@@ -288,8 +301,21 @@ MCinitClient(oid user, bstream *fin, str
MT_lock_set(&mal_contextLock);
c = MCnewClient();
- if (c)
+
+ if (c){
+ Client c_old = setClientContext(c);
+ assert(NULL == c_old);
c = MCinitClientRecord(c, user, fin, fout);
+ if(malProfileMode > 0)
+ generic_event("client_connection",
+ (struct GenericEvent)
+ { &c->idx,
+ NULL,
+ NULL,
+ NULL,
+ 0 },
+ 0);
+ }
MT_lock_unset(&mal_contextLock);
return c;
}
diff --git a/monetdb5/ma
