MonetDB: userprofile - revert back user stats to fix server crash

[svetlin]

Changeset: 85100c53f541 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/85100c53f541
Modified Files:
        monetdb5/mal/mal_runtime.c
        sql/backends/monet5/sql.h
Branch: userprofile
Log Message:

revert back user stats to fix server crash


diffs (36 lines):

diff --git a/monetdb5/mal/mal_runtime.c b/monetdb5/mal/mal_runtime.c
--- a/monetdb5/mal/mal_runtime.c
+++ b/monetdb5/mal/mal_runtime.c
@@ -74,6 +74,10 @@ static
 void
 updateUserStats(Client cntxt, MalBlkPtr mb, lng ticks, time_t started, time_t 
finished, str query)
 {
+       // don't keep stats for context without username
+       if (cntxt->username == NULL)
+               return;
+
        size_t idx = getUSRstatsIdx(mb, cntxt->user);
 
        if (idx == (size_t) -1) {
@@ -81,9 +85,7 @@ updateUserStats(Client cntxt, MalBlkPtr 
                return;
        }
 
-       if (cntxt->username == NULL)
-               return;
-       if (USRstats[idx].username == NULL || USRstats[idx].user != cntxt->user 
|| strcmp(USRstats[idx].username, cntxt->username) != 0) {
+       if (USRstats[idx].username == NULL) {
                clearUSRstats(idx);
                USRstats[idx].user = cntxt->user;
                USRstats[idx].username = GDKstrdup(cntxt->username);
diff --git a/sql/backends/monet5/sql.h b/sql/backends/monet5/sql.h
--- a/sql/backends/monet5/sql.h
+++ b/sql/backends/monet5/sql.h
@@ -293,6 +293,7 @@ extern str SQLstr_column_stop_vacuum(Cli
 sql5_export str getBackendContext(Client cntxt, backend **be);
 
 #define USER_TABLE_NAME "db_user_info"
+#define SCHEMA_TABLE_NAME "schemas"
 #define USER_PASSWORD_COLUMN "password"
 
 #endif /* _SQL_H */
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org