Changeset: fbef84912c3c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fbef84912c3c
Modified Files:
sql/backends/monet5/Tests/All
sql/backends/monet5/Tests/cqstream00.sql
sql/backends/monet5/Tests/cqstream03.sql
sql/backends/monet5/Tests/cqstream03.stable.err
sql/backends/monet5/Tests/cqstream03.stable.out
sql/backends/monet5/Tests/cquery06.sql
sql/backends/monet5/Tests/cquery08.sql
sql/backends/monet5/sql_basket.c
sql/backends/monet5/sql_cat.c
sql/backends/monet5/sql_cquery.c
Branch: trails
Log Message:
Adjusted parameters in the tests according to the changes
diffs (169 lines):
diff --git a/sql/backends/monet5/Tests/All b/sql/backends/monet5/Tests/All
--- a/sql/backends/monet5/Tests/All
+++ b/sql/backends/monet5/Tests/All
@@ -89,9 +89,9 @@ cquery00
cquery05
cquery06
cquery07
-cquery08
cquery10
cquery20
+cquery08
cqstream00
cqstream01
diff --git a/sql/backends/monet5/Tests/cqstream00.sql
b/sql/backends/monet5/Tests/cqstream00.sql
--- a/sql/backends/monet5/Tests/cqstream00.sql
+++ b/sql/backends/monet5/Tests/cqstream00.sql
@@ -1,7 +1,6 @@
-- Example of a stream splitter
--- SET WINDOW 2 STRIDE 1
-- call cquery."window"('sys','stmp2',1); -- consume 1 tuple and tumble 1 from
this stream
-create stream table stmp2 (t timestamp, sensor integer, val decimal(8,2)) set
window 2;
+create stream table stmp2 (t timestamp, sensor integer, val decimal(8,2)) set
window 1 stride 1;
--select * from cquery.streams();
insert into stmp2 values('2005-09-23 12:34:26.000',1,11.0);
@@ -22,7 +21,7 @@ end;
start continuous sys.cq_splitter();
-- wait for a few seconds for scheduler to do work
-call cquery.wait(3000);
+call cquery.wait(5000);
-- STOP cq_splitter;
pause continuous sys.cq_splitter();
diff --git a/sql/backends/monet5/Tests/cqstream03.sql
b/sql/backends/monet5/Tests/cqstream03.sql
--- a/sql/backends/monet5/Tests/cqstream03.sql
+++ b/sql/backends/monet5/Tests/cqstream03.sql
@@ -15,11 +15,11 @@ begin
end if;
end;
-start continuous sys.cq_agenda() with heartbeat 1000;
+start continuous sys.cq_agenda() with heartbeat 2000;
select * from cquery.status();
-stop continuous sys.cq_agenda();
+stop continuous sys.cq_agenda(); --error
drop procedure cq_agenda;
drop table tmp13;
drop table agenda13;
diff --git a/sql/backends/monet5/Tests/cqstream03.stable.err
b/sql/backends/monet5/Tests/cqstream03.stable.err
--- a/sql/backends/monet5/Tests/cqstream03.stable.err
+++ b/sql/backends/monet5/Tests/cqstream03.stable.err
@@ -27,9 +27,12 @@ stderr of test 'cqstream03` in directory
# 12:58:46 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-17764" "--port=38071"
# 12:58:46 >
-MAPI = (monetdb) /var/tmp/mtest-24395/.s.monetdb.39287
-QUERY = call cquery."heartbeat"('sys','cq_agenda',1000);
-ERROR = !Beat ignored, a window constraint exists
+MAPI = (monetdb) /var/tmp/mtest-19488/.s.monetdb.35698
+QUERY = start continuous sys.cq_agenda() with heartbeat 2000;
+
+MAPI = (monetdb) /var/tmp/mtest-19488/.s.monetdb.35698
+QUERY = stop continuous sys.cq_agenda(); --error
+
# 12:58:46 >
diff --git a/sql/backends/monet5/Tests/cqstream03.stable.out
b/sql/backends/monet5/Tests/cqstream03.stable.out
--- a/sql/backends/monet5/Tests/cqstream03.stable.out
+++ b/sql/backends/monet5/Tests/cqstream03.stable.out
@@ -39,8 +39,7 @@ Ready.
% .L1, .L1, .L1, .L1, .L1, .L1 # table_name
% tick, schema, function, state, errors, stmt # name
% timestamp, clob, clob, clob, clob, clob # type
-% 26, 4, 9, 10, 0, 17 # length
-[ NULL, "user", "cq_agenda", "readytorun", "",
"user.cq_agenda();" ]
+% 26, 0, 0, 0, 0, 0 # length
#drop procedure cq_agenda;
#drop table tmp13;
#drop table agenda13;
diff --git a/sql/backends/monet5/Tests/cquery06.sql
b/sql/backends/monet5/Tests/cquery06.sql
--- a/sql/backends/monet5/Tests/cquery06.sql
+++ b/sql/backends/monet5/Tests/cquery06.sql
@@ -8,7 +8,7 @@ end;
pause continuous cq_basic06(); --error
-start continuous cq_basic06() WITH HEARTBEAT 1000; --1 second
+start continuous cq_basic06() with heartbeat 1000; --1 second
call cquery.wait(2100);
diff --git a/sql/backends/monet5/Tests/cquery08.sql
b/sql/backends/monet5/Tests/cquery08.sql
--- a/sql/backends/monet5/Tests/cquery08.sql
+++ b/sql/backends/monet5/Tests/cquery08.sql
@@ -3,14 +3,14 @@ create table cqresult081(i integer);
create procedure cq_basic081()
begin
- insert into cqresult081 VALUES (1);
+ insert into cqresult081 values (1);
end;
create table cqresult082(i integer);
create procedure cq_basic082()
begin
- insert into cqresult082 VALUES (2);
+ insert into cqresult082 values (2);
end;
start continuous cq_basic081();
@@ -23,7 +23,7 @@ set session authorization dummyme;
stop all continuous; --error
-reset session authorization;
+set session session authorization monetdb;
stop all continuous; --ok
diff --git a/sql/backends/monet5/sql_basket.c b/sql/backends/monet5/sql_basket.c
--- a/sql/backends/monet5/sql_basket.c
+++ b/sql/backends/monet5/sql_basket.c
@@ -137,7 +137,7 @@ BSKTregisterInternal(Client cntxt, MalBl
return MAL_SUCCEED;
if( !isStream(t))
- throw(MAL,"basket.register","Only allowed for stream tables\n");
+ throw(SQL,"basket.register","Only allowed for stream tables\n");
if((idx = BSKTnewEntry()) < 1)
throw(MAL,"basket.register",MAL_MALLOC_FAIL);
diff --git a/sql/backends/monet5/sql_cat.c b/sql/backends/monet5/sql_cat.c
--- a/sql/backends/monet5/sql_cat.c
+++ b/sql/backends/monet5/sql_cat.c
@@ -183,7 +183,7 @@ alter_stream_table(mvc *sql, char *sname
{
sql_schema *s = mvc_bind_schema(sql, sname);
sql_table *t = NULL;
- char* opname;
+ char* opname;
if (s)
t = mvc_bind_table(sql, s, tname);
diff --git a/sql/backends/monet5/sql_cquery.c b/sql/backends/monet5/sql_cquery.c
--- a/sql/backends/monet5/sql_cquery.c
+++ b/sql/backends/monet5/sql_cquery.c
@@ -1126,7 +1126,7 @@ CQderegisterAll(Client cntxt, MalBlkPtr
MT_lock_set(&ttrLock);
- for(i = 0 ; i < pnettop; i++) {
+ for(i = pnettop - 1 ; i > -1; i--) {
pnet[i].status = CQSTOP;
MT_lock_unset(&ttrLock);
@@ -1136,7 +1136,6 @@ CQderegisterAll(Client cntxt, MalBlkPtr
}
MT_lock_set(&ttrLock);
CQfree(i);
- i--;
}
pnstatus = CQSTOP;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
