MonetDB: default - small cleanup

[Niels Nes]

Changeset: fa45cf1c0a3d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fa45cf1c0a3d
Modified Files:
        sql/backends/monet5/sql.mx
        sql/backends/monet5/sql_result.h
        sql/include/sql_mem.h
        sql/storage/store.c
Branch: default
Log Message:

small cleanup


diffs (73 lines):

diff --git a/sql/backends/monet5/sql.mx b/sql/backends/monet5/sql.mx
--- a/sql/backends/monet5/sql.mx
+++ b/sql/backends/monet5/sql.mx
@@ -1257,7 +1257,7 @@ sql.prelude();
 #include <mal_function.h>
 #include <mal_stack.h>
 #include <mal_interpreter.h>
-#include <mal_session.h>
+
 #include <tablet.h>
 #include <streams.h>
 #include <mtime.h>
diff --git a/sql/backends/monet5/sql_result.h b/sql/backends/monet5/sql_result.h
--- a/sql/backends/monet5/sql_result.h
+++ b/sql/backends/monet5/sql_result.h
@@ -21,6 +21,7 @@
 
 #include "mal_client.h"
 #include <stream.h>
+#include <sql.h>
 #include <sql_mvc.h>
 #include <sql_catalog.h>
 #include <sql_qc.h>
diff --git a/sql/include/sql_mem.h b/sql/include/sql_mem.h
--- a/sql/include/sql_mem.h
+++ b/sql/include/sql_mem.h
@@ -17,8 +17,8 @@
  * All Rights Reserved.
  */
 
-#ifndef _MEM_H_
-#define _MEM_H_
+#ifndef _SQL_MEM_H_
+#define _SQL_MEM_H_
 
 #include <gdk.h>
 
@@ -90,4 +90,4 @@ extern size_t sa_size( sql_allocator *sa
 
 #define _strlen(s) (int)strlen(s)
 
-#endif /*_MEM_H_*/
+#endif /*_SQL_MEM_H_*/
diff --git a/sql/storage/store.c b/sql/storage/store.c
--- a/sql/storage/store.c
+++ b/sql/storage/store.c
@@ -1260,6 +1260,9 @@ store_init(int debug, store_type store, 
 
        bs_debug = debug;
 
+       MT_lock_init(&bs_lock, "SQL_bs_lock");
+       MT_lock_set(&bs_lock, "store_init");
+
        /* initialize empty bats */
        if (store == store_bat ||
            store == store_su ||
@@ -1285,11 +1288,13 @@ store_init(int debug, store_type store, 
        }
        active_store_type = store;
        if (!logger_funcs.create ||
-           logger_funcs.create(logdir, CATALOG_VERSION*v) == LOG_ERR)
+           logger_funcs.create(logdir, CATALOG_VERSION*v) == LOG_ERR) {
+               MT_lock_unset(&bs_lock, "store_init");
                return -1;
-
-       MT_lock_init(&bs_lock, "SQL_bs_lock");
+       }
+
        sa = sa_create();
+       MT_lock_unset(&bs_lock, "store_init");
        types_init(sa, debug);
 
 #define FUNC_OIDS 2000
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list