Changeset: 164c19b7ff79 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=164c19b7ff79
Modified Files:
sql/backends/monet5/iot/basket.c
sql/backends/monet5/iot/basket.mal
sql/backends/monet5/iot/iot.c
sql/backends/monet5/iot/petrinet.c
Branch: iot
Log Message:
Fix naming
diffs (109 lines):
diff --git a/sql/backends/monet5/iot/basket.c b/sql/backends/monet5/iot/basket.c
--- a/sql/backends/monet5/iot/basket.c
+++ b/sql/backends/monet5/iot/basket.c
@@ -456,7 +456,6 @@ BSKTpushBasket(Client cntxt, MalBlkPtr m
case TYPE_oid:
case TYPE_flt:
case TYPE_dbl:
- case TYPE_wrd:
case TYPE_lng:
#ifdef HAVE_HGE
case TYPE_hge:
@@ -759,7 +758,7 @@ BSKTdelete(Client cntxt, MalBlkPtr mb, M
str
BSKTclear(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
{
- wrd *res = getArgReference_wrd(stk, pci, 0);
+ lng *res = getArgReference_lng(stk, pci, 0);
mvc *m = NULL;
str msg;
str sname = *getArgReference_str(stk, pci, 1);
diff --git a/sql/backends/monet5/iot/basket.mal
b/sql/backends/monet5/iot/basket.mal
--- a/sql/backends/monet5/iot/basket.mal
+++ b/sql/backends/monet5/iot/basket.mal
@@ -53,7 +53,7 @@ pattern update(sch:str,tbl:str, cols:bat
address BSKTupdate
comment "Dump the new tuples into the basket";
-pattern clear_table(sch:str,tbl:str):wrd
+pattern clear_table(sch:str,tbl:str):lng
address BSKTclear
comment "Remove the basket";
diff --git a/sql/backends/monet5/iot/iot.c b/sql/backends/monet5/iot/iot.c
--- a/sql/backends/monet5/iot/iot.c
+++ b/sql/backends/monet5/iot/iot.c
@@ -94,7 +94,7 @@ IOTquery(Client cntxt, MalBlkPtr mb, Mal
msg = IOTprocedureStmt(cntxt, mb, sch, nme);
if (msg)
return msg;
- s = findSymbolInModule(cntxt->nspace, putName(nme,
strlen(nme)));
+ s = findSymbolInModule(cntxt->nspace, putName(nme));
if (s == NULL)
throw(SQL, "iot.query", "Definition missing");
qry = s->def;
@@ -114,15 +114,15 @@ IOTquery(Client cntxt, MalBlkPtr mb, Mal
}
_DEBUG_IOT_ fprintf(stderr,"#iot: bake a new continuous query plan\n");
- scope = findModule(cntxt->nspace, putName(sch, strlen(sch)));
- s = newFunction(putName(sch, strlen(sch)), putName(nme, strlen(nme)),
FUNCTIONsymbol);
+ scope = findModule(cntxt->nspace, putName(sch));
+ s = newFunction(putName(sch), putName(nme), FUNCTIONsymbol);
if (s == NULL)
throw(SQL, "iot.query", "Procedure code does not exist.");
freeMalBlk(s->def);
s->def = copyMalBlk(qry);
p = getInstrPtr(s->def, 0);
- setModuleId(p, putName(sch, strlen(sch)));
- setFunctionId(p, putName(nme, strlen(nme)));
+ setModuleId(p, putName(sch));
+ setFunctionId(p, putName(nme));
insertSymbol(scope, s);
_DEBUG_IOT_ printFunction(cntxt->fdout, s->def, 0, LIST_MAL_ALL);
/* optimize the code and register at scheduler */
@@ -131,7 +131,7 @@ IOTquery(Client cntxt, MalBlkPtr mb, Mal
msg = optimizeMALBlock(cntxt, s->def);
if (msg == MAL_SUCCEED)
msg = optimizerCheck(cntxt, s->def, "optimizer.iot", 1,
GDKusec() - clk);
- addtoMalBlkHistory(mb, "iot");
+ addtoMalBlkHistory(mb);
}
if (msg == MAL_SUCCEED) {
_DEBUG_IOT_ fprintf(stderr,"#iot: continuous query plan\n");
diff --git a/sql/backends/monet5/iot/petrinet.c
b/sql/backends/monet5/iot/petrinet.c
--- a/sql/backends/monet5/iot/petrinet.c
+++ b/sql/backends/monet5/iot/petrinet.c
@@ -102,9 +102,9 @@ str PNanalyseWrapper(Client cntxt, MalBl
str fcnnme = *getArgReference_str(stk, pci, 2);
(void) mb;
- scope = findModule(cntxt->nspace, putName(modnme, (int)
strlen(modnme)));
+ scope = findModule(cntxt->nspace, putName(modnme));
if (scope)
- s = findSymbolInModule(scope, putName(fcnnme, (int)
strlen(fcnnme)));
+ s = findSymbolInModule(scope, putName(fcnnme));
if (s == NULL)
throw(MAL, "petrinet.analysis", "Could not find function");
@@ -120,9 +120,9 @@ str PNregister(Client cntxt, MalBlkPtr m
str fcnnme = *getArgReference_str(stk, pci, 2);
(void) mb;
- scope = findModule(cntxt->nspace, putName(modnme, (int)
strlen(modnme)));
+ scope = findModule(cntxt->nspace, putName(modnme));
if (scope)
- s = findSymbolInModule(scope, putName(fcnnme, (int)
strlen(fcnnme)));
+ s = findSymbolInModule(scope, putName(fcnnme));
if (s == NULL)
throw(MAL, "petrinet.register", "Could not find function");
@@ -164,7 +164,7 @@ PNregisterInternal(Client cntxt, MalBlkP
pnet[pnettop].modname = GDKstrdup(getModuleId(sig));
pnet[pnettop].fcnname = GDKstrdup(getFunctionId(sig));
snprintf(buf,IDLENGTH,"petri_%d",pnettop);
- s = newFunction(iotRef, putName(buf,strlen(buf)), FUNCTIONsymbol);
+ s = newFunction(iotRef, putName(buf), FUNCTIONsymbol);
nmb = s->def;
setArgType(nmb, nmb->stmt[0],0, TYPE_void);
(void) newStmt(nmb, sqlRef, transactionRef);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
