[prev in list] [next in list] [prev in thread] [next in thread]
List: monetdb-checkins
Subject: MonetDB: protocol - Merge again.
From: Mark Raasveldt <commits+m.raasveldt=cwi.nl () monetdb ! org>
Date: 2016-09-29 12:41:29
Message-ID: hg.c859c1533224.1475152889.6315528441665844383 () monetdb2 ! cwi-incubator ! nl
[Download RAW message or body]
Changeset: c859c1533224 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c859c1533224
Added Files:
monetdb5/modules/mal/Tests/clients-hashes.stable.out.Darwin
Modified Files:
.hgtags
MonetDB.spec
NT/installer32/MonetDB-ODBC-Installer.vdproj
NT/installer32/MonetDB5-Geom-Module.vdproj
NT/installer32/MonetDB5-SQL-Installer.vdproj
NT/installer64/MonetDB-ODBC-Installer.vdproj
NT/installer64/MonetDB5-Geom-Module.vdproj
NT/installer64/MonetDB5-SQL-Installer.vdproj
NT/monetdb_config.h.in
NT/rules.msc
buildtools/ChangeLog-Archive
buildtools/ChangeLog.Jun2016
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
common/stream/stream.c
common/utils/mcrypt.c
common/utils/mcrypt.h
configure.ag
debian/changelog
gdk/gdk_bbp.c
gdk/gdk_heap.c
gdk/gdk_posix.c
gdk/gdk_private.h
gdk/gdk_utils.c
gdk/libbat.rc
libversions
monetdb5/mal/Makefile.ag
monetdb5/mal/mal_authorize.c
monetdb5/mal/mal_debugger.c
monetdb5/mal/mal_session.c
monetdb5/modules/mal/Tests/clients-hashes.malC
monetdb5/modules/mal/clients.c
monetdb5/modules/mal/tablet.c
monetdb5/tools/libmonetdb5.rc
sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out
sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out.int128
sql/benchmarks/tpch/LOCKED/Tests/14.stable.out
sql/benchmarks/tpch/LOCKED/Tests/14.stable.out.int128
sql/benchmarks/tpch/Tests/01-22.stable.out
sql/benchmarks/tpch/Tests/01-22.stable.out.int128
sql/benchmarks/tpch/Tests/01-explain.stable.out.int128
sql/benchmarks/tpch/Tests/01-plan.stable.out.int128
sql/benchmarks/tpch/Tests/14-explain.stable.out.int128
sql/benchmarks/tpch/Tests/14-plan.stable.out.int128
sql/benchmarks/tpch/Tests/14.stable.out
sql/benchmarks/tpch/Tests/14.stable.out.int128
sql/benchmarks/tpch/Tests/17-explain.stable.out.int128
sql/benchmarks/tpch/Tests/17-plan.stable.out
sql/benchmarks/tpch/Tests/17-plan.stable.out.int128
sql/benchmarks/tpch/Tests/20-explain.stable.out.int128
sql/benchmarks/tpch/Tests/20-plan.stable.out.int128
sql/server/rel_optimizer.c
sql/test/BugDay_2005-10-06_2.9.3/Tests/not_null.SF-933194.stable.out
sql/test/BugDay_2005-10-06_2.9.3/Tests/type_dump_test.SF-989257.stable.out
sql/test/BugTracker-2009/Tests/POWER_vs_prod.SF-2596114.stable.out
sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.stable.out
sql/test/BugTracker-2014/Tests/querylog.Bug-3607.stable.out
sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
sql/test/Tests/median_stdev.stable.out
sql/test/pg_regress/Tests/int2.stable.out
testing/Mtest.py.in
tools/mserver/mserver5.c
vertoo.data
Branch: protocol
Log Message:
Merge again.
diffs (truncated from 2042 to 300 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -634,3 +634,6 @@ 4a05df3932a97865ac7e4037361723d5563490b3
c8b06c670a635978640d742643c317b82c5f4b8c Jun2016_SP1_release
731a25ce40993c0d73ee4fcefb286b9a0a2e0981 Jun2016_9
731a25ce40993c0d73ee4fcefb286b9a0a2e0981 Jun2016_SP2_release
+f16cdfed96bdc0f3324f8ced85a8b74c67f4dc9b Jun2016_11
+731a25ce40993c0d73ee4fcefb286b9a0a2e0981 Jun2016_SP2_release
+f16cdfed96bdc0f3324f8ced85a8b74c67f4dc9b Jun2016_SP2_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -899,6 +899,13 @@ rm -f %{buildroot}%{_bindir}/Maddlog
%postun -p /sbin/ldconfig
%changelog
+* Wed Sep 28 2016 Sjoerd Mullender <sjoerd@acm.org> - 11.23.11-20160928
+- Rebuilt.
+
+* Mon Sep 26 2016 Sjoerd Mullender <sjoerd@acm.org> - 11.23.11-20160928
+- buildtools: We now use the CommonCrypto library instead of the OpenSSL library
+ on Darwin.
+
* Mon Sep 19 2016 Sjoerd Mullender <sjoerd@acm.org> - 11.23.9-20160919
- Rebuilt.
- BZ#3939: Assert failure on concurrent queries when querying sys.queue
diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in
--- a/NT/monetdb_config.h.in
+++ b/NT/monetdb_config.h.in
@@ -345,9 +345,6 @@
/* Define to 1 if you have the `mallopt' function. */
/* #undef HAVE_MALLOPT */
-/* Define to 1 if you have the `MD5_Update' function. */
-#define HAVE_MD5_UPDATE 1
-
/* Define to 1 if you have the <memory.h> header file. */
#define HAVE_MEMORY_H 1
@@ -430,9 +427,6 @@
/* Define if the compiler supports the restrict keyword */
/* #undef HAVE_RESTRICT */
-/* Define to 1 if you have the `RIPEMD160_Update' function. */
-#define HAVE_RIPEMD160_UPDATE 1
-
/* Define to 1 if you have the `round' function. */
#if !defined(_MSC_VER) || _MSC_VER > 1600
#define HAVE_ROUND 1
@@ -459,6 +453,13 @@
/* Define to 1 if you have the `setsid' function. */
/* #undef HAVE_SETSID */
+#ifdef HAVE_OPENSSL
+/* Define to 1 if you have the `MD5_Update' function. */
+#define HAVE_MD5_UPDATE 1
+
+/* Define to 1 if you have the `RIPEMD160_Update' function. */
+#define HAVE_RIPEMD160_UPDATE 1
+
/* Define to 1 if you have the `SHA1_Update' function. */
#define HAVE_SHA1_UPDATE 1
@@ -473,6 +474,7 @@
/* Define to 1 if you have the `SHA512_Update' function. */
#define HAVE_SHA512_UPDATE 1
+#endif
/* Define to 1 if you have the `shutdown' function. */
#define HAVE_SHUTDOWN 1
diff --git a/buildtools/ChangeLog-Archive b/buildtools/ChangeLog-Archive
--- a/buildtools/ChangeLog-Archive
+++ b/buildtools/ChangeLog-Archive
@@ -1,6 +1,10 @@
# DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
# This file contains past ChangeLog entries
+* Mon Sep 26 2016 Sjoerd Mullender <sjoerd@acm.org> - 11.23.11-20160928
+- We now use the CommonCrypto library instead of the OpenSSL library
+ on Darwin.
+
* Fri Feb 26 2016 Sjoerd Mullender <sjoerd@acm.org> - 11.23.1-20160601
- A new package MonetDB-lidar (Fedora) or libmonetdb5-server-lidar
(Debian/Ubuntu) has been created to work with LiDAR data.
diff --git a/buildtools/ChangeLog.Jun2016 b/buildtools/ChangeLog.Jun2016
--- a/buildtools/ChangeLog.Jun2016
+++ b/buildtools/ChangeLog.Jun2016
@@ -1,7 +1,3 @@
# ChangeLog file for buildtools
# This file is updated with Maddlog
-* Mon Sep 26 2016 Sjoerd Mullender <sjoerd@acm.org>
-- We now use the CommonCrypto library instead of the OpenSSL library
- on Darwin.
-
diff --git a/clients/mapilib/mapi.rc b/clients/mapilib/mapi.rc
--- a/clients/mapilib/mapi.rc
+++ b/clients/mapilib/mapi.rc
@@ -23,7 +23,7 @@ BEGIN
// Maintained via vertoo. Please don't modify by hand!
// Contact MonetDB-developers@lists.sourceforge.net for details and/or \
assistance. VALUE "InternalName", "Mapi\0"
- VALUE "LegalCopyright", "Copyright © MonetDB B.V. 2008-2015\0"
+ VALUE "LegalCopyright", "Copyright © MonetDB B.V. 2008-2016\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "Mapi.dll\0"
VALUE "PrivateBuild", "\0"
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
@@ -23,7 +23,7 @@ BEGIN
// Maintained via vertoo. Please don't modify by hand!
// Contact MonetDB-developers@lists.sourceforge.net for details and/or \
assistance. VALUE "InternalName", "libMonetODBC\0"
- VALUE "LegalCopyright", "Copyright © MonetDB B.V. 2008-2015\0"
+ VALUE "LegalCopyright", "Copyright © MonetDB B.V. 2008-2016\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "libMonetODBC.dll\0"
VALUE "PrivateBuild", "\0"
diff --git a/common/stream/stream.c b/common/stream/stream.c
--- a/common/stream/stream.c
+++ b/common/stream/stream.c
@@ -604,8 +604,10 @@ void
close_stream(stream *s)
{
if (s) {
- s->close(s);
- s->destroy(s);
+ if (s->close)
+ s->close(s);
+ if (s->destroy)
+ s->destroy(s);
}
}
diff --git a/common/utils/mcrypt.h b/common/utils/mcrypt.h
--- a/common/utils/mcrypt.h
+++ b/common/utils/mcrypt.h
@@ -19,7 +19,4 @@ char *mcrypt_SHA512Sum(const char *strin
char *mcrypt_RIPEMD160Sum(const char *string, size_t len);
char *mcrypt_BackendSum(const char *string, size_t len);
char *mcrypt_hashPassword(const char *algo, const char *password, const char \
*challenge);
-#ifdef HAVE_EMBEDDED
-char* mcrypt_sum_fail(const char *string, size_t len);
#endif
-#endif
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -2681,8 +2681,13 @@ AC_CHECK_FUNCS([\
LIBS="$save_LIBS"
AC_MSG_CHECKING([__builtin_add_overflow])
+# Test for __builtin_mul_overflow with __int128 arguments, since at
+# the time of writing, there is a bug in Clang that "forgets" to link
+# to the runtime that contains the required function __muloti4. Also
+# see https://llvm.org/bugs/show_bug.cgi?id=16404 which is a similar
+# issue.
AC_LINK_IFELSE(
- [AC_LANG_PROGRAM([[]], [[int a, b, c; __builtin_add_overflow(a, b, &c);]])],
+ [AC_LANG_PROGRAM([[]], [[__int128 a, b, c; __builtin_mul_overflow(a, b, &c);]])],
[AC_DEFINE([HAVE___BUILTIN_ADD_OVERFLOW], 1,
[Define if you have the `__builtin_{add,sub,mul}_overflow' functions.])
AC_MSG_RESULT(yes)],
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+monetdb (11.23.11) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender <sjoerd@acm.org> Wed, 28 Sep 2016 13:47:01 +0200
+
+monetdb (11.23.11) unstable; urgency=low
+
+ * buildtools: We now use the CommonCrypto library instead of the OpenSSL library
+ on Darwin.
+
+ -- Sjoerd Mullender <sjoerd@acm.org> Mon, 26 Sep 2016 13:47:01 +0200
+
monetdb (11.23.9) unstable; urgency=low
* Rebuilt.
diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -1309,8 +1309,10 @@ BBPinit(void)
ATOMIC_INIT(BBPsizeLock);
#endif
- if (BBPfarms[0].dirname == NULL)
- BBPaddfarm(".", (1 << PERSISTENT) | (1 << TRANSIENT));
+ if (BBPfarms[0].dirname == NULL) {
+ BBPaddfarm(".", 1 << PERSISTENT);
+ BBPaddfarm(".", 1 << TRANSIENT);
+ }
GDKremovedir(0, DELDIR);
diff --git a/gdk/gdk_heap.c b/gdk/gdk_heap.c
--- a/gdk/gdk_heap.c
+++ b/gdk/gdk_heap.c
@@ -99,7 +99,7 @@ HEAPalloc(Heap *h, size_t nitems, size_t
GDKerror("HEAPalloc: allocating more than heap can accomodate\n");
return GDK_FAIL;
}
- if (h->filename == NULL || h->size < GDK_mmap_minsize) {
+ if (h->filename == NULL || h->size < (h->farmid == 0 ? GDK_mmap_minsize_persistent \
: GDK_mmap_minsize_transient)) { h->storage = STORE_MEM;
h->base = (char *) GDKmallocmax(h->size, &h->size, 0);
HEAPDEBUG fprintf(stderr, "#HEAPalloc " SZFMT " " PTRFMT "\n", h->size, PTRFMTCAST \
h->base); @@ -206,7 +206,7 @@ HEAPextend(Heap *h, size_t size, int may
Heap bak = *h;
size_t cur = GDKmem_cursize(), tot = GDK_mem_maxsize;
int exceeds_swap = size > (tot + tot - MIN(tot + tot, cur));
- int must_mmap = h->filename != NULL && (exceeds_swap || h->newstorage != STORE_MEM \
|| size >= GDK_mmap_minsize); + int must_mmap = h->filename != NULL && (exceeds_swap \
|| h->newstorage != STORE_MEM || size >= (h->farmid == 0 ? \
GDK_mmap_minsize_persistent : GDK_mmap_minsize_transient));
h->size = size;
@@ -621,7 +621,7 @@ HEAPload_intern(Heap *h, const char *nme
char *srcpath, *dstpath;
int t0;
- h->storage = h->newstorage = h->size < GDK_mmap_minsize ? STORE_MEM : STORE_MMAP;
+ h->storage = h->newstorage = h->size < (h->farmid == 0 ? \
GDK_mmap_minsize_persistent : GDK_mmap_minsize_transient) ? STORE_MEM : STORE_MMAP; \
if (h->filename == NULL) h->filename = (char *) GDKmalloc(strlen(nme) + strlen(ext) \
+ 2); if (h->filename == NULL)
diff --git a/gdk/gdk_posix.c b/gdk/gdk_posix.c
--- a/gdk/gdk_posix.c
+++ b/gdk/gdk_posix.c
@@ -557,7 +557,7 @@ MT_mremap(const char *path, int mode, vo
#else
p = MAP_FAILED;
if (path == NULL ||
- *new_size <= GDK_mmap_minsize) {
+ *new_size <= GDK_mmap_minsize_persistent) {
/* size not too big yet or
* anonymous, try to make new
* anonymous mmap and copy
diff --git a/gdk/gdk_private.h b/gdk/gdk_private.h
--- a/gdk/gdk_private.h
+++ b/gdk/gdk_private.h
@@ -246,7 +246,8 @@ extern struct BBPfarm_t {
extern int BBP_dirty; /* BBP table dirty? */
extern batlock_t GDKbatLock[BBP_BATMASK + 1];
extern bbplock_t GDKbbpLock[BBP_THREADMASK + 1];
-extern size_t GDK_mmap_minsize; /* size after which we use memory mapped files */
+extern size_t GDK_mmap_minsize_persistent; /* size after which we use memory mapped \
files for persistent heaps */ +extern size_t GDK_mmap_minsize_transient; /* size \
after which we use memory mapped files for transient heaps */ extern size_t \
GDK_mmap_pagesize; /* mmap granularity */ extern MT_Lock GDKnameLock;
extern MT_Lock GDKthreadLock;
diff --git a/gdk/gdk_utils.c b/gdk/gdk_utils.c
--- a/gdk/gdk_utils.c
+++ b/gdk/gdk_utils.c
@@ -273,8 +273,16 @@ BATSIGinit(void)
/* memory thresholds; these values some "sane" constants only, really
* set in GDKinit() */
-size_t GDK_mmap_minsize = (size_t) 1 << 18;
-size_t GDK_mmap_pagesize = (size_t) 1 << 16; /* mmap granularity */
+#define MMAP_MINSIZE_PERSISTENT ((size_t) 1 << 18)
+#if SIZEOF_SIZE_T == 4
+#define MMAP_MINSIZE_TRANSIENT ((size_t) 1 << 20)
+#else
+#define MMAP_MINSIZE_TRANSIENT ((size_t) 1 << 32)
+#endif
+#define MMAP_PAGESIZE ((size_t) 1 << 16)
+size_t GDK_mmap_minsize_persistent = MMAP_MINSIZE_PERSISTENT;
+size_t GDK_mmap_minsize_transient = MMAP_MINSIZE_TRANSIENT;
+size_t GDK_mmap_pagesize = MMAP_PAGESIZE; /* mmap granularity */
size_t GDK_mem_maxsize = GDK_VM_MAXSIZE;
size_t GDK_vm_maxsize = GDK_VM_MAXSIZE;
@@ -539,8 +547,10 @@ GDKinit(opt *set, int setlen)
} else if (strcmp("gdk_vm_maxsize", n[i].name) == 0) {
GDK_vm_maxsize = (size_t) strtoll(n[i].value, NULL, 10);
GDK_vm_maxsize = MAX(1 << 30, GDK_vm_maxsize);
- } else if (strcmp("gdk_mmap_minsize", n[i].name) == 0) {
- GDK_mmap_minsize = (size_t) strtoll(n[i].value, NULL, 10);
+ } else if (strcmp("gdk_mmap_minsize_persistent", n[i].name) == 0) {
+ GDK_mmap_minsize_persistent = (size_t) strtoll(n[i].value, NULL, 10);
+ } else if (strcmp("gdk_mmap_minsize_transient", n[i].name) == 0) {
+ GDK_mmap_minsize_transient = (size_t) strtoll(n[i].value, NULL, 10);
} else if (strcmp("gdk_mmap_pagesize", n[i].name) == 0) {
GDK_mmap_pagesize = (size_t) strtoll(n[i].value, NULL, 10);
if (GDK_mmap_pagesize < 1 << 12 ||
@@ -588,9 +598,13 @@ GDKinit(opt *set, int setlen)
snprintf(buf, sizeof(buf), SZFMT, GDK_mem_maxsize);
GDKsetenv("gdk_mem_maxsize", buf);
}
- if (GDKgetenv("gdk_mmap_minsize") == NULL) {
- snprintf(buf, sizeof(buf), SZFMT, GDK_mmap_minsize);
- GDKsetenv("gdk_mmap_minsize", buf);
+ if (GDKgetenv("gdk_mmap_minsize_persistent") == NULL) {
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic