Changeset: 106ef2c88288 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=106ef2c88288
Removed Files:
testing/MkillUsers.in
testing/Mtimeout.c
Modified Files:
MonetDB.spec
buildtools/ChangeLog.Mar2018
buildtools/autogen/autogen/am.py
buildtools/autogen/autogen/msc.py
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
clients/Tests/exports.stable.out
clients/examples/C/Makefile.ag
clients/mapiclient/Makefile.ag
clients/mapiclient/Tests/mclient--help
clients/mapiclient/Tests/mclient--help.bat
clients/mapiclient/Tests/msqldump--help
clients/mapiclient/Tests/msqldump--help.bat
clients/mapiclient/Tests/stethoscope--help
clients/mapiclient/Tests/stethoscope--help.bat
clients/mapiclient/Tests/tachograph--help
clients/mapiclient/Tests/tachograph--help.bat
clients/mapiclient/Tests/tomograph--help
clients/mapiclient/Tests/tomograph--help.bat
clients/mapilib/Makefile.ag
common/stream/Makefile.ag
common/stream/monetdb-stream.pc.in
common/utils/muuid.h
configure.ag
debian/monetdb-testing.install
gdk/Makefile.ag
gdk/gdk.h
gdk/gdk_firstn.c
gdk/gdk_join.c
gdk/monetdb-gdk.pc.in
geom/monetdb5/Makefile.ag
monetdb5/extras/rapi/Makefile.ag
monetdb5/modules/kernel/algebra.c
monetdb5/modules/mal/remote.c
monetdb5/modules/mal/remote.h
monetdb5/modules/mal/remote.mal
monetdb5/optimizer/opt_candidates.c
monetdb5/optimizer/opt_prelude.c
monetdb5/optimizer/opt_prelude.h
monetdb5/tools/Makefile.ag
monetdb5/tools/Tests/mserver5--help
monetdb5/tools/Tests/mserver5--help.bat
monetdb5/tools/monetdb5.pc.in
sql/backends/monet5/LSST/Makefile.ag
sql/backends/monet5/Makefile.ag
sql/backends/monet5/Tests/Mbeddedsql5--help
sql/backends/monet5/Tests/Mbeddedsql5--help.bat
sql/backends/monet5/UDF/capi/Makefile.ag
sql/backends/monet5/UDF/pyapi/Makefile.ag
sql/backends/monet5/UDF/pyapi3/Makefile.ag
sql/backends/monet5/UDF/udf/Makefile.ag
sql/backends/monet5/generator/Makefile.ag
sql/backends/monet5/sql.c
sql/backends/monet5/sql_gencode.c
sql/backends/monet5/sql_statistics.c
sql/backends/monet5/vaults/Makefile.ag
sql/backends/monet5/vaults/bam/Makefile.ag
sql/backends/monet5/vaults/fits/Makefile.ag
sql/backends/monet5/vaults/lidar/Makefile.ag
sql/backends/monet5/vaults/netcdf/Makefile.ag
sql/backends/monet5/vaults/shp/Makefile.ag
sql/include/sql_mem.h
sql/test/BugDay_2005-10-06_2.9.3/Tests/alter_table_describe-mclient.SF-1146092.SQL.sh
sql/test/BugDay_2005-10-06_2.9.3/Tests/not_null.SF-933194.SQL.sh
sql/test/BugDay_2005-10-06_2.9.3/Tests/type_dump_test.SF-989257.SQL.sh
sql/test/BugTracker/Tests/authorization.SF-1430616.SQL.sh
sql/test/BugTracker/Tests/drop_schema_crash.SF-1504794.SQL.sh
sql/test/BugTracker/Tests/explain.SF-1739353.SQL.sh
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.SQL.sh
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-1join-query.stable.out
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-1join-view.stable.out
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-2join-query.stable.out
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-2join-view.stable.out
sql/test/Tests/bogus-auto-generated-keys.SQL.sh
sql/test/bugs/Tests/except-union-intersect-bug-sf-1146079.SQL.sh
sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_JdbcClient.SQL.sh
testing/ChangeLog
testing/Makefile.ag
testing/Mtest.py.in
testing/README
testing/process.py
tools/merovingian/client/Makefile.ag
tools/merovingian/daemon/Makefile.ag
tools/mserver/Makefile.ag
Branch: delete_in_vlist
Log Message:
Merge with default.
diffs (truncated from 2239 to 300 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -854,9 +854,7 @@ developer. If you do want to test, inst
%license COPYING
%defattr(-,root,root)
%{_bindir}/Mdiff
-%{_bindir}/MkillUsers
%{_bindir}/Mlog
-%{_bindir}/Mtimeout
%package testing-python
Summary: MonetDB - Monet Database Management System
diff --git a/buildtools/ChangeLog.Mar2018 b/buildtools/ChangeLog.Mar2018
--- a/buildtools/ChangeLog.Mar2018
+++ b/buildtools/ChangeLog.Mar2018
@@ -1,3 +1,11 @@
# ChangeLog file for buildtools
# This file is updated with Maddlog
+* Tue Apr 3 2018 Sjoerd Mullender <sjo...@acm.org>
+- On Linux and Unix, try not to link to libraries multiple times: that
+ only causes the code (and worse, the variables in those libraries) to be
+ included multiple times. On Windows, we do need to link to libraries
+ multiple times (once for each DLL we create if the DLL references
+ anything from the library) but that doesn't cause the linked library
+ to be loaded multiple times.
+
diff --git a/buildtools/autogen/autogen/am.py b/buildtools/autogen/autogen/am.py
--- a/buildtools/autogen/autogen/am.py
+++ b/buildtools/autogen/autogen/am.py
@@ -208,12 +208,19 @@ def am_additional_libs(name, sep, type,
if l[0] not in ("-", "$", "@"):
l = am_translate_dir(l, am) + ".la"
if c:
- if c in ('NATIVE_WIN32', 'WIN32'):
+ c = c.split('&')
+ if 'NATIVE_WIN32' in c:
continue
global libno
v = 'LIB%d' % libno
libno = libno + 1
- add = 'if %s\n%s = %s\nelse\n%s =\nendif\n%s' % (c, v, l, v, add)
+ s = ''
+ for x in c:
+ s += 'if %s\n' % x
+ s += '%s = %s\n' % (v, l)
+ for x in c:
+ s += 'else\n%s =\nendif\n' % v
+ add = s + add
l = '$(%s)' % v
add = add + " " + l
return add + "\n"
diff --git a/buildtools/autogen/autogen/msc.py
b/buildtools/autogen/autogen/msc.py
--- a/buildtools/autogen/autogen/msc.py
+++ b/buildtools/autogen/autogen/msc.py
@@ -209,8 +209,15 @@ def msc_additional_libs(fd, name, sep, t
for l in list:
if '?' in l:
c, l = l.split('?', 1)
- if c in ('NATIVE_WIN32', 'WIN32'):
- c = None
+ c = c.split('&')
+ try:
+ c.remove('NATIVE_WIN32')
+ except ValueError:
+ pass
+ try:
+ c.remove('WIN32')
+ except ValueError:
+ pass
else:
c = None
d = None
@@ -243,7 +250,7 @@ def msc_additional_libs(fd, name, sep, t
global libno
v = 'LIB%d' % libno
libno = libno + 1
- cond += '!IF defined(%s)\n%s = %s\n!ELSE\n%s =\n!ENDIF\n' % (c, v,
l, v)
+ cond += '!IF defined(%s)\n%s = %s\n!ELSE\n%s =\n!ENDIF\n' % (') &&
defined('.join(c), v, l, v)
l = '$(%s)' % v
if d:
deps = '%s %s' % (deps, l)
diff --git a/clients/Tests/MAL-signatures.stable.out
b/clients/Tests/MAL-signatures.stable.out
--- a/clients/Tests/MAL-signatures.stable.out
+++ b/clients/Tests/MAL-signatures.stable.out
@@ -10783,6 +10783,7 @@ Ready.
[ "remote", "prelude", "command remote.prelude():void ",
"RMTprelude;", "initialise the remote module" ]
[ "remote", "put", "pattern remote.put(conn:str, object:any):str ",
"RMTput;", "copies object to the remote site and returns its identifier"
]
[ "remote", "register", "pattern remote.register(conn:str, mod:str,
fcn:str):void ", "RMTregister;", "register <mod>.<fcn> at the remote site"
]
+[ "remote", "register_supervisor", "command
remote.register_supervisor(sup_uuid:str, query_uuid:str):int ",
"RMTregisterSupervisor;", "Register the supervisor uuid at a remote site"
]
[ "remote", "resolve", "command remote.resolve(pattern:str):bat[:str]
", "RMTresolve;", "resolve a pattern against Merovingian and return the
URIs" ]
[ "sabaoth", "epilogue", "command sabaoth.epilogue():void ",
"SABepilogue;", "Release the resources held by the sabaoth module" ]
[ "sabaoth", "getLocalConnectionHost", "command
sabaoth.getLocalConnectionHost():str ", "SABgetLocalConnectionHost;",
"Returns the hostname this server can be connected to, or nil if none" ]
diff --git a/clients/Tests/MAL-signatures.stable.out.int128
b/clients/Tests/MAL-signatures.stable.out.int128
--- a/clients/Tests/MAL-signatures.stable.out.int128
+++ b/clients/Tests/MAL-signatures.stable.out.int128
@@ -14994,6 +14994,7 @@ Ready.
[ "remote", "prelude", "command remote.prelude():void ",
"RMTprelude;", "initialise the remote module" ]
[ "remote", "put", "pattern remote.put(conn:str, object:any):str ",
"RMTput;", "copies object to the remote site and returns its identifier"
]
[ "remote", "register", "pattern remote.register(conn:str, mod:str,
fcn:str):void ", "RMTregister;", "register <mod>.<fcn> at the remote site"
]
+[ "remote", "register_supervisor", "command
remote.register_supervisor(sup_uuid:str, query_uuid:str):int ",
"RMTregisterSupervisor;", "Register the supervisor uuid at a remote site"
]
[ "remote", "resolve", "command remote.resolve(pattern:str):bat[:str]
", "RMTresolve;", "resolve a pattern against Merovingian and return the
URIs" ]
[ "sabaoth", "epilogue", "command sabaoth.epilogue():void ",
"SABepilogue;", "Release the resources held by the sabaoth module" ]
[ "sabaoth", "getLocalConnectionHost", "command
sabaoth.getLocalConnectionHost():str ", "SABgetLocalConnectionHost;",
"Returns the hostname this server can be connected to, or nil if none" ]
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
@@ -139,6 +139,7 @@ BUN BATgrows(BAT *b);
gdk_return BAThash(BAT *b, BUN masksize);
void BAThseqbase(BAT *b, oid o);
gdk_return BATimprints(BAT *b);
+BAT *BATintersect(BAT *l, BAT *r, BAT *sl, BAT *sr, int nil_matches, BUN
estimate);
BAT *BATintersectcand(BAT *a, BAT *b);
gdk_return BATjoin(BAT **r1p, BAT **r2p, BAT *l, BAT *r, BAT *sl, BAT *sr, int
nil_matches, BUN estimate) __attribute__((__warn_unused_result__));
gdk_return BATkey(BAT *b, bool onoff);
@@ -1656,6 +1657,7 @@ str RMTprelude(void *ret);
str RMTput(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str RMTregister(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str RMTregisterInternal(Client cntxt, str conn, str mod, str fcn);
+str RMTregisterSupervisor(int *ret, str *sup_uuid, str *query_uuid);
str RMTresolve(bat *ret, str *pat);
str RUNadder(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
str RUNchoice(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
@@ -2476,6 +2478,7 @@ str reconnectRef;
str reenterMAL(Client cntxt, MalBlkPtr mb, int startpc, int stoppc, MalStkPtr
stk);
str refineRef;
str registerRef;
+str register_supervisorRef;
str releaseRef;
str remapRef;
str remoteRef;
diff --git a/clients/examples/C/Makefile.ag b/clients/examples/C/Makefile.ag
--- a/clients/examples/C/Makefile.ag
+++ b/clients/examples/C/Makefile.ag
@@ -5,15 +5,14 @@
# Copyright 1997 - July 2008 CWI, August 2008 - 2018 MonetDB B.V.
MTSAFE
-INCLUDES = ../../mapilib ../../../common/options $(READLINE_INCS)
-
-MAPI_LIBS = $(SOCKET_LIBS)
+INCLUDES = ../../mapilib
BINS = {
CONDINST = HAVE_TESTING
DIR = bindir
SOURCES = sample0.c sample1.c sample4.c \
smack00.c smack01.c
- LIBS = $(MAPI_LIBS) ../../mapilib/libmapi \
- $(curl_LIBS)
+ LIBS = ../../mapilib/libmapi \
+ ../../../common/stream/libstream \
+ $(SOCKET_LIBS) $(zlib_LIBS) $(BZ_LIBS) $(snappy_LIBS)
$(lz4_LIBS) $(liblzma_LIBS) $(curl_LIBS) $(LTLIBICONV) $(openssl_LIBS)
}
diff --git a/clients/mapiclient/Makefile.ag b/clients/mapiclient/Makefile.ag
--- a/clients/mapiclient/Makefile.ag
+++ b/clients/mapiclient/Makefile.ag
@@ -14,43 +14,44 @@ lib_mcutil = {
bin_mclient = {
SOURCES = mclient.c ReadlineTools.c ReadlineTools.h mhelp.c mhelp.h
- LIBS = libmcutil ../mapilib/libmapi \
- ../../common/stream/libstream \
+ LIBS = libmcutil \
../../common/utils/libmutils \
+ ../mapilib/libmapi \
+ ../../common/stream/libstream \
$(READLINE_LIBS) \
- $(curl_LIBS) $(LTLIBICONV) $(PTHREAD_LIBS) $(MATH_LIBS)
$(SOCKET_LIBS)
+ $(SOCKET_LIBS) $(zlib_LIBS) $(BZ_LIBS) $(snappy_LIBS)
$(lz4_LIBS) $(liblzma_LIBS) $(curl_LIBS) $(LTLIBICONV) $(openssl_LIBS)
}
bin_msqldump = {
SOURCES = msqldump.c msqldump.h
- LIBS = libmcutil ../mapilib/libmapi \
+ LIBS = libmcutil ../../common/utils/libmutils \
+ ../mapilib/libmapi \
../../common/stream/libstream \
- ../../common/utils/libmutils \
- $(curl_LIBS)
+ $(SOCKET_LIBS) $(zlib_LIBS) $(BZ_LIBS) $(snappy_LIBS)
$(lz4_LIBS) $(liblzma_LIBS) $(curl_LIBS) $(LTLIBICONV) $(openssl_LIBS)
}
bin_stethoscope = {
SOURCES = stethoscope.c
- LIBS = libmcutil ../mapilib/libmapi \
+ LIBS = libmcutil ../../common/utils/libmutils \
+ ../mapilib/libmapi \
../../common/stream/libstream \
- ../../common/utils/libmutils \
- $(curl_LIBS) $(MALLOC_LIBS) $(PTHREAD_LIBS) $(SOCKET_LIBS)
+ $(SOCKET_LIBS) $(zlib_LIBS) $(BZ_LIBS) $(snappy_LIBS)
$(lz4_LIBS) $(liblzma_LIBS) $(curl_LIBS) $(LTLIBICONV) $(openssl_LIBS)
$(PTHREAD_LIBS)
}
bin_tachograph = {
SOURCES = tachograph.c
- LIBS = libmcutil ../mapilib/libmapi \
+ LIBS = libmcutil ../../common/utils/libmutils \
+ ../mapilib/libmapi \
../../common/stream/libstream \
- ../../common/utils/libmutils \
- $(curl_LIBS) $(MALLOC_LIBS) $(PTHREAD_LIBS) $(SOCKET_LIBS)
+ $(SOCKET_LIBS) $(zlib_LIBS) $(BZ_LIBS) $(snappy_LIBS)
$(lz4_LIBS) $(liblzma_LIBS) $(curl_LIBS) $(LTLIBICONV) $(openssl_LIBS)
$(PTHREAD_LIBS)
}
bin_tomograph = {
SOURCES = tomograph.c
- LIBS = libmcutil ../mapilib/libmapi \
+ LIBS = libmcutil ../../common/utils/libmutils \
+ ../mapilib/libmapi \
../../common/stream/libstream \
- ../../common/utils/libmutils \
- $(curl_LIBS) $(MALLOC_LIBS) $(PTHREAD_LIBS) $(SOCKET_LIBS)
+ $(SOCKET_LIBS) $(zlib_LIBS) $(BZ_LIBS) $(snappy_LIBS)
$(lz4_LIBS) $(liblzma_LIBS) $(curl_LIBS) $(LTLIBICONV) $(openssl_LIBS)
$(PTHREAD_LIBS)
}
# disabled: it's not really a tool for users, more to debug mapi
diff --git a/clients/mapiclient/Tests/mclient--help
b/clients/mapiclient/Tests/mclient--help
--- a/clients/mapiclient/Tests/mclient--help
+++ b/clients/mapiclient/Tests/mclient--help
@@ -1,3 +1,3 @@
#!/bin/sh
-Mlog -x $MTIMEOUT mclient --help
+Mlog -x mclient --help
diff --git a/clients/mapiclient/Tests/mclient--help.bat
b/clients/mapiclient/Tests/mclient--help.bat
--- a/clients/mapiclient/Tests/mclient--help.bat
+++ b/clients/mapiclient/Tests/mclient--help.bat
@@ -1,4 +1,4 @@
@echo on
@prompt # $t $g
- %MTIMEOUT% mclient --help
+ mclient --help
diff --git a/clients/mapiclient/Tests/msqldump--help
b/clients/mapiclient/Tests/msqldump--help
--- a/clients/mapiclient/Tests/msqldump--help
+++ b/clients/mapiclient/Tests/msqldump--help
@@ -1,3 +1,3 @@
#!/bin/sh
-Mlog -x $MTIMEOUT msqldump --help
+Mlog -x msqldump --help
diff --git a/clients/mapiclient/Tests/msqldump--help.bat
b/clients/mapiclient/Tests/msqldump--help.bat
--- a/clients/mapiclient/Tests/msqldump--help.bat
+++ b/clients/mapiclient/Tests/msqldump--help.bat
@@ -1,4 +1,4 @@
@echo on
@prompt # $t $g
- %MTIMEOUT% msqldump --help
+ msqldump --help
diff --git a/clients/mapiclient/Tests/stethoscope--help
b/clients/mapiclient/Tests/stethoscope--help
--- a/clients/mapiclient/Tests/stethoscope--help
+++ b/clients/mapiclient/Tests/stethoscope--help
@@ -1,3 +1,3 @@
#!/bin/sh
-Mlog -x $MTIMEOUT stethoscope --help
+Mlog -x stethoscope --help
diff --git a/clients/mapiclient/Tests/stethoscope--help.bat
b/clients/mapiclient/Tests/stethoscope--help.bat
--- a/clients/mapiclient/Tests/stethoscope--help.bat
+++ b/clients/mapiclient/Tests/stethoscope--help.bat
@@ -1,4 +1,4 @@
@echo on
@prompt # $t $g
- %MTIMEOUT% stethoscope --help
+ stethoscope --help
diff --git a/clients/mapiclient/Tests/tachograph--help
b/clients/mapiclient/Tests/tachograph--help
--- a/clients/mapiclient/Tests/tachograph--help
+++ b/clients/mapiclient/Tests/tachograph--help
@@ -1,3 +1,3 @@
#!/bin/sh
-Mlog -x $MTIMEOUT tachograph --help
+Mlog -x tachograph --help
diff --git a/clients/mapiclient/Tests/tachograph--help.bat
b/clients/mapiclient/Tests/tachograph--help.bat
--- a/clients/mapiclient/Tests/tachograph--help.bat
+++ b/clients/mapiclient/Tests/tachograph--help.bat
@@ -1,4 +1,4 @@
@echo on
@prompt # $t $g
- %MTIMEOUT% tachograph --help
+ tachograph --help
diff --git a/clients/mapiclient/Tests/tomograph--help
b/clients/mapiclient/Tests/tomograph--help
--- a/clients/mapiclient/Tests/tomograph--help
+++ b/clients/mapiclient/Tests/tomograph--help
@@ -1,3 +1,3 @@
#!/bin/sh
-Mlog -x $MTIMEOUT tomograph --help
+Mlog -x tomograph --help
diff --git a/clients/mapiclient/Tests/tomograph--help.bat
b/clients/mapiclient/Tests/tomograph--help.bat
--- a/clients/mapiclient/Tests/tomograph--help.bat
+++ b/clients/mapiclient/Tests/tomograph--help.bat
@@ -1,4 +1,4 @@
@echo on
@prompt # $t $g
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
