Changeset: 976d2e9fa417 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/976d2e9fa417 Branch: new_rmt_opt Log Message:
Merges with default diffs (truncated from 6612 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -813,3 +813,4 @@ ce63ebe9a78c52ef0cbe8fd6f2159d2637f0387c 1efa83c6409769d13b2ee30e497d5f7ab42fa955 Jun2023_9 6f88424ebfd9d82c072cf21d89070e04321983da Jun2023_11 6f88424ebfd9d82c072cf21d89070e04321983da Jun2023_SP2_release +e6eb06773c17035954ac5d001cfe1f09ff3425cc Jun2023_13 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-SP2/%{name}-%{version}.tar.bz2 +Source: https://www.monetdb.org/downloads/sources/Jun2023-SP3/%{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 @@ -867,6 +867,26 @@ fi %endif %changelog +* Fri Nov 03 2023 Sjoerd Mullender <sjo...@acm.org> - 11.47.13-20231103 +- Rebuilt. +- GH#7300: Implement missing standard SQL DATE and TIMESTAMP functions +- GH#7324: string_distance('method',str1, str2) as a generic distance + function +- GH#7409: Numpy table returning UDFs with variadic arguments + +* Thu Nov 2 2023 Sjoerd Mullender <sjo...@acm.org> - 11.47.13-20231103 +- sql: Added a missing interface function sys.timestamp_to_str with + a TIMESTAMP (as opposed to TIMESTAMP WITH TIME ZONE) argument. + The missing interface caused error messages being produced when the + function was called with a TIMESTAMP argument, although it did give + the correct result. + +* Tue Oct 31 2023 Sjoerd Mullender <sjo...@acm.org> - 11.47.13-20231103 +- gdk: A bug was fixed where the administration of which bats were in use was + interpreted incorrectly during startup, causing problems later. One + symptom that has been observed was failure to startup with a message + that the catalog tables could not be loaded. + * Fri Sep 29 2023 Sjoerd Mullender <sjo...@acm.org> - 11.47.11-20230929 - Rebuilt. 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 @@ -30330,11 +30330,6 @@ nil_2time_timestamp; cast to timestamp and check for overflow batcalc timestamp -pattern batcalc.timestamp(X_0:bat[:oid], X_1:int, X_2:bat[:BAT]):bat[:timestamp] -nil_2time_timestamp; -cast to timestamp and check for overflow -batcalc -timestamp pattern batcalc.timestamp(X_0:bat[:timestamp], X_1:bat[:oid], X_2:int):bat[:timestamp] timestamp_2time_timestamp; cast timestamp to timestamp and check for overflow 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 @@ -21555,11 +21555,6 @@ nil_2time_timestamp; cast to timestamp and check for overflow batcalc timestamp -pattern batcalc.timestamp(X_0:bat[:oid], X_1:int, X_2:bat[:BAT]):bat[:timestamp] -nil_2time_timestamp; -cast to timestamp and check for overflow -batcalc -timestamp pattern batcalc.timestamp(X_0:bat[:timestamp], X_1:bat[:oid], X_2:int):bat[:timestamp] timestamp_2time_timestamp; cast timestamp to timestamp and check for overflow 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 @@ -357,6 +357,7 @@ size_t HEAPvmsize(Heap *h); void IMPSdestroy(BAT *b); lng IMPSimprintsize(BAT *b); int MT_access(const char *pathname, int mode); +gdk_return MT_alloc_tls(MT_TLS_t *newkey); int MT_check_nr_cores(void); void MT_cond_broadcast(MT_Cond *cond); void MT_cond_destroy(MT_Cond *cond); @@ -393,6 +394,8 @@ void MT_thread_setdata(void *data); void MT_thread_setlockwait(MT_Lock *lock); void MT_thread_setsemawait(MT_Sema *sema); void MT_thread_setworking(const char *work); +void *MT_tls_get(MT_TLS_t key); +void MT_tls_set(MT_TLS_t key, void *val); void OIDXdestroy(BAT *b); ssize_t OIDfromStr(const char *src, size_t *len, oid **dst, bool external); ssize_t OIDtoStr(str *dst, size_t *len, const oid *src, bool external); diff --git a/clients/odbc/driver/SQLGetInfo.c b/clients/odbc/driver/SQLGetInfo.c --- a/clients/odbc/driver/SQLGetInfo.c +++ b/clients/odbc/driver/SQLGetInfo.c @@ -590,12 +590,14 @@ MNDBGetInfo(ODBCDbc *dbc, break; case SQL_INFO_SCHEMA_VIEWS: nValue = SQL_ISV_CHARACTER_SETS | + SQL_ISV_CHECK_CONSTRAINTS | SQL_ISV_COLUMNS | + SQL_ISV_REFERENTIAL_CONSTRAINTS | SQL_ISV_SCHEMATA | + SQL_ISV_TABLE_CONSTRAINTS | SQL_ISV_TABLES | SQL_ISV_VIEWS; /* SQL_ISV_ASSERTIONS | - * SQL_ISV_CHECK_CONSTRAINTS | * SQL_ISV_COLLATIONS | * SQL_ISV_COLUMN_DOMAIN_USAGE | * SQL_ISV_COLUMN_PRIVILEGES | @@ -604,9 +606,7 @@ MNDBGetInfo(ODBCDbc *dbc, * SQL_ISV_DOMAIN_CONSTRAINTS | * SQL_ISV_DOMAINS | * SQL_ISV_KEY_COLUMN_USAGE | - * SQL_ISV_REFERENTIAL_CONSTRAINTS | * SQL_ISV_SQL_LANGUAGES | - * SQL_ISV_TABLE_CONSTRAINTS | * SQL_ISV_TABLE_PRIVILEGES | * SQL_ISV_TRANSLATIONS | * SQL_ISV_USAGE_PRIVILEGES | diff --git a/clients/odbc/tests/ODBCgetInfo.c b/clients/odbc/tests/ODBCgetInfo.c --- a/clients/odbc/tests/ODBCgetInfo.c +++ b/clients/odbc/tests/ODBCgetInfo.c @@ -618,7 +618,7 @@ const struct { .info = SQL_INFO_SCHEMA_VIEWS, .name = "SQL_INFO_SCHEMA_VIEWS", .type = INTEGER, - .i = SQL_ISV_CHARACTER_SETS | SQL_ISV_COLUMNS | SQL_ISV_SCHEMATA | SQL_ISV_TABLES | SQL_ISV_VIEWS, + .i = SQL_ISV_CHARACTER_SETS | SQL_ISV_CHECK_CONSTRAINTS | SQL_ISV_COLUMNS | SQL_ISV_REFERENTIAL_CONSTRAINTS | SQL_ISV_SCHEMATA | SQL_ISV_TABLE_CONSTRAINTS | SQL_ISV_TABLES | SQL_ISV_VIEWS, }, { .info = SQL_INSERT_STATEMENT, diff --git a/cmake/monetdb-defines.cmake b/cmake/monetdb-defines.cmake --- a/cmake/monetdb-defines.cmake +++ b/cmake/monetdb-defines.cmake @@ -121,8 +121,10 @@ function(monetdb_configure_defines) cmake_push_check_state() set(CMAKE_REQUIRED_LIBRARIES "${CMAKE_THREAD_LIBS_INIT}") check_function_exists("pthread_kill" HAVE_PTHREAD_KILL) + check_function_exists("pthread_setname_np" HAVE_PTHREAD_SETNAME_NP) check_function_exists("pthread_sigmask" HAVE_PTHREAD_SIGMASK) cmake_pop_check_state() + check_function_exists("SetThreadDescription" HAVE_SETTHREADDESCRIPTION) check_symbol_exists("regcomp" "regex.h" HAVE_POSIX_REGEX) endfunction() diff --git a/cmake/monetdb-findpackages.cmake b/cmake/monetdb-findpackages.cmake --- a/cmake/monetdb-findpackages.cmake +++ b/cmake/monetdb-findpackages.cmake @@ -9,7 +9,7 @@ #]] # Detect required packages -find_package(BISON REQUIRED 3.2) +find_package(BISON 3.0 REQUIRED) find_package(Iconv) find_package(Threads) 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 "4") +set(GDK_VERSION_PATCH "5") set(GDK_VERSION "${GDK_VERSION_MAJOR}.${GDK_VERSION_MINOR}.${GDK_VERSION_PATCH}") # version of the MAPI library (subdirectory clients/mapilib) @@ -54,7 +54,7 @@ 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 "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) @@ -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 "4") +set(SQL_VERSION_PATCH "5") 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,32 @@ +monetdb (11.47.13) unstable; urgency=low + + * Rebuilt. + * GH#7300: Implement missing standard SQL DATE and TIMESTAMP functions + * GH#7324: string_distance('method',str1, str2) as a generic distance + function + * GH#7409: Numpy table returning UDFs with variadic arguments + + -- Sjoerd Mullender <sjo...@acm.org> Fri, 03 Nov 2023 10:48:08 +0100 + +monetdb (11.47.13) unstable; urgency=low + + * sql: Added a missing interface function sys.timestamp_to_str with + a TIMESTAMP (as opposed to TIMESTAMP WITH TIME ZONE) argument. + The missing interface caused error messages being produced when the + function was called with a TIMESTAMP argument, although it did give + the correct result. + + -- Sjoerd Mullender <sjo...@acm.org> Thu, 2 Nov 2023 10:48:08 +0100 + +monetdb (11.47.13) unstable; urgency=low + + * gdk: A bug was fixed where the administration of which bats were in use was + interpreted incorrectly during startup, causing problems later. One + symptom that has been observed was failure to startup with a message + that the catalog tables could not be loaded. + + -- Sjoerd Mullender <sjo...@acm.org> Tue, 31 Oct 2023 10:48:08 +0100 + monetdb (11.47.11) unstable; urgency=low * Rebuilt. diff --git a/gdk/ChangeLog b/gdk/ChangeLog --- a/gdk/ChangeLog +++ b/gdk/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog file for GDK # This file is updated with Maddlog +* Thu Nov 2 2023 Sjoerd Mullender <sjo...@acm.org> +- Removed the compiled-in limit on the number of threads that can be used. + The number of threads are still limited, but the limit is dictated + solely by the operating system and the availability of enough memory. + * Thu Sep 28 2023 Sjoerd Mullender <sjo...@acm.org> - We now prevent accidental upgrades from a database without 128 bit integers to one with 128 bit integers (also known as HUGEINT) from diff --git a/gdk/ChangeLog-Archive b/gdk/ChangeLog-Archive --- a/gdk/ChangeLog-Archive +++ b/gdk/ChangeLog-Archive @@ -1,6 +1,12 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Tue Oct 31 2023 Sjoerd Mullender <sjo...@acm.org> - 11.47.13-20231103 +- A bug was fixed where the administration of which bats were in use was + interpreted incorrectly during startup, causing problems later. One + symptom that has been observed was failure to startup with a message + that the catalog tables could not be loaded. + * Fri Sep 22 2023 Sjoerd Mullender <sjo...@acm.org> - 11.47.7-20230925 - Fixed a number of data races (race conditions). diff --git a/gdk/ChangeLog.Jun2023 b/gdk/ChangeLog.Jun2023 --- a/gdk/ChangeLog.Jun2023 +++ b/gdk/ChangeLog.Jun2023 @@ -1,9 +1,3 @@ # ChangeLog file for GDK # This file is updated with Maddlog -* Tue Oct 31 2023 Sjoerd Mullender <sjo...@acm.org> -- A bug was fixed where the administration of which bats were in use was - interpreted incorrectly during startup, causing problems later. One - symptom that has been observed was failure to startup with a message - that the catalog tables could not be loaded. - diff --git a/gdk/gdk.h b/gdk/gdk.h --- a/gdk/gdk.h +++ b/gdk/gdk.h @@ -1971,18 +1971,7 @@ VALptr(const ValRecord *v) } } -/* - * The kernel maintains a central table of all active threads. They - * are indexed by their tid. The structure contains information on the - * input/output file descriptors, which should be set before a - * database operation is started. It ensures that output is delivered - * to the proper client. - * - * The Thread structure should be ideally made directly accessible to - * each thread. This speeds up access to tid and file descriptors. - */ -#define THREADS 1024 -#define THREADDATA 3 +#define THREADS 1024 /* maximum value for gdk_nr_threads */ typedef struct threadStruct *Thread; diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c --- a/gdk/gdk_logger.c +++ b/gdk/gdk_logger.c @@ -2773,8 +2773,7 @@ internal_log_bat(logger *lg, BAT *b, log if (b->ttype == TYPE_msk) { _______________________________________________ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
