MonetDB: HTM - Fix comliation warnings mostly by making mvc_prec...

[Dimitar Nedev]

Changeset: 38482aa6a97e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=38482aa6a97e
Modified Files:
        sql/backends/monet5/sql.c
        sql/server/sql_mvc.c
        sql/server/sql_mvc.h
Branch: HTM
Log Message:

Fix comliation warnings mostly by making mvc_precommit return an int


diffs (82 lines):

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
@@ -360,7 +360,7 @@ SQLprecommit(Client cntxt, MalBlkPtr mb,
 {
        mvc *sql = NULL;
        str msg;
-       sql_trans *tr = NULL;
+       int result;
        (void) stk;
        (void) pci;
 
@@ -371,12 +371,12 @@ SQLprecommit(Client cntxt, MalBlkPtr mb,
 
        if (sql->session->auto_commit != 0)
                throw(SQL, "sql.trans", "2DM30!PRECOMMIT: not allowed in auto 
commit mode");
-       tr = mvc_precommit(sql, 0, 0);
-
-       if (tr == NULL) {
+
+       result = mvc_precommit(sql, 0, 0);
+       if (result < 0) {
                throw(SQL, "sql.trans", "2D000!PRECOMMIT: failed");
        }
-       return MAL_SUCCEED;
+       return msg;
 }
 
 str
@@ -395,10 +395,11 @@ SQLpersistcommit(Client cntxt, MalBlkPtr
 
        if (sql->session->auto_commit != 0)
                throw(SQL, "sql.trans", "2DM30!PERSISTCOMMIT: not allowed in 
auto commit mode");
+
        result = mvc_persistcommit(sql, 0, 0);
-
-       if (result < 0)
-                       throw(SQL, "sql.trans", "2D000!PERSISTCOMMIT: failed");
+       if (result < 0) {
+               throw(SQL, "sql.trans", "2D000!PERSISTCOMMIT: failed");
+       }
        return msg;
 }
 
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
@@ -309,7 +309,7 @@ mvc_commit(mvc *m, int chain, const char
        return result;
 }
 
-sql_trans *
+int
 mvc_precommit(mvc *m, int chain, const char *name) {
        sql_trans *tr = m->session->tr;
        int result = SQL_OK;//, wait = 0;
@@ -331,11 +331,11 @@ mvc_precommit(mvc *m, int chain, const c
                store_unlock();
                (void)sql_error(m, 010, "40000!PRECOMMIT: transaction is 
aborted because of concurrency conflicts, will ROLLBACK instead");
                mvc_rollback(m, chain, name);
-               return NULL;
+               return -1;
        }
        // yes, unlock the store, mvc_persistcommit will lock it again before 
processing
        store_unlock();
-       return tr;
+       return result;
 }
 
 int
diff --git a/sql/server/sql_mvc.h b/sql/server/sql_mvc.h
--- a/sql/server/sql_mvc.h
+++ b/sql/server/sql_mvc.h
@@ -155,7 +155,7 @@ extern void mvc_trans(mvc *c);
 extern int mvc_commit_prepare(mvc *m, int chain, const char *name, sql_trans 
*tr);
 extern void mvc_commit_finish(mvc *m, int chain, const char *name);
 extern int mvc_commit(mvc *c, int chain, const char *name);
-extern sql_trans *mvc_precommit(mvc *m, int chain, const char *name);
+extern int mvc_precommit(mvc *m, int chain, const char *name);
 extern int mvc_persistcommit(mvc *m, int chain, const char *name);
 extern int mvc_rollback(mvc *c, int chain, const char *name);
 extern int mvc_release(mvc *c, const char *name);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list