Changeset: da8fa8b78fdb for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=da8fa8b78fdb
Modified Files:
sql/backends/monet5/sql_scenario.c
sql/storage/bat/bat_logger.c
sql/storage/restrict/restrict_logger.c
sql/storage/sql_storage.h
sql/storage/store.c
Branch: Jan2014
Log Message:
enable debugging of the storage layer and gdk logging
This is passed using --set sql_debug=
Known debug levels at this point
512 join index
256 enable rel_planner
128 gdk_logger don't log bat changes
64 singleuser
32 readonly
2 debug - store
1 debug - logger
diffs (79 lines):
diff --git a/sql/backends/monet5/sql_scenario.c
b/sql/backends/monet5/sql_scenario.c
--- a/sql/backends/monet5/sql_scenario.c
+++ b/sql/backends/monet5/sql_scenario.c
@@ -227,7 +227,7 @@ SQLinit(void)
SQLdebug |= 64;
if (readonly)
SQLdebug |= 32;
- if ((SQLnewcatalog = mvc_init(FALSE, store_bat, readonly, single_user,
0)) < 0)
+ if ((SQLnewcatalog = mvc_init(SQLdebug, store_bat, readonly,
single_user, 0)) < 0)
throw(SQL, "SQLinit", "Catalogue initialization failed");
SQLinitialized = TRUE;
MT_lock_unset(&sql_contextLock, "SQL init");
diff --git a/sql/storage/bat/bat_logger.c b/sql/storage/bat/bat_logger.c
--- a/sql/storage/bat/bat_logger.c
+++ b/sql/storage/bat/bat_logger.c
@@ -242,11 +242,11 @@ bl_postversion( void *lg)
}
static int
-bl_create(char *logdir, int cat_version)
+bl_create(int debug, char *logdir, int cat_version)
{
if (bat_logger)
return LOG_ERR;
- bat_logger = logger_create(0, "sql", logdir, cat_version,
bl_preversion, bl_postversion);
+ bat_logger = logger_create(debug, "sql", logdir, cat_version,
bl_preversion, bl_postversion);
if (bat_logger)
return LOG_OK;
return LOG_ERR;
diff --git a/sql/storage/restrict/restrict_logger.c
b/sql/storage/restrict/restrict_logger.c
--- a/sql/storage/restrict/restrict_logger.c
+++ b/sql/storage/restrict/restrict_logger.c
@@ -23,11 +23,11 @@
logger *restrict_logger = NULL;
static int
-bl_create(char *logdir, int catalog_version)
+bl_create(int debug, char *logdir, int catalog_version)
{
if (restrict_logger)
return LOG_ERR;
- restrict_logger = logger_create(0, "sql", logdir, catalog_version,
NULL, NULL);
+ restrict_logger = logger_create(debug, "sql", logdir, catalog_version,
NULL, NULL);
if (restrict_logger)
return LOG_OK;
return LOG_ERR;
diff --git a/sql/storage/sql_storage.h b/sql/storage/sql_storage.h
--- a/sql/storage/sql_storage.h
+++ b/sql/storage/sql_storage.h
@@ -245,7 +245,7 @@ typedef struct store_functions {
extern store_functions store_funcs;
-typedef int (*logger_create_fptr) (char *logdir, int catalog_version);
+typedef int (*logger_create_fptr) (int debug, char *logdir, int
catalog_version);
typedef void (*logger_destroy_fptr) (void);
typedef int (*logger_restart_fptr) (void);
diff --git a/sql/storage/store.c b/sql/storage/store.c
--- a/sql/storage/store.c
+++ b/sql/storage/store.c
@@ -1267,7 +1267,7 @@ store_init(int debug, store_type store,
int v = 1;
sql_allocator *sa;
- bs_debug = debug;
+ bs_debug = debug&2;
#ifdef NEED_MT_LOCK_INIT
MT_lock_init(&bs_lock, "SQL_bs_lock");
@@ -1284,7 +1284,7 @@ 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(debug, logdir, CATALOG_VERSION*v) == LOG_ERR) {
MT_lock_unset(&bs_lock, "store_init");
return -1;
}
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
