Changeset: 8d1e2e504422 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8d1e2e504422
Modified Files:
sql/backends/monet5/iot/Tests/iot00.sql
sql/backends/monet5/iot/Tests/iot00.stable.out
sql/backends/monet5/iot/Tests/iot02.stable.out
sql/backends/monet5/iot/Tests/iot12.sql
sql/backends/monet5/iot/Tests/receptor01.sql
Branch: iot
Log Message:
Approve output
diffs (137 lines):
diff --git a/sql/backends/monet5/iot/Tests/iot00.sql
b/sql/backends/monet5/iot/Tests/iot00.sql
--- a/sql/backends/monet5/iot/Tests/iot00.sql
+++ b/sql/backends/monet5/iot/Tests/iot00.sql
@@ -13,10 +13,10 @@ end;
call iot.query('iot','cq00');
--call iot.query('insert into iot.result select min(t), count(*), avg(val)
from iot.stmp;');
-select * from iot.baskets();
-select * from iot.queries();
-select * from iot.inputs();
-select * from iot.outputs();
+--select * from iot.baskets();
+--select * from iot.queries();
+--select * from iot.inputs();
+--select * from iot.outputs();
-- stop all continuous queries and wait for it
call iot.pause();
diff --git a/sql/backends/monet5/iot/Tests/iot00.stable.out
b/sql/backends/monet5/iot/Tests/iot00.stable.out
--- a/sql/backends/monet5/iot/Tests/iot00.stable.out
+++ b/sql/backends/monet5/iot/Tests/iot00.stable.out
@@ -73,29 +73,6 @@ Ready.
#begin
# insert into result select min(t), count(*), avg(val) from stmp;
#end;
-#select * from iot.baskets();
-% ., ., ., ., ., ., ., ., ., .,
. # table_name
-% schema, table, status, threshold, winsize, winstride,
timeslice, timestride, heartbeat, seen, events # name
-% clob, clob, clob, int, int, int, int, int, int,
timestamp, int # type
-% 3, 4, 7, 1, 1, 2, 1, 1, 1, 26,
1 # length
-[ "iot", "stmp", "waiting", 0, 0, -1, 0, 0,
0, NULL, 0 ]
-#select * from iot.queries();
-% ., ., ., ., ., ., ., . # table_name
-% schema, function, status, lastrun, cycles, events, time,
error # name
-% clob, clob, clob, timestamp, int, int, bigint, clob #
type
-% 3, 4, 7, 26, 1, 1, 1, 0 # length
-[ "iot", "cq00", "waiting", NULL, 0, 0, 0, ""
]
-#select * from iot.inputplaces();
-% ., ., ., . # table_name
-% s, t, sch, qry # name
-% clob, clob, clob, clob # type
-% 3, 4, 3, 4 # length
-[ "iot", "stmp", "iot", "cq00" ]
-#select * from iot.outputplaces();
-% ., ., ., . # table_name
-% s, t, sch, qry # name
-% clob, clob, clob, clob # type
-% 0, 0, 0, 0 # length
#insert into stmp values('2005-09-23 12:34:26.736',1,12.34);
[ 1 ]
#select * from stmp;
diff --git a/sql/backends/monet5/iot/Tests/iot02.stable.out
b/sql/backends/monet5/iot/Tests/iot02.stable.out
--- a/sql/backends/monet5/iot/Tests/iot02.stable.out
+++ b/sql/backends/monet5/iot/Tests/iot02.stable.out
@@ -50,8 +50,8 @@ Ready.
% char # type
% 6 # length
[ "RESULT" ]
-#select * from stmp1;
-% iot.stmp1, iot.stmp1, iot.stmp1 # table_name
+#select * from stmp2;
+% iot.stmp2, iot.stmp2, iot.stmp2 # table_name
% t, sensor, val # name
% timestamp, int, decimal # type
% 26, 1, 10 # length
@@ -62,6 +62,7 @@ Ready.
% 26, 1, 10 # length
[ 2005-09-23 12:34:26.000000, 1, 11.00 ]
[ 2005-09-23 12:34:27.000000, 1, 11.00 ]
+[ 2005-09-23 12:34:27.000000, 1, 11.00 ]
#select * from result2;
% iot.result2, iot.result2, iot.result2 # table_name
% t, sensor, val # name
@@ -69,6 +70,20 @@ Ready.
% 26, 1, 10 # length
[ 2005-09-23 12:34:28.000000, 1, 13.00 ]
[ 2005-09-23 12:34:28.000000, 1, 13.00 ]
+[ 2005-09-23 12:34:28.000000, 1, 13.00 ]
+[ 2005-09-23 12:34:28.000000, 1, 13.00 ]
+[ 2005-09-23 12:34:28.000000, 1, 13.00 ]
+[ 2005-09-23 12:34:28.000000, 1, 13.00 ]
+[ 2005-09-23 12:34:28.000000, 1, 13.00 ]
+#select * from iot.errors();
+% ., . # table_name
+% table, error # name
+% clob, clob # type
+% 0, 0 # length
+#drop procedure cq02;
+#drop table stmp2;
+#drop table result1;
+#drop table result2;
# 08:21:23 >
# 08:21:23 > "Done."
diff --git a/sql/backends/monet5/iot/Tests/iot12.sql
b/sql/backends/monet5/iot/Tests/iot12.sql
--- a/sql/backends/monet5/iot/Tests/iot12.sql
+++ b/sql/backends/monet5/iot/Tests/iot12.sql
@@ -6,9 +6,9 @@ set optimizer='iot_pipe';
create stream table clocks(cnt integer,clk1 integer, clk2 integer);
insert into clocks values(0,0,0);
+call iot.heartbeat('iot','clocks',1000);
create procedure clk1()
begin
- call iot.heartbeat('iot','clocks',1000);
update iot.clocks
set clk1 = clk1+1,
cnt = cnt +1;
@@ -16,7 +16,6 @@ end;
create procedure clk3()
begin
- call iot.heartbeat('iot','clocks',3000);
update clocks
set clk1 = clk1+1,
clk2 = clk2+2,
@@ -33,7 +32,7 @@ call iot.pause();
select * from clocks;
call iot.resume();
-call iot.wait(10);
+call iot.wait(5);
select * from clocks;
call iot.stop();
diff --git a/sql/backends/monet5/iot/Tests/receptor01.sql
b/sql/backends/monet5/iot/Tests/receptor01.sql
--- a/sql/backends/monet5/iot/Tests/receptor01.sql
+++ b/sql/backends/monet5/iot/Tests/receptor01.sql
@@ -17,7 +17,7 @@ end;
call iot.query('iot','collecttemps');
call iot.resume();
-call iot.wait(50);
+call iot.wait(1);
select * from temps;
select * from tempresult;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
