X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=src%2Fcore%2Fstore.c;h=e643f457a7e6ba564242e369f8ad7bf64b0ebbd2;hp=0ab57d97be4e5ee884f6a472188fd857eb0bd6b2;hb=82f8f7dbf1dcfb18f74f1ca8b58ed823a1225404;hpb=11824e1af21c11b8f5a99a1247debed4990f0c7d

diff --git a/src/core/store.c b/src/core/store.c
index 0ab57d9..e643f45 100644
--- a/src/core/store.c
+++ b/src/core/store.c
@@ -59,8 +59,6 @@ struct sdb_store {
 	pthread_rwlock_t host_lock;
 };
 
-sdb_store_t *global_store = NULL;
-
 /*
  * private types
  */
@@ -136,7 +134,7 @@ store_obj_destroy(sdb_object_t *obj)
 static int
 host_init(sdb_object_t *obj, va_list ap)
 {
-	sdb_host_t *sobj = HOST(obj);
+	host_t *sobj = HOST(obj);
 	int ret;
 
 	/* this will consume the first argument (type) of ap */
@@ -159,7 +157,7 @@ host_init(sdb_object_t *obj, va_list ap)
 static void
 host_destroy(sdb_object_t *obj)
 {
-	sdb_host_t *sobj = HOST(obj);
+	host_t *sobj = HOST(obj);
 	assert(obj);
 
 	store_obj_destroy(obj);
@@ -175,7 +173,7 @@ host_destroy(sdb_object_t *obj)
 static int
 service_init(sdb_object_t *obj, va_list ap)
 {
-	sdb_service_t *sobj = SVC(obj);
+	service_t *sobj = SVC(obj);
 	int ret;
 
 	/* this will consume the first argument (type) of ap */
@@ -192,7 +190,7 @@ service_init(sdb_object_t *obj, va_list ap)
 static void
 service_destroy(sdb_object_t *obj)
 {
-	sdb_service_t *sobj = SVC(obj);
+	service_t *sobj = SVC(obj);
 	assert(obj);
 
 	store_obj_destroy(obj);
@@ -272,13 +270,13 @@ static sdb_type_t store_type = {
 };
 
 static sdb_type_t host_type = {
-	/* size = */ sizeof(sdb_host_t),
+	/* size = */ sizeof(host_t),
 	/* init = */ host_init,
 	/* destroy = */ host_destroy
 };
 
 static sdb_type_t service_type = {
-	/* size = */ sizeof(sdb_service_t),
+	/* size = */ sizeof(service_t),
 	/* init = */ service_init,
 	/* destroy = */ service_destroy
 };
@@ -290,7 +288,7 @@ static sdb_type_t metric_type = {
 };
 
 static sdb_type_t attribute_type = {
-	/* size = */ sizeof(sdb_attribute_t),
+	/* size = */ sizeof(attr_t),
 	/* init = */ attr_init,
 	/* destroy = */ attr_destroy
 };
@@ -299,28 +297,6 @@ static sdb_type_t attribute_type = {
  * private helper functions
  */
 
-static sdb_host_t *
-lookup_host(sdb_store_t *st, const char *name, bool canonicalize)
-{
-	sdb_host_t *host;
-	char *cname;
-
-	assert(name);
-	if (! canonicalize)
-		return HOST(sdb_avltree_lookup(st->hosts, name));
-
-	cname = strdup(name);
-	cname = sdb_plugin_cname(cname);
-	if (! cname) {
-		sdb_log(SDB_LOG_ERR, "store: strdup failed");
-		return NULL;
-	}
-
-	host = HOST(sdb_avltree_lookup(st->hosts, cname));
-	free(cname);
-	return host;
-} /* lookup_host */
-
 static int
 record_backend(sdb_store_obj_t *obj)
 {
@@ -446,39 +422,17 @@ store_obj(sdb_store_obj_t *parent, sdb_avltree_t *parent_tree,
 } /* store_obj */
 
 static int
-store_attr(sdb_store_obj_t *parent, sdb_avltree_t *attributes,
-		const char *key, const sdb_data_t *value, sdb_time_t last_update)
-{
-	sdb_store_obj_t *attr = NULL;
-	int status;
-
-	status = store_obj(parent, attributes, SDB_ATTRIBUTE,
-			key, last_update, &attr);
-	if (status)
-		return status;
-
-	/* don't update unchanged values */
-	if (! sdb_data_cmp(&ATTR(attr)->value, value))
-		return status;
-
-	assert(attr);
-	if (sdb_data_copy(&ATTR(attr)->value, value))
-		return -1;
-	return status;
-} /* store_attr */
-
-static int
-store_metric_store(sdb_metric_t *metric, sdb_metric_store_t *store)
+store_metric_store(sdb_metric_t *metric, sdb_store_metric_t *m)
 {
 	char *type = metric->store.type;
 	char *id = metric->store.id;
 
-	if ((! metric->store.type) || strcasecmp(metric->store.type, store->type)) {
-		if (! (type = strdup(store->type)))
+	if ((! metric->store.type) || strcasecmp(metric->store.type, m->store.type)) {
+		if (! (type = strdup(m->store.type)))
 			return -1;
 	}
-	if ((! metric->store.id) || strcasecmp(metric->store.id, store->id)) {
-		if (! (id = strdup(store->id))) {
+	if ((! metric->store.id) || strcasecmp(metric->store.id, m->store.id)) {
+		if (! (id = strdup(m->store.id))) {
 			if (type != metric->store.type)
 				free(type);
 			return -1;
@@ -500,7 +454,7 @@ store_metric_store(sdb_metric_t *metric, sdb_metric_store_t *store)
 
 /* The store's host_lock has to be acquired before calling this function. */
 static sdb_avltree_t *
-get_host_children(sdb_host_t *host, int type)
+get_host_children(host_t *host, int type)
 {
 	if ((type != SDB_SERVICE) && (type != SDB_METRIC)
 			&& (type != SDB_ATTRIBUTE))
@@ -578,31 +532,80 @@ ts_tojson(sdb_timeseries_t *ts, sdb_strbuf_t *buf)
  */
 
 static int
-store_attribute(const char *hostname,
-		const char *key, const sdb_data_t *value,
-		sdb_time_t last_update, sdb_object_t *user_data)
+store_attribute(sdb_store_attribute_t *attr, sdb_object_t *user_data)
 {
 	sdb_store_t *st = SDB_STORE(user_data);
+	sdb_store_obj_t *parent = NULL;
+	sdb_store_obj_t *new = NULL;
+	const char *hostname;
+	host_t *host;
 
-	sdb_host_t *host;
-	sdb_avltree_t *attrs;
+	sdb_avltree_t *children = NULL;
+	sdb_avltree_t *attributes;
 	int status = 0;
 
-	if ((! hostname) || (! key))
+	if ((! attr) || (! attr->parent) || (! attr->key))
+		return -1;
+
+	hostname = attr->hostname;
+	if (attr->parent_type == SDB_HOST)
+		hostname = attr->parent;
+	if (! hostname)
 		return -1;
 
 	pthread_rwlock_wrlock(&st->host_lock);
-	host = lookup_host(st, hostname, /* canonicalize = */ 1);
-	attrs = get_host_children(host, SDB_ATTRIBUTE);
-	if (! attrs) {
+	host = HOST(sdb_avltree_lookup(st->hosts, hostname));
+	if (! host) {
 		sdb_log(SDB_LOG_ERR, "store: Failed to store attribute '%s' - "
-				"host '%s' not found", key, hostname);
+				"host '%s' not found", attr->key, hostname);
+		status = -1;
+	}
+
+	switch (attr->parent_type) {
+	case SDB_HOST:
+		parent = STORE_OBJ(host);
+		attributes = get_host_children(host, SDB_ATTRIBUTE);
+		break;
+	case SDB_SERVICE:
+		children = get_host_children(host, SDB_SERVICE);
+		break;
+	case SDB_METRIC:
+		children = get_host_children(host, SDB_METRIC);
+		break;
+	default:
 		status = -1;
+		break;
+	}
+
+	if (children) {
+		parent = STORE_OBJ(sdb_avltree_lookup(children, attr->parent));
+		if (! parent) {
+			sdb_log(SDB_LOG_ERR, "store: Failed to store attribute '%s' - "
+					"%s '%s/%s' not found", attr->key,
+					SDB_STORE_TYPE_TO_NAME(attr->parent_type),
+					attr->hostname, attr->parent);
+			status = -1;
+		}
+		else
+			attributes = attr->parent_type == SDB_SERVICE
+				? SVC(parent)->attributes
+				: METRIC(parent)->attributes;
 	}
 
 	if (! status)
-		status = store_attr(STORE_OBJ(host), attrs, key, value, last_update);
+		status = store_obj(parent, attributes, SDB_ATTRIBUTE,
+				attr->key, attr->last_update, &new);
+
+	if (! status) {
+		assert(new);
+		/* update the value if it changed */
+		if (sdb_data_cmp(&ATTR(new)->value, &attr->value))
+			if (sdb_data_copy(&ATTR(new)->value, &attr->value))
+				status = -1;
+	}
 
+	if (parent != STORE_OBJ(host))
+		sdb_object_deref(SDB_OBJ(parent));
 	sdb_object_deref(SDB_OBJ(host));
 	pthread_rwlock_unlock(&st->host_lock);
 
@@ -610,199 +613,82 @@ store_attribute(const char *hostname,
 } /* store_attribute */
 
 static int
-store_host(const char *name, sdb_time_t last_update, sdb_object_t *user_data)
+store_host(sdb_store_host_t *host, sdb_object_t *user_data)
 {
 	sdb_store_t *st = SDB_STORE(user_data);
-
-	char *cname = NULL;
 	int status = 0;
 
-	if (! name)
+	if ((! host) || (! host->name))
 		return -1;
 
-	cname = sdb_plugin_cname(strdup(name));
-	if (! cname) {
-		sdb_log(SDB_LOG_ERR, "store: strdup failed");
-		return -1;
-	}
-
 	pthread_rwlock_wrlock(&st->host_lock);
 	status = store_obj(NULL, st->hosts,
-			SDB_HOST, cname, last_update, NULL);
+			SDB_HOST, host->name, host->last_update, NULL);
 	pthread_rwlock_unlock(&st->host_lock);
 
-	free(cname);
 	return status;
 } /* store_host */
 
 static int
-store_service_attr(const char *hostname, const char *service,
-		const char *key, const sdb_data_t *value, sdb_time_t last_update,
-		sdb_object_t *user_data)
-{
-	sdb_store_t *st = SDB_STORE(user_data);
-
-	sdb_host_t *host;
-	sdb_service_t *svc;
-	sdb_avltree_t *services;
-	int status = 0;
-
-	if ((! hostname) || (! service) || (! key))
-		return -1;
-
-	pthread_rwlock_wrlock(&st->host_lock);
-	host = lookup_host(st, hostname, /* canonicalize = */ 1);
-	services = get_host_children(host, SDB_SERVICE);
-	sdb_object_deref(SDB_OBJ(host));
-	if (! services) {
-		sdb_log(SDB_LOG_ERR, "store: Failed to store attribute '%s' "
-				"for service '%s' - host '%ss' not found",
-				key, service, hostname);
-		pthread_rwlock_unlock(&st->host_lock);
-		return -1;
-	}
-
-	svc = SVC(sdb_avltree_lookup(services, service));
-	if (! svc) {
-		sdb_log(SDB_LOG_ERR, "store: Failed to store attribute '%s' - "
-				"service '%s/%s' not found", key, hostname, service);
-		status = -1;
-	}
-
-	if (! status)
-		status = store_attr(STORE_OBJ(svc), svc->attributes,
-				key, value, last_update);
-
-	sdb_object_deref(SDB_OBJ(svc));
-	pthread_rwlock_unlock(&st->host_lock);
-
-	return status;
-} /* store_service_attr */
-
-static int
-store_service(const char *hostname, const char *name,
-		sdb_time_t last_update, sdb_object_t *user_data)
+store_service(sdb_store_service_t *service, sdb_object_t *user_data)
 {
 	sdb_store_t *st = SDB_STORE(user_data);
 
-	sdb_host_t *host;
+	host_t *host;
 	sdb_avltree_t *services;
-	sdb_data_t d;
 
 	int status = 0;
 
-	if ((! hostname) || (! name))
+	if ((! service) || (! service->hostname) || (! service->name))
 		return -1;
 
 	pthread_rwlock_wrlock(&st->host_lock);
-	host = lookup_host(st, hostname, /* canonicalize = */ 1);
+	host = HOST(sdb_avltree_lookup(st->hosts, service->hostname));
 	services = get_host_children(host, SDB_SERVICE);
 	if (! services) {
 		sdb_log(SDB_LOG_ERR, "store: Failed to store service '%s' - "
-				"host '%s' not found", name, hostname);
+				"host '%s' not found", service->name, service->hostname);
 		status = -1;
 	}
 
 	if (! status)
 		status = store_obj(STORE_OBJ(host), services, SDB_SERVICE,
-				name, last_update, NULL);
+				service->name, service->last_update, NULL);
 
 	sdb_object_deref(SDB_OBJ(host));
 	pthread_rwlock_unlock(&st->host_lock);
-
-	if (status)
-		return status;
-
-	/* record the hostname as an attribute */
-	d.type = SDB_TYPE_STRING;
-	d.data.string = SDB_OBJ(host)->name;
-	if (store_service_attr(hostname, name, "hostname", &d, last_update, user_data))
-		status = -1;
 	return status;
 } /* store_service */
 
 static int
-store_metric_attr(const char *hostname, const char *metric,
-		const char *key, const sdb_data_t *value, sdb_time_t last_update,
-		sdb_object_t *user_data)
-{
-	sdb_store_t *st = SDB_STORE(user_data);
-
-	sdb_avltree_t *metrics;
-	sdb_host_t *host;
-	sdb_metric_t *m;
-	int status = 0;
-
-	if ((! hostname) || (! metric) || (! key))
-		return -1;
-
-	pthread_rwlock_wrlock(&st->host_lock);
-	host = lookup_host(st, hostname, /* canonicalize = */ 1);
-	metrics = get_host_children(host, SDB_METRIC);
-	sdb_object_deref(SDB_OBJ(host));
-	if (! metrics) {
-		sdb_log(SDB_LOG_ERR, "store: Failed to store attribute '%s' "
-				"for metric '%s' - host '%s' not found",
-				key, metric, hostname);
-		pthread_rwlock_unlock(&st->host_lock);
-		return -1;
-	}
-
-	m = METRIC(sdb_avltree_lookup(metrics, metric));
-	if (! m) {
-		sdb_log(SDB_LOG_ERR, "store: Failed to store attribute '%s' - "
-				"metric '%s/%s' not found", key, hostname, metric);
-		status = -1;
-	}
-
-	if (! status)
-		status = store_attr(STORE_OBJ(m), m->attributes,
-				key, value, last_update);
-
-	sdb_object_deref(SDB_OBJ(m));
-	pthread_rwlock_unlock(&st->host_lock);
-
-	return status;
-} /* store_metric_attr */
-
-static int
-store_metric(const char *hostname, const char *name,
-		sdb_metric_store_t *store, sdb_time_t last_update,
-		sdb_object_t *user_data)
+store_metric(sdb_store_metric_t *metric, sdb_object_t *user_data)
 {
 	sdb_store_t *st = SDB_STORE(user_data);
 
 	sdb_store_obj_t *obj = NULL;
-	sdb_host_t *host;
-	sdb_metric_t *metric;
-	sdb_data_t d;
-
 	sdb_avltree_t *metrics;
+	host_t *host;
 
 	int status = 0;
 
-	if ((! hostname) || (! name))
+	if ((! metric) || (! metric->hostname) || (! metric->name))
 		return -1;
 
-	if (store) {
-		if ((store->type != NULL) != (store->id != NULL))
-			return -1;
-		else if (! store->type)
-			store = NULL;
-	}
+	if ((metric->store.type != NULL) != (metric->store.id != NULL))
+		return -1;
 
 	pthread_rwlock_wrlock(&st->host_lock);
-	host = lookup_host(st, hostname, /* canonicalize = */ 1);
+	host = HOST(sdb_avltree_lookup(st->hosts, metric->hostname));
 	metrics = get_host_children(host, SDB_METRIC);
 	if (! metrics) {
 		sdb_log(SDB_LOG_ERR, "store: Failed to store metric '%s' - "
-				"host '%s' not found", name, hostname);
+				"host '%s' not found", metric->name, metric->hostname);
 		status = -1;
 	}
 
 	if (! status)
 		status = store_obj(STORE_OBJ(host), metrics, SDB_METRIC,
-				name, last_update, &obj);
+				metric->name, metric->last_update, &obj);
 	sdb_object_deref(SDB_OBJ(host));
 
 	if (status) {
@@ -811,31 +697,17 @@ store_metric(const char *hostname, const char *name,
 	}
 
 	assert(obj);
-	metric = METRIC(obj);
-
-	if (store)
-		if (store_metric_store(metric, store))
+	if (metric->store.type && metric->store.id)
+		if (store_metric_store(METRIC(obj), metric))
 			status = -1;
 	pthread_rwlock_unlock(&st->host_lock);
-
-	/* record the hostname as an attribute */
-	d.type = SDB_TYPE_STRING;
-	d.data.string = SDB_OBJ(host)->name;
-	if (store_metric_attr(hostname, name, "hostname", &d, last_update, user_data))
-		status = -1;
 	return status;
 } /* store_metric */
 
 sdb_store_writer_t sdb_store_writer = {
-	store_host, store_service, store_metric,
-	store_attribute, store_service_attr, store_metric_attr,
+	store_host, store_service, store_metric, store_attribute,
 };
 
-/*
- * TODO: let prepare and execute accept a store object as their user_data
- * object
- */
-
 static sdb_object_t *
 prepare_query(sdb_ast_node_t *ast,
 		sdb_strbuf_t __attribute__((unused)) *errbuf,
@@ -847,9 +719,10 @@ prepare_query(sdb_ast_node_t *ast,
 static int
 execute_query(sdb_object_t *q,
 		sdb_strbuf_t *buf, sdb_strbuf_t *errbuf,
-		sdb_object_t __attribute__((unused)) *user_data)
+		sdb_object_t *user_data)
 {
-	return sdb_store_query_execute(QUERY(q), buf, errbuf);
+	return sdb_store_query_execute(SDB_STORE(user_data),
+			QUERY(q), buf, errbuf);
 } /* execute_query */
 
 sdb_store_reader_t sdb_store_reader = {
@@ -866,57 +739,50 @@ sdb_store_create(void)
 	return SDB_STORE(sdb_object_create("store", store_type));
 } /* sdb_store_create */
 
-int
-sdb_store_init(void)
-{
-	if (global_store)
-		return 0;
-
-	global_store = SDB_STORE(sdb_object_create("store", store_type));
-	if (! global_store) {
-		sdb_log(SDB_LOG_ERR, "store: Failed to allocate store");
-		return -1;
-	}
-	if (sdb_plugin_register_writer("memstore",
-				&sdb_store_writer, SDB_OBJ(global_store)))
-		return -1;
-	return sdb_plugin_register_reader("memstore",
-			&sdb_store_reader, SDB_OBJ(global_store));
-} /* sdb_store_init */
-
-void
-sdb_store_clear(void)
-{
-	if (! global_store)
-		return;
-	sdb_avltree_clear(global_store->hosts);
-} /* sdb_store_clear */
-
 int
 sdb_store_host(sdb_store_t *store, const char *name, sdb_time_t last_update)
 {
-	return store_host(name, last_update, SDB_OBJ(store));
+	sdb_store_host_t host = {
+		name, last_update, 0, NULL, 0,
+	};
+	return store_host(&host, SDB_OBJ(store));
 } /* sdb_store_host */
 
 int
 sdb_store_service(sdb_store_t *store, const char *hostname, const char *name,
 		sdb_time_t last_update)
 {
-	return store_service(hostname, name, last_update, SDB_OBJ(store));
+	sdb_store_service_t service = {
+		hostname, name, last_update, 0, NULL, 0,
+	};
+	return store_service(&service, SDB_OBJ(store));
 } /* sdb_store_service */
 
 int
 sdb_store_metric(sdb_store_t *store, const char *hostname, const char *name,
 		sdb_metric_store_t *metric_store, sdb_time_t last_update)
 {
-	return store_metric(hostname, name, metric_store, last_update, SDB_OBJ(store));
+	sdb_store_metric_t metric = {
+		hostname, name, { NULL, NULL }, last_update, 0, NULL, 0,
+	};
+	if (metric_store) {
+		metric.store.type = metric_store->type;
+		metric.store.id = metric_store->id;
+	}
+	return store_metric(&metric, SDB_OBJ(store));
 } /* sdb_store_metric */
 
 int
 sdb_store_attribute(sdb_store_t *store, const char *hostname,
 		const char *key, const sdb_data_t *value, sdb_time_t last_update)
 {
-	return store_attribute(hostname, key, value, last_update, SDB_OBJ(store));
+	sdb_store_attribute_t attr = {
+		NULL, SDB_HOST, hostname, key, SDB_DATA_INIT, last_update, 0, NULL, 0,
+	};
+	if (value) {
+		attr.value = *value;
+	}
+	return store_attribute(&attr, SDB_OBJ(store));
 } /* sdb_store_attribute */
 
 int
@@ -924,8 +790,13 @@ sdb_store_service_attr(sdb_store_t *store, const char *hostname,
 		const char *service, const char *key, const sdb_data_t *value,
 		sdb_time_t last_update)
 {
-	return store_service_attr(hostname, service, key, value,
-			last_update, SDB_OBJ(store));
+	sdb_store_attribute_t attr = {
+		hostname, SDB_SERVICE, service, key, SDB_DATA_INIT, last_update, 0, NULL, 0,
+	};
+	if (value) {
+		attr.value = *value;
+	}
+	return store_attribute(&attr, SDB_OBJ(store));
 } /* sdb_store_service_attr */
 
 int
@@ -933,19 +804,24 @@ sdb_store_metric_attr(sdb_store_t *store, const char *hostname,
 		const char *metric, const char *key, const sdb_data_t *value,
 		sdb_time_t last_update)
 {
-	return store_metric_attr(hostname, metric, key, value,
-			last_update, SDB_OBJ(store));
+	sdb_store_attribute_t attr = {
+		hostname, SDB_METRIC, metric, key, SDB_DATA_INIT, last_update, 0, NULL, 0,
+	};
+	if (value) {
+		attr.value = *value;
+	}
+	return store_attribute(&attr, SDB_OBJ(store));
 } /* sdb_store_metric_attr */
 
 sdb_store_obj_t *
-sdb_store_get_host(const char *name)
+sdb_store_get_host(sdb_store_t *store, const char *name)
 {
-	sdb_host_t *host;
+	host_t *host;
 
-	if ((! global_store) || (! name))
+	if ((! store) || (! name))
 		return NULL;
 
-	host = lookup_host(global_store, name, /* canonicalize = */ 0);
+	host = HOST(sdb_avltree_lookup(store->hosts, name));
 	if (! host)
 		return NULL;
 
@@ -1059,28 +935,29 @@ sdb_store_get_attr(sdb_store_obj_t *obj, const char *name, sdb_data_t *res,
 /* TODO: sdb_store_fetch_timeseries should move into the plugin module */
 
 int
-sdb_store_fetch_timeseries(const char *hostname, const char *metric,
+sdb_store_fetch_timeseries(sdb_store_t *store,
+		const char *hostname, const char *metric,
 		sdb_timeseries_opts_t *opts, sdb_strbuf_t *buf)
 {
 	sdb_avltree_t *metrics;
-	sdb_host_t *host;
+	host_t *host;
 	sdb_metric_t *m;
 
 	sdb_timeseries_t *ts;
 
 	int status = 0;
 
-	if ((! global_store) || (! hostname) || (! metric) || (! opts) || (! buf))
+	if ((! store) || (! hostname) || (! metric) || (! opts) || (! buf))
 		return -1;
 
-	pthread_rwlock_rdlock(&global_store->host_lock);
-	host = lookup_host(global_store, hostname, /* canonicalize = */ 1);
+	pthread_rwlock_rdlock(&store->host_lock);
+	host = HOST(sdb_avltree_lookup(store->hosts, hostname));
 	metrics = get_host_children(host, SDB_METRIC);
 	sdb_object_deref(SDB_OBJ(host));
 	if (! metrics) {
 		sdb_log(SDB_LOG_ERR, "store: Failed to fetch time-series '%s/%s' "
 				"- host '%s' not found", hostname, metric, hostname);
-		pthread_rwlock_unlock(&global_store->host_lock);
+		pthread_rwlock_unlock(&store->host_lock);
 		return -1;
 	}
 
@@ -1088,7 +965,7 @@ sdb_store_fetch_timeseries(const char *hostname, const char *metric,
 	if (! m) {
 		sdb_log(SDB_LOG_ERR, "store: Failed to fetch time-series '%s/%s' "
 				"- metric '%s' not found", hostname, metric, metric);
-		pthread_rwlock_unlock(&global_store->host_lock);
+		pthread_rwlock_unlock(&store->host_lock);
 		return -1;
 	}
 
@@ -1097,7 +974,7 @@ sdb_store_fetch_timeseries(const char *hostname, const char *metric,
 				"- no data-store configured for the stored metric",
 				hostname, metric);
 		sdb_object_deref(SDB_OBJ(m));
-		pthread_rwlock_unlock(&global_store->host_lock);
+		pthread_rwlock_unlock(&store->host_lock);
 		return -1;
 	}
 
@@ -1107,7 +984,7 @@ sdb_store_fetch_timeseries(const char *hostname, const char *metric,
 
 		strncpy(type, m->store.type, sizeof(type));
 		strncpy(id, m->store.id, sizeof(id));
-		pthread_rwlock_unlock(&global_store->host_lock);
+		pthread_rwlock_unlock(&store->host_lock);
 
 		ts = sdb_plugin_fetch_timeseries(type, id, opts);
 		if (! ts) {
@@ -1125,13 +1002,14 @@ sdb_store_fetch_timeseries(const char *hostname, const char *metric,
 } /* sdb_store_fetch_timeseries */
 
 int
-sdb_store_scan(int type, sdb_store_matcher_t *m, sdb_store_matcher_t *filter,
+sdb_store_scan(sdb_store_t *store, int type,
+		sdb_store_matcher_t *m, sdb_store_matcher_t *filter,
 		sdb_store_lookup_cb cb, void *user_data)
 {
 	sdb_avltree_iter_t *host_iter = NULL;
 	int status = 0;
 
-	if ((! global_store) || (! cb))
+	if ((! store) || (! cb))
 		return -1;
 
 	if ((type != SDB_HOST) && (type != SDB_SERVICE) && (type != SDB_METRIC)) {
@@ -1139,8 +1017,8 @@ sdb_store_scan(int type, sdb_store_matcher_t *m, sdb_store_matcher_t *filter,
 		return -1;
 	}
 
-	pthread_rwlock_rdlock(&global_store->host_lock);
-	host_iter = sdb_avltree_get_iter(global_store->hosts);
+	pthread_rwlock_rdlock(&store->host_lock);
+	host_iter = sdb_avltree_get_iter(store->hosts);
 	if (! host_iter)
 		status = -1;
 
@@ -1190,7 +1068,7 @@ sdb_store_scan(int type, sdb_store_matcher_t *m, sdb_store_matcher_t *filter,
 	}
 
 	sdb_avltree_iter_destroy(host_iter);
-	pthread_rwlock_unlock(&global_store->host_lock);
+	pthread_rwlock_unlock(&store->host_lock);
 	return status;
 } /* sdb_store_scan */