Changeset: 6d4feaa12b77 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6d4feaa12b77
Modified Files:
monetdb5/modules/mal/clients.mal
sql/backends/monet5/sql.mal
sql/scripts/22_clients.sql
sql/test/BugTracker-2016/Tests/set-negative-querytimeout.Bug-6070.stable.err
sql/test/BugTracker-2016/Tests/set-negative-querytimeout.Bug-6070.stable.out
Branch: default
Log Message:
merge from Dec2016
diffs (128 lines):
diff --git a/monetdb5/modules/mal/clients.mal b/monetdb5/modules/mal/clients.mal
--- a/monetdb5/modules/mal/clients.mal
+++ b/monetdb5/modules/mal/clients.mal
@@ -80,7 +80,7 @@ pattern settimeout(n:lng):void
address CLTsetTimeout
comment "Abort a query after n seconds.";
-pattern setTimeout(q:lng,s:lng):void
+pattern settimeout(q:lng,s:lng):void
address CLTsetTimeout
comment "Abort a query after q seconds (q=0 means run undisturbed).
The session timeout aborts the connection after spending too
diff --git a/sql/backends/monet5/sql.mal b/sql/backends/monet5/sql.mal
--- a/sql/backends/monet5/sql.mal
+++ b/sql/backends/monet5/sql.mal
@@ -461,14 +461,6 @@ pattern password(user:str) :str
address db_password_wrap
comment "Return password hash of user";
-pattern settimeout(s:lng):void
-address CLTsetTimeout
-comment "Abort query after s seconds";
-
-pattern settimeout(s:lng,t:lng):void
-address CLTsetTimeout
-comment "Abort query after s and session after t seconds";
-
pattern dump_cache()(query:bat[:str],count:bat[:int])
address dump_cache
comment "dump the content of the query cache";
diff --git a/sql/scripts/22_clients.sql b/sql/scripts/22_clients.sql
--- a/sql/scripts/22_clients.sql
+++ b/sql/scripts/22_clients.sql
@@ -21,8 +21,8 @@ external name sql.shutdown;
-- control the query and session time out
create procedure sys.settimeout("query" bigint)
- external name sql.settimeout;
+ external name clients.settimeout;
create procedure sys.settimeout("query" bigint, "session" bigint)
- external name sql.settimeout;
+ external name clients.settimeout;
create procedure sys.setsession("timeout" bigint)
- external name sql.setsession;
+ external name clients.setsession;
diff --git
a/sql/test/BugTracker-2016/Tests/set-negative-querytimeout.Bug-6070.stable.err
b/sql/test/BugTracker-2016/Tests/set-negative-querytimeout.Bug-6070.stable.err
---
a/sql/test/BugTracker-2016/Tests/set-negative-querytimeout.Bug-6070.stable.err
+++
b/sql/test/BugTracker-2016/Tests/set-negative-querytimeout.Bug-6070.stable.err
@@ -31,12 +31,13 @@ stderr of test 'set-negative-querytimeou
MAPI = (monetdb) /var/tmp/mtest-9911/.s.monetdb.38717
QUERY = CALL "sys"."settimeout"(-9);
-
-MAPI = (monetdb) /var/tmp/mtest-11113/.s.monetdb.39447
+ERROR = !Query time out should be > 0
+MAPI = (monetdb) /var/tmp/mtest-19764/.s.monetdb.39840
QUERY = CALL "sys"."settimeout"(7, -9);
-
-MAPI = (monetdb) /var/tmp/mtest-11113/.s.monetdb.39447
+ERROR = !Session time out should be > 0
+MAPI = (monetdb) /var/tmp/mtest-19764/.s.monetdb.39840
QUERY = CALL "sys"."setsession"(-8);
+ERROR = !Query time out should be > 0
# 17:30:21 >
diff --git
a/sql/test/BugTracker-2016/Tests/set-negative-querytimeout.Bug-6070.stable.out
b/sql/test/BugTracker-2016/Tests/set-negative-querytimeout.Bug-6070.stable.out
---
a/sql/test/BugTracker-2016/Tests/set-negative-querytimeout.Bug-6070.stable.out
+++
b/sql/test/BugTracker-2016/Tests/set-negative-querytimeout.Bug-6070.stable.out
@@ -67,49 +67,49 @@ Ready.
# 17:30:20 >
#SELECT "querytimeout", "sessiontimeout" FROM "sys"."sessions"() WHERE
"active";
-% .L, .L # table_name
+% .L1, .L1 # table_name
% querytimeout, sessiontimeout # name
% bigint, bigint # type
% 1, 1 # length
[ 0, 0 ]
#SELECT "querytimeout", "sessiontimeout" FROM "sys"."sessions"() WHERE
"active";
-% .L, .L # table_name
+% .L1, .L1 # table_name
% querytimeout, sessiontimeout # name
% bigint, bigint # type
% 1, 1 # length
[ 9, 0 ]
#SELECT "querytimeout", "sessiontimeout" FROM "sys"."sessions"() WHERE
"active";
-% .L, .L # table_name
+% .L1, .L1 # table_name
% querytimeout, sessiontimeout # name
% bigint, bigint # type
% 1, 1 # length
[ 0, 0 ]
#SELECT "querytimeout", "sessiontimeout" FROM "sys"."sessions"() WHERE
"active";
-% .L, .L # table_name
+% .L1, .L1 # table_name
% querytimeout, sessiontimeout # name
% bigint, bigint # type
% 1, 1 # length
[ 0, 0 ]
#SELECT "querytimeout", "sessiontimeout" FROM "sys"."sessions"() WHERE
"active";
-% .L, .L # table_name
+% .L1, .L1 # table_name
% querytimeout, sessiontimeout # name
% bigint, bigint # type
% 1, 1 # length
-[ 0, 0 ]
+[ 7, 0 ]
#SELECT "querytimeout", "sessiontimeout" FROM "sys"."sessions"() WHERE
"active";
-% .L, .L # table_name
+% .L1, .L1 # table_name
% querytimeout, sessiontimeout # name
% bigint, bigint # type
% 1, 1 # length
[ 7, 9 ]
#SELECT "querytimeout", "sessiontimeout" FROM "sys"."sessions"() WHERE
"active";
-% .L, .L # table_name
+% .L1, .L1 # table_name
% querytimeout, sessiontimeout # name
% bigint, bigint # type
% 1, 1 # length
[ 7, 8 ]
#SELECT "querytimeout", "sessiontimeout" FROM "sys"."sessions"() WHERE
"active";
-% .L, .L # table_name
+% .L1, .L1 # table_name
% querytimeout, sessiontimeout # name
% bigint, bigint # type
% 1, 1 # length
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
