Changeset: bc2f08ccd146 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bc2f08ccd146
Modified Files:
monetdb5/extras/rapi/Tests/All
monetdb5/extras/rapi/rapi.c
monetdb5/modules/mal/mal_mapi.c
sql/backends/monet5/Tests/All
sql/backends/monet5/sql_assert.c
sql/backends/monet5/vaults/netcdf.c
sql/test/BugTracker-2015/Tests/All
Branch: default
Log Message:
Merge with Jul2015 branch.
diffs (143 lines):
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/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);
}
} while (!ATOMIC_GET(serverexiting, atomicLock, "SERVERlistenThread") &&
!GDKexiting());
diff --git a/sql/backends/monet5/Tests/All b/sql/backends/monet5/Tests/All
--- a/sql/backends/monet5/Tests/All
+++ b/sql/backends/monet5/Tests/All
@@ -1,24 +1,24 @@
optimizers
-HAVE_LIBR?rapi00
-HAVE_LIBR?rapi01
-HAVE_LIBR?rapi02
-HAVE_LIBR?rapi03
-HAVE_LIBR?rapi04
-HAVE_LIBR?rapi05
-HAVE_LIBR?rapi06
-HAVE_LIBR?rapi07
-#HAVE_LIBR?rapi08
-HAVE_LIBR?rapi09
-HAVE_LIBR?rapi10
-HAVE_LIBR?rapi12
-HAVE_LIBR?rapi13
-HAVE_LIBR?rapi14
-HAVE_LIBR?rapi15
-HAVE_LIBR?rapi16
-HAVE_LIBR?rapi17
-HAVE_LIBR?rapi18
-HAVE_LIBR?rapi19
+HAVE_LIBR&NOT_WIN32?rapi00
+HAVE_LIBR&NOT_WIN32?rapi01
+HAVE_LIBR&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
+HAVE_LIBR&NOT_WIN32?rapi09
+HAVE_LIBR&NOT_WIN32?rapi10
+HAVE_LIBR&NOT_WIN32?rapi12
+HAVE_LIBR&NOT_WIN32?rapi13
+HAVE_LIBR&NOT_WIN32?rapi14
+HAVE_LIBR&NOT_WIN32?rapi15
+HAVE_LIBR&NOT_WIN32?rapi16
+HAVE_LIBR&NOT_WIN32?rapi17
+HAVE_LIBR&NOT_WIN32?rapi18
+HAVE_LIBR&NOT_WIN32?rapi19
# should this work?
#inlineUDF
diff --git a/sql/backends/monet5/sql_assert.c b/sql/backends/monet5/sql_assert.c
--- a/sql/backends/monet5/sql_assert.c
+++ b/sql/backends/monet5/sql_assert.c
@@ -111,8 +111,8 @@ SQLassertLng(Client cntxt, MalBlkPtr mb,
#ifdef HAVE_HGE
str
SQLassertHge(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci){
- hge *flg = (hge*) getArgReference(stk,pci, 1);
- str *msg = (str*) getArgReference(stk,pci, 2);
+ hge *flg = getArgReference_hge(stk,pci, 1);
+ str *msg = getArgReference_str(stk,pci, 2);
(void) cntxt;
(void)mb;
if (*flg){
diff --git a/sql/backends/monet5/vaults/netcdf.c
b/sql/backends/monet5/vaults/netcdf.c
--- a/sql/backends/monet5/vaults/netcdf.c
+++ b/sql/backends/monet5/vaults/netcdf.c
@@ -222,7 +222,7 @@ NCDFattach(Client cntxt, MalBlkPtr mb, M
sql_table *tfiles = NULL, *tdims = NULL, *tvars = NULL, *tvardim =
NULL, *tattrs = NULL;
sql_column *col;
str msg = MAL_SUCCEED;
- str fname = *(str*)getArgReference(stk, pci, 1);
+ str fname = *getArgReference_str(stk, pci, 1);
char buf[BUFSIZ], *s= buf;
oid fid, rid = oid_nil;
sql_trans *tr;
@@ -618,9 +618,9 @@ NCDFimportVariable(Client cntxt, MalBlkP
sql_table *tfiles = NULL, *arr_table = NULL;
sql_column *col;
- str msg = MAL_SUCCEED, vname = *(str*)getArgReference(stk, pci, 2);
+ str msg = MAL_SUCCEED, vname = *getArgReference_str(stk, pci, 2);
str fname = NULL, dimtype = NULL, aname_sys = NULL;
- int fid = *(int*)getArgReference(stk, pci, 1);
+ int fid = *getArgReference_int(stk, pci, 1);
int varid, vndims, vnatts, i, j, retval;
char buf[BUFSIZ], *s= buf, aname[256], **dname;
oid rid = oid_nil;
diff --git a/sql/test/BugTracker-2015/Tests/All
b/sql/test/BugTracker-2015/Tests/All
--- a/sql/test/BugTracker-2015/Tests/All
+++ b/sql/test/BugTracker-2015/Tests/All
@@ -83,7 +83,7 @@ select-push-crash.Bug-3829
coalesce.Bug-3830
null.Bug-3833
date_comparison_incorrect_results.Bug-3834
-hugeint-wrong-value.Bug-3849
+HAVE_HGE?hugeint-wrong-value.Bug-3849
dump-DELETE.Bug-3850
missed-error.Bug-3842
constant-random.Bug-3836
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
