Changeset: 018c9eeb1c94 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=018c9eeb1c94
Modified Files:
sql/backends/monet5/iot/Tests/iot14.sql
sql/backends/monet5/iot/Tests/iot14.stable.out
sql/backends/monet5/iot/Tests/webtest.stable.out
Branch: iot
Log Message:
Approve output
diffs (156 lines):
diff --git a/sql/backends/monet5/iot/Tests/iot14.sql
b/sql/backends/monet5/iot/Tests/iot14.sql
--- a/sql/backends/monet5/iot/Tests/iot14.sql
+++ b/sql/backends/monet5/iot/Tests/iot14.sql
@@ -12,6 +12,8 @@ end;
call iot.query('iot','sdel00',3);
call iot.show('iot','sdel00');
call iot.pause();
+call iot.keep('iot','sdel');
+
select * from sdel;
insert into sdel values('2005-09-23 12:34:26.736',1,12.34);
insert into sdel values('2005-09-23 12:34:26.736',3,12.34);
@@ -27,5 +29,6 @@ call iot.stop();
select 'final state';
select * from sdel;
+--select * from iot.errors();
drop procedure sdel00;
drop table sdel;
diff --git a/sql/backends/monet5/iot/Tests/iot14.stable.out
b/sql/backends/monet5/iot/Tests/iot14.stable.out
--- a/sql/backends/monet5/iot/Tests/iot14.stable.out
+++ b/sql/backends/monet5/iot/Tests/iot14.stable.out
@@ -28,33 +28,6 @@ Ready.
#set schema iot;
#set optimizer='iot_pipe';
#create stream table sdel (t timestamp, sensor integer, val decimal(8,2)) ;
-#insert into sdel values('2005-09-23 12:34:26.736',1,12.34);
-[ 1 ]
-#insert into sdel values('2005-09-23 12:34:26.736',2,12.34);
-[ 1 ]
-#insert into sdel values('2005-09-23 12:34:26.736',3,12.34);
-[ 1 ]
-#insert into sdel values('2005-09-23 12:34:26.736',4,12.34);
-[ 1 ]
-#select * from sdel;
-% iot.sdel, iot.sdel, iot.sdel # table_name
-% t, sensor, val # name
-% timestamp, int, decimal # type
-% 26, 1, 10 # length
-[ 2005-09-23 12:34:26.736000, 1, 12.34 ]
-[ 2005-09-23 12:34:26.736000, 2, 12.34 ]
-[ 2005-09-23 12:34:26.736000, 3, 12.34 ]
-[ 2005-09-23 12:34:26.736000, 4, 12.34 ]
-#delete from sdel where sensor = 2;
-[ 1 ]
-#select * from sdel;
-% iot.sdel, iot.sdel, iot.sdel # table_name
-% t, sensor, val # name
-% timestamp, int, decimal # type
-% 26, 1, 10 # length
-[ 2005-09-23 12:34:26.736000, 1, 12.34 ]
-[ 2005-09-23 12:34:26.736000, 3, 12.34 ]
-[ 2005-09-23 12:34:26.736000, 4, 12.34 ]
#create procedure sdel00()
#begin
# delete from sdel where sensor = 3;
@@ -77,21 +50,22 @@ end user.petri_0;
unsafe function user.iot_sdel00():void;
X_0 := sql.mvc();
X_20 := basket.register(X_0,"iot","sdel",0);
-barrier X_48 := language.dataflow();
+ X_24 := basket.lock(X_20,"iot","sdel");
+barrier X_49 := language.dataflow();
C_1:bat[:oid] := basket.tid(X_0,"iot","sdel");
X_4:bat[:int] := basket.bind(X_20,"iot","sdel","sensor");
C_10 := algebra.subselect(X_4,3,3,true,false,false);
X_14 := algebra.projection(C_10,C_1);
basket.delete(X_20,"iot","sdel",X_14);
- X_24 := basket.tumble(X_20,"iot","sdel");
- basket.commit(X_24,"iot","sdel");
-exit X_48;
+ X_25 := basket.tumble(X_24,"iot","sdel");
+exit X_49;
catch SQLexception:str;
iot.error("user","sdel00",SQLexception);
exit SQLexception:str;
catch MALexception:str;
iot.error("user","sdel00",MALexception);
exit MALexception:str;
+ basket.unlock(X_25,"iot","sdel");
end user.iot_sdel00;
#inline actions= 0 time=1 usec
#candidates actions= 1 time=0 usec
@@ -120,8 +94,6 @@ end user.iot_sdel00;
% t, sensor, val # name
% timestamp, int, decimal # type
% 26, 1, 10 # length
-[ 2005-09-23 12:34:26.736000, 1, 12.34 ]
-[ 2005-09-23 12:34:26.736000, 4, 12.34 ]
#insert into sdel values('2005-09-23 12:34:26.736',1,12.34);
[ 1 ]
#insert into sdel values('2005-09-23 12:34:26.736',3,12.34);
@@ -136,8 +108,7 @@ end user.iot_sdel00;
% timestamp, int, decimal # type
% 26, 1, 10 # length
[ 2005-09-23 12:34:26.736000, 1, 12.34 ]
-[ 2005-09-23 12:34:26.736000, 4, 12.34 ]
-[ 2005-09-23 12:34:26.736000, 1, 12.34 ]
+[ 2005-09-23 12:34:26.736000, 3, 12.34 ]
[ 2005-09-23 12:34:26.736000, 4, 12.34 ]
[ 2005-09-23 12:34:26.736000, 3, 12.34 ]
#call iot.stop();
@@ -155,8 +126,6 @@ end user.iot_sdel00;
% 26, 1, 10 # length
[ 2005-09-23 12:34:26.736000, 1, 12.34 ]
[ 2005-09-23 12:34:26.736000, 4, 12.34 ]
-[ 2005-09-23 12:34:26.736000, 1, 12.34 ]
-[ 2005-09-23 12:34:26.736000, 4, 12.34 ]
#drop procedure sdel00;
#drop table sdel;
diff --git a/sql/backends/monet5/iot/Tests/webtest.stable.out
b/sql/backends/monet5/iot/Tests/webtest.stable.out
--- a/sql/backends/monet5/iot/Tests/webtest.stable.out
+++ b/sql/backends/monet5/iot/Tests/webtest.stable.out
@@ -61,30 +61,29 @@ end user.petri_0;
% 69 # length
unsafe function user.iot_web00():void;
X_0 := sql.mvc();
- X_28 := basket.register(X_0,"iot","ntemps",0);
- X_32 := basket.lock(X_28,"iot","ntemps");
-barrier X_57 := language.dataflow();
+ X_27 := basket.register(X_0,"iot","ntemps",0);
+ X_31 := basket.lock(X_27,"iot","ntemps");
+barrier X_56 := language.dataflow();
C_1:bat[:oid] := basket.tid(X_0,"iot","ntemps");
- X_4:bat[:timestamp] := basket.bind(X_28,"iot","ntemps","iotclk");
+ X_4:bat[:timestamp] := basket.bind(X_27,"iot","ntemps","iotclk");
X_8 := aggr.min(X_4);
-exit X_57;
- X_10 := sql.append(X_32,"iot","atemps","iotclk",X_8);
+exit X_56;
+ X_10 := sql.append(X_31,"iot","atemps","iotclk",X_8);
X_12 := aggr.count(X_4);
X_13 := calc.int(X_12);
X_15 := sql.append(X_10,"iot","atemps","cnt",X_13);
X_17:bat[:flt] := basket.bind(X_15,"iot","ntemps","temperature");
- X_20 := batcalc.dbl(X_17);
- X_21:dbl := aggr.avg(X_20);
- X_22 := calc.flt(X_21);
- X_24 := sql.append(X_15,"iot","atemps","temperature",X_22);
- X_33 := basket.tumble(X_24,"iot","ntemps");
+ X_20:dbl := aggr.avg(X_17);
+ X_21 := calc.flt(X_20);
+ X_23 := sql.append(X_15,"iot","atemps","temperature",X_21);
+ X_32 := basket.tumble(X_23,"iot","ntemps");
catch SQLexception:str;
iot.error("user","web00",SQLexception);
exit SQLexception:str;
catch MALexception:str;
iot.error("user","web00",MALexception);
exit MALexception:str;
- basket.unlock(X_33,"iot","ntemps");
+ basket.unlock(X_32,"iot","ntemps");
end user.iot_web00;
#inline actions= 0 time=0 usec
#candidates actions= 1 time=1 usec
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
