Changeset: 2a94797dce40 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2a94797dce40
Added Files:
clients/ruby/Tests/rubytest.rb.in
Removed Files:
clients/ruby/Tests/rubytest.rb
monetdb5/mal/mal_http_daemon.c
monetdb5/mal/mal_http_daemon.h
Modified Files:
clients/Tests/malcheck.stable.err
clients/ruby/Tests/gemtest.rb
monetdb5/extras/rapi/Tests/All
monetdb5/extras/rapi/rapi.c
monetdb5/mal/Makefile.ag
monetdb5/mal/Tests/tst275.stable.out
monetdb5/modules/mal/mal_mapi.c
sql/backends/monet5/Tests/All
sql/backends/monet5/sql_assert.c
sql/backends/monet5/vaults/lidar.c
sql/backends/monet5/vaults/lidar.h
sql/backends/monet5/vaults/lidar.mal
sql/backends/monet5/vaults/netcdf.c
sql/test/BugTracker-2015/Tests/All
testing/Mtest.py.in
Branch: leftmart
Log Message:
Merge with default branch.
diffs (truncated from 600 to 300 lines):
diff --git a/clients/Tests/malcheck.stable.err
b/clients/Tests/malcheck.stable.err
--- a/clients/Tests/malcheck.stable.err
+++ b/clients/Tests/malcheck.stable.err
@@ -5,13 +5,6 @@ stderr of test 'malcheck` in directory '
# 15:15:51 > "./malcheck.sh" "malcheck"
# 15:15:51 >
-Traceback (most recent call last):
- File "<string>", line 1, in <module>
- File
"/export/scratch1/mk/default/Linux/lib/python2.7/site-packages/MonetDBtesting/malcheck.py",
line 200, in <module>
- process(f)
- File
"/export/scratch1/mk/default/Linux/lib/python2.7/site-packages/MonetDBtesting/malcheck.py",
line 75, in process
- data = open(f).read()
-IOError: [Errno 2] No such file or directory: 'monetdb5/mal/mal_properties.c'
# 15:16:26 >
# 15:16:26 > "Done."
diff --git a/clients/ruby/Tests/gemtest.rb b/clients/ruby/Tests/gemtest.rb
--- a/clients/ruby/Tests/gemtest.rb
+++ b/clients/ruby/Tests/gemtest.rb
@@ -1,8 +1,8 @@
# tests rubytest.rb & gemtest.rb are (and shoudl be kept!) identical,
# except the following two lines:
-#require_relative '../lib/MonetDB' # rubytest.rb
- require 'MonetDB' # gemtest.rb
+#require_relative '$RELSRCDIR/../lib/MonetDB' # rubytest.rb.in
+ require 'MonetDB' # gemtest.rb
class MapiRubyInterfaceTestCase
diff --git a/clients/ruby/Tests/rubytest.rb b/clients/ruby/Tests/rubytest.rb.in
rename from clients/ruby/Tests/rubytest.rb
rename to clients/ruby/Tests/rubytest.rb.in
--- a/clients/ruby/Tests/rubytest.rb
+++ b/clients/ruby/Tests/rubytest.rb.in
@@ -1,8 +1,8 @@
# tests rubytest.rb & gemtest.rb are (and shoudl be kept!) identical,
# except the following two lines:
- require_relative '../lib/MonetDB' # rubytest.rb
-#require 'MonetDB' # gemtest.rb
+ require_relative '$RELSRCDIR/../lib/MonetDB' # rubytest.rb.in
+#require 'MonetDB' # gemtest.rb
class MapiRubyInterfaceTestCase
diff --git a/monetdb5/extras/rapi/Tests/All b/monetdb5/extras/rapi/Tests/All
--- a/monetdb5/extras/rapi/Tests/All
+++ b/monetdb5/extras/rapi/Tests/All
@@ -1,9 +1,9 @@
-HAVE_LIBR?rapi00
-HAVE_LIBR?rapi01
-HAVE_LIBR&HAVE_HGE?rapi02
-HAVE_LIBR?rapi03
-HAVE_LIBR?rapi04
-HAVE_LIBR?rapi05
-HAVE_LIBR?rapi06
-HAVE_LIBR?rapi07
-HAVE_LIBR?rapi08
+HAVE_LIBR&NOT_WIN32?rapi00
+HAVE_LIBR&NOT_WIN32?rapi01
+HAVE_LIBR&HAVE_HGE&NOT_WIN32?rapi02
+HAVE_LIBR&NOT_WIN32?rapi03
+HAVE_LIBR&NOT_WIN32?rapi04
+HAVE_LIBR&NOT_WIN32?rapi05
+HAVE_LIBR&NOT_WIN32?rapi06
+HAVE_LIBR&NOT_WIN32?rapi07
+HAVE_LIBR&NOT_WIN32?rapi08
diff --git a/monetdb5/extras/rapi/rapi.c b/monetdb5/extras/rapi/rapi.c
--- a/monetdb5/extras/rapi/rapi.c
+++ b/monetdb5/extras/rapi/rapi.c
@@ -287,7 +287,7 @@ rapi_export str RAPIevalAggr(Client cntx
}
str RAPIeval(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci, bit
grouped) {
- sql_func * sqlfun = *(sql_func**) getArgReference(stk, pci, pci->retc);
+ sql_func * sqlfun = *(sql_func**) getArgReference_ptr(stk, pci,
pci->retc);
str exprStr = *getArgReference_str(stk, pci, pci->retc + 1);
SEXP x, env, retval;
diff --git a/monetdb5/mal/Makefile.ag b/monetdb5/mal/Makefile.ag
--- a/monetdb5/mal/Makefile.ag
+++ b/monetdb5/mal/Makefile.ag
@@ -9,8 +9,7 @@ INCLUDES = ../../common/options \
../../common/utils \
../../clients/mapilib \
../../gdk \
- $(READLINE_INCS) \
- $(libmicrohttpd_CFLAGS)
+ $(READLINE_INCS)
MTSAFE
lib_mal = {
@@ -26,7 +25,6 @@ lib_mal = {
mal_exception.c mal_exception.h \
mal_factory.c mal_factory.h \
mal_function.c mal_function.h \
- mal_http_daemon.c mal_http_daemon.h \
mal_import.c mal_import.h \
mal_runtime.c mal_runtime.h \
mal_instruction.c mal_instruction.h \
diff --git a/monetdb5/mal/Tests/tst275.stable.out
b/monetdb5/mal/Tests/tst275.stable.out
--- a/monetdb5/mal/Tests/tst275.stable.out
+++ b/monetdb5/mal/Tests/tst275.stable.out
@@ -54,8 +54,8 @@ end user.main;
# t t t # name
# void str str # type
#--------------------------#
-[ 0@0, "batId", "tmp_525" ]
-[ 1@0, "batCacheid", "341" ]
+[ 0@0, "batId", "tmp_461" ]
+[ 1@0, "batCacheid", "305" ]
[ 2@0, "hparentid", "0" ]
[ 3@0, "tparentid", "0" ]
[ 4@0, "batSharecnt", "0" ]
@@ -71,57 +71,56 @@ end user.main;
[ 14@0, "hsorted", "1" ]
[ 15@0, "hrevsorted", "1" ]
[ 16@0, "hident", "h" ]
-[ 17@0, "hdense", "1" ]
-[ 18@0, "hseqbase", "0@0" ]
-[ 19@0, "hkey", "1" ]
-[ 20@0, "hvarsized", "1" ]
-[ 21@0, "halign", "0" ]
-[ 22@0, "hnosorted", "0" ]
-[ 23@0, "hnorevsorted", "0" ]
-[ 24@0, "hnodense", "0" ]
-[ 25@0, "hnokey[0]", "0" ]
-[ 26@0, "hnokey[1]", "0" ]
-[ 27@0, "hnonil", "1" ]
-[ 28@0, "hnil", "0" ]
-[ 29@0, "tident", "t" ]
-[ 30@0, "tdense", "0" ]
-[ 31@0, "tseqbase", "0@0" ]
-[ 32@0, "tsorted", "1" ]
-[ 33@0, "trevsorted", "1" ]
-[ 34@0, "tkey", "1" ]
-[ 35@0, "tvarsized", "0" ]
-[ 36@0, "talign", "20000001" ]
-[ 37@0, "tnosorted", "0" ]
-[ 38@0, "tnorevsorted", "0" ]
-[ 39@0, "tnodense", "0" ]
-[ 40@0, "tnokey[0]", "0" ]
-[ 41@0, "tnokey[1]", "0" ]
-[ 42@0, "tnonil", "1" ]
-[ 43@0, "tnil", "0" ]
-[ 44@0, "batInserted", "0" ]
-[ 45@0, "batDeleted", "0" ]
-[ 46@0, "batFirst", "0" ]
-[ 47@0, "htop", "0" ]
-[ 48@0, "ttop", "0" ]
-[ 49@0, "batStamp", "152" ]
-[ 50@0, "lastUsed", "1117" ]
-[ 51@0, "curStamp", "154" ]
-[ 52@0, "batCopiedtodisk", "0" ]
-[ 53@0, "batDirtydesc", "dirty" ]
-[ 54@0, "H->heap.dirty", "clean" ]
-[ 55@0, "T->heap.dirty", "clean" ]
-[ 56@0, "head.free", "0" ]
-[ 57@0, "head.size", "0" ]
-[ 58@0, "head.storage", "absent" ]
-[ 59@0, "head.newstorage", "malloced" ]
-[ 60@0, "head.filename", "no file" ]
-[ 61@0, "tail.free", "0" ]
-[ 62@0, "tail.size", "1024" ]
-[ 63@0, "tail.storage", "malloced" ]
-[ 64@0, "tail.newstorage", "malloced" ]
-[ 65@0, "tail.filename", "05/525.tail" ]
-[ 66@0, "H->vheap->dirty", "clean" ]
-[ 67@0, "T->vheap->dirty", "clean" ]
+[ 17@0, "hseqbase", "0@0" ]
+[ 18@0, "hkey", "1" ]
+[ 19@0, "hvarsized", "1" ]
+[ 20@0, "halign", "0" ]
+[ 21@0, "hnosorted", "0" ]
+[ 22@0, "hnorevsorted", "0" ]
+[ 23@0, "hnodense", "0" ]
+[ 24@0, "hnokey[0]", "0" ]
+[ 25@0, "hnokey[1]", "0" ]
+[ 26@0, "hnonil", "1" ]
+[ 27@0, "hnil", "0" ]
+[ 28@0, "tident", "t" ]
+[ 29@0, "tdense", "0" ]
+[ 30@0, "tseqbase", "0@0" ]
+[ 31@0, "tsorted", "1" ]
+[ 32@0, "trevsorted", "1" ]
+[ 33@0, "tkey", "1" ]
+[ 34@0, "tvarsized", "0" ]
+[ 35@0, "talign", "20000001" ]
+[ 36@0, "tnosorted", "0" ]
+[ 37@0, "tnorevsorted", "0" ]
+[ 38@0, "tnodense", "0" ]
+[ 39@0, "tnokey[0]", "0" ]
+[ 40@0, "tnokey[1]", "0" ]
+[ 41@0, "tnonil", "1" ]
+[ 42@0, "tnil", "0" ]
+[ 43@0, "batInserted", "0" ]
+[ 44@0, "batDeleted", "0" ]
+[ 45@0, "batFirst", "0" ]
+[ 46@0, "htop", "0" ]
+[ 47@0, "ttop", "0" ]
+[ 48@0, "batStamp", "535" ]
+[ 49@0, "lastUsed", "45504" ]
+[ 50@0, "curStamp", "537" ]
+[ 51@0, "batCopiedtodisk", "0" ]
+[ 52@0, "batDirtydesc", "dirty" ]
+[ 53@0, "H->heap.dirty", "clean" ]
+[ 54@0, "T->heap.dirty", "clean" ]
+[ 55@0, "head.free", "0" ]
+[ 56@0, "head.size", "0" ]
+[ 57@0, "head.storage", "absent" ]
+[ 58@0, "head.newstorage", "malloced" ]
+[ 59@0, "head.filename", "no file" ]
+[ 60@0, "tail.free", "0" ]
+[ 61@0, "tail.size", "1024" ]
+[ 62@0, "tail.storage", "malloced" ]
+[ 63@0, "tail.newstorage", "malloced" ]
+[ 64@0, "tail.filename", "04/461.tail" ]
+[ 65@0, "H->vheap->dirty", "clean" ]
+[ 66@0, "T->vheap->dirty", "clean" ]
#~EndVariableOutput~#
#-----------------#
# h t # name
diff --git a/monetdb5/mal/mal_http_daemon.c b/monetdb5/mal/mal_http_daemon.c
deleted file mode 100644
--- a/monetdb5/mal/mal_http_daemon.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * Copyright 2008-2015 MonetDB B.V.
- */
-
-/* (author) A. de Rijke
- * For documentation see website
- */
-
-#include "monetdb_config.h"
-
-#include "mal.h"
-#include "mal_exception.h"
-#include "mal_private.h"
-#include "mal_http_daemon.h"
-
-/* dummy noop functions to implement the exported API, if these had been
- * defined to return a str, we could have informed the caller no
- * implementation was available */
-
-void
-register_http_handler(http_request_handler handler)
-{
- (void)handler;
-}
-
-void
-startHttpdaemon(void)
-{
-}
-
-void
-stopHttpdaemon(void)
-{
-}
diff --git a/monetdb5/mal/mal_http_daemon.h b/monetdb5/mal/mal_http_daemon.h
deleted file mode 100644
--- a/monetdb5/mal/mal_http_daemon.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * Copyright 2008-2015 MonetDB B.V.
- */
-
-#ifndef _MAL_HTTP_DAEMON_H_
-#define _MAL_HTTP_DAEMON_H_
-#include "mal.h"
-
-typedef int (*http_request_handler)
- (const char *url, const char *method, char **page, const char *);
-
-mal_export void register_http_handler(http_request_handler handler);
-
-#endif
diff --git a/monetdb5/modules/mal/mal_mapi.c b/monetdb5/modules/mal/mal_mapi.c
--- a/monetdb5/modules/mal/mal_mapi.c
+++ b/monetdb5/modules/mal/mal_mapi.c
@@ -366,7 +366,7 @@ SERVERlistenThread(SOCKET *Sock)
mnstr_flush(data->out);
showException(GDKstdout, MAL, "initClient",
"cannot fork new client
thread");
- free(data);
+ GDKfree(data);
}
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
