Changeset: aeb6601e5525 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=aeb6601e5525
Modified Files:
.hgtags
MonetDB.spec
NT/monetdb_config.h.in
NT/rules.msc
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
configure.ag
debian/changelog
gdk/gdk.h
gdk/gdk_atoms.h
gdk/gdk_utils.c
gdk/gdk_utils.h
gdk/libbat.rc
libversions
monetdb5/tools/libmonetdb5.rc
vertoo.data
Branch: default
Log Message:
Merge with linear-hashing branch.
diffs (truncated from 598 to 300 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -755,3 +755,6 @@ c35ea84b568b792c5fd073f6a1e1a24372de0e20
4eb6068f63cf87fc6996daed59fbcc917c8b2881 Nov2019_13
c35ea84b568b792c5fd073f6a1e1a24372de0e20 Nov2019_SP2_release
4eb6068f63cf87fc6996daed59fbcc917c8b2881 Nov2019_SP2_release
+7186b517a584f0244e20eb7abe61f7a7c0c9ea1b Nov2019_15
+4eb6068f63cf87fc6996daed59fbcc917c8b2881 Nov2019_SP2_release
+7186b517a584f0244e20eb7abe61f7a7c0c9ea1b Nov2019_SP2_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -941,6 +941,12 @@ fi
%postun -p /sbin/ldconfig
%changelog
+* Mon Feb 17 2020 Sjoerd Mullender <sjo...@acm.org> - 11.35.15-20200217
+- Rebuilt.
+- BZ#6817: running analyze on a schema which contains a stream table
+ stops with an error
+- BZ#6819: functions do not persist
+
* Wed Feb 12 2020 Sjoerd Mullender <sjo...@acm.org> - 11.35.13-20200212
- Rebuilt.
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+monetdb (11.35.15) unstable; urgency=low
+
+ * Rebuilt.
+ * BZ#6817: running analyze on a schema which contains a stream table
+ stops with an error
+ * BZ#6819: functions do not persist
+
+ -- Sjoerd Mullender <sjo...@acm.org> Mon, 17 Feb 2020 12:40:46 +0100
+
monetdb (11.35.13) unstable; urgency=low
* Rebuilt.
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -463,7 +463,6 @@
#define FALSE false
#endif
-#define IDLENGTH 64 /* maximum BAT id length */
#define BATMARGIN 1.2 /* extra free margin for new heaps */
#define BATTINY_BITS 8
#define BATTINY ((BUN)1<<BATTINY_BITS) /* minimum allocation
buncnt for a BAT */
@@ -1683,271 +1682,6 @@ gdk_export gdk_return BATorderidx(BAT *b
gdk_export gdk_return GDKmergeidx(BAT *b, BAT**a, int n_ar);
gdk_export bool BATcheckorderidx(BAT *b);
-/*
- * @- Multilevel Storage Modes
- *
- * We should bring in the compressed mode as the first, maybe
- * built-in, mode. We could then add for instance HTTP remote storage,
- * SQL storage, and READONLY (cd-rom) storage.
- *
- * @+ GDK Utilities
- * Interfaces for memory management, error handling, thread management
- * and system information.
- *
- * @- GDK memory management
- * @multitable @columnfractions 0.08 0.8
- * @item void*
- * @tab GDKmalloc (size_t size)
- * @item void*
- * @tab GDKzalloc (size_t size)
- * @item void*
- * @tab GDKmallocmax (size_t size, size_t *maxsize, int emergency)
- * @item void*
- * @tab GDKrealloc (void* pold, size_t size)
- * @item void*
- * @tab GDKreallocmax (void* pold, size_t size, size_t *maxsize, int emergency)
- * @item void
- * @tab GDKfree (void* blk)
- * @item str
- * @tab GDKstrdup (str s)
- * @item str
- * @tab GDKstrndup (str s, size_t n)
- * @end multitable
- *
- * These utilities are primarily used to maintain control over
- * critical interfaces to the C library. Moreover, the statistic
- * routines help in identifying performance and bottlenecks in the
- * current implementation.
- *
- * Compiled with -DMEMLEAKS the GDK memory management log their
- * activities, and are checked on inconsistent frees and memory leaks.
- */
-
-/* we prefer to use vm_alloc routines on size > GDKmmap */
-gdk_export void *GDKmmap(const char *path, int mode, size_t len);
-
-gdk_export size_t GDK_mem_maxsize; /* max allowed size of committed memory
*/
-gdk_export size_t GDK_vm_maxsize; /* max allowed size of reserved vm */
-
-gdk_export size_t GDKmem_cursize(void); /* RAM/swapmem that MonetDB has
claimed from OS */
-gdk_export size_t GDKvm_cursize(void); /* current MonetDB VM address space
usage */
-
-gdk_export void *GDKmalloc(size_t size)
- __attribute__((__malloc__))
- __attribute__((__alloc_size__(1)))
- __attribute__((__warn_unused_result__));
-gdk_export void *GDKzalloc(size_t size)
- __attribute__((__malloc__))
- __attribute__((__alloc_size__(1)))
- __attribute__((__warn_unused_result__));
-gdk_export void *GDKrealloc(void *pold, size_t size)
- __attribute__((__alloc_size__(2)))
- __attribute__((__warn_unused_result__));
-gdk_export void GDKfree(void *blk);
-gdk_export str GDKstrdup(const char *s)
- __attribute__((__warn_unused_result__));
-gdk_export str GDKstrndup(const char *s, size_t n)
- __attribute__((__warn_unused_result__));
-
-#include "gdk_tracer.h"
-
-#if !defined(NDEBUG) && !defined(STATIC_CODE_ANALYSIS)
-/* In debugging mode, replace GDKmalloc and other functions with a
- * version that optionally prints calling information.
- *
- * We have two versions of this code: one using a GNU C extension, and
- * one using traditional C. The GNU C version also prints the name of
- * the calling function.
- */
-#ifdef __GNUC__
-#define GDKmalloc(s) \
- ({ \
- size_t _size = (s); \
- void *_res = GDKmalloc(_size); \
- TRC_DEBUG(ALLOC, "GDKmalloc(%zu) -> %p\n", \
- _size, _res); \
- _res; \
- })
-#define GDKzalloc(s) \
- ({ \
- size_t _size = (s); \
- void *_res = GDKzalloc(_size); \
- TRC_DEBUG(ALLOC, "GDKzalloc(%zu) -> %p\n", \
- _size, _res); \
- _res; \
- })
-#define GDKrealloc(p, s) \
- ({ \
- void *_ptr = (p); \
- size_t _size = (s); \
- void *_res = GDKrealloc(_ptr, _size); \
- TRC_DEBUG(ALLOC, "GDKrealloc(%p,%zu) -> %p\n", \
- _ptr, _size, _res); \
- _res; \
- })
-#define GDKfree(p) \
- ({ \
- void *_ptr = (p); \
- if (_ptr) \
- TRC_DEBUG(ALLOC, "GDKfree(%p)\n", _ptr); \
- GDKfree(_ptr); \
- })
-#define GDKstrdup(s) \
- ({ \
- const char *_str = (s); \
- void *_res = GDKstrdup(_str); \
- TRC_DEBUG(ALLOC, "GDKstrdup(len=%zu) -> %p\n", \
- _str ? strlen(_str) : 0, _res); \
- _res; \
- })
-#define GDKstrndup(s, n) \
- ({ \
- const char *_str = (s); \
- size_t _n = (n); \
- void *_res = GDKstrndup(_str, _n); \
- TRC_DEBUG(ALLOC, "GDKstrndup(len=%zu) -> %p\n", \
- _n, _res); \
- _res; \
- })
-#define GDKmmap(p, m, l) \
- ({ \
- const char *_path = (p); \
- int _mode = (m); \
- size_t _len = (l); \
- void *_res = GDKmmap(_path, _mode, _len); \
- TRC_DEBUG(ALLOC, "GDKmmap(%s,0x%x,%zu) -> %p\n", \
- _path ? _path : "NULL", \
- (unsigned) _mode, _len, \
- _res); \
- _res; \
- })
-#define malloc(s) \
- ({ \
- size_t _size = (s); \
- void *_res = malloc(_size); \
- TRC_DEBUG(ALLOC, "malloc(%zu) -> %p\n", \
- _size, _res); \
- _res; \
- })
-#define calloc(n, s) \
- ({ \
- size_t _nmemb = (n); \
- size_t _size = (s); \
- void *_res = calloc(_nmemb,_size); \
- TRC_DEBUG(ALLOC, "calloc(%zu,%zu) -> %p\n", \
- _nmemb, _size, _res); \
- _res; \
- })
-#define realloc(p, s) \
- ({ \
- void *_ptr = (p); \
- size_t _size = (s); \
- void *_res = realloc(_ptr, _size); \
- TRC_DEBUG(ALLOC, "realloc(%p,%zu) -> %p\n", \
- _ptr, _size, _res); \
- _res; \
- })
-#define free(p) \
- ({ \
- void *_ptr = (p); \
- TRC_DEBUG(ALLOC, "free(%p)\n", _ptr); \
- free(_ptr); \
- })
-#else
-static inline void *
-GDKmalloc_debug(size_t size)
-{
- void *res = GDKmalloc(size);
- TRC_DEBUG(ALLOC, "GDKmalloc(%zu) -> %p\n", size, res);
- return res;
-}
-#define GDKmalloc(s) GDKmalloc_debug((s))
-static inline void *
-GDKzalloc_debug(size_t size)
-{
- void *res = GDKzalloc(size);
- TRC_DEBUG(ALLOC, "GDKzalloc(%zu) -> %p\n",
- size, res);
- return res;
-}
-#define GDKzalloc(s) GDKzalloc_debug((s))
-static inline void *
-GDKrealloc_debug(void *ptr, size_t size)
-{
- void *res = GDKrealloc(ptr, size);
- TRC_DEBUG(ALLOC, "GDKrealloc(%p,%zu) -> %p\n",
- ptr, size, res);
- return res;
-}
-#define GDKrealloc(p, s) GDKrealloc_debug((p), (s))
-static inline void
-GDKfree_debug(void *ptr)
-{
- TRC_DEBUG(ALLOC, "GDKfree(%p)\n", ptr);
- GDKfree(ptr);
-}
-#define GDKfree(p) GDKfree_debug((p))
-static inline char *
-GDKstrdup_debug(const char *str)
-{
- void *res = GDKstrdup(str);
- TRC_DEBUG(ALLOC, "GDKstrdup(len=%zu) -> %p\n",
- str ? strlen(str) : 0, res);
- return res;
-}
-#define GDKstrdup(s) GDKstrdup_debug((s))
-static inline char *
-GDKstrndup_debug(const char *str, size_t n)
-{
- void *res = GDKstrndup(str, n);
- TRC_DEBUG(ALLOC, "GDKstrndup(len=%zu) -> %p\n", n, res);
- return res;
-}
-#define GDKstrndup(s, n) GDKstrndup_debug((s), (n))
-static inline void *
-GDKmmap_debug(const char *path, int mode, size_t len)
-{
- void *res = GDKmmap(path, mode, len);
- TRC_DEBUG(ALLOC, "GDKmmap(%s,0x%x,%zu) -> %p\n",
- path ? path : "NULL", mode, len,
- res);
- return res;
-}
-#define GDKmmap(p, m, l) GDKmmap_debug((p), (m), (l))
-static inline void *
-malloc_debug(size_t size)
-{
- void *res = malloc(size);
- TRC_DEBUG(ALLOC, "malloc(%zu) -> %p\n", size, res);
- return res;
-}
-#define malloc(s) malloc_debug((s))
-static inline void *
-calloc_debug(size_t nmemb, size_t size)
-{
- void *res = calloc(nmemb, size);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
