Changeset: 6387843ccd77 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/6387843ccd77 Modified Files: clients/Tests/MAL-signatures-hge.test clients/Tests/MAL-signatures.test clients/Tests/exports.stable.out sql/backends/monet5/sql.c sql/backends/monet5/sql_cat.c sql/server/rel_schema.c sql/server/rel_semantic.c sql/server/sql_parser.y Branch: ustr Log Message:
Merge with default branch. diffs (truncated from 870 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.56.0 +current_version = 56.0.0 commit = False tag = False diff --git a/ChangeLog b/ChangeLog --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog file for devel # This file is updated with Maddlog +* Thu May 7 2026 Sjoerd Mullender <[email protected]> +- The version number has changed from three levels where the first level + has always been 11 to two levels. The 11. has been dropped. + +* Wed May 6 2026 Martin van Dinther <[email protected]> +- Added capability to change the OPTIMIZER setting for a USER via: + ALTER USER user_id OPTIMIZER 'minimal_pipe'; + * Sat May 2 2026 Lucas Pereira <[email protected]> - Set default to 'no' of monetdbd discovery property. diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -6,7 +6,7 @@ # # For copyright information, see the file debian/copyright. -%global version 11.56.0 +%global version 56.0.0 %bcond_with compat 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 @@ -50890,7 +50890,7 @@ SQLalter_table Catalog operation alter_table sqlcatalog alter_user -pattern sqlcatalog.alter_user(X_0:str, X_1:str, X_2:int, X_3:str, X_4:str, X_5:str, X_6:str, X_7:lng, X_8:int):void +pattern sqlcatalog.alter_user(X_0:str, X_1:str, X_2:int, X_3:str, X_4:str, X_5:str, X_6:str, X_7:lng, X_8:int, X_9:str):void SQLalter_user Catalog operation alter_user sqlcatalog 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 @@ -39270,7 +39270,7 @@ SQLalter_table Catalog operation alter_table sqlcatalog alter_user -pattern sqlcatalog.alter_user(X_0:str, X_1:str, X_2:int, X_3:str, X_4:str, X_5:str, X_6:str, X_7:lng, X_8:int):void +pattern sqlcatalog.alter_user(X_0:str, X_1:str, X_2:int, X_3:str, X_4:str, X_5:str, X_6:str, X_7:lng, X_8:int, X_9:str):void SQLalter_user Catalog operation alter_user sqlcatalog 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 @@ -351,7 +351,7 @@ gdk_return GDKtracer_stop(void); gdk_return GDKupgradevarheap(BAT *b, var_t v, BUN cap, BUN ncopy) __attribute__((__warn_unused_result__)); lng GDKusec(void); void GDKusr1triggerCB(void (*func)(void)); -const char *GDKversion(void) __attribute__((__const__)); +const char *GDKversion(bool full) __attribute__((__const__)); size_t GDKvm_cursize(void); void *GDKzalloc(size_t size) __attribute__((__malloc__)) __attribute__((__malloc__(GDKfree, 1))) __attribute__((__alloc_size__(1))) __attribute__((__warn_unused_result__)); void HASHdestroy(BAT *b); 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,56,0) - PRODUCTVERSION version(11,56,0) + FILEVERSION version(56,0,0) + PRODUCTVERSION version(56,0,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,56,0) + VALUE "FileVersion", sversion(56,0,0) VALUE "InternalName", "Mapi\0" VALUE "LegalCopyright", "Copyright (c) 2026 MonetDB Foundation\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "Mapi.dll\0" VALUE "PrivateBuild", "\0" VALUE "ProductName", "MonetDB Client Libraries\0" - VALUE "ProductVersion", sversion(11,56,0) + VALUE "ProductVersion", sversion(56,0,0) 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,56,0) - PRODUCTVERSION version(11,56,0) + FILEVERSION version(56,0,0) + PRODUCTVERSION version(56,0,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,56,0) + VALUE "FileVersion", sversion(56,0,0) VALUE "InternalName", "MonetODBC\0" VALUE "LegalCopyright", "Copyright (c) 2026 MonetDB Foundation\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "MonetODBC.dll\0" VALUE "PrivateBuild", "\0" VALUE "ProductName", "MonetDB ODBC Driver\0" - VALUE "ProductVersion", sversion(11,56,0) + VALUE "ProductVersion", sversion(56,0,0) VALUE "SpecialBuild", "\0" END END diff --git a/clients/odbc/tests/ODBCStmtAttr.c b/clients/odbc/tests/ODBCStmtAttr.c --- a/clients/odbc/tests/ODBCStmtAttr.c +++ b/clients/odbc/tests/ODBCStmtAttr.c @@ -41,7 +41,7 @@ prerr(SQLSMALLINT tpe, SQLHANDLE hnd, co || (strcmp(pref,"Info") != 0) || (strcmp((char*)state,"01S02") != 0) || errnr != 0 - || (strncmp((char*)msg,"[MonetDB][ODBC Driver 11.", 25) != 0)) + || (strncmp((char*)msg,"[MonetDB][ODBC Driver ", 22) != 0)) fprintf(stderr, "%s: %s: SQLstate %s, Errnr %d, Message %s\n", func, pref, (char*)state, (int)errnr, (char*)msg); break; case SQL_INVALID_HANDLE: diff --git a/clients/odbc/tests/ODBCtester.c b/clients/odbc/tests/ODBCtester.c --- a/clients/odbc/tests/ODBCtester.c +++ b/clients/odbc/tests/ODBCtester.c @@ -90,8 +90,8 @@ retrieveDiagMsg(SQLHANDLE stmt, char * o if (ret == SQL_SUCCESS || ret == SQL_SUCCESS_WITH_INFO) { /* The message layout is: "[MonetDB][ODBC Driver 11.46.0][MonetDB-Test]error/warning text". The ODBC driver version numbers changes in time. Overwrite it to get a stable output */ - if (strncmp(msg, "[MonetDB][ODBC Driver 11.", 25) == 0) { - return snprintf(outp, outp_len, "SQLstate %s, Errnr %d, Message [MonetDB][ODBC Driver 11.##.#]%s\n", (char*)state, (int)errnr, strchr(msg + 25, ']') + 1); + if (strncmp(msg, "[MonetDB][ODBC Driver ", 22) == 0) { + return snprintf(outp, outp_len, "SQLstate %s, Errnr %d, Message [MonetDB][ODBC Driver ##.##.#]%s\n", (char*)state, (int)errnr, strchr(msg + 25, ']') + 1); } return snprintf(outp, outp_len, "SQLstate %s, Errnr %d, Message %s\n", (char*)state, (int)errnr, (char*)msg); } @@ -198,7 +198,7 @@ testGetDataTruncatedString(SQLHANDLE stm "SQLColAttribute(1, SQL_DESC_LITERAL_PREFIX: ') returns 0, NumAttr 47\n" "SQLColAttribute(1, SQL_DESC_LITERAL_SUFFIX: ') returns 0, NumAttr 47\n" "SQLGetData(1, SQL_C_CHAR, 20) returns 1, vallen 47, buf: '1234567890123456789'\n" - "SQLstate 01004, Errnr 0, Message [MonetDB][ODBC Driver 11.##.#][MonetDB-Test]String data, right truncated\n" + "SQLstate 01004, Errnr 0, Message [MonetDB][ODBC Driver ##.##.#][MonetDB-Test]String data, right truncated\n" "SQLGetData(1, SQL_C_CHAR, 30) returns 0, vallen 28, buf: '0 abcdefghijklmnopqrstuvwxyz'\n"); } else if (ctype == SQL_C_WCHAR) { @@ -210,9 +210,9 @@ testGetDataTruncatedString(SQLHANDLE stm "SQLColAttribute(1, SQL_DESC_LITERAL_PREFIX: ') returns 0, NumAttr 47\n" "SQLColAttribute(1, SQL_DESC_LITERAL_SUFFIX: ') returns 0, NumAttr 47\n" "SQLGetData(1, SQL_C_WCHAR, 20) returns 1, vallen 94, buf: ''\n" - "SQLstate 01004, Errnr 0, Message [MonetDB][ODBC Driver 11.##.#][MonetDB-Test]String data, right truncated\n" + "SQLstate 01004, Errnr 0, Message [MonetDB][ODBC Driver ##.##.#][MonetDB-Test]String data, right truncated\n" "SQLGetData(1, SQL_C_WCHAR, 30) returns 1, vallen 76, buf: ''\n" - "SQLstate 01004, Errnr 0, Message [MonetDB][ODBC Driver 11.##.#][MonetDB-Test]String data, right truncated\n"); + "SQLstate 01004, Errnr 0, Message [MonetDB][ODBC Driver ##.##.#][MonetDB-Test]String data, right truncated\n"); } ret = SQLCloseCursor(stmt); 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,56,0) - PRODUCTVERSION version(11,56,0) + FILEVERSION version(56,0,0) + PRODUCTVERSION version(56,0,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,56,0) + VALUE "FileVersion", sversion(56,0,0) VALUE "InternalName", "MonetODBCs.dll" VALUE "LegalCopyright", "Copyright (c) 2026 MonetDB Foundation\0" VALUE "OriginalFilename", "MonetODBCs.dll" VALUE "ProductName", "MonetDB ODBC Setup" - VALUE "ProductVersion", sversion(11,56,0) + VALUE "ProductVersion", sversion(56,0,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 @@ -8,8 +8,8 @@ # For copyright information, see the file debian/copyright. #]] -set(MONETDB_VERSION_MAJOR "11") -set(MONETDB_VERSION_MINOR "56") +set(MONETDB_VERSION_MAJOR "56") +set(MONETDB_VERSION_MINOR "0") set(MONETDB_VERSION_PATCH "0") if(RELEASE_VERSION) diff --git a/gdk/gdk_utils.c b/gdk/gdk_utils.c --- a/gdk/gdk_utils.c +++ b/gdk/gdk_utils.c @@ -1640,9 +1640,18 @@ THRinit(void) return 0; } +/* stringify token */ +#define _STRINGIFY_(s) #s +#define STRINGIFY(t) _STRINGIFY_(t) + const char * -GDKversion(void) +GDKversion(bool full) { + (void) full; /* in case patch != 0 */ +#if MONETDB_VERSION_PATCH == 0 + if (!full) + return STRINGIFY(MONETDB_VERSION_MAJOR) "." STRINGIFY(MONETDB_VERSION_MINOR); +#endif return MONETDB_VERSION; } diff --git a/gdk/gdk_utils.h b/gdk/gdk_utils.h --- a/gdk/gdk_utils.h +++ b/gdk/gdk_utils.h @@ -124,7 +124,7 @@ gdk_export bool GDKexiting(void); gdk_export void GDKprepareExit(void); gdk_export void GDKreset(int status); /* global version number */ -gdk_export const char *GDKversion(void) +gdk_export const char *GDKversion(bool full) __attribute__((__const__)); /* ABI version of GDK library */ gdk_export const char *GDKlibversion(void) diff --git a/gdk/libbat.rc b/gdk/libbat.rc --- a/gdk/libbat.rc +++ b/gdk/libbat.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,56,0) - PRODUCTVERSION version(11,56,0) + FILEVERSION version(56,0,0) + PRODUCTVERSION version(56,0,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 Goblin Database Kernel DLL\0" - VALUE "FileVersion", sversion(11,56,0) + VALUE "FileVersion", sversion(56,0,0) VALUE "InternalName", "libbat\0" VALUE "LegalCopyright", "Copyright (c) 2026 MonetDB Foundation\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "libbat.dll\0" VALUE "PrivateBuild", "\0" VALUE "ProductName", "MonetDB Common Libraries\0" - VALUE "ProductVersion", sversion(11,56,0) + VALUE "ProductVersion", sversion(56,0,0) VALUE "SpecialBuild", "\0" END END diff --git a/monetdb5/tools/libmonetdb5.rc b/monetdb5/tools/libmonetdb5.rc --- a/monetdb5/tools/libmonetdb5.rc +++ b/monetdb5/tools/libmonetdb5.rc @@ -6,8 +6,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_U #define sversion(major,minor,patch) #major "." #minor "." #patch "\0" _______________________________________________ checkin-list mailing list -- [email protected] To unsubscribe send an email to [email protected]
