1 files changed, 14 insertions, 23 deletions

diff --git a/database/sqlite/sqlite_context.c b/src/database/sqlite/sqlite_context.c
index 26ed8a96a..ad76a1ee2 100644
--- a/database/sqlite/sqlite_context.c
+++ b/src/database/sqlite/sqlite_context.c
@@ -52,7 +52,7 @@ int sql_init_context_database(int memory)
     if (likely(!memory))
         target_version = perform_context_database_migration(db_context_meta, DB_CONTEXT_METADATA_VERSION);
 
-    if (configure_sqlite_database(db_context_meta, target_version))
+    if (configure_sqlite_database(db_context_meta, target_version, "context_config"))
         return 1;
 
     if (likely(!memory))
@@ -60,34 +60,17 @@ int sql_init_context_database(int memory)
     else
         snprintfz(buf, sizeof(buf) - 1, "ATTACH DATABASE ':memory:' as meta");
 
-    if(init_database_batch(db_context_meta, list)) return 1;
+    if(init_database_batch(db_context_meta, list, "context")) return 1;
 
-    if (init_database_batch(db_context_meta, &database_context_config[0]))
+    if (init_database_batch(db_context_meta, &database_context_config[0], "context_init"))
         return 1;
 
-    if (init_database_batch(db_context_meta, &database_context_cleanup[0]))
+    if (init_database_batch(db_context_meta, &database_context_cleanup[0], "context_cleanup"))
         return 1;
 
     return 0;
 }
 
-/*
- * Close the sqlite database
- */
-
-void sql_close_context_database(void)
-{
-    int rc;
-    if (unlikely(!db_context_meta))
-        return;
-
-    netdata_log_info("Closing context SQLite database");
-
-    rc = sqlite3_close_v2(db_context_meta);
-    if (unlikely(rc != SQLITE_OK))
-        error_report("Error %d while closing the context SQLite database, %s", rc, sqlite3_errstr(rc));
-}
-
 //
 // Fetching data
 //
@@ -421,6 +404,12 @@ int sql_context_cache_stats(int op)
     return count;
 }
 
+
+uint64_t sqlite_get_context_space(void)
+{
+    return sqlite_get_db_space(db_context_meta);
+}
+
 //
 // TESTING FUNCTIONS
 //
@@ -455,7 +444,8 @@ int ctx_unittest(void)
     uuid_t host_uuid;
     uuid_generate(host_uuid);
 
-    initialize_thread_key_pool();
+    if (sqlite_library_init())
+        return 1;
 
     int rc = sql_init_context_database(1);
 
@@ -531,7 +521,8 @@ int ctx_unittest(void)
     ctx_get_context_list(&host_uuid, dict_ctx_get_context_list_cb, NULL);
     netdata_log_info("List context end after delete");
 
-    sql_close_context_database();
+    sql_close_database(db_context_meta, "CONTEXT");
+    sqlite_library_shutdown();
 
     return 0;
 }