Changeset: 091ec7a917ea for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=091ec7a917ea
Modified Files:
monetdb5/mal/mal_interpreter.h
monetdb5/modules/mal/querylog.c
Branch: Oct2014
Log Message:
Fixed type checks for querylog.call() and querylog.define() functions.
This fixes bug 3607.
diffs (62 lines):
diff --git a/monetdb5/mal/mal_interpreter.h b/monetdb5/mal/mal_interpreter.h
--- a/monetdb5/mal/mal_interpreter.h
+++ b/monetdb5/mal/mal_interpreter.h
@@ -98,11 +98,11 @@ mal_export ptr getArgReference(MalStkPtr
assert(v->vtype == TYPE_bte); \
&v->val.btval;
\
})
-#define getArgReference_oid(s, pci, k) \
- ({
\
- ValRecord *v = &(s)->stk[(pci)->argv[k]]; \
- assert(v->vtype == TYPE_oid); \
- &v->val.oval;
\
+#define getArgReference_oid(s, pci, k)
\
+ ({
\
+ ValRecord *v = &(s)->stk[(pci)->argv[k]];
\
+ assert(v->vtype == TYPE_oid || v->vtype == TYPE_void); \
+ &v->val.oval;
\
})
#define getArgReference_ptr(s, pci, k) \
({
\
diff --git a/monetdb5/modules/mal/querylog.c b/monetdb5/modules/mal/querylog.c
--- a/monetdb5/modules/mal/querylog.c
+++ b/monetdb5/modules/mal/querylog.c
@@ -189,15 +189,15 @@ static void
{
QLOG_cat_id = QLOGcreate("cat","id",TYPE_oid);
QLOG_cat_user = QLOGcreate("cat","user",TYPE_str);
- QLOG_cat_defined = QLOGcreate("cat","defined",TYPE_lng);
+ QLOG_cat_defined = QLOGcreate("cat","defined",TYPE_timestamp);
QLOG_cat_query = QLOGcreate("cat","query",TYPE_str);
QLOG_cat_pipe = QLOGcreate("cat","pipe",TYPE_str);
QLOG_cat_mal = QLOGcreate("cat","mal",TYPE_int);
QLOG_cat_optimize = QLOGcreate("cat","optimize",TYPE_lng);
QLOG_calls_id = QLOGcreate("calls","id",TYPE_oid);
- QLOG_calls_start = QLOGcreate("calls","start",TYPE_lng);
- QLOG_calls_stop = QLOGcreate("calls","stop",TYPE_lng);
+ QLOG_calls_start = QLOGcreate("calls","start",TYPE_timestamp);
+ QLOG_calls_stop = QLOGcreate("calls","stop",TYPE_timestamp);
QLOG_calls_arguments = QLOGcreate("calls","arguments",TYPE_str);
QLOG_calls_tuples = QLOGcreate("calls","tuples",TYPE_wrd);
QLOG_calls_exec = QLOGcreate("calls","exec",TYPE_lng);
@@ -299,7 +299,7 @@ QLOGdefine(Client cntxt, MalBlkPtr mb, M
str *q = getArgReference_str(stk,pci,1);
str *pipe = getArgReference_str(stk,pci,2);
str *usr = getArgReference_str(stk,pci,3);
- timestamp *tick = getArgReference(stk,pci,4);
+ timestamp *tick = getArgReference_TYPE(stk,pci,4,timestamp);
oid o;
(void) cntxt;
@@ -324,8 +324,8 @@ QLOGdefine(Client cntxt, MalBlkPtr mb, M
str
QLOGcall(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
{
- timestamp *tick1 = getArgReference(stk,pci,1);
- timestamp *tick2 = getArgReference(stk,pci,2);
+ timestamp *tick1 = getArgReference_TYPE(stk,pci,1,timestamp);
+ timestamp *tick2 = getArgReference_TYPE(stk,pci,2,timestamp);
str *arg = getArgReference_str(stk,pci,3);
wrd *tuples = getArgReference_wrd(stk,pci,4);
lng *xtime = getArgReference_lng(stk,pci,5);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
