Changeset: 69d3a0b35273 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=69d3a0b35273
Modified Files:
sql/backends/monet5/Tests/cfunction00.sql
sql/backends/monet5/Tests/cfunction01.sql
sql/backends/monet5/Tests/cqstream02.stable.err
sql/backends/monet5/Tests/cqstream03.stable.err
sql/backends/monet5/Tests/cquery02.sql
sql/backends/monet5/Tests/cquery03.stable.err
sql/backends/monet5/Tests/cquery04.sql
sql/backends/monet5/Tests/cquery06.stable.err
sql/backends/monet5/Tests/cquery07.stable.err
sql/backends/monet5/Tests/cquery09.stable.err
sql/backends/monet5/Tests/cquery10.stable.err
sql/backends/monet5/Tests/cquery15.stable.err
sql/backends/monet5/sql_cat.c
sql/backends/monet5/sql_cquery.c
sql/backends/monet5/sql_cquery.h
sql/server/rel_psm.c
sql/server/sql_parser.y
Branch: trails
Log Message:
Don't need to provide procedure/function reference to pause,resume or stop a CQ
diffs (truncated from 375 to 300 lines):
diff --git a/sql/backends/monet5/Tests/cfunction00.sql
b/sql/backends/monet5/Tests/cfunction00.sql
--- a/sql/backends/monet5/Tests/cfunction00.sql
+++ b/sql/backends/monet5/Tests/cfunction00.sql
@@ -19,7 +19,7 @@ call cquery.wait(1000); #give it time to
select aggr00(); #should return 1
select aggr00(); #should return 2
-stop continuous function aggr00;
+stop continuous aggr00;
drop function aggr00;
--factory factories.aggr00():int; #[0] (0) 0
diff --git a/sql/backends/monet5/Tests/cfunction01.sql
b/sql/backends/monet5/Tests/cfunction01.sql
--- a/sql/backends/monet5/Tests/cfunction01.sql
+++ b/sql/backends/monet5/Tests/cfunction01.sql
@@ -22,24 +22,24 @@ start continuous function aggr01();
call cquery.wait(1000); #wait to be started
select aggr01(); #should return 0
-pause continuous function aggr01;
+pause continuous aggr01;
insert into ftmp values(1),(1);
-resume continuous function aggr01;
+resume continuous aggr01;
call cquery.wait(1000); #wait for processing
select aggr01(); #should return 2
-pause continuous function aggr01;
+pause continuous aggr01;
insert into ftmp values(2),(2);
insert into ftmp values(3),(3);
-resume continuous function aggr01;
+resume continuous aggr01;
select aggr01(); #should return 6
call cquery.wait(1000);
select aggr01(); #should return 6
-stop continuous function aggr01;
+stop continuous aggr01;
drop function aggr01;
drop table ftmp;
diff --git a/sql/backends/monet5/Tests/cqstream02.stable.err
b/sql/backends/monet5/Tests/cqstream02.stable.err
--- a/sql/backends/monet5/Tests/cqstream02.stable.err
+++ b/sql/backends/monet5/Tests/cqstream02.stable.err
@@ -29,7 +29,7 @@ stderr of test 'cqstream02` in directory
MAPI = (monetdb) /var/tmp/mtest-5601/.s.monetdb.32593
QUERY = pause continuous cq_collector;
-ERROR = !The continuous procedure cq_collector has not yet started
+ERROR = !The continuous query cq_collector has not yet started
CODE = 42000
# 13:01:25 >
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
@@ -33,7 +33,7 @@ ERROR = !Heartbeat ignored, a window con
CODE = 42000
MAPI = (monetdb) /var/tmp/mtest-5601/.s.monetdb.32593
QUERY = stop continuous cq_agenda; --error
-ERROR = !The continuous procedure cq_agenda has not yet started
+ERROR = !The continuous query cq_agenda has not yet started
CODE = 42000
diff --git a/sql/backends/monet5/Tests/cquery02.sql
b/sql/backends/monet5/Tests/cquery02.sql
--- a/sql/backends/monet5/Tests/cquery02.sql
+++ b/sql/backends/monet5/Tests/cquery02.sql
@@ -40,7 +40,7 @@ call cquery.wait(1000);
select aaa from cqresult02; --output 2 tuples with value 10 and 22
-stop continuous procedure cq_basic02;
+stop continuous cq_basic02;
drop procedure cq_basic02;
drop table cqinput02;
diff --git a/sql/backends/monet5/Tests/cquery03.stable.err
b/sql/backends/monet5/Tests/cquery03.stable.err
--- a/sql/backends/monet5/Tests/cquery03.stable.err
+++ b/sql/backends/monet5/Tests/cquery03.stable.err
@@ -29,7 +29,7 @@ stderr of test 'cquery03` in directory '
MAPI = (monetdb) /var/tmp/mtest-5601/.s.monetdb.32593
QUERY = stop continuous cqfoo;
-ERROR = !The continuous procedure cqfoo has not yet started
+ERROR = !The continuous query cqfoo has not yet started
CODE = 42000
# 14:15:08 >
diff --git a/sql/backends/monet5/Tests/cquery04.sql
b/sql/backends/monet5/Tests/cquery04.sql
--- a/sql/backends/monet5/Tests/cquery04.sql
+++ b/sql/backends/monet5/Tests/cquery04.sql
@@ -30,7 +30,7 @@ call cquery.wait(1000);
select aaa from cqresult04; --output 3 tuples with value 2
-stop continuous procedure cq_basic04;
+stop continuous cq_basic04;
drop procedure cq_basic04;
drop table cqinput04;
diff --git a/sql/backends/monet5/Tests/cquery06.stable.err
b/sql/backends/monet5/Tests/cquery06.stable.err
--- a/sql/backends/monet5/Tests/cquery06.stable.err
+++ b/sql/backends/monet5/Tests/cquery06.stable.err
@@ -29,7 +29,7 @@ stderr of test 'cquery06` in directory '
MAPI = (monetdb) /var/tmp/mtest-5601/.s.monetdb.32593
QUERY = pause continuous cq_basic06; --error
-ERROR = !The continuous procedure cq_basic06 has not yet started
+ERROR = !The continuous query cq_basic06 has not yet started
CODE = 42000
diff --git a/sql/backends/monet5/Tests/cquery07.stable.err
b/sql/backends/monet5/Tests/cquery07.stable.err
--- a/sql/backends/monet5/Tests/cquery07.stable.err
+++ b/sql/backends/monet5/Tests/cquery07.stable.err
@@ -29,27 +29,27 @@ stderr of test 'cquery07` in directory '
MAPI = (monetdb) /var/tmp/mtest-17075/.s.monetdb.33483
QUERY = stop continuous cq_basic07; --error
-ERROR = !The continuous procedure cq_basic07 has not yet started
+ERROR = !The continuous query cq_basic07 has not yet started
CODE = 42000
MAPI = (monetdb) /var/tmp/mtest-17075/.s.monetdb.33483
QUERY = pause continuous cq_basic07; --error
-ERROR = !The continuous procedure cq_basic07 is already paused
+ERROR = !The continuous query cq_basic07 is already paused
CODE = 42000
MAPI = (monetdb) /var/tmp/mtest-17075/.s.monetdb.33483
QUERY = resume continuous cq_basic07 WITH HEARTBEAT 2000 CYCLES 300; --error
-ERROR = !The continuous procedure cq_basic07 is already running
+ERROR = !The continuous query cq_basic07 is already running
CODE = 42000
MAPI = (monetdb) /var/tmp/mtest-17075/.s.monetdb.33483
QUERY = stop continuous cq_basic07; --error
-ERROR = !The continuous procedure cq_basic07 has not yet started
+ERROR = !The continuous query cq_basic07 has not yet started
CODE = 42000
MAPI = (monetdb) /var/tmp/mtest-17075/.s.monetdb.33483
QUERY = pause continuous cq_basic07; --error
-ERROR = !The continuous procedure cq_basic07 has not yet started
+ERROR = !The continuous query cq_basic07 has not yet started
CODE = 42000
MAPI = (monetdb) /var/tmp/mtest-17075/.s.monetdb.33483
QUERY = resume continuous cq_basic07 WITH HEARTBEAT 2000 CYCLES 300; --error
-ERROR = !The continuous procedure cq_basic07 has not yet started
+ERROR = !The continuous query cq_basic07 has not yet started
CODE = 42000
# 17:03:11 >
diff --git a/sql/backends/monet5/Tests/cquery09.stable.err
b/sql/backends/monet5/Tests/cquery09.stable.err
--- a/sql/backends/monet5/Tests/cquery09.stable.err
+++ b/sql/backends/monet5/Tests/cquery09.stable.err
@@ -33,7 +33,7 @@ ERROR = !DROP TABLE: unable to drop stre
CODE = 42000
MAPI = (monetdb) /var/tmp/mtest-9183/.s.monetdb.35225
QUERY = stop continuous cq_c; --error
-ERROR = !The continuous procedure cq_c has not yet started
+ERROR = !The continuous query cq_c has not yet started
CODE = 42000
# 16:43:44 >
diff --git a/sql/backends/monet5/Tests/cquery10.stable.err
b/sql/backends/monet5/Tests/cquery10.stable.err
--- a/sql/backends/monet5/Tests/cquery10.stable.err
+++ b/sql/backends/monet5/Tests/cquery10.stable.err
@@ -30,11 +30,11 @@ stderr of test 'cquery10` in directory '
MAPI = (monetdb) /var/tmp/mtest-5601/.s.monetdb.32593
QUERY = pause continuous cq_cycles;
-ERROR = !The continuous procedure cq_cycles has not yet started
+ERROR = !The continuous query cq_cycles has not yet started
CODE = 42000
MAPI = (monetdb) /var/tmp/mtest-5601/.s.monetdb.32593
QUERY = stop continuous cq_cycles;
-ERROR = !The continuous procedure cq_cycles has not yet started
+ERROR = !The continuous query cq_cycles has not yet started
CODE = 42000
# 11:35:03 >
diff --git a/sql/backends/monet5/Tests/cquery15.stable.err
b/sql/backends/monet5/Tests/cquery15.stable.err
--- a/sql/backends/monet5/Tests/cquery15.stable.err
+++ b/sql/backends/monet5/Tests/cquery15.stable.err
@@ -33,11 +33,11 @@ ERROR = !The continuous procedure one_al
CODE = 3F000
MAPI = (monetdb) /var/tmp/mtest-13813/.s.monetdb.31830
QUERY = stop continuous cq_basic15; --error
-ERROR = !The continuous procedure cq_basic15 has not yet started
+ERROR = !The continuous query cq_basic15 has not yet started
CODE = 42000
MAPI = (monetdb) /var/tmp/mtest-13813/.s.monetdb.31830
QUERY = stop continuous one_aliasother; --error
-ERROR = !The continuous procedure one_aliasother has not yet started
+ERROR = !The continuous query one_aliasother has not yet started
CODE = 42000
# 17:45:15 >
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
@@ -430,13 +430,13 @@ static str
change_single_cp(str alias, int action, lng heartbeat, lng startat, int cycles)
{
if(action & mod_resume_continuous) {
- return CQresume(alias, action, 1, heartbeat, startat, cycles);
+ return CQresume(alias, 1, heartbeat, startat, cycles);
} else if(action & mod_resume_continuous_no_alter) {
- return CQresume(alias, action, 0, 0, 0, 0);
+ return CQresume(alias, 0, 0, 0, 0);
} else if(action & mod_pause_continuous) {
- return CQpause(alias, action);
+ return CQpause(alias);
} else if(action & mod_stop_continuous) {
- return CQderegister(alias, action);
+ return CQderegister(alias);
}
assert(0);
return NULL;
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
@@ -692,11 +692,10 @@ finish:
}
str
-CQresume(str alias, int which, int with_alter, lng heartbeats, lng startat,
int cycles)
+CQresume(str alias, int with_alter, lng heartbeats, lng startat, int cycles)
{
str msg = MAL_SUCCEED;
int idx = 0, j;
- const char* err_message = (which & mod_continuous_function) ?
"function" : "procedure";
#ifdef DEBUG_CQUERY
fprintf(stderr, "#resume scheduler\n");
@@ -720,12 +719,12 @@ CQresume(str alias, int which, int with_
idx = CQlocateAlias(alias);
if( idx == pnettop) {
msg = createException(SQL, "cquery.resume",
- SQLSTATE(42000) "The
continuous %s %s has not yet started\n", err_message, alias);
+ SQLSTATE(42000) "The
continuous query %s has not yet started\n", alias);
goto unlock;
}
if( pnet[idx].status != CQPAUSE) {
msg = createException(SQL, "cquery.resume",
- SQLSTATE(42000) "The
continuous %s %s is already running\n", err_message, alias);
+ SQLSTATE(42000) "The
continuous query %s is already running\n", alias);
goto unlock;
}
if(with_alter && heartbeats != HEARTBEAT_NIL) {
@@ -783,23 +782,22 @@ CQresumeAll(void)
}
str
-CQpause(str alias, int which)
+CQpause(str alias)
{
int idx = 0;
str msg = MAL_SUCCEED, this_alias = NULL;
- const char* err_message = (which & mod_continuous_function) ?
"function" : "procedure";
MT_Id myID = MT_getpid();
MT_lock_set(&ttrLock);
idx = CQlocateAlias(alias);
if( idx == pnettop) {
msg = createException(SQL, "cquery.pause",
- SQLSTATE(42000) "The
continuous %s %s has not yet started\n", err_message, alias);
+ SQLSTATE(42000) "The
continuous query %s has not yet started\n", alias);
goto finish;
}
if( pnet[idx].status == CQPAUSE) {
msg = createException(SQL, "cquery.pause",
- SQLSTATE(42000) "The
continuous %s %s is already paused\n", err_message, alias);
+ SQLSTATE(42000) "The
continuous query %s is already paused\n", alias);
goto finish;
}
// actually wait if the query was running
@@ -1012,18 +1010,17 @@ CQwait(Client cntxt, MalBlkPtr mb, MalSt
/* Remove a specific continuous query from the scheduler */
str
-CQderegister(str alias, int which)
+CQderegister(str alias)
{
int idx = 0;
str msg = MAL_SUCCEED, this_alias = NULL;
- const char* err_message = (which & mod_continuous_function) ?
"function" : "procedure";
MT_Id myID = MT_getpid();
MT_lock_set(&ttrLock);
idx = CQlocateAlias(alias);
if(idx == pnettop || pnet[idx].status == CQDELETE) {
msg = createException(SQL, "cquery.deregister",
- SQLSTATE(42000) "The
continuous %s %s has not yet started\n", err_message, alias);
+ SQLSTATE(42000) "The
continuous query %s has not yet started\n", alias);
goto unlock;
}
if(myID != cq_pid) {
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
