Changeset: f4498ff3c162 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/f4498ff3c162
Modified Files:
monetdb5/mal/mal_client.h
monetdb5/modules/mal/clients.c
sql/backends/monet5/sql.c
Branch: default
Log Message:
Don't unnecessarily promote to lng.
diffs (37 lines):
diff --git a/monetdb5/mal/mal_client.h b/monetdb5/mal/mal_client.h
--- a/monetdb5/mal/mal_client.h
+++ b/monetdb5/mal/mal_client.h
@@ -77,7 +77,7 @@ typedef struct CLIENT {
int memorylimit; /* maximum memory currently
allowed in MB */
lng maxmem; /* max_memory from
db_user_info table */
lng sessiontimeout; /* session abort after x usec,
0 = no limit */
- lng logical_sessiontimeout; /* logical session timeout, client
defined */
+ int logical_sessiontimeout; /* logical session timeout, client
defined */
lng idletimeout; /* idle in active transaction
timeout */
lng querytimeout; /* timeout per query in usec, 0
= no limit */
QryCtx qryctx; /* per query limitations */
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
@@ -545,7 +545,7 @@ CLTsessionTimeout(Client ctx, MalBlkPtr
"Session not active
anymore");
else {
mal_clients[idx].sessiontimeout = sto > 0 ? (lng) sto *1000000
+ (GDKusec() - mal_clients[idx].session) : 0;
- mal_clients[idx].logical_sessiontimeout = (lng) sto;
+ mal_clients[idx].logical_sessiontimeout = sto;
}
MT_lock_unset(&mal_contextLock);
return msg;
diff --git a/sql/backends/monet5/sql.c b/sql/backends/monet5/sql.c
--- a/sql/backends/monet5/sql.c
+++ b/sql/backends/monet5/sql.c
@@ -3776,8 +3776,7 @@ sql_sessions_wrap(Client cntxt, MalBlkPt
goto bailout;
if (BUNappend(login, &ts, false) != GDK_SUCCEED)
goto bailout;
- timeout = (int) (c->logical_sessiontimeout);
- if (BUNappend(sessiontimeout, &timeout, false) != GDK_SUCCEED)
+ if (BUNappend(sessiontimeout, &c->logical_sessiontimeout,
false) != GDK_SUCCEED)
goto bailout;
timeout = (int) (c->querytimeout / 1000000);
if (BUNappend(querytimeout, &timeout, false) != GDK_SUCCEED)
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
