Changeset: e25c61739b28 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/e25c61739b28 Modified Files: clients/Tests/exports.stable.out gdk/gdk_logger.c sql/storage/bat/bat_logger.c sql/storage/sql_storage.h sql/storage/store.c Branch: group-commit Log Message:
Merge with default. diffs (truncated from 40314 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -758,3 +758,6 @@ 00463fdd0d51d7ce058549a82bc74efaea6035a2 db3cec8ea853884e857fcfb413428116cb95e786 Jul2021_17 8c015afafb5903ea59b0e2cffac1138a0d82e007 Jul2021_19 8c015afafb5903ea59b0e2cffac1138a0d82e007 Jul2021_SP4_release +cab90a348501b045e19cee5cebcc44f3800bd0a8 Jul2021_21 +cab90a348501b045e19cee5cebcc44f3800bd0a8 Jul2021_SP5_release +5872f047d97c98d3a848514438b8f97fa446855d Jan2022_11 diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -81,7 +81,7 @@ Group: Applications/Databases License: MPLv2.0 URL: https://www.monetdb.org/ BugURL: https://bugs.monetdb.org/ -Source: https://www.monetdb.org/downloads/sources/Jan2022-SP1/%{name}-%{version}.tar.bz2 +Source: https://www.monetdb.org/downloads/sources/Jan2022-SP2/%{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 @@ -848,6 +848,37 @@ fi %endif %changelog +* Fri Mar 25 2022 Sjoerd Mullender <sjo...@acm.org> - 11.43.11-20220325 +- Rebuilt. +- GH#7252: Segmentation fault on second run +- GH#7253: Extremely slow INSERT INTO <table> SELECT +- GH#7254: Commit with deletions is very slow +- GH#7263: PRIMARY KEY constraint is not persistent through server restarts +- GH#7267: Update after delete does not update some rows + +* Fri Mar 18 2022 Sjoerd Mullender <sjo...@acm.org> - 11.43.11-20220325 +- gdk: Fixed a race condition which could cause a too large size being written + for a .theap file to the BBP.dir file after the correct size file had + been saved to disk. +- gdk: We now ignore the size and capacity columns in the BBP.dir file. + These values are essential during run time, but not useful in the + on-disk image of the database. + +* Wed Mar 9 2022 Sjoerd Mullender <sjo...@acm.org> - 11.43.11-20220325 +- gdk: Fixed a bug in the append code for msk (bit mask) bats. +- gdk: Conversions from floating point types to integral types that involve + multiplication now use the "long double" as intermediate type, thereby + loosing as few significant bits as is feasible. +- gdk: Found and fixed another source for the now infamous BBPcheckbats error + that sometimes occurs at startup of the server. + +* Wed Feb 16 2022 Sjoerd Mullender <sjo...@acm.org> - 11.43.11-20220325 +- clients: Improved the handling of the \r (internal pager) command in mclient. + It now properly counts the header of table, and when a (very) long + table is being printed and aborted part way in the built-in pager, not + all data is transferred to the client (and then discarded). Instead + at most 1000 rows are transferred. + * Mon Feb 07 2022 Sjoerd Mullender <sjo...@acm.org> - 11.43.9-20220207 - Rebuilt. - GH#7237: SELECT with concurrent writes rarely returns corrupt data diff --git a/NT/mkodbcwxs.py b/NT/mkodbcwxs.py --- a/NT/mkodbcwxs.py +++ b/NT/mkodbcwxs.py @@ -90,7 +90,7 @@ def main(): vcpkg.format(r'bin\bz2.dll'), vcpkg.format(r'bin\charset-1.dll'), # for iconv-2.dll vcpkg.format(r'bin\lz4.dll'), - vcpkg.format(r'bin\lzma.dll'), + vcpkg.format(r'bin\liblzma.dll'), vcpkg.format(r'bin\zlib1.dll')]) print(r' </Directory>') id = comp(features, id, 12, diff --git a/NT/mksqlwxs.py b/NT/mksqlwxs.py --- a/NT/mksqlwxs.py +++ b/NT/mksqlwxs.py @@ -158,7 +158,7 @@ def main(): vcpkg.format(r'bin\getopt.dll'), vcpkg.format(r'bin\libxml2.dll'), vcpkg.format(r'bin\lz4.dll'), - vcpkg.format(r'bin\lzma.dll'), + vcpkg.format(r'bin\liblzma.dll'), vcpkg.format(r'bin\pcre.dll'), vcpkg.format(r'bin\zlib1.dll')]) id = comp(debug, id, 14, diff --git a/clients/ChangeLog-Archive b/clients/ChangeLog-Archive --- a/clients/ChangeLog-Archive +++ b/clients/ChangeLog-Archive @@ -1,6 +1,13 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Wed Feb 16 2022 Sjoerd Mullender <sjo...@acm.org> - 11.43.11-20220325 +- Improved the handling of the \r (internal pager) command in mclient. + It now properly counts the header of table, and when a (very) long + table is being printed and aborted part way in the built-in pager, not + all data is transferred to the client (and then discarded). Instead + at most 1000 rows are transferred. + * Wed Aug 11 2021 Sjoerd Mullender <sjo...@acm.org> - 11.43.1-20220103 - A new output formatting mode was added to mclient. Use -fcsv-noquote to produce a CSV (comma-separated values) output where the quote diff --git a/clients/ChangeLog.Jan2022 b/clients/ChangeLog.Jan2022 --- a/clients/ChangeLog.Jan2022 +++ b/clients/ChangeLog.Jan2022 @@ -1,10 +1,3 @@ # ChangeLog file for clients # This file is updated with Maddlog -* Wed Feb 16 2022 Sjoerd Mullender <sjo...@acm.org> -- Improved the handling of the \r (internal pager) command in mclient. - It now properly counts the header of table, and when a (very) long - table is being printed and aborted part way in the built-in pager, not - all data is transferred to the client (and then discarded). Instead - at most 1000 rows are transferred. - diff --git a/clients/Tests/MAL-signatures.test b/clients/Tests/MAL-signatures.test --- a/clients/Tests/MAL-signatures.test +++ b/clients/Tests/MAL-signatures.test @@ -33008,6 +33008,11 @@ similarity command battxtsim.similarity(X_0:bat[:str], X_1:bat[:str]):bat[:dbl] fstrcmp0_impl_bulk; Normalized edit distance between two strings +baturl +extractURLHost +command baturl.extractURLHost(X_0:bat[:str], X_1:bit):bat[:str] +BATextractURLHost; +Extract host from BAT of URLs batuuid isaUUID command batuuid.isaUUID(X_0:bat[:str]):bat[:bit] @@ -47999,6 +48004,11 @@ command txtsim.stringdiff(X_0:str, X_1:s stringdiff_impl; calculate the soundexed editdistance url +extractURLHost +command url.extractURLHost(X_0:str, X_1:bit):str +extractURLHost; +Extract host from a URL relaxed version +url getAnchor command url.getAnchor(X_0:url):str URLgetAnchor; @@ -48032,7 +48042,7 @@ url getHost command url.getHost(X_0:url):str URLgetHost; -Extract the server name from the URL +Extract the server name from the URL strict version url getPort command url.getPort(X_0:url):str 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 @@ -115,6 +115,7 @@ BAT *BATconvert(BAT *b, BAT *s, int tp, BUN BATcount_no_nil(BAT *b, BAT *s); gdk_return BATdel(BAT *b, BAT *d) __attribute__((__warn_unused_result__)); BAT *BATdense(oid hseq, oid tseq, BUN cnt) __attribute__((__warn_unused_result__)); +BAT *BATdescriptor(bat i); BAT *BATdiff(BAT *l, BAT *r, BAT *sl, BAT *sr, bool nil_matches, bool not_in, BUN estimate); BAT *BATdiffcand(BAT *a, BAT *b); BAT *BATdiffcand(BAT *a, BAT *b); @@ -124,7 +125,7 @@ gdk_return BATfirstn(BAT **topn, BAT **g restrict_t BATgetaccess(BAT *b); ValPtr BATgetprop(BAT *b, enum prop_t idx); gdk_return BATgroup(BAT **groups, BAT **extents, BAT **histo, BAT *b, BAT *s, BAT *g, BAT *e, BAT *h) __attribute__((__warn_unused_result__)); -const char *BATgroupaggrinit(BAT *b, BAT *g, BAT *e, BAT *s, oid *minp, oid *maxp, BUN *ngrpp, struct canditer *ci, BUN *ncand); +const char *BATgroupaggrinit(BAT *b, BAT *g, BAT *e, BAT *s, oid *minp, oid *maxp, BUN *ngrpp, struct canditer *ci); gdk_return BATgroupavg(BAT **bnp, BAT **cntsp, BAT *b, BAT *g, BAT *e, BAT *s, int tp, bool skip_nils, bool abort_on_error, int scale); gdk_return BATgroupavg3(BAT **avgp, BAT **remp, BAT **cntp, BAT *b, BAT *g, BAT *e, BAT *s, bool skip_nils); BAT *BATgroupavg3combine(BAT *avg, BAT *rem, BAT *cnt, BAT *g, BAT *e, bool skip_nils); @@ -166,7 +167,6 @@ BAT *BATmergecand(BAT *a, BAT *b); void *BATmin(BAT *b, void *aggr); void *BATmin_skipnil(BAT *b, void *aggr, bit skipnil); gdk_return BATmode(BAT *b, bool transient); -void BATmsync(BAT *b); BAT *BATnegcands(BUN nr, BAT *odels); BAT *BATnil_grp(BAT *l, BAT *g, BAT *e, BAT *s); bool BATordered(BAT *b); @@ -209,16 +209,15 @@ gdk_return BATupdatepos(BAT *b, const oi BBPrec *BBP[N_BBPINIT]; gdk_return BBPaddfarm(const char *dirname, uint32_t rolemask, bool logerror); void BBPcold(bat i); -BAT *BBPdescriptor(bat b); int BBPfix(bat b); bat BBPindex(const char *nme); -void BBPkeepref(bat i); +void BBPkeepref(BAT *b) __attribute__((__nonnull__(1))); bat BBPlimit; void BBPlock(void); BAT *BBPquickdesc(bat b); int BBPreclaim(BAT *b); int BBPrelease(bat b); -int BBPrename(bat bid, const char *nme); +int BBPrename(BAT *b, const char *nme); int BBPretain(bat b); gdk_return BBPsave(BAT *b); void BBPshare(bat b); @@ -405,7 +404,6 @@ void *THRgetdata(int); int THRgettid(void); int THRhighwater(void); void THRsetdata(int, void *); -void TMabort(void); gdk_return TMcommit(void); gdk_return TMsubcommit(BAT *bl); gdk_return TMsubcommit_list(bat *restrict subcommit, BUN *restrict sizes, int cnt, lng logno, lng transid); @@ -463,7 +461,7 @@ ssize_t bteFromStr(const char *src, size ssize_t bteToStr(str *dst, size_t *len, const bte *src, bool external); const bte bte_nil; oid canditer_idx(const struct canditer *ci, BUN p); -BUN canditer_init(struct canditer *ci, BAT *b, BAT *s); +void canditer_init(struct canditer *ci, BAT *b, BAT *s); oid canditer_last(const struct canditer *ci); oid canditer_mask_next(const struct canditer *ci, oid o, bool next); oid canditer_peek(struct canditer *ci); @@ -796,13 +794,6 @@ str TABLETcreate_bats(Tablet *as, BUN es void TABLETdestroy_format(Tablet *as); int TABLEToutput_file(Tablet *as, BAT *order, stream *s); int TRACEtable(Client cntxt, BAT **r); -str TRNglobal_abort(bit *ret); -str TRNglobal_commit(bit *ret); -str TRNglobal_sync(bit *ret); -str TRNsubcommit(bit *ret, bat *bid); -str TRNtrans_abort(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); -str TRNtrans_clean(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); -str TRNtrans_commit(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); int TYPE_xml; UserStats USRstats; str WLCcommit(int clientid); diff --git a/cmake/monetdb-versions.cmake b/cmake/monetdb-versions.cmake --- a/cmake/monetdb-versions.cmake +++ b/cmake/monetdb-versions.cmake @@ -40,19 +40,19 @@ set(MONETDB_VERSION "${MONETDB_VERSION_M # common/options and common/utils) set(GDK_VERSION_MAJOR "25") set(GDK_VERSION_MINOR "0") -set(GDK_VERSION_PATCH "2") +set(GDK_VERSION_PATCH "3") set(GDK_VERSION "${GDK_VERSION_MAJOR}.${GDK_VERSION_MINOR}.${GDK_VERSION_PATCH}") # version of the MAPI library (subdirectory clients/mapilib) set(MAPI_VERSION_MAJOR "14") set(MAPI_VERSION_MINOR "0") -set(MAPI_VERSION_PATCH "0") +set(MAPI_VERSION_PATCH "1") 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_MAJOR "32") set(MONETDB5_VERSION_MINOR "0") -set(MONETDB5_VERSION_PATCH "3") +set(MONETDB5_VERSION_PATCH "4") set(MONETDB5_VERSION "${MONETDB5_VERSION_MAJOR}.${MONETDB5_VERSION_MINOR}.${MONETDB5_VERSION_PATCH}") # version of the MONETDBE library (subdirectory tools/monetdbe) @@ -64,11 +64,11 @@ set(MONETDBE_VERSION "${MONETDBE_VERSION # version of the STREAM library (subdirectory common/stream) set(STREAM_VERSION_MAJOR "16") set(STREAM_VERSION_MINOR "0") -set(STREAM_VERSION_PATCH "0") +set(STREAM_VERSION_PATCH "1") set(STREAM_VERSION "${STREAM_VERSION_MAJOR}.${STREAM_VERSION_MINOR}.${STREAM_VERSION_PATCH}") # version of the SQL library (subdirectory sql) set(SQL_VERSION_MAJOR "12") set(SQL_VERSION_MINOR "0") -set(SQL_VERSION_PATCH "2") +set(SQL_VERSION_PATCH "3") 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,46 @@ +monetdb (11.43.11) unstable; urgency=low + + * Rebuilt. + * GH#7252: Segmentation fault on second run + * GH#7253: Extremely slow INSERT INTO <table> SELECT + * GH#7254: Commit with deletions is very slow + * GH#7263: PRIMARY KEY constraint is not persistent through server restarts + * GH#7267: Update after delete does not update some rows + + -- Sjoerd Mullender <sjo...@acm.org> Fri, 25 Mar 2022 09:53:47 +0100 + +monetdb (11.43.11) unstable; urgency=low + + * gdk: Fixed a race condition which could cause a too large size being written + for a .theap file to the BBP.dir file after the correct size file had + been saved to disk. + * gdk: We now ignore the size and capacity columns in the BBP.dir file. + These values are essential during run time, but not useful in the + on-disk image of the database. + + -- Sjoerd Mullender <sjo...@acm.org> Fri, 18 Mar 2022 09:53:47 +0100 + +monetdb (11.43.11) unstable; urgency=low + + * gdk: Fixed a bug in the append code for msk (bit mask) bats. + * gdk: Conversions from floating point types to integral types that involve + multiplication now use the "long double" as intermediate type, thereby _______________________________________________ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
