MonetDB: Nov2019 - Revert session timeout to seconds and check b...

[Sjoerd Mullender]

Changeset: 0db41ed2b409 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0db41ed2b409
Modified Files:
        monetdb5/modules/mal/clients.c
        
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: Nov2019
Log Message:

Revert session timeout to seconds and check before change.


diffs (64 lines):

diff --git a/monetdb5/modules/mal/clients.c b/monetdb5/modules/mal/clients.c
--- a/monetdb5/modules/mal/clients.c
+++ b/monetdb5/modules/mal/clients.c
@@ -252,7 +252,7 @@ CLTwakeup(void *ret, int *id)
     return MCawakeClient(*id);
 }
 
-/* set session time out based in minutes */
+/* set session time out based in seconds */
 str
 CLTsetSessionTimeout(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
 {
@@ -260,8 +260,8 @@ CLTsetSessionTimeout(Client cntxt, MalBl
        (void) mb;
        sto=  *getArgReference_lng(stk,pci,1);
        if( sto < 0)
-               throw(MAL,"timeout","Query time out should be >= 0");
-       cntxt->stimeout = sto * 60 * 1000 * 1000;
+               throw(MAL,"timeout","Session time out should be >= 0");
+       cntxt->stimeout = sto * 1000 * 1000;
     return MAL_SUCCEED;
 }
 
@@ -274,13 +274,13 @@ CLTsetTimeout(Client cntxt, MalBlkPtr mb
        qto=  *getArgReference_lng(stk,pci,1);
        if( qto < 0)
                throw(MAL,"timeout","Query time out should be >= 0");
-       cntxt->qtimeout = qto * 1000 * 1000;
        if ( pci->argc == 3){
                sto=  *getArgReference_lng(stk,pci,2);
                if( sto < 0)
                        throw(MAL,"timeout","Session time out should be >= 0");
                cntxt->stimeout = sto * 1000 * 1000;
        }
+       cntxt->qtimeout = qto * 1000 * 1000;
     return MAL_SUCCEED;
 }
 
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
@@ -37,9 +37,7 @@ QUERY = CALL "sys"."settimeout"(7, -9);
 ERROR = !Session time out should be >= 0
 MAPI  = (monetdb) /var/tmp/mtest-15044/.s.monetdb.30743
 QUERY = CALL "sys"."setsession"(-8);
-ERROR = !Query time out should be >= 0
-
-
+ERROR = !Session time out should be >= 0
 
 # 17:30:21 >  
 # 17:30:21 >  "Done."
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
@@ -94,7 +94,7 @@ stdout of test 'set-negative-querytimeou
 % querytimeout,        sessiontimeout # name
 % bigint,      bigint # type
 % 1,   1 # length
-[ 7,   0       ]
+[ 0,   0       ]
 #SELECT "querytimeout", "sessiontimeout" FROM "sys"."sessions"() WHERE 
"active";
 % .L1, .L1 # table_name
 % querytimeout,        sessiontimeout # name
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list