Changeset: 98d5fc776077 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=98d5fc776077
Modified Files:
sql/backends/monet5/iot/Tests/ais/Tests/ais07.sql
sql/backends/monet5/iot/Tests/ais/Tests/ais10.sql
sql/backends/monet5/iot/Tests/ais/Tests/ais11.sql
Branch: iot
Log Message:
Updated some ais tests
diffs (43 lines):
diff --git a/sql/backends/monet5/iot/Tests/ais/Tests/ais07.sql
b/sql/backends/monet5/iot/Tests/ais/Tests/ais07.sql
--- a/sql/backends/monet5/iot/Tests/ais/Tests/ais07.sql
+++ b/sql/backends/monet5/iot/Tests/ais/Tests/ais07.sql
@@ -1,4 +1,3 @@
-CREATE SCHEMA ais;
SET SCHEMA ais;
SET optimizer = 'iot_pipe';
@@ -42,7 +41,7 @@ CREATE PROCEDURE ais07q()
BEGIN
INSERT INTO ais07r
WITH data AS (SELECT mmsi, geographic_to_cartesian(lat, lon) AS
calc_point FROM vessels7 WHERE (implicit_timestamp, mmsi) IN (SELECT
max(implicit_timestamp), mmsi FROM vessels7 WHERE nav_status = 1 GROUP BY
mmsi)),
- results AS (SELECT harbor, mmsi FROM data CROSS JOIN
static_locations, data_time WHERE sys.st_contains(field, calc_point)),
+ results AS (SELECT harbor, mmsi FROM data CROSS JOIN
static_locations WHERE sys.st_contains(field, calc_point)),
data_time AS (SELECT current_timestamp AS cur_time)
SELECT cur_time, harbor, mmsi FROM results CROSS JOIN data_time;
END;
diff --git a/sql/backends/monet5/iot/Tests/ais/Tests/ais10.sql
b/sql/backends/monet5/iot/Tests/ais/Tests/ais10.sql
--- a/sql/backends/monet5/iot/Tests/ais/Tests/ais10.sql
+++ b/sql/backends/monet5/iot/Tests/ais/Tests/ais10.sql
@@ -40,7 +40,7 @@ CREATE STREAM TABLE ais10r (calc_time ti
CREATE PROCEDURE ais10q()
BEGIN
INSERT INTO ais10r
- WITH data AS (SELECT harbor, mmsi, sog, sys.Distance(field,
geographic_to_cartesian(lat, lon)) AS distance FROM vessels10 CROSS JOIN
static_locations WHERE (implicit_timestamp, mmsi) IN (SELECT
max(implicit_timestamp), mmsi FROM vessels10 GROUP BY mmsi)),
+ WITH data AS (SELECT harbor, mmsi, sog, sys.st_distance(field,
geographic_to_cartesian(lat, lon)) AS distance FROM vessels10 CROSS JOIN
static_locations WHERE (implicit_timestamp, mmsi) IN (SELECT
max(implicit_timestamp), mmsi FROM vessels10 GROUP BY mmsi)),
data_time AS (SELECT current_timestamp AS cur_time)
SELECT cur_time, harbor, mmsi, distance / sog * 1.852 FROM data
CROSS JOIN data_time WHERE distance > 0;
END;
diff --git a/sql/backends/monet5/iot/Tests/ais/Tests/ais11.sql
b/sql/backends/monet5/iot/Tests/ais/Tests/ais11.sql
--- a/sql/backends/monet5/iot/Tests/ais/Tests/ais11.sql
+++ b/sql/backends/monet5/iot/Tests/ais/Tests/ais11.sql
@@ -37,8 +37,10 @@ CALL iot.pause();
DELETE FROM iot.webserverstreams;
DROP PROCEDURE ais11q;
DROP TABLE vessels11;
+DROP VIEW ais11v;
DROP TABLE ais11r;
CALL iot.stop();
+SET SCHEMA sys;
DROP SCHEMA ais;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
