MonetDB: Oct2014 - Use proper types internally

[Martin Kersten]

Changeset: 08d5fa25c209 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=08d5fa25c209
Modified Files:
        monetdb5/modules/mal/querylog.c
        monetdb5/optimizer/opt_querylog.c
        sql/backends/monet5/sql_gencode.c
Branch: Oct2014
Log Message:

Use proper types internally
Fixes bug3607


diffs (63 lines):

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
@@ -36,6 +36,7 @@
 
 #include "monetdb_config.h"
 #include "querylog.h"
+#include "mtime.h"
 
 /* (c) M.L. Kersten
  * The query logger facility is hardwired to avoid interference 
@@ -298,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);
-       lng *tick = getArgReference_lng(stk,pci,4);
+       timestamp *tick = getArgReference(stk,pci,4);
        oid o;
 
        (void) cntxt;
@@ -323,8 +324,8 @@ QLOGdefine(Client cntxt, MalBlkPtr mb, M
 str
 QLOGcall(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
 {
-       lng *tick1  = getArgReference_lng(stk,pci,1);
-       lng *tick2  = getArgReference_lng(stk,pci,2);
+       timestamp *tick1  = getArgReference(stk,pci,1);
+       timestamp *tick2  = getArgReference(stk,pci,2);
        str *arg        = getArgReference_str(stk,pci,3);
        wrd *tuples = getArgReference_wrd(stk,pci,4);
        lng *xtime  = getArgReference_lng(stk,pci,5);
diff --git a/monetdb5/optimizer/opt_querylog.c 
b/monetdb5/optimizer/opt_querylog.c
--- a/monetdb5/optimizer/opt_querylog.c
+++ b/monetdb5/optimizer/opt_querylog.c
@@ -19,6 +19,7 @@
 
 #include "monetdb_config.h"
 #include "opt_querylog.h"
+#include "mtime.h"
 #include "querylog.h"
 
 int 
@@ -65,7 +66,7 @@ OPTquerylogImplementation(Client cntxt, 
        name= getArg(q,0)= newVariable(mb,GDKstrdup("name"),TYPE_str);
        defineQuery = pushArgument(mb,defineQuery,name);
        q = newStmt(mb, "mtime", "current_timestamp");
-       start= getArg(q,0)= newVariable(mb,GDKstrdup("start"),TYPE_any);
+       start= getArg(q,0)= newVariable(mb,GDKstrdup("start"),TYPE_timestamp);
        defineQuery = pushArgument(mb,defineQuery,start);
        pushInstruction(mb, defineQuery);
 
diff --git a/sql/backends/monet5/sql_gencode.c 
b/sql/backends/monet5/sql_gencode.c
--- a/sql/backends/monet5/sql_gencode.c
+++ b/sql/backends/monet5/sql_gencode.c
@@ -2687,6 +2687,8 @@ backend_dumpproc(backend *be, Client c, 
                        return NULL;
                }
                q->token = REMsymbol;   // will be patched
+               setVarType(mb, getArg(q, 0), TYPE_oid);
+               setVarUDFtype(mb, getArg(q, 0));
                q = pushStr(mb, q, t);
                GDKfree(tt);
                q = pushStr(mb, q, getSQLoptimizer(be->mvc));
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list