Changeset: 1058f9e02f7c for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/1058f9e02f7c Branch: literal_features Log Message:
merged with default diffs (truncated from 1087 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -811,3 +811,5 @@ 573511e0e7bf2f7ab11f00b45711aab5f1aff6f2 573511e0e7bf2f7ab11f00b45711aab5f1aff6f2 Jun2023_SP1_release ce63ebe9a78c52ef0cbe8fd6f2159d2637f0387c Jun2023_7 1efa83c6409769d13b2ee30e497d5f7ab42fa955 Jun2023_9 +6f88424ebfd9d82c072cf21d89070e04321983da Jun2023_11 +6f88424ebfd9d82c072cf21d89070e04321983da Jun2023_SP2_release diff --git a/ChangeLog-Archive b/ChangeLog-Archive --- a/ChangeLog-Archive +++ b/ChangeLog-Archive @@ -1,6 +1,10 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Fri Sep 29 2023 Sjoerd Mullender <[email protected]> - 11.47.11-20230929 +- Fixed an installation issue on Debian and Ubuntu introduced in the + last build. + * Wed Aug 30 2023 Sjoerd Mullender <[email protected]> - 11.47.7-20230925 - Do a lot more error checking, mostly for allocation failures. More is still needed, though. diff --git a/ChangeLog.Jun2023 b/ChangeLog.Jun2023 --- a/ChangeLog.Jun2023 +++ b/ChangeLog.Jun2023 @@ -1,7 +1,3 @@ # ChangeLog file for devel # This file is updated with Maddlog -* Fri Sep 29 2023 Sjoerd Mullender <[email protected]> -- Fixed an installation issue on Debian and Ubuntu introduced in the - last build. - diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -860,6 +860,13 @@ fi %endif %changelog +* Fri Sep 29 2023 Sjoerd Mullender <[email protected]> - 11.47.11-20230929 +- Rebuilt. + +* Fri Sep 29 2023 Sjoerd Mullender <[email protected]> - 11.47.11-20230929 +- MonetDB: Fixed an installation issue on Debian and Ubuntu introduced in the + last build. + * Wed Sep 27 2023 Sjoerd Mullender <[email protected]> - 11.47.9-20230927 - Rebuilt. - GH#7402: Privileges on merge table not propagated to partition tables 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 "3") +set(GDK_VERSION_PATCH "4") set(GDK_VERSION "${GDK_VERSION_MAJOR}.${GDK_VERSION_MINOR}.${GDK_VERSION_PATCH}") # version of the MAPI library (subdirectory clients/mapilib) diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +monetdb (11.47.11) unstable; urgency=low + + * Rebuilt. + + -- Sjoerd Mullender <[email protected]> Fri, 29 Sep 2023 12:00:43 +0200 + +monetdb (11.47.11) unstable; urgency=low + + * MonetDB: Fixed an installation issue on Debian and Ubuntu introduced in the + last build. + + -- Sjoerd Mullender <[email protected]> Fri, 29 Sep 2023 12:00:43 +0200 + monetdb (11.47.9) unstable; urgency=low * Rebuilt. diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c --- a/gdk/gdk_logger.c +++ b/gdk/gdk_logger.c @@ -2421,10 +2421,15 @@ log_cleanup_range(logger *lg, ulng id) static void do_rotate(logger *lg) { - logged_range *next = lg->current->next; + logged_range *cur = lg->current; + logged_range *next = cur->next; if (next) { assert(ATOMIC_GET(&next->refcount) == 1); - lg->current = lg->current->next; + lg->current = next; + if (ATOMIC_GET(&cur->refcount) == 1) { + close_stream(cur->output_log); + cur->output_log = NULL; + } } } @@ -3099,7 +3104,14 @@ log_tflush(logger *lg, ulng file_id, uln } /* else somebody else has flushed our log file */ - ATOMIC_DEC(&frange->refcount); + if (ATOMIC_DEC(&frange->refcount) == 1) { + rotation_lock(lg); + if (frange != lg->current) { + close_stream(frange->output_log); + frange->output_log = NULL; + } + rotation_unlock(lg); + } if (ATOMIC_DEC(&lg->nr_flushers) == 0) { /* I am the last flusher diff --git a/gdk/gdk_tm.c b/gdk/gdk_tm.c --- a/gdk/gdk_tm.c +++ b/gdk/gdk_tm.c @@ -61,6 +61,10 @@ epilogue(int cnt, bat *subcommit, bool l BAT *b; if (BBP_status(bid) & BBPPERSISTENT) { + /* first turn off BBPNEW, then turn on + * BBPEXISTING so that concurrent BATassertProps + * doesn't fail */ + BBP_status_off(bid, BBPNEW); BBP_status_on(bid, BBPEXISTING); } else if (BBP_status(bid) & BBPDELETED) { /* check mmap modes of bats that are now 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,16 @@ +monetdb (11.47.11) unstable; urgency=low + + * Rebuilt. + + -- Sjoerd Mullender <[email protected]> Fri, 29 Sep 2023 12:00:43 +0200 + +monetdb (11.47.11) unstable; urgency=low + + * MonetDB: Fixed an installation issue on Debian and Ubuntu introduced in the + last build. + + -- Sjoerd Mullender <[email protected]> Fri, 29 Sep 2023 12:00:43 +0200 + monetdb (11.47.9) 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,10 @@ +* Fri Sep 29 2023 Sjoerd Mullender <[email protected]> - 11.47.11-20230929 +- Rebuilt. + +* Fri Sep 29 2023 Sjoerd Mullender <[email protected]> - 11.47.11-20230929 +- MonetDB: Fixed an installation issue on Debian and Ubuntu introduced in the + last build. + * Wed Sep 27 2023 Sjoerd Mullender <[email protected]> - 11.47.9-20230927 - Rebuilt. - GH#7402: Privileges on merge table not propagated to partition tables diff --git a/monetdb5/modules/atoms/Tests/json01.maltest b/monetdb5/modules/atoms/Tests/json01.maltest --- a/monetdb5/modules/atoms/Tests/json01.maltest +++ b/monetdb5/modules/atoms/Tests/json01.maltest @@ -18,7 +18,7 @@ f:= json.filter(b,"f1") query T rowsort io.print(f) ---- -"[1]" +"1" statement ok b:= json.new("{\"f1\":1,\"f2\":2}") @@ -29,7 +29,7 @@ f:= json.filter(b,"f2") query T rowsort io.print(f) ---- -"[2]" +"2" statement ok f:= json.filter(b,"f1,f2") @@ -48,7 +48,7 @@ f:= json.filter(b,"f1[0]") query T rowsort io.print(f) ---- -"[1]" +"3" statement ok f:= json.filter(b,"f1[1]") @@ -56,7 +56,7 @@ f:= json.filter(b,"f1[1]") query T rowsort io.print(f) ---- -"[3]" +"3" statement ok f:= json.filter(b,"f1[2]") @@ -91,7 +91,7 @@ f:= json.filter(b,"f1") query T rowsort io.print(f) ---- -"[{\"f12\":3}]" +"{\"f12\":3}" statement ok f:= json.filter(b,"f1.f12") @@ -99,7 +99,7 @@ f:= json.filter(b,"f1.f12") query T rowsort io.print(f) ---- -"[3]" +"3" statement ok f:= json.filter(b,"$.f1.f12") @@ -107,7 +107,7 @@ f:= json.filter(b,"$.f1.f12") query T rowsort io.print(f) ---- -"[3]" +"3" statement ok f:= json.filter(b,"..f12") @@ -126,7 +126,7 @@ f:= json.filter(b,"[0]") query T rowsort io.print(f) ---- -"[1]" +"1" statement ok f:= json.filter(b,"[1]") @@ -134,7 +134,7 @@ f:= json.filter(b,"[1]") query T rowsort io.print(f) ---- -"[\"f2\"]" +"\"f2\"" statement ok f:= json.filter(b,"[2]") @@ -142,7 +142,7 @@ f:= json.filter(b,"[2]") query T rowsort io.print(f) ---- -"[2]" +"2" statement ok f:= json.filter(b,"[3]") @@ -169,7 +169,7 @@ f:= json.filter(b,"[0]") query T rowsort io.print(f) ---- -"[{\"boter\":1}]" +"{\"boter\":1}" statement ok f:= json.filter(b,"[0].boter") @@ -177,7 +177,7 @@ f:= json.filter(b,"[0].boter") query T rowsort io.print(f) ---- -"[1]" +"1" statement ok f:= json.filter(b,"[1]") @@ -185,7 +185,7 @@ f:= json.filter(b,"[1]") query T rowsort io.print(f) ---- -"[{\"kaas\":2}]" +"{\"kaas\":2}" statement ok f:= json.filter(b,"[1].kaas") @@ -193,7 +193,7 @@ f:= json.filter(b,"[1].kaas") query T rowsort io.print(f) ---- -"[2]" +"2" statement ok f:= json.filter(b,"[2]") @@ -201,7 +201,7 @@ f:= json.filter(b,"[2]") query T rowsort io.print(f) _______________________________________________ checkin-list mailing list -- [email protected] To unsubscribe send an email to [email protected]
