Changeset: b3195a0901d1 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/b3195a0901d1 Modified Files: clients/Tests/MAL-signatures-hge.test clients/Tests/MAL-signatures.test clients/Tests/exports.stable.out monetdb5/modules/atoms/json.c monetdb5/modules/mal/tablet.c sql/backends/monet5/sql_upgrades.c sql/server/rel_optimize_sel.c sql/server/sql_privileges.c sql/test/emptydb/Tests/check.stable.out sql/test/emptydb/Tests/check.stable.out.int128 tools/mserver/mserver5.c Branch: nested Log Message:
merge with default diffs (truncated from 4879 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.54.0 +current_version = 11.56.0 commit = False tag = False diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -849,3 +849,5 @@ a63e11c1fd1b2dfba2a0ed8a985455286bc023d3 00d41c24cb9d5c43bd35e9e02e6a739a65c02810 Mar2025_13 00d41c24cb9d5c43bd35e9e02e6a739a65c02810 Mar2025_SP2_release 2842c30252114ac29284da18825ed15f86bc507f Mar2025_15 +2842c30252114ac29284da18825ed15f86bc507f Mar2025_SP3_release +3bc4079f4e74840fe5a946ed084fb439a351049e Dec2025_root diff --git a/ChangeLog b/ChangeLog --- a/ChangeLog +++ b/ChangeLog @@ -1,12 +1,3 @@ # ChangeLog file for devel # This file is updated with Maddlog -* Tue Sep 16 2025 Sjoerd Mullender <[email protected]> -- This server is no longer compatible with the MonetDB Stethoscope. - -* Mon Apr 28 2025 Niels Nes <[email protected]> -- Changed the way complex AND and OR expressions are handled. The new - expression tree uses 2 new cmp flag (cmp_con/cmp_dis), both expressions - hold lists of expressions. This structure reduces the need for stack - space, allowing way larger expressions trees to be handled. - diff --git a/ChangeLog b/ChangeLog.Dec2025 copy from ChangeLog copy to ChangeLog.Dec2025 diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -8,7 +8,7 @@ # Copyright August 2008 - 2023 MonetDB B.V.; # Copyright 1997 - July 2008 CWI. -%global version 11.54.0 +%global version 11.56.0 %bcond_with compat diff --git a/clients/ChangeLog b/clients/ChangeLog.Dec2025 copy from clients/ChangeLog copy to clients/ChangeLog.Dec2025 diff --git a/clients/Tests/MAL-signatures-hge.test b/clients/Tests/MAL-signatures-hge.test --- a/clients/Tests/MAL-signatures-hge.test +++ b/clients/Tests/MAL-signatures-hge.test @@ -45129,6 +45129,16 @@ pattern calc.timestamptz(X_0:str, X_1:in str_2time_timestamptz cast to timestamp and check for overflow calc +to_hex +command calc.to_hex(X_0:int):str +CALCto_hex_int +convert to unsigned hexadecimal number representation +calc +to_hex +command calc.to_hex(X_0:lng):str +CALCto_hex_lng +convert to unsigned hexadecimal number representation +calc url command calc.url(X_0:str):url URLnew 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 @@ -33684,6 +33684,16 @@ pattern calc.timestamptz(X_0:str, X_1:in str_2time_timestamptz cast to timestamp and check for overflow calc +to_hex +command calc.to_hex(X_0:int):str +CALCto_hex_int +convert to unsigned hexadecimal number representation +calc +to_hex +command calc.to_hex(X_0:lng):str +CALCto_hex_lng +convert to unsigned hexadecimal number representation +calc url command calc.url(X_0:str):url URLnew 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 @@ -320,7 +320,6 @@ void GDKqsort(void *restrict h, void *re 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); void GDKreset(int status); -void GDKsetbuf(char *); void GDKsetdebug(unsigned debug); gdk_return GDKsetenv(const char *name, const char *value); stream *GDKstdin; @@ -382,6 +381,7 @@ int MT_join_thread(MT_Id t); bool MT_path_absolute(const char *path); void MT_sleep_ms(unsigned int ms); void MT_thread_deregister(void); +char *MT_thread_get_exceptbuf(void); QryCtx *MT_thread_get_qry_ctx(void); const char *MT_thread_getalgorithm(void); allocator *MT_thread_getallocator(void); diff --git a/clients/mapilib/ChangeLog b/clients/mapilib/ChangeLog.Dec2025 copy from clients/mapilib/ChangeLog copy to clients/mapilib/ChangeLog.Dec2025 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,54,0) - PRODUCTVERSION version(11,54,0) + FILEVERSION version(11,56,0) + PRODUCTVERSION version(11,56,0) FILEFLAGSMASK 0x3fL FILEFLAGS 0 FILEOS VOS_NT_WINDOWS32 @@ -21,14 +21,14 @@ BEGIN VALUE "Comments", "\0" VALUE "CompanyName", "MonetDB Foundation\0" VALUE "FileDescription", "MonetDB Application Interface DLL\0" - VALUE "FileVersion", sversion(11,54,0) + VALUE "FileVersion", sversion(11,56,0) VALUE "InternalName", "Mapi\0" VALUE "LegalCopyright", "Copyright (c) 2024, 2025 MonetDB Foundation\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "Mapi.dll\0" VALUE "PrivateBuild", "\0" VALUE "ProductName", "MonetDB Client Libraries\0" - VALUE "ProductVersion", sversion(11,54,0) + VALUE "ProductVersion", sversion(11,56,0) VALUE "SpecialBuild", "\0" END END diff --git a/clients/odbc/ChangeLog b/clients/odbc/ChangeLog --- a/clients/odbc/ChangeLog +++ b/clients/odbc/ChangeLog @@ -1,9 +1,3 @@ # ChangeLog file for odbc # This file is updated with Maddlog -* Wed Jul 9 2025 Martin van Dinther <[email protected]> -- Corrected SQLColAttribute() and SQLGetDescField() for when - FieldIdentifier is SQL_DESC_LITERAL_PREFIX or SQL_DESC_LITERAL_SUFFIX. - They will now return the correct literal prefix or suffix string - instead of an empty string depending on the datatype of the column. - diff --git a/clients/odbc/ChangeLog b/clients/odbc/ChangeLog.Dec2025 copy from clients/odbc/ChangeLog copy to clients/odbc/ChangeLog.Dec2025 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,54,0) - PRODUCTVERSION version(11,54,0) + FILEVERSION version(11,56,0) + PRODUCTVERSION version(11,56,0) FILEFLAGSMASK 0x3fL FILEFLAGS 0 FILEOS VOS_NT_WINDOWS32 @@ -21,14 +21,14 @@ BEGIN VALUE "Comments", "\0" VALUE "CompanyName", "MonetDB Foundation\0" VALUE "FileDescription", "MonetDB ODBC Driver DLL\0" - VALUE "FileVersion", sversion(11,54,0) + VALUE "FileVersion", sversion(11,56,0) VALUE "InternalName", "MonetODBC\0" VALUE "LegalCopyright", "Copyright (c) 2024, 2025 MonetDB Foundation\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "MonetODBC.dll\0" VALUE "PrivateBuild", "\0" VALUE "ProductName", "MonetDB ODBC Driver\0" - VALUE "ProductVersion", sversion(11,54,0) + VALUE "ProductVersion", sversion(11,56,0) 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 @@ -51,8 +51,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION version(11,54,0) - PRODUCTVERSION version(11,54,0) + FILEVERSION version(11,56,0) + PRODUCTVERSION version(11,56,0) FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -69,12 +69,12 @@ BEGIN BEGIN VALUE "CompanyName", "MonetDB Foundation" VALUE "FileDescription", "MonetDB ODBC Setup DLL" - VALUE "FileVersion", sversion(11,54,0) + VALUE "FileVersion", sversion(11,56,0) VALUE "InternalName", "MonetODBCs.dll" VALUE "LegalCopyright", "Copyright (c) 2024, 2025 MonetDB Foundation" VALUE "OriginalFilename", "MonetODBCs.dll" VALUE "ProductName", "MonetDB ODBC Setup" - VALUE "ProductVersion", sversion(11,54,0) + VALUE "ProductVersion", sversion(11,56,0) 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 @@ -11,7 +11,7 @@ #]] set(MONETDB_VERSION_MAJOR "11") -set(MONETDB_VERSION_MINOR "54") +set(MONETDB_VERSION_MINOR "56") set(MONETDB_VERSION_PATCH "0") if(RELEASE_VERSION) diff --git a/common/stream/ChangeLog b/common/stream/ChangeLog.Dec2025 copy from common/stream/ChangeLog copy to common/stream/ChangeLog.Dec2025 diff --git a/gdk/ChangeLog b/gdk/ChangeLog --- a/gdk/ChangeLog +++ b/gdk/ChangeLog @@ -1,10 +1,3 @@ # ChangeLog file for GDK # This file is updated with Maddlog -* Tue Aug 26 2025 Lucas Pereira <[email protected]> -- log_tflush function, when flushnow flag is true, now passes bitmap array - that indicates which bat id's need to be sync'ed to disk, instead - of passing NULL which would trigger a sync of the full catalog. If - new bats are added to the catalog, they will be sync'ed always (see - maxupdated flag). - diff --git a/gdk/ChangeLog b/gdk/ChangeLog.Dec2025 copy from gdk/ChangeLog copy to gdk/ChangeLog.Dec2025 diff --git a/gdk/gdk.h b/gdk/gdk.h --- a/gdk/gdk.h +++ b/gdk/gdk.h @@ -1023,7 +1023,7 @@ BATnegateprops(BAT *b) b->tmaxpos = b->tminpos = BUN_NONE; } -#define GDKMAXERRLEN 10240 +#define GDKMAXERRLEN 5120 #define GDKERROR "!ERROR: " #define GDKFATAL "!FATAL: " @@ -1774,8 +1774,6 @@ gdk_export void ma_info(const allocator #define MA_NEW_ARRAY( sa, type, size ) (type*)ma_alloc( sa, ((size)*sizeof(type))) #define MA_ZNEW_ARRAY( sa, type, size ) (type*)ma_zalloc( sa, ((size)*sizeof(type))) #define MA_RENEW_ARRAY( sa, type, ptr, sz, osz ) (type*)ma_realloc( sa, ptr, ((sz)*sizeof(type)), ((osz)*sizeof(type))) -#define MA_STRDUP( sa, s) ma_strdup(sa, s) -#define MA_STRNDUP( sa, s, l) ma_strndup(sa, s, l) #if !defined(NDEBUG) && !defined(__COVERITY__) && defined(__GNUC__) && !defined(_CLANGD) @@ -1811,6 +1809,15 @@ gdk_export void ma_info(const allocator _sa, ma_name(_sa), _ptr, _sz, _osz, _res); \ _res; \ }) +#define ma_free(sa, p) \ + ({ \ + allocator *_sa = (sa); \ + void *_p = (p); \ + TRC_DEBUG(ALLOC, \ + "ma_free(%p(%s),%p)\n", \ + _sa, ma_name(_sa), _p); \ + ma_free(_sa, _p); \ + }) #define ma_strdup(sa, s) \ ({ \ allocator *_sa = (sa); \ @@ -1832,7 +1839,18 @@ gdk_export void ma_info(const allocator _sa, ma_name(_sa), _l, _res); \ _res; \ }) -#define create_allocator(sa, nm, lk) \ +#define ma_strconcat(sa, s1, s2) \ + ({ \ + allocator *_sa = (sa); \ + const char *_s1 = (s1); \ _______________________________________________ checkin-list mailing list -- [email protected] To unsubscribe send an email to [email protected]
