MonetDB: Jul2017 - Check results of sql_session_create

[Pedro Ferreira]

Changeset: 4a11a91e6d27 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4a11a91e6d27
Modified Files:
        sql/server/sql_mvc.c
        sql/storage/store.c
Branch: Jul2017
Log Message:

Check results of sql_session_create


diffs (31 lines):

diff --git a/sql/server/sql_mvc.c b/sql/server/sql_mvc.c
--- a/sql/server/sql_mvc.c
+++ b/sql/server/sql_mvc.c
@@ -556,6 +556,13 @@ mvc_create(int clientid, backend_stack s
        store_lock();
        m->session = sql_session_create(stk, 1 /*autocommit on*/);
        store_unlock();
+       if(!m->session) {
+               qc_destroy(m->qc);
+               _DELETE(m->vars);
+               _DELETE(m->args);
+               _DELETE(m);
+               return NULL;
+       }
 
        m->type = Q_PARSE;
        m->pushdown = 1;
diff --git a/sql/storage/store.c b/sql/storage/store.c
--- a/sql/storage/store.c
+++ b/sql/storage/store.c
@@ -1846,6 +1846,10 @@ idle_manager(void)
                }
 
                s = sql_session_create(gtrans->stk, 0);
+               if(!s) {
+                       MT_lock_unset(&bs_lock);
+                       continue;
+               }
                sql_trans_begin(s);
                if (store_vacuum( s->tr ) == 0)
                        sql_trans_commit(s->tr);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list