MonetDB: Jun2023 - Merge heads.

[Lucas Pereira via checkin-list]

Changeset: 8aa6ab273a34 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/8aa6ab273a34
Branch: Jun2023
Log Message:

Merge heads.


diffs (42 lines):

diff --git a/sql/backends/monet5/sql_user.c b/sql/backends/monet5/sql_user.c
--- a/sql/backends/monet5/sql_user.c
+++ b/sql/backends/monet5/sql_user.c
@@ -870,23 +870,23 @@ monet5_user_get_limits(mvc *m, int user,
        lng max_memory = 0;
        int max_workers = 0;
 
-       if (!m->session->tr->active) {
-               sys = find_sql_schema(m->session->tr, "sys");
-               auths = find_sql_table(m->session->tr, sys, "auths");
-               user_info = find_sql_table(m->session->tr, sys, "db_user_info");
+       assert(m->session->tr->active);
+
+       sys = find_sql_schema(m->session->tr, "sys");
+       auths = find_sql_table(m->session->tr, sys, "auths");
+       user_info = find_sql_table(m->session->tr, sys, "db_user_info");
 
-               rid = store->table_api.column_find_row(m->session->tr, 
find_sql_column(auths, "id"), &user, NULL);
-               if (is_oid_nil(rid))
-                       return -2;
-               if (!(username = 
store->table_api.column_find_value(m->session->tr, find_sql_column(auths, 
"name"), rid)))
-                       return -1;
-               rid = store->table_api.column_find_row(m->session->tr, 
find_sql_column(user_info, "name"), username, NULL);
-               _DELETE(username);
+       rid = store->table_api.column_find_row(m->session->tr, 
find_sql_column(auths, "id"), &user, NULL);
+       if (is_oid_nil(rid))
+               return -2;
+       if (!(username = store->table_api.column_find_value(m->session->tr, 
find_sql_column(auths, "name"), rid)))
+               return -1;
+       rid = store->table_api.column_find_row(m->session->tr, 
find_sql_column(user_info, "name"), username, NULL);
+       _DELETE(username);
 
-               if (!is_oid_nil(rid)) {
-                       max_memory = 
store->table_api.column_find_lng(m->session->tr, find_sql_column(user_info, 
"max_memory"), rid);
-                       max_workers = 
store->table_api.column_find_int(m->session->tr, find_sql_column(user_info, 
"max_workers"), rid);
-               }
+       if (!is_oid_nil(rid)) {
+               max_memory = store->table_api.column_find_lng(m->session->tr, 
find_sql_column(user_info, "max_memory"), rid);
+               max_workers = store->table_api.column_find_int(m->session->tr, 
find_sql_column(user_info, "max_workers"), rid);
        }
 
        *maxmem = max_memory > 0 ? max_memory : 0;
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org