MonetDB: qcancel - set timeout when clients.querytimeout is called

[svetlin]

Changeset: 5709ac79523a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5709ac79523a
Modified Files:
        .hgignore
        monetdb5/modules/mal/clients.c
        sql/test/sysmon/Tests/All
Branch: qcancel
Log Message:

set timeout when  clients.querytimeout is called


diffs (39 lines):

diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -47,6 +47,7 @@ tags
 *.pyo
 *.rej
 *.orig
+compile_commands.json
 
 # package building on Mac OS X
 MacOSX/build
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
@@ -499,8 +499,12 @@ CLTqueryTimeout(Client cntxt, MalBlkPtr 
        MT_lock_set(&mal_contextLock);
        if (mal_clients[idx].mode == FREECLIENT)
                msg = createException(MAL,"clients.queryTimeout","Session not 
active anymore");
-       else
-               mal_clients[idx].querytimeout = (lng) qto * 1000000;
+       else {
+               lng timeout_micro = (lng) qto * 1000000;
+               mal_clients[idx].querytimeout = timeout_micro;
+               QryCtx *qry_ctx = MT_thread_get_qry_ctx();
+               qry_ctx->querytimeout = timeout_micro;
+       }
        MT_lock_unset(&mal_contextLock);
        return msg;
 }
diff --git a/sql/test/sysmon/Tests/All b/sql/test/sysmon/Tests/All
--- a/sql/test/sysmon/Tests/All
+++ b/sql/test/sysmon/Tests/All
@@ -2,4 +2,5 @@ sys_queue
 sys_queue_expand
 sys_user_statistics
 sys_queue_multisessions
-query_timeout
+timeout_cp
+timeout_join
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list