Changeset: 841e7594fd39 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/841e7594fd39 Modified Files: gdk/gdk.h Branch: Jan2022-strimps-integration Log Message:
Merge with Jan2022 diffs (truncated from 731 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.2 +current_version = 11.43.4 commit = False tag = False diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -824,3 +824,6 @@ 1cc77329e40543d12dd9de04cbeec50d442520e9 1cc77329e40543d12dd9de04cbeec50d442520e9 Jul2021_SP2_release e730f4981db58bb336d6b17a022eec95d9f0eae5 Jan2022_1 e730f4981db58bb336d6b17a022eec95d9f0eae5 Jan2022_release +34d6df33e954fe8fbee1cb3d4e2bde0bbd903d74 Jan2022_3 +e730f4981db58bb336d6b17a022eec95d9f0eae5 Jan2022_release +34d6df33e954fe8fbee1cb3d4e2bde0bbd903d74 Jan2022_release diff --git a/ChangeLog.Jan2022 b/ChangeLog.Jan2022 --- a/ChangeLog.Jan2022 +++ b/ChangeLog.Jan2022 @@ -1,3 +1,6 @@ # ChangeLog file for devel # This file is updated with Maddlog +* Wed Jan 12 2022 Sjoerd Mullender <[email protected]> +- A couple of concurrency issues have been fixed. + 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.2 +%global version 11.43.4 %{!?buildno: %global buildno %(date +%Y%m%d)} # Use bcond_with to add a --with option; i.e., "without" is default. @@ -850,6 +850,23 @@ fi %endif %changelog +* Tue Jan 11 2022 Sjoerd Mullender <[email protected]> - 11.43.3-20220111 +- Rebuilt. +- GH#7215: ODBC Driver SQLStatistics returns duplicate rows/rows for other + tables + +* Tue Jan 11 2022 Sjoerd Mullender <[email protected]> - 11.43.3-20220111 +- gdk: On Windows, files and directories we create now get the attribute + FILE_ATTIBUTE_NOT_CONTENT_INDEXED, meaning that they should not be + indexed by indexing or search services. + +* Thu Jan 6 2022 Martin van Dinther <[email protected]> - 11.43.3-20220111 +- merovingian: Disabled logging into merovingian.log of next info message types: + - proxying client <host>:<port> for database '<dbname>' to <url> + - target connection is on local UNIX domain socket, passing on filedescriptor instead of proxying + These messages were written to the log file at each connection. In most + cases this information is not used. The disabling reduces the log file size. + * Mon Jan 03 2022 Sjoerd Mullender <[email protected]> - 11.43.1-20220103 - Rebuilt. - GH#7168: Loosing the documentation 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,43,2) - PRODUCTVERSION version(11,43,2) + FILEVERSION version(11,43,4) + PRODUCTVERSION version(11,43,4) 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,43,2) + VALUE "FileVersion", sversion(11,43,4) VALUE "InternalName", "Mapi\0" VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2022\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "Mapi.dll\0" VALUE "PrivateBuild", "\0" VALUE "ProductName", "MonetDB Client Libraries\0" - VALUE "ProductVersion", sversion(11,43,2) + VALUE "ProductVersion", sversion(11,43,4) 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,43,2) - PRODUCTVERSION version(11,43,2) + FILEVERSION version(11,43,4) + PRODUCTVERSION version(11,43,4) 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,43,2) + VALUE "FileVersion", sversion(11,43,4) VALUE "InternalName", "MonetODBC\0" VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2022\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "MonetODBC.dll\0" VALUE "PrivateBuild", "\0" VALUE "ProductName", "MonetDB SQL Server\0" - VALUE "ProductVersion", sversion(11,43,2) + VALUE "ProductVersion", sversion(11,43,4) 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,43,2) - PRODUCTVERSION version(11,43,2) + FILEVERSION version(11,43,4) + PRODUCTVERSION version(11,43,4) 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,43,2) + VALUE "FileVersion", sversion(11,43,4) VALUE "InternalName", "MonetODBCs.dll" VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2022" VALUE "OriginalFilename", "MonetODBCs.dll" VALUE "ProductName", "MonetDB SQL Server" - VALUE "ProductVersion", sversion(11,43,2) + VALUE "ProductVersion", sversion(11,43,4) 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 "43") -set(MONETDB_VERSION_PATCH "2") +set(MONETDB_VERSION_PATCH "4") if(RELEASE_VERSION) set(MONETDB_RELEASE "unreleased") @@ -53,7 +53,7 @@ set(MONETDB_VERSION "${MONETDB_VERSION_M # common/options and common/utils) set(GDK_VERSION_CURRENT "24") set(GDK_VERSION_MINOR "0") -set(GDK_VERSION_PATCH "0") +set(GDK_VERSION_PATCH "1") math(EXPR GDK_VERSION_MAJOR "${GDK_VERSION_CURRENT} - ${GDK_VERSION_MINOR}") set(GDK_VERSION "${GDK_VERSION_MAJOR}.${GDK_VERSION_MINOR}.${GDK_VERSION_PATCH}") @@ -67,14 +67,14 @@ set(MAPI_VERSION "${MAPI_VERSION_MAJOR}. # version of the MONETDB5 library (subdirectory monetdb5, not including extras or sql) set(MONETDB5_VERSION_CURRENT "32") set(MONETDB5_VERSION_MINOR "0") -set(MONETDB5_VERSION_PATCH "0") +set(MONETDB5_VERSION_PATCH "1") math(EXPR MONETDB5_VERSION_MAJOR "${MONETDB5_VERSION_CURRENT} - ${MONETDB5_VERSION_MINOR}") set(MONETDB5_VERSION "${MONETDB5_VERSION_MAJOR}.${MONETDB5_VERSION_MINOR}.${MONETDB5_VERSION_PATCH}") # version of the MONETDBE library (subdirectory tools/monetdbe) set(MONETDBE_VERSION_CURRENT "3") set(MONETDBE_VERSION_MINOR "0") -set(MONETDBE_VERSION_PATCH "0") +set(MONETDBE_VERSION_PATCH "1") math(EXPR MONETDBE_VERSION_MAJOR "${MONETDBE_VERSION_CURRENT} - ${MONETDBE_VERSION_MINOR}") set(MONETDBE_VERSION "${MONETDBE_VERSION_MAJOR}.${MONETDBE_VERSION_MINOR}.${MONETDBE_VERSION_PATCH}") diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,29 @@ +monetdb (11.43.3) unstable; urgency=low + + * Rebuilt. + * GH#7215: ODBC Driver SQLStatistics returns duplicate rows/rows for other + tables + + -- Sjoerd Mullender <[email protected]> Tue, 11 Jan 2022 10:46:27 +0100 + +monetdb (11.43.3) unstable; urgency=low + + * gdk: On Windows, files and directories we create now get the attribute + FILE_ATTIBUTE_NOT_CONTENT_INDEXED, meaning that they should not be + indexed by indexing or search services. + + -- Sjoerd Mullender <[email protected]> Tue, 11 Jan 2022 10:46:27 +0100 + +monetdb (11.43.3) unstable; urgency=low + + * merovingian: Disabled logging into merovingian.log of next info message types: + - proxying client <host>:<port> for database '<dbname>' to <url> + - target connection is on local UNIX domain socket, passing on filedescriptor instead of proxying + These messages were written to the log file at each connection. In most + cases this information is not used. The disabling reduces the log file size. + + -- Martin van Dinther <[email protected]> Thu, 6 Jan 2022 10:46:27 +0100 + monetdb (11.43.1) unstable; urgency=low * Rebuilt. diff --git a/gdk/ChangeLog-Archive b/gdk/ChangeLog-Archive --- a/gdk/ChangeLog-Archive +++ b/gdk/ChangeLog-Archive @@ -1,6 +1,11 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Tue Jan 11 2022 Sjoerd Mullender <[email protected]> - 11.43.3-20220111 +- On Windows, files and directories we create now get the attribute + FILE_ATTIBUTE_NOT_CONTENT_INDEXED, meaning that they should not be + indexed by indexing or search services. + * Mon Jan 3 2022 Panagiotis Koutsourakis <[email protected]> - 11.43.1-20220103 - Implement string imprints (strimps for short) a pre-filter structure for strings in order to accelerate LIKE queries. If a strimp exists diff --git a/gdk/ChangeLog.Jan2022 b/gdk/ChangeLog.Jan2022 --- a/gdk/ChangeLog.Jan2022 +++ b/gdk/ChangeLog.Jan2022 @@ -1,8 +1,3 @@ # ChangeLog file for GDK # This file is updated with Maddlog -* Tue Jan 11 2022 Sjoerd Mullender <[email protected]> -- On Windows, files and directories we create now get the attribute - FILE_ATTIBUTE_NOT_CONTENT_INDEXED, meaning that they should not be - indexed by indexing or search services. - diff --git a/gdk/gdk.h b/gdk/gdk.h --- a/gdk/gdk.h +++ b/gdk/gdk.h @@ -879,6 +879,10 @@ gdk_export size_t HEAPmemsize(Heap *h); gdk_export void HEAPdecref(Heap *h, bool remove); gdk_export void HEAPincref(Heap *h); +#define isVIEW(x) \ + (((x)->theap && (x)->theap->parentid != (x)->batCacheid) || \ + ((x)->tvheap && (x)->tvheap->parentid != (x)->batCacheid)) + /* BAT iterator, also protects use of BAT heaps with reference counts. * * A BAT iterator has to be used with caution, but it does have to be @@ -942,6 +946,7 @@ bat_iterator_nolock(BAT *b) { /* does not get matched by bat_iterator_end */ if (b) { + bool isview = isVIEW(b); return (BATiter) { .b = b, .h = b->theap, @@ -959,8 +964,8 @@ bat_iterator_nolock(BAT *b) (size_t) b->batCount << b->tshift : 0, .vhfree = b->tvheap ? b->tvheap->free : 0, - .minpos = b->tminpos, - .maxpos = b->tmaxpos, + .minpos = isview ? BUN_NONE : b->tminpos, + .maxpos = isview ? BUN_NONE : b->tmaxpos, .unique_est = b->tunique_est, #ifndef NDEBUG .locked = false, @@ -2158,13 +2163,6 @@ gdk_export void VIEWbounds(BAT *b, BAT * } \ } while (false) -/* the parentid in a VIEW is correct for the normal view. We must - * correct for the reversed view. - */ -#define isVIEW(x) \ - (((x)->theap && (x)->theap->parentid != (x)->batCacheid) || \ - ((x)->tvheap && (x)->tvheap->parentid != (x)->batCacheid)) - #define VIEWtparent(x) ((x)->theap == NULL || (x)->theap->parentid == (x)->batCacheid ? 0 : (x)->theap->parentid) #define VIEWvtparent(x) ((x)->tvheap == NULL || (x)->tvheap->parentid == (x)->batCacheid ? 0 : (x)->tvheap->parentid) _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
