Changeset: 61467ac73216 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=61467ac73216
Modified Files:
clients/Tests/malcheck.stable.out
sql/backends/monet5/iot/basket.c
sql/backends/monet5/iot/iot.mal
Branch: iot
Log Message:
Minor fixes
diffs (62 lines):
diff --git a/clients/Tests/malcheck.stable.out
b/clients/Tests/malcheck.stable.out
--- a/clients/Tests/malcheck.stable.out
+++ b/clients/Tests/malcheck.stable.out
@@ -7,9 +7,8 @@ stdout of test 'malcheck` in directory '
BSKTdrop: missing for MAL command drop in sql/backends/monet5/iot/basket.mal
BSKTerror: missing for MAL command error in sql/backends/monet5/iot/iot.mal
-BSKTimportBasket: missing for MAL pattern iot.import in
sql/backends/monet5/iot/iot.mal
+PNstop: missing for MAL pattern stop in sql/backends/monet5/iot/iot.mal
PNstep: missing for MAL pattern step in sql/backends/monet5/iot/petrinet.mal
-PNsetCycleDelay: missing for MAL pattern period in
sql/backends/monet5/iot/petrinet.mal
# 15:16:26 >
# 15:16:26 > "Done."
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
@@ -231,13 +231,18 @@ BSKTheartbeat(Client cntxt, MalBlkPtr mb
{
str sch = *getArgReference_str(stk,pci,1);
str tbl = *getArgReference_str(stk,pci,2);
- int ticks = *getArgReference_int(stk,pci,3);
+ lng ticks;
int idx;
str msg;
(void) cntxt;
(void) mb;
+ if( getArgType(mb,pci,3) == TYPE_int){
+ idx = *getArgReference_int(stk,pci,3);
+ ticks = idx;
+ } else
+ ticks = *getArgReference_lng(stk,pci,3);
if( ticks < 0)
throw(SQL,"basket.heartbeat","Positive heartbeat expected\n");
idx = BSKTlocate(sch, tbl);
@@ -255,7 +260,7 @@ BSKTheartbeat(Client cntxt, MalBlkPtr mb
str
BSKTgetheartbeat(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
{
- int *ret = getArgReference_int(stk,pci,0);
+ lng *ret = getArgReference_lng(stk,pci,0);
str sch = *getArgReference_str(stk,pci,1);
str tbl = *getArgReference_str(stk,pci,2);
int idx;
diff --git a/sql/backends/monet5/iot/iot.mal b/sql/backends/monet5/iot/iot.mal
--- a/sql/backends/monet5/iot/iot.mal
+++ b/sql/backends/monet5/iot/iot.mal
@@ -73,7 +73,11 @@ pattern iot.heartbeat(sch:str,tbl:str,N:
address BSKTheartbeat
comment "Set an delay to N milliseconds";
-pattern iot.getheartbeat(sch:str,tbl:str):int
+pattern iot.heartbeat(sch:str,tbl:str,N:lng)
+address BSKTheartbeat
+comment "Set an delay to N milliseconds";
+
+pattern iot.getheartbeat(sch:str,tbl:str):lng
address BSKTgetheartbeat
comment "Get the hearbeat delay";
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
