Changeset: 020a55a532c5 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/020a55a532c5
Modified Files:
MonetDB.spec
cmake/monetdb-versions.cmake
debian/control
gdk/gdk_bbp.c
gdk/gdk_storage.c
Branch: default
Log Message:
Merge with Mar2025 branch.
diffs (truncated from 3444 to 300 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -219,6 +219,49 @@ functionality of MonetDB.
%{_datadir}/monetdb/cmake/monetdb_config_headerTargets.cmake
%endif
+%package mutils
+Summary: MonetDB mutils library
+Group: Applications/Databases
+
+%description mutils
+MonetDB is a database management system that is developed from a
+main-memory perspective with use of a fully decomposed storage model,
+automatic index management, extensibility of data types and search
+accelerators. It also has an SQL front end.
+
+This package contains a shared library (libmutils) which is needed by
+various other components.
+
+%ldconfig_scriptlets mutils
+
+%files mutils
+%license COPYING
+%defattr(-,root,root)
+%{_libdir}/libmutils*.so.*
+
+%if %{without compat}
+%package mutils-devel
+Summary: MonetDB mutils library
+Group: Applications/Databases
+Requires: %{name}-mutils%{?_isa} = %{version}-%{release}
+
+%description mutils-devel
+MonetDB is a database management system that is developed from a
+main-memory perspective with use of a fully decomposed storage model,
+automatic index management, extensibility of data types and search
+accelerators. It also has an SQL front end.
+
+This package contains the files to develop with the %{name}-mutils
+library.
+
+%files mutils-devel
+%defattr(-,root,root)
+%dir %{_includedir}/monetdb
+%{_libdir}/libmutils*.so
+%{_libdir}/pkgconfig/monetdb-mutils.pc
+%{_datadir}/monetdb/cmake/mutilsTargets*.cmake
+%endif
+
%package stream
Summary: MonetDB stream library
Group: Applications/Databases
@@ -244,6 +287,7 @@ various other components.
Summary: MonetDB stream library
Group: Applications/Databases
Requires: %{name}-stream%{?_isa} = %{version}-%{release}
+Requires: %{name}-mutils-devel%{?_isa} = %{version}-%{release}
Requires: bzip2-devel
Requires: libcurl-devel
Requires: zlib-devel
diff --git a/NT/mkodbcwxs.py b/NT/mkodbcwxs.py
--- a/NT/mkodbcwxs.py
+++ b/NT/mkodbcwxs.py
@@ -93,6 +93,7 @@ def main():
r'lib\MonetODBC.dll', r'lib\MonetODBC.pdb',
r'lib\MonetODBCs.dll', r'lib\MonetODBCs.pdb',
rf'bin\stream-{version}.dll', rf'lib\stream-{version}.pdb',
+ rf'bin\mutils-{version}.dll', rf'lib\mutils-{version}.pdb',
vcpkg.format(r'bin\iconv-2.dll'),
vcpkg.format(r'bin\bz2.dll'),
vcpkg.format(r'bin\charset-1.dll'), # for iconv-2.dll
diff --git a/NT/mksqlwxs.py b/NT/mksqlwxs.py
--- a/NT/mksqlwxs.py
+++ b/NT/mksqlwxs.py
@@ -159,6 +159,7 @@ def main():
r'bin\monetdbe.dll',
rf'bin\monetdbsql-{version}.dll',
rf'bin\stream-{version}.dll',
+ rf'bin\mutils-{version}.dll',
vcpkg.format(r'bin\iconv-2.dll'),
vcpkg.format(r'bin\bz2.dll'),
vcpkg.format(r'bin\charset-1.dll'), # for iconv-2.dll
@@ -178,7 +179,8 @@ def main():
rf'lib\mapi-{version}.pdb',
rf'lib\monetdb5-{version}.pdb',
rf'lib\monetdbsql-{version}.pdb',
- rf'lib\stream-{version}.pdb'])
+ rf'lib\stream-{version}.pdb',
+ rf'lib\mutils-{version}.pdb'])
id = comp(geom, id, 14,
[vcpkg.format(r'bin\geos_c.dll'),
vcpkg.format(r'bin\geos.dll')])
@@ -220,6 +222,7 @@ def main():
r'lib\monetdbe.lib',
rf'lib\monetdbsql-{version}.lib',
rf'lib\stream-{version}.lib',
+ rf'lib\mutils-{version}.lib',
vcpkg.format(r'lib\iconv.lib'),
vcpkg.format(r'lib\bz2.lib'),
vcpkg.format(r'lib\charset.lib'),
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
@@ -360,7 +360,6 @@ gdk_return HEAPextend(Heap *h, size_t si
void HEAPincref(Heap *h);
size_t HEAPmemsize(Heap *h);
size_t HEAPvmsize(Heap *h);
-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);
@@ -370,21 +369,12 @@ void MT_cond_signal(MT_Cond *cond);
void MT_cond_wait(MT_Cond *cond, MT_Lock *lock);
int MT_create_thread(MT_Id *t, void (*function)(void *), void *arg, enum
MT_thr_detach d, const char *threadname);
void MT_exiting_thread(void);
-FILE *MT_fopen(const char *filename, const char *mode);
-char *MT_getcwd(char *buffer, size_t size);
MT_Id MT_getpid(void);
size_t MT_getrss(void);
void MT_init(void);
int MT_join_thread(MT_Id t);
-int MT_lockf(const char *filename, int mode);
-int MT_mkdir(const char *dirname);
-int MT_open(const char *filename, int flags);
bool MT_path_absolute(const char *path);
-int MT_remove(const char *filename);
-int MT_rename(const char *old, const char *new);
-int MT_rmdir(const char *dirname);
void MT_sleep_ms(unsigned int ms);
-int MT_stat(const char *filename, struct stat *stb);
void MT_thread_deregister(void);
QryCtx *MT_thread_get_qry_ctx(void);
const char *MT_thread_getalgorithm(void);
@@ -485,7 +475,6 @@ BAT *canditer_slice(const struct candite
BAT *canditer_slice2(const struct canditer *ci, BUN lo1, BUN hi1, BUN lo2, BUN
hi2);
BAT *canditer_slice2val(const struct canditer *ci, oid lo1, oid hi1, oid lo2,
oid hi2);
BAT *canditer_sliceval(const struct canditer *ci, oid lo, oid hi);
-int closedir(DIR *dir);
char *ctime_r(const time_t *restrict, char *restrict);
date date_add_day(date dt, int days) __attribute__((__const__));
date date_add_month(date dt, int months) __attribute__((__const__));
@@ -519,7 +508,6 @@ int daytime_usec(daytime tm) __attribute
ssize_t dblFromStr(const char *src, size_t *len, dbl **dst, bool external);
ssize_t dblToStr(str *dst, size_t *len, const dbl *src, bool external);
const dbl dbl_nil;
-char *dirname(char *path);
int dlclose(void *handle);
char *dlerror(void);
void *dlopen(const char *file, int mode);
@@ -534,7 +522,6 @@ const flt flt_nil;
gdk_return gdk_add_callback(const char *name, gdk_callback_func *f, int argc,
void *argv[], int interval);
gdk_return gdk_remove_callback(const char *, gdk_callback_func *f);
bat getBBPsize(void);
-char *get_bin_path(void);
int gettimeofday(struct timeval *tv, int *ignore_zone);
struct tm *gmtime_r(const time_t *restrict, struct tm *restrict);
ssize_t hgeFromStr(const char *src, size_t *len, hge **dst, bool external);
@@ -568,7 +555,6 @@ gdk_return log_tsequence(logger *lg, int
gdk_return log_tstart(logger *lg, bool flushnow, ulng *log_file_id);
ATOMIC_TYPE lvl_per_component[];
void *mdlopen(const char *library, int mode);
-const char *mercurial_revision(void) __attribute__((__const__));
int mo_add_option(opt **Set, int setlen, opt_kind kind, const char *name,
const char *value);
int mo_builtin_settings(opt **Set);
const char *mo_find_option(opt *set, int setlen, const char *name);
@@ -576,13 +562,9 @@ void mo_free_options(opt *set, int setle
void mo_print_options(opt *set, int setlen);
int mo_system_config(opt **Set, int setlen);
const oid oid_nil;
-DIR *opendir(const char *dirname);
-void print_trace(void);
ssize_t ptrFromStr(const char *src, size_t *len, ptr **dst, bool external);
ssize_t ptrToStr(str *dst, size_t *len, const ptr *src, bool external);
const ptr ptr_nil;
-struct dirent *readdir(DIR *dir);
-void rewinddir(DIR *dir);
void *sa_alloc(allocator *sa, size_t sz);
allocator *sa_create(allocator *pa);
void sa_destroy(allocator *sa);
@@ -616,11 +598,8 @@ ssize_t timestamp_precision_tostr(str *b
ssize_t timestamp_tostr(str *buf, size_t *len, const timestamp *val, bool
external);
ssize_t timestamp_tz_fromstr(const char *buf, size_t *len, timestamp **ret,
bool external);
const timestamp unixepoch;
-wchar_t *utf8towchar(const char *src);
const uuid uuid_nil;
gdk_return void_inplace(BAT *b, oid id, const void *val, bool force)
__attribute__((__warn_unused_result__));
-char *wchartoutf8(const wchar_t *src);
-int winerror(int);
# mapi
MapiMsg mapi_bind(MapiHdl hdl, int fnr, char **ptr)
__attribute__((__nonnull__(1)));
@@ -725,16 +704,6 @@ MapiMsg mapi_store_field(MapiHdl hdl, in
MapiMsg mapi_timeout(Mapi mid, unsigned int time)
__attribute__((__nonnull__(1)));
void mapi_trace(Mapi mid, bool flag) __attribute__((__nonnull__(1)));
char *mapi_unquote(char *msg) __attribute__((__nonnull__(1)));
-char *mcrypt_BackendSum(const char *string, size_t len);
-char *mcrypt_MD5Sum(const char *string, size_t len);
-char *mcrypt_RIPEMD160Sum(const char *string, size_t len);
-char *mcrypt_SHA1Sum(const char *string, size_t len);
-char *mcrypt_SHA224Sum(const char *string, size_t len);
-char *mcrypt_SHA256Sum(const char *string, size_t len);
-char *mcrypt_SHA384Sum(const char *string, size_t len);
-char *mcrypt_SHA512Sum(const char *string, size_t len);
-const char *mcrypt_getHashAlgorithms(void) __attribute__((__const__));
-char *mcrypt_hashPassword(const char *algo, const char *password, const char
*challenge);
int mo_add_option(opt **Set, int setlen, opt_kind kind, const char *name,
const char *value);
int mo_builtin_settings(opt **Set);
const char *mo_find_option(opt *set, int setlen, const char *name);
@@ -1118,26 +1087,6 @@ const char modRef[];
char monet_characteristics[4096];
char monet_cwd[FILENAME_MAX];
void moveInstruction(MalBlkPtr mb, int pc, int target);
-void msab_dbfarminit(const char *dbfarm);
-void msab_dbnameinit(const char *dbname);
-void msab_dbpathinit(const char *dbpath);
-char *msab_deserialise(sabdb **ret, const char *sabdb);
-void msab_freeStatus(sabdb **ret);
-char *msab_getDBfarm(char **ret);
-char *msab_getDBname(char **ret);
-char *msab_getMyStatus(sabdb **ret);
-char *msab_getStatus(sabdb **ret, const char *dbname);
-char *msab_getUUID(char **ret);
-char *msab_getUplogInfo(sabuplog *ret, const sabdb *db);
-char *msab_marchConnection(const char *host, const int port);
-char *msab_marchScenario(const char *lang);
-char *msab_pickSecret(char **generated_secret);
-char *msab_registerStarted(void);
-char *msab_registerStarting(void);
-char *msab_registerStop(void);
-char *msab_retreatScenario(const char *lang);
-char *msab_serialise(char **ret, const sabdb *db);
-char *msab_wildRetreat(void);
const char mtimeRef[];
const char mulRef[];
const char multiplexRef[];
@@ -1311,8 +1260,7 @@ const char thetajoinRef[];
const char thetaselectRef[];
const char tidRef[];
const char totalRef[];
-void traceFunction(component_t comp, MalBlkPtr mb, MalStkPtr stk, int flg);
-void traceInstruction(component_t comp, MalBlkPtr mb, MalStkPtr stk, InstrPtr
p, int flg);
+void traceInstruction(MalBlkPtr mb, MalStkPtr stk, InstrPtr p, int flg);
const char transactionRef[];
const char transaction_abortRef[];
const char transaction_beginRef[];
@@ -1355,6 +1303,64 @@ char *monetdbe_result_fetch(monetdbe_res
char *monetdbe_set_autocommit(monetdbe_database dbhdl, int value);
const char *monetdbe_version(void);
+# mutils
+int MT_access(const char *pathname, int mode);
+FILE *MT_fopen(const char *filename, const char *mode);
+char *MT_getcwd(char *buffer, size_t size);
+int MT_lockf(const char *filename, int mode);
+int MT_mkdir(const char *dirname);
+int MT_open(const char *filename, int flags);
+int MT_remove(const char *filename);
+int MT_rename(const char *old, const char *new);
+int MT_rmdir(const char *dirname);
+int MT_stat(const char *filename, struct stat *stb);
+int charwidth(uint32_t c);
+int closedir(DIR *dir);
+char *dirname(char *path);
+char *generateUUID(void);
+char *get_bin_path(void);
+char *mcrypt_BackendSum(const char *string, size_t len);
+char *mcrypt_MD5Sum(const char *string, size_t len);
+char *mcrypt_RIPEMD160Sum(const char *string, size_t len);
+char *mcrypt_SHA1Sum(const char *string, size_t len);
+char *mcrypt_SHA224Sum(const char *string, size_t len);
+char *mcrypt_SHA256Sum(const char *string, size_t len);
+char *mcrypt_SHA384Sum(const char *string, size_t len);
+char *mcrypt_SHA512Sum(const char *string, size_t len);
+const char *mcrypt_getHashAlgorithms(void) __attribute__((__const__));
+char *mcrypt_hashPassword(const char *algo, const char *password, const char
*challenge);
+const char *mercurial_revision(void) __attribute__((__const__));
+void msab_dbfarminit(const char *dbfarm);
+void msab_dbnameinit(const char *dbname);
+void msab_dbpathinit(const char *dbpath);
+char *msab_deserialise(sabdb **ret, const char *sabdb);
+void msab_freeStatus(sabdb **ret);
+char *msab_getDBfarm(char **ret);
+char *msab_getDBname(char **ret);
+char *msab_getMyStatus(sabdb **ret);
+char *msab_getStatus(sabdb **ret, const char *dbname);
+char *msab_getUUID(char **ret);
+char *msab_getUplogInfo(sabuplog *ret, const sabdb *db);
+char *msab_marchConnection(const char *host, const int port);
+char *msab_marchScenario(const char *lang);
+char *msab_pickSecret(char **generated_secret);
+char *msab_registerStarted(void);
+char *msab_registerStarting(void);
+char *msab_registerStop(void);
+char *msab_retreatScenario(const char *lang);
+char *msab_serialise(char **ret, const sabdb *db);
+char *msab_wildRetreat(void);
+DIR *opendir(const char *dirname);
+void print_trace(void);
+char *prompt_getlogin(void);
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
