MonetDB: default - PYTHON_MAP and PYTHON3_MAP were removed.
Changeset: 131bcf476db4 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/131bcf476db4
Modified Files:
clients/mapiclient/mhelp.c
Branch: default
Log Message:
PYTHON_MAP and PYTHON3_MAP were removed.
diffs (12 lines):
diff --git a/clients/mapiclient/mhelp.c b/clients/mapiclient/mhelp.c
--- a/clients/mapiclient/mhelp.c
+++ b/clients/mapiclient/mhelp.c
@@ -743,7 +743,7 @@ SQLhelp sqlhelp2[] = {
NULL},
{"language_keyword",
NULL,
-"C | CPP | R | PYTHON | PYTHON_MAP | PYTHON3 | PYTHON3_MAP",
+"C | CPP | R | PYTHON | PYTHON3",
NULL,
NULL},
{"match_options",
___
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: Jun2023 - On initialization, reduce size of BBP; handov...
Changeset: 592c49a02629 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/592c49a02629
Modified Files:
gdk/gdk_bbp.c
Branch: Jun2023
Log Message:
On initialization, reduce size of BBP; handover higher numbered bats to global
free list.
Also, add a debugger only function printlist(bat bid) to print a free
list, only usable from the debugger.
diffs (89 lines):
diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -1699,6 +1699,15 @@ BBPinit(void)
fclose(fp);
}
+ /* remove trailing free bats from potential free list (they will
+* get added when needed) */
+ for (bat i = (bat) ATOMIC_GET(&BBPsize) - 1; i > 0; i--) {
+ if (BBP_desc(i) != NULL)
+ break;
+ bbpsize--;
+ }
+ ATOMIC_SET(&BBPsize, bbpsize);
+
/* add free bats to free list in such a way that low numbered
* ones are at the head of the list */
for (bat i = (bat) ATOMIC_GET(&BBPsize) - 1; i > 0; i--) {
@@ -2559,36 +2568,51 @@ BBPuncacheit(bat i, bool unloaddesc)
* BBPclear removes a BAT from the BBP directory forever.
*/
static inline void
-BBPhandover(Thread t, int n)
+BBPhandover(Thread t, uint32_t n)
{
+ bat *p, bid;
/* take one bat from our private free list and hand it over to
* the global free list */
- bat i = t->freebats;
- bat bid = i;
- if (i == 0)
- return;
- for (int j = 1; j < n; j++) {
- if (BBP_next(i) == 0) {
- n = j;
- break;
- }
- i = BBP_next(i);
+ if (n >= t->nfreebats) {
+ bid = t->freebats;
+ t->freebats = 0;
+ t->nfreebats = 0;
+ } else {
+ p = &t->freebats;
+ for (uint32_t i = n; i < t->nfreebats; i++)
+ p = &BBP_next(*p);
+ bid = *p;
+ *p = 0;
+ t->nfreebats -= n;
}
- t->freebats = BBP_next(i);
- t->nfreebats -= n;
- BBP_next(i) = 0;
- bat *p = &BBP_free;
- while (n > 0) {
+ p = &BBP_free;
+ while (bid != 0) {
while (*p && *p < bid)
p = &BBP_next(*p);
- i = BBP_next(bid);
+ bat i = BBP_next(bid);
BBP_next(bid) = *p;
*p = bid;
bid = i;
- n--;
}
}
+#ifndef NDEBUG
+extern void printlist(bat bid) __attribute__((__cold__));
+/* print a bat free list, pass start of free list as argument
+ * to be used from the debugger */
+void
+printlist(bat bid)
+{
+ int n = 0;
+ while (bid) {
+ printf("%d ", bid);
+ bid = BBP_next(bid);
+ n++;
+ }
+ printf("(%d)\n", n);
+}
+#endif
+
static inline void
bbpclear(bat i, bool lock)
{
___
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: default - Merge with Jun2023 branch.
Changeset: 0aacfb64b8d2 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/0aacfb64b8d2
Modified Files:
gdk/gdk_bbp.c
gdk/gdk_heap.c
gdk/gdk_private.h
gdk/gdk_utils.c
tools/mserver/mserver5.c
Branch: default
Log Message:
Merge with Jun2023 branch.
diffs (truncated from 326 to 300 lines):
diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -1700,6 +1700,15 @@ BBPinit(void)
fclose(fp);
}
+ /* remove trailing free bats from potential free list (they will
+* get added when needed) */
+ for (bat i = (bat) ATOMIC_GET(&BBPsize) - 1; i > 0; i--) {
+ if (BBP_desc(i) != NULL)
+ break;
+ bbpsize--;
+ }
+ ATOMIC_SET(&BBPsize, bbpsize);
+
/* add free bats to free list in such a way that low numbered
* ones are at the head of the list */
for (bat i = (bat) ATOMIC_GET(&BBPsize) - 1; i > 0; i--) {
@@ -2554,36 +2563,51 @@ BBPuncacheit(bat i, bool unloaddesc)
* BBPclear removes a BAT from the BBP directory forever.
*/
static inline void
-BBPhandover(Thread t, int n)
+BBPhandover(Thread t, uint32_t n)
{
+ bat *p, bid;
/* take one bat from our private free list and hand it over to
* the global free list */
- bat i = t->freebats;
- bat bid = i;
- if (i == 0)
- return;
- for (int j = 1; j < n; j++) {
- if (BBP_next(i) == 0) {
- n = j;
- break;
- }
- i = BBP_next(i);
+ if (n >= t->nfreebats) {
+ bid = t->freebats;
+ t->freebats = 0;
+ t->nfreebats = 0;
+ } else {
+ p = &t->freebats;
+ for (uint32_t i = n; i < t->nfreebats; i++)
+ p = &BBP_next(*p);
+ bid = *p;
+ *p = 0;
+ t->nfreebats -= n;
}
- t->freebats = BBP_next(i);
- t->nfreebats -= n;
- BBP_next(i) = 0;
- bat *p = &BBP_free;
- while (n > 0) {
+ p = &BBP_free;
+ while (bid != 0) {
while (*p && *p < bid)
p = &BBP_next(*p);
- i = BBP_next(bid);
+ bat i = BBP_next(bid);
BBP_next(bid) = *p;
*p = bid;
bid = i;
- n--;
}
}
+#ifndef NDEBUG
+extern void printlist(bat bid) __attribute__((__cold__));
+/* print a bat free list, pass start of free list as argument
+ * to be used from the debugger */
+void
+printlist(bat bid)
+{
+ int n = 0;
+ while (bid) {
+ printf("%d ", bid);
+ bid = BBP_next(bid);
+ n++;
+ }
+ printf("(%d)\n", n);
+}
+#endif
+
static inline void
bbpclear(bat i, bool lock)
{
diff --git a/gdk/gdk_heap.c b/gdk/gdk_heap.c
--- a/gdk/gdk_heap.c
+++ b/gdk/gdk_heap.c
@@ -157,6 +157,14 @@ HEAPalloc(Heap *h, size_t nitems, size_t
h->free = 0;
h->cleanhash = false;
+#ifdef SIZE_CHECK_IN_HEAPS_ONLY
+ if (GDKvm_cursize() + h->size >= GDK_vm_maxsize &&
+ !MT_thread_override_limits()) {
+ GDKerror("allocating too much memory (current: %zu, requested:
%zu, limit: %zu)\n", GDKvm_cursize(), h->size, GDK_vm_maxsize);
+ return GDK_FAIL;
+ }
+#endif
+
size_t allocated;
if (GDKinmemory(h->farmid) ||
((allocated = GDKmem_cursize()) + h->size < GDK_mem_maxsize &&
@@ -255,6 +263,14 @@ HEAPextend(Heap *h, size_t size, bool ma
}
failure = "size > h->size";
+#ifdef SIZE_CHECK_IN_HEAPS_ONLY
+ if (GDKvm_cursize() + size - h->size >= GDK_vm_maxsize &&
+ !MT_thread_override_limits()) {
+ GDKerror("allocating too much memory (current: %zu, requested:
%zu, limit: %zu)\n", GDKvm_cursize(), size - h->size, GDK_vm_maxsize);
+ return GDK_FAIL;
+ }
+#endif
+
if (h->storage != STORE_MEM) {
char *p;
char *path;
@@ -826,6 +842,14 @@ HEAPload_intern(Heap *h, const char *nme
GDKfree(srcpath);
GDKfree(dstpath);
+#ifdef SIZE_CHECK_IN_HEAPS_ONLY
+ if (GDKvm_cursize() + h->size >= GDK_vm_maxsize &&
+ !MT_thread_override_limits()) {
+ GDKerror("allocating too much memory (current: %zu, requested:
%zu, limit: %zu)\n", GDKvm_cursize(), h->size, GDK_vm_maxsize);
+ return GDK_FAIL;
+ }
+#endif
+
size_t size = h->size;
QryCtx *qc = NULL;
if (h->storage != STORE_MEM)
diff --git a/gdk/gdk_private.h b/gdk/gdk_private.h
--- a/gdk/gdk_private.h
+++ b/gdk/gdk_private.h
@@ -23,6 +23,9 @@
/* persist strimp heaps for persistent BATs */
#define PERSISTENTSTRIMP 1
+/* only check whether we exceed gdk_vm_maxsize when allocating heaps */
+/* #define SIZE_CHECK_IN_HEAPS_ONLY
MonetDB: Jun2023 - Pre-release version number update.
Changeset: 25889c65b7ea for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/25889c65b7ea
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: Jun2023
Log Message:
Pre-release version number update.
diffs (191 lines):
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
[bumpversion]
-current_version = 11.47.4
+current_version = 11.47.5
commit = False
tag = False
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -7,7 +7,7 @@
# Copyright 1997 - July 2008 CWI, August 2008 - 2023 MonetDB B.V.
%global name MonetDB
-%global version 11.47.4
+%global version 11.47.5
%{!?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,47,4)
- PRODUCTVERSION version(11,47,4)
+ FILEVERSION version(11,47,5)
+ PRODUCTVERSION version(11,47,5)
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,47,4)
+ VALUE "FileVersion", sversion(11,47,5)
VALUE "InternalName", "Mapi\0"
VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2023\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "Mapi.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB Client Libraries\0"
- VALUE "ProductVersion", sversion(11,47,4)
+ VALUE "ProductVersion", sversion(11,47,5)
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,47,4)
- PRODUCTVERSION version(11,47,4)
+ FILEVERSION version(11,47,5)
+ PRODUCTVERSION version(11,47,5)
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,47,4)
+ VALUE "FileVersion", sversion(11,47,5)
VALUE "InternalName", "MonetODBC\0"
VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2023\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "MonetODBC.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB SQL Server\0"
- VALUE "ProductVersion", sversion(11,47,4)
+ VALUE "ProductVersion", sversion(11,47,5)
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,47,4)
- PRODUCTVERSION version(11,47,4)
+ FILEVERSION version(11,47,5)
+ PRODUCTVERSION version(11,47,5)
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,47,4)
+VALUE "FileVersion", sversion(11,47,5)
VALUE "InternalName", "MonetODBCs.dll"
VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2023"
VALUE "OriginalFilename", "MonetODBCs.dll"
VALUE "ProductName", "MonetDB SQL Server"
-VALUE "ProductVersion", sversion(11,47,4)
+VALUE "ProductVersion", sversion(11,47,5)
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
@@ -10,10 +10,10 @@
set(MONETDB_VERSION_MAJOR "11")
set(MONETDB_VERSION_MINOR "47")
-set(MONETDB_VERSION_PATCH "4")
+set(MONETDB_VERSION_PATCH "5")
if(RELEASE_VERSION)
- set(MONETDB_RELEASE "unreleased")
+ set(MONETDB_RELEASE "Jun2023-SP1")
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
MonetDB: default - Merge with Jun2023 branch, not changing any f...
Changeset: 7057b40701a5 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/7057b40701a5 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: default Log Message: Merge with Jun2023 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: Jun2023 - Updated library versions.
Changeset: 78fea3abc2f0 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/78fea3abc2f0
Modified Files:
cmake/monetdb-versions.cmake
Branch: Jun2023
Log Message:
Updated library versions.
diffs (35 lines):
diff --git a/cmake/monetdb-versions.cmake b/cmake/monetdb-versions.cmake
--- a/cmake/monetdb-versions.cmake
+++ b/cmake/monetdb-versions.cmake
@@ -42,7 +42,7 @@ set(MONETDB_VERSION "${MONETDB_VERSION_M
# common/options and common/utils)
set(GDK_VERSION_MAJOR "27")
set(GDK_VERSION_MINOR "0")
-set(GDK_VERSION_PATCH "1")
+set(GDK_VERSION_PATCH "2")
set(GDK_VERSION
"${GDK_VERSION_MAJOR}.${GDK_VERSION_MINOR}.${GDK_VERSION_PATCH}")
# version of the MAPI library (subdirectory clients/mapilib)
@@ -54,13 +54,13 @@ set(MAPI_VERSION "${MAPI_VERSION_MAJOR}.
# version of the MONETDB5 library (subdirectory monetdb5, not including extras
or sql)
set(MONETDB5_VERSION_MAJOR "34")
set(MONETDB5_VERSION_MINOR "0")
-set(MONETDB5_VERSION_PATCH "1")
+set(MONETDB5_VERSION_PATCH "2")
set(MONETDB5_VERSION
"${MONETDB5_VERSION_MAJOR}.${MONETDB5_VERSION_MINOR}.${MONETDB5_VERSION_PATCH}")
# version of the MONETDBE library (subdirectory tools/monetdbe)
set(MONETDBE_VERSION_MAJOR "26")
set(MONETDBE_VERSION_MINOR "0")
-set(MONETDBE_VERSION_PATCH "2")
+set(MONETDBE_VERSION_PATCH "3")
set(MONETDBE_VERSION
"${MONETDBE_VERSION_MAJOR}.${MONETDBE_VERSION_MINOR}.${MONETDBE_VERSION_PATCH}")
# version of the STREAM library (subdirectory common/stream)
@@ -72,5 +72,5 @@ set(STREAM_VERSION "${STREAM_VERSION_MAJ
# version of the SQL library (subdirectory sql)
set(SQL_VERSION_MAJOR "14")
set(SQL_VERSION_MINOR "0")
-set(SQL_VERSION_PATCH "1")
+set(SQL_VERSION_PATCH "2")
set(SQL_VERSION
"${SQL_VERSION_MAJOR}.${SQL_VERSION_MINOR}.${SQL_VERSION_PATCH}")
___
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: Jun2023 - Moved contents of ChangeLog.Jun2023 to MonetD...
Changeset: 573511e0e7bf for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/573511e0e7bf
Modified Files:
MonetDB.spec
debian/changelog
misc/packages/deb/changelog
misc/packages/rpm/changelog
monetdb5/ChangeLog-Archive
monetdb5/ChangeLog.Jun2023
sql/ChangeLog-Archive
sql/ChangeLog.Jun2023
Branch: Jun2023
Log Message:
Moved contents of ChangeLog.Jun2023 to MonetDB.spec, debian/changelog and
ChangeLog-Archive.
diffs (188 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -89,7 +89,7 @@ Group: Applications/Databases
License: MPL-2.0
URL: https://www.monetdb.org/
BugURL: https://github.com/MonetDB/MonetDB/issues
-Source:
https://www.monetdb.org/downloads/sources/Jun2023/%{name}-%{version}.tar.bz2
+Source:
https://www.monetdb.org/downloads/sources/Jun2023-SP1/%{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
@@ -860,6 +860,24 @@ fi
%endif
%changelog
+* Tue Jul 18 2023 Sjoerd Mullender - 11.47.5-20230718
+- Rebuilt.
+- GH#7388: Query results in large cross product
+- GH#7394: BBPextend: ERROR: trying to extend BAT pool beyond the limit
+ (16384)
+
+* Thu Jun 22 2023 Sjoerd Mullender - 11.47.5-20230718
+- sql: An upgrade that both creates a new .snapshot user and extends the
+ sys.db_user_info table with (among others) a password column did
+ these in such a way that the passord value for the new user was NULL.
+ This is fixed by updating the password.
+
+* Thu Jun 22 2023 Sjoerd Mullender - 11.47.5-20230718
+- monetdb5: There is now a new option --set tablet_threads=N to limit the
number
+ of threads used for a COPY INTO from CSV file query. This option can
+ also be set for a specific database using the monetdb command using
+ the ncopyintothreads property.
+
* Thu Jun 22 2023 Sjoerd Mullender - 11.47.3-20230622
- Rebuilt.
- GH#7344: Database upgrade failure due to user object dependency on
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,30 @@
+monetdb (11.47.5) unstable; urgency=low
+
+ * Rebuilt.
+ * GH#7388: Query results in large cross product
+ * GH#7394: BBPextend: ERROR: trying to extend BAT pool beyond the limit
+(16384)
+
+ -- Sjoerd Mullender Tue, 18 Jul 2023 13:12:19 +0200
+
+monetdb (11.47.5) unstable; urgency=low
+
+ * sql: An upgrade that both creates a new .snapshot user and extends the
+sys.db_user_info table with (among others) a password column did
+these in such a way that the passord value for the new user was NULL.
+This is fixed by updating the password.
+
+ -- Sjoerd Mullender Thu, 22 Jun 2023 13:12:19 +0200
+
+monetdb (11.47.5) unstable; urgency=low
+
+ * monetdb5: There is now a new option --set tablet_threads=N to limit the
number
+of threads used for a COPY INTO from CSV file query. This option can
+also be set for a specific database using the monetdb command using
+the ncopyintothreads property.
+
+ -- Sjoerd Mullender Thu, 22 Jun 2023 13:12:19 +0200
+
monetdb (11.47.3) unstable; urgency=low
* Rebuilt.
diff --git a/misc/packages/deb/changelog b/misc/packages/deb/changelog
--- a/misc/packages/deb/changelog
+++ b/misc/packages/deb/changelog
@@ -1,3 +1,30 @@
+monetdb (11.47.5) unstable; urgency=low
+
+ * Rebuilt.
+ * GH#7388: Query results in large cross product
+ * GH#7394: BBPextend: ERROR: trying to extend BAT pool beyond the limit
+(16384)
+
+ -- Sjoerd Mullender Tue, 18 Jul 2023 13:12:19 +0200
+
+monetdb (11.47.5) unstable; urgency=low
+
+ * sql: An upgrade that both creates a new .snapshot user and extends the
+sys.db_user_info table with (among others) a password column did
+these in such a way that the passord value for the new user was NULL.
+This is fixed by updating the password.
+
+ -- Sjoerd Mullender Thu, 22 Jun 2023 13:12:19 +0200
+
+monetdb (11.47.5) unstable; urgency=low
+
+ * monetdb5: There is now a new option --set tablet_threads=N to limit the
number
+of threads used for a COPY INTO from CSV file query. This option can
+also be set for a specific database using the monetdb command using
+the ncopyintothreads property.
+
+ -- Sjoerd Mullender Thu, 22 Jun 2023 13:12:19 +0200
+
monetdb (11.47.3) unstable; urgency=low
* Rebuilt.
diff --git a/misc/packages/rpm/changelog b/misc/packages/rpm/changelog
--- a/misc/packages/rpm/changelog
+++ b/misc/packages/rpm/changelog
@@ -1,3 +1,21 @@
+* Tue Jul 18 2023 Sjoerd Mullender - 11.47.5-20230718
+- Rebuilt.
+- GH#7388: Query results in large cross product
+- GH#7394: BBPextend: ERROR: trying to extend BAT pool beyond the limit
+ (16384)
+
+* Thu Jun 22 2023 Sjoerd Mullender - 11.47.5-20230718
+- sql: An upgrade that both creates a new .snapshot user and extends the
+ sys.db_user_info table with (among others) a
MonetDB: Jun2023 - Setting tag Jun2023_5 for the release build.
Changeset: 49df889d99c5 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/49df889d99c5 Modified Files: .hgtags Branch: Jun2023 Log Message: Setting tag Jun2023_5 for the release build. diffs (8 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -807,3 +807,4 @@ 8b736d6dcfd63d0560c99fc5427b504c116b74b0 aba8c31c60480148cd388a09ac99b42679406258 Jun2023_1 79dbf838f04483a2d9ccce8332090ff91b18caec Jun2023_3 79dbf838f04483a2d9ccce8332090ff91b18caec Jun2023_release +573511e0e7bf2f7ab11f00b45711aab5f1aff6f2 Jun2023_5 ___ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: Jun2023 - Post release build.
Changeset: 0cd53dcc5c70 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/0cd53dcc5c70
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: Jun2023
Log Message:
Post release build.
diffs (191 lines):
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
[bumpversion]
-current_version = 11.47.5
+current_version = 11.47.6
commit = False
tag = False
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -7,7 +7,7 @@
# Copyright 1997 - July 2008 CWI, August 2008 - 2023 MonetDB B.V.
%global name MonetDB
-%global version 11.47.5
+%global version 11.47.6
%{!?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,47,5)
- PRODUCTVERSION version(11,47,5)
+ FILEVERSION version(11,47,6)
+ PRODUCTVERSION version(11,47,6)
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,47,5)
+ VALUE "FileVersion", sversion(11,47,6)
VALUE "InternalName", "Mapi\0"
VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2023\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "Mapi.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB Client Libraries\0"
- VALUE "ProductVersion", sversion(11,47,5)
+ VALUE "ProductVersion", sversion(11,47,6)
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,47,5)
- PRODUCTVERSION version(11,47,5)
+ FILEVERSION version(11,47,6)
+ PRODUCTVERSION version(11,47,6)
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,47,5)
+ VALUE "FileVersion", sversion(11,47,6)
VALUE "InternalName", "MonetODBC\0"
VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2023\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "MonetODBC.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB SQL Server\0"
- VALUE "ProductVersion", sversion(11,47,5)
+ VALUE "ProductVersion", sversion(11,47,6)
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,47,5)
- PRODUCTVERSION version(11,47,5)
+ FILEVERSION version(11,47,6)
+ PRODUCTVERSION version(11,47,6)
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,47,5)
+VALUE "FileVersion", sversion(11,47,6)
VALUE "InternalName", "MonetODBCs.dll"
VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2023"
VALUE "OriginalFilename", "MonetODBCs.dll"
VALUE "ProductName", "MonetDB SQL Server"
-VALUE "ProductVersion", sversion(11,47,5)
+VALUE "ProductVersion", sversion(11,47,6)
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
@@ -10,10 +10,10 @@
set(MONETDB_VERSION_MAJOR "11")
set(MONETDB_VERSION_MINOR "47")
-set(MONETDB_VERSION_PATCH "5")
+set(MONETDB_VERSION_PATCH "6")
if(RELEASE_VERSION)
- set(MONETDB_RELEASE "Jun2023-SP1")
+ 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 @@ LANG
MonetDB: default - Merge with Jun2023 branch.
Changeset: f1e05acecfa3 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/f1e05acecfa3
Modified Files:
.hgtags
MonetDB.spec
cmake/monetdb-versions.cmake
debian/changelog
misc/packages/deb/changelog
misc/packages/rpm/changelog
Branch: default
Log Message:
Merge with Jun2023 branch.
diffs (231 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -807,3 +807,4 @@ 8b736d6dcfd63d0560c99fc5427b504c116b74b0
aba8c31c60480148cd388a09ac99b42679406258 Jun2023_1
79dbf838f04483a2d9ccce8332090ff91b18caec Jun2023_3
79dbf838f04483a2d9ccce8332090ff91b18caec Jun2023_release
+573511e0e7bf2f7ab11f00b45711aab5f1aff6f2 Jun2023_5
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -89,7 +89,7 @@ Group: Applications/Databases
License: MPL-2.0
URL: https://www.monetdb.org/
BugURL: https://github.com/MonetDB/MonetDB/issues
-Source:
https://www.monetdb.org/downloads/sources/Jun2023/%{name}-%{version}.tar.bz2
+Source:
https://www.monetdb.org/downloads/sources/Jun2023-SP1/%{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
@@ -860,6 +860,24 @@ fi
%endif
%changelog
+* Tue Jul 18 2023 Sjoerd Mullender - 11.47.5-20230718
+- Rebuilt.
+- GH#7388: Query results in large cross product
+- GH#7394: BBPextend: ERROR: trying to extend BAT pool beyond the limit
+ (16384)
+
+* Thu Jun 22 2023 Sjoerd Mullender - 11.47.5-20230718
+- sql: An upgrade that both creates a new .snapshot user and extends the
+ sys.db_user_info table with (among others) a password column did
+ these in such a way that the passord value for the new user was NULL.
+ This is fixed by updating the password.
+
+* Thu Jun 22 2023 Sjoerd Mullender - 11.47.5-20230718
+- monetdb5: There is now a new option --set tablet_threads=N to limit the
number
+ of threads used for a COPY INTO from CSV file query. This option can
+ also be set for a specific database using the monetdb command using
+ the ncopyintothreads property.
+
* Thu Jun 22 2023 Sjoerd Mullender - 11.47.3-20230622
- Rebuilt.
- GH#7344: Database upgrade failure due to user object dependency on
diff --git a/cmake/monetdb-versions.cmake b/cmake/monetdb-versions.cmake
--- a/cmake/monetdb-versions.cmake
+++ b/cmake/monetdb-versions.cmake
@@ -42,7 +42,7 @@ set(MONETDB_VERSION "${MONETDB_VERSION_M
# common/options and common/utils)
set(GDK_VERSION_MAJOR "27")
set(GDK_VERSION_MINOR "0")
-set(GDK_VERSION_PATCH "1")
+set(GDK_VERSION_PATCH "2")
set(GDK_VERSION
"${GDK_VERSION_MAJOR}.${GDK_VERSION_MINOR}.${GDK_VERSION_PATCH}")
# version of the MAPI library (subdirectory clients/mapilib)
@@ -54,13 +54,13 @@ set(MAPI_VERSION "${MAPI_VERSION_MAJOR}.
# version of the MONETDB5 library (subdirectory monetdb5, not including extras
or sql)
set(MONETDB5_VERSION_MAJOR "34")
set(MONETDB5_VERSION_MINOR "0")
-set(MONETDB5_VERSION_PATCH "1")
+set(MONETDB5_VERSION_PATCH "2")
set(MONETDB5_VERSION
"${MONETDB5_VERSION_MAJOR}.${MONETDB5_VERSION_MINOR}.${MONETDB5_VERSION_PATCH}")
# version of the MONETDBE library (subdirectory tools/monetdbe)
set(MONETDBE_VERSION_MAJOR "26")
set(MONETDBE_VERSION_MINOR "0")
-set(MONETDBE_VERSION_PATCH "2")
+set(MONETDBE_VERSION_PATCH "3")
set(MONETDBE_VERSION
"${MONETDBE_VERSION_MAJOR}.${MONETDBE_VERSION_MINOR}.${MONETDBE_VERSION_PATCH}")
# version of the STREAM library (subdirectory common/stream)
@@ -72,5 +72,5 @@ set(STREAM_VERSION "${STREAM_VERSION_MAJ
# version of the SQL library (subdirectory sql)
set(SQL_VERSION_MAJOR "14")
set(SQL_VERSION_MINOR "0")
-set(SQL_VERSION_PATCH "1")
+set(SQL_VERSION_PATCH "2")
set(SQL_VERSION
"${SQL_VERSION_MAJOR}.${SQL_VERSION_MINOR}.${SQL_VERSION_PATCH}")
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,30 @@
+monetdb (11.47.5) unstable; urgency=low
+
+ * Rebuilt.
+ * GH#7388: Query results in large cross product
+ * GH#7394: BBPextend: ERROR: trying to extend BAT pool beyond the limit
+(16384)
+
+ -- Sjoerd Mullender Tue, 18 Jul 2023 13:12:19 +0200
+
+monetdb (11.47.5) unstable; urgency=low
+
+ * sql: An upgrade that both creates a new .snapshot user and extends the
+sys.db_user_info table with (among others) a password column did
+these in such a way that the passord value for the new user was NULL.
+This is fixed by updating the password.
+
+ -- Sjoerd Mullender Thu, 22 Jun 2023 13:12:19 +0200
+
+monetdb (11.47.5) unstable; urgency=low
+
+ * monetdb5: There is now a new option --set tablet_threads=N to limit the
number
+of threads used for a COPY INTO from CSV file query. This option can
+also be se
MonetDB: default - Merge with Jun2023 branch, not changing any f...
Changeset: 81b0a97051b6 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/81b0a97051b6 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: default Log Message: Merge with Jun2023 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: Jun2023 - Ported to Python 3.12, new code also used on ...
Changeset: 2ddcea96061c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/2ddcea96061c
Modified Files:
sql/backends/monet5/UDF/pyapi3/type_conversion3.c
Branch: Jun2023
Log Message:
Ported to Python 3.12, new code also used on 3.10 and 3.11.
On 3.12 the representation of the Python Long was changed, so now we
avoid looking into the object completely and use slightly higher level
interfaces to get at needed information.
diffs (234 lines):
diff --git a/sql/backends/monet5/UDF/pyapi3/type_conversion3.c
b/sql/backends/monet5/UDF/pyapi3/type_conversion3.c
--- a/sql/backends/monet5/UDF/pyapi3/type_conversion3.c
+++ b/sql/backends/monet5/UDF/pyapi3/type_conversion3.c
@@ -9,6 +9,7 @@
*/
#include "monetdb_config.h"
+#define PY_SSIZE_T_CLEAN
#include "type_conversion.h"
#include "unicode.h"
@@ -42,6 +43,7 @@ int hge_to_string(char *str, hge x)
PyObject *PyLong_FromHge(hge h)
{
+#if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION < 10
PyLongObject *z;
size_t size = 0;
hge shift = h >= 0 ? h : -h;
@@ -65,6 +67,15 @@ PyObject *PyLong_FromHge(hge h)
#endif
}
return (PyObject *)z;
+#else
+ return PyObject_CallMethod((PyObject *) &PyLong_Type, "from_bytes",
"(y#s)", &h, (Py_ssize_t) sizeof(h),
+#ifdef WORDS_BIGENDIAN
+ "big"
+#else
+ "little"
+#endif
+ );
+#endif
}
#endif
@@ -255,23 +266,23 @@ wrapup:
return msg;
}
-#define STRING_TO_NUMBER_FACTORY(tpe)
\
- str str_to_##tpe(const char *ptr, size_t maxsize, tpe *value)
\
- {
\
- size_t len = sizeof(tpe);
\
- char buf[256];
\
- if (maxsize > 0) {
\
- if (maxsize >= sizeof(buf))
\
- maxsize = sizeof(buf) - 1;
\
- strncpy(buf, ptr, maxsize);
\
- buf[maxsize] = 0;
\
- if (strlen(buf) >= sizeof(buf) - 1)
\
- return GDKstrdup("string too long to
convert."); \
- ptr = buf;
\
- }
\
+#define STRING_TO_NUMBER_FACTORY(tpe)
\
+ str str_to_##tpe(const char *ptr, size_t maxsize, tpe *value)
\
+ {
\
+ size_t len = sizeof(tpe);
\
+ char buf[256];
\
+ if (maxsize > 0) {
\
+ if (maxsize >= sizeof(buf))
\
+ maxsize = sizeof(buf) - 1;
\
+ strncpy(buf, ptr, maxsize);
\
+ buf[maxsize] = 0;
\
+ if (strlen(buf) >= sizeof(buf) - 1)
\
+ return GDKstrdup("string too long to
convert.");\
+ ptr = buf;
\
+ }
\
if (BATatoms[TYPE_##tpe].atomFromStr(ptr, &len, (void
**)&value, false) < 0) \
- return GDKstrdup("Error converting string.");
\
- return MAL_SUCCEED;
\
+ return GDKstrdup("Error converting string.");
\
+ return MAL_SUCCEED;
