Changeset: 8638f7f6521b for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/8638f7f6521b Modified Files: clients/Tests/exports.stable.out Branch: groupjoin Log Message:
merged with default diffs (truncated from 3967 to 300 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/ChangeLog.strimps-updates b/ChangeLog.strimps-updates new file mode 100644 --- /dev/null +++ b/ChangeLog.strimps-updates @@ -0,0 +1,10 @@ +# ChangeLog file for strimpsv2 +# This file is updated with Maddlog + +* Mon Jul 17 2023 Panagiotis Koutsourakis <kutsu...@monetdbsolutions.com> +- Implemented direct masking for strimp construction. The strimps + datastructure now keeps an array of 65K 64-bit integers that is zero + everywhere except at the indexes that correspond to header pairs. The + entry for the nth pair in order has the nth bit of the bitstring + on. These can be used to quickly construct bitstrings. + 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 <sjo...@acm.org> - 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 + (163840000) + +* Thu Jun 22 2023 Sjoerd Mullender <sjo...@acm.org> - 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 <sjo...@acm.org> - 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 <sjo...@acm.org> - 11.47.3-20230622 - Rebuilt. - GH#7344: Database upgrade failure due to user object dependency on 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 @@ -301,6 +301,7 @@ int GDKms(void); gdk_return GDKmunmap(void *addr, size_t len); int GDKnr_threads; void GDKprepareExit(void); +void GDKprintinfo(void); void GDKqsort(void *restrict h, void *restrict t, const void *restrict base, size_t n, int hs, int ts, int tpe, bool reverse, bool nilslast); void *GDKrealloc(void *pold, size_t size) __attribute__((__alloc_size__(2))) __attribute__((__warn_unused_result__)); gdk_return GDKrebuild_segment_tree(oid ncount, oid data_size, BAT *st, void **segment_tree, oid **levels_offset, oid *nlevels); 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", 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 + (163840000) + + -- Sjoerd Mullender <sjo...@acm.org> 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 <sjo...@acm.org> 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 <sjo...@acm.org> Thu, 22 Jun 2023 13:12:19 +0200 + monetdb (11.47.3) unstable; urgency=low * Rebuilt. diff --git a/gdk/CMakeLists.txt b/gdk/CMakeLists.txt --- a/gdk/CMakeLists.txt +++ b/gdk/CMakeLists.txt @@ -89,7 +89,7 @@ target_sources(bat gdk_analytic.h gdk_tracer.c gdk_tracer.h gdk_rtree.c - gdk_strimps.c gdk_strimps.h + gdk_strimps.c PUBLIC ${gdk_public_headers}) 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--) { @@ -2227,31 +2236,27 @@ BBPdump(void) continue; BAT *b = BBP_desc(i); unsigned status = BBP_status(i); - fprintf(stderr, - "# %d: " ALGOOPTBATFMT " " - "refs=%d lrefs=%d " - "status=%u%s", - i, - ALGOOPTBATPAR(b), - BBP_refs(i), - BBP_lrefs(i), - status, - BBP_cache(i) ? "" : " not cached"); + printf("# %d: " ALGOOPTBATFMT "refs=%d lrefs=%d status=%u%s", + i, + ALGOOPTBATPAR(b), + BBP_refs(i), + BBP_lrefs(i), + status, + BBP_cache(i) ? "" : " not cached"); if (b == NULL) { - fprintf(stderr, ", no descriptor\n"); + printf(", no descriptor\n"); continue; } if (b->theap) { if (b->theap->parentid != b->batCacheid) { - fprintf(stderr, " Theap -> %d", b->theap->parentid); + printf(" Theap -> %d", b->theap->parentid); } else { - fprintf(stderr, - " Theap=[%zu,%zu,f=%d]%s%s", - b->theap->free, - b->theap->size, - b->theap->farmid, - b->theap->base == NULL ? "X" : b->theap->storage == STORE_MMAP ? "M" : "", - status & BBPSWAPPED ? "(Swapped)" : b->theap->dirty ? "(Dirty)" : ""); + printf(" Theap=[%zu,%zu,f=%d]%s%s", + b->theap->free, + b->theap->size, + b->theap->farmid, + b->theap->base == NULL ? "X" : b->theap->storage == STORE_MMAP ? "M" : "", + status & BBPSWAPPED ? "(Swapped)" : b->theap->dirty ? "(Dirty)" : ""); mem += HEAPmemsize(b->theap); vm += HEAPvmsize(b->theap); n++; @@ -2259,17 +2264,15 @@ BBPdump(void) } if (b->tvheap) { if (b->tvheap->parentid != b->batCacheid) { - fprintf(stderr, - " Tvheap -> %d", - b->tvheap->parentid); + printf(" Tvheap -> %d", + b->tvheap->parentid); } else { - fprintf(stderr, - " Tvheap=[%zu,%zu,f=%d]%s%s", - b->tvheap->free, - b->tvheap->size, - b->tvheap->farmid, - b->tvheap->base == NULL ? "X" : b->tvheap->storage == STORE_MMAP ? "M" : "", - b->tvheap->dirty ? "(Dirty)" : ""); + printf(" Tvheap=[%zu,%zu,f=%d]%s%s", + b->tvheap->free, + b->tvheap->size, + b->tvheap->farmid, + b->tvheap->base == NULL ? "X" : b->tvheap->storage == STORE_MMAP ? "M" : "", + b->tvheap->dirty ? "(Dirty)" : ""); mem += HEAPmemsize(b->tvheap); vm += HEAPvmsize(b->tvheap); } @@ -2278,19 +2281,19 @@ BBPdump(void) if (b->thash && b->thash != (Hash *) 1) { size_t m = HEAPmemsize(&b->thash->heaplink) + HEAPmemsize(&b->thash->heapbckt); size_t v = HEAPvmsize(&b->thash->heaplink) + HEAPvmsize(&b->thash->heapbckt); - fprintf(stderr, " Thash=[%zu,%zu,f=%d/%d]", m, v, - b->thash->heaplink.farmid, - b->thash->heapbckt.farmid); + printf(" Thash=[%zu,%zu,f=%d/%d]", m, v, + b->thash->heaplink.farmid, + b->thash->heapbckt.farmid); mem += m; vm += v; } MT_rwlock_rdunlock(&b->thashlock); } - fprintf(stderr, " role: %s\n", - b->batRole == PERSISTENT ? "persistent" : "transient"); + printf(" role: %s\n", + b->batRole == PERSISTENT ? "persistent" : "transient"); } - fprintf(stderr, "# %d bats: mem=%zu, vm=%zu\n", n, mem, vm); - fflush(stderr); + printf("# %d bats: mem=%zu, vm=%zu\n", n, mem, vm); + fflush(stdout); } /* @@ -2560,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; _______________________________________________ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
