X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=src%2Fcore%2Fstore.c;h=fa72955886bfa04778daa110bc02515b909919b1;hp=498217b394c092ce1a356a98d1f31e7bcffcdc3f;hb=9a96acd759c31211aa512e174339a9c178c4eb83;hpb=502bbcd0731ca35b4f3d93653a818f5246f81e0b

diff --git a/src/core/store.c b/src/core/store.c
index 498217b..fa72955 100644
--- a/src/core/store.c
+++ b/src/core/store.c
@@ -43,11 +43,10 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <math.h>
 #include <pthread.h>
 
 /*
- * private variables
+ * private types
  */
 
 struct sdb_store {
@@ -59,9 +58,17 @@ struct sdb_store {
 	pthread_rwlock_t host_lock;
 };
 
-/*
- * private types
- */
+/* internal representation of a to-be-stored object */
+typedef struct {
+	sdb_store_obj_t *parent;
+	sdb_avltree_t *parent_tree;
+	int type;
+	const char *name;
+	sdb_time_t last_update;
+	const char * const *backends;
+	size_t backends_num;
+} store_obj_t;
+#define STORE_OBJ_INIT { NULL, NULL, 0, NULL, 0, NULL, 0 }
 
 static sdb_type_t host_type;
 static sdb_type_t service_type;
@@ -134,7 +141,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 */
@@ -157,7 +164,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);
@@ -173,7 +180,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 */
@@ -190,7 +197,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);
@@ -270,13 +277,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
 };
@@ -288,7 +295,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
 };
@@ -297,89 +304,71 @@ 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)
+record_backends(sdb_store_obj_t *obj,
+		const char * const *backends, size_t backends_num)
 {
-	const sdb_plugin_info_t *info;
 	char **tmp;
 	size_t i;
 
-	info = sdb_plugin_current();
-	if (! info)
-		return 0;
+	for (i = 0; i < backends_num; i++) {
+		bool found = 0;
+		size_t j;
 
-	for (i = 0; i < obj->backends_num; ++i)
-		if (!strcasecmp(obj->backends[i], info->plugin_name))
-			return 0;
+		for (j = 0; j < obj->backends_num; ++j) {
+			if (!strcasecmp(obj->backends[j], backends[i])) {
+				found = 1;
+				break;
+			}
+		}
+		if (found)
+			continue;
 
-	tmp = realloc(obj->backends,
-			(obj->backends_num + 1) * sizeof(*obj->backends));
-	if (! tmp)
-		return -1;
+		tmp = realloc(obj->backends,
+				(obj->backends_num + 1) * sizeof(*obj->backends));
+		if (! tmp)
+			return -1;
 
-	obj->backends = tmp;
-	obj->backends[obj->backends_num] = strdup(info->plugin_name);
-	if (! obj->backends[obj->backends_num])
-		return -1;
+		obj->backends = tmp;
+		obj->backends[obj->backends_num] = strdup(backends[i]);
+		if (! obj->backends[obj->backends_num])
+			return -1;
 
-	++obj->backends_num;
+		++obj->backends_num;
+	}
 	return 0;
-} /* record_backend */
+} /* record_backends */
 
 static int
-store_obj(sdb_store_obj_t *parent, sdb_avltree_t *parent_tree,
-		int type, const char *name, sdb_time_t last_update,
-		sdb_store_obj_t **updated_obj)
+store_obj(store_obj_t *obj, sdb_store_obj_t **updated_obj)
 {
 	sdb_store_obj_t *old, *new;
 	int status = 0;
 
-	assert(parent_tree);
+	assert(obj->parent_tree);
 
-	if (last_update <= 0)
-		last_update = sdb_gettime();
+	if (obj->last_update <= 0)
+		obj->last_update = sdb_gettime();
 
-	old = STORE_OBJ(sdb_avltree_lookup(parent_tree, name));
+	old = STORE_OBJ(sdb_avltree_lookup(obj->parent_tree, obj->name));
 	if (old) {
-		if (old->last_update > last_update) {
+		if (old->last_update > obj->last_update) {
 			sdb_log(SDB_LOG_DEBUG, "store: Cannot update %s '%s' - "
 					"value too old (%"PRIsdbTIME" < %"PRIsdbTIME")",
-					SDB_STORE_TYPE_TO_NAME(type), name,
-					last_update, old->last_update);
+					SDB_STORE_TYPE_TO_NAME(obj->type), obj->name,
+					obj->last_update, old->last_update);
 			/* don't report an error; the object may be updated by multiple
 			 * backends */
 			status = 1;
 		}
-		else if (old->last_update == last_update) {
+		else if (old->last_update == obj->last_update) {
 			/* don't report an error and also don't even log this to avoid
 			 * excessive noise on high sampling frequencies */
 			status = 1;
 		}
 		else {
-			sdb_time_t interval = last_update - old->last_update;
-			old->last_update = last_update;
+			sdb_time_t interval = obj->last_update - old->last_update;
+			old->last_update = obj->last_update;
 			if (interval) {
 				if (old->interval)
 					old->interval = (sdb_time_t)((0.9 * (double)old->interval)
@@ -393,23 +382,24 @@ store_obj(sdb_store_obj_t *parent, sdb_avltree_t *parent_tree,
 		sdb_object_deref(SDB_OBJ(old));
 	}
 	else {
-		if (type == SDB_ATTRIBUTE) {
+		if (obj->type == SDB_ATTRIBUTE) {
 			/* the value will be updated by the caller */
-			new = STORE_OBJ(sdb_object_create(name, attribute_type,
-						type, last_update, NULL));
+			new = STORE_OBJ(sdb_object_create(obj->name, attribute_type,
+						obj->type, obj->last_update, NULL));
 		}
 		else {
 			sdb_type_t t;
-			t = type == SDB_HOST
+			t = obj->type == SDB_HOST
 				? host_type
-				: type == SDB_SERVICE
+				: obj->type == SDB_SERVICE
 					? service_type
 					: metric_type;
-			new = STORE_OBJ(sdb_object_create(name, t, type, last_update));
+			new = STORE_OBJ(sdb_object_create(obj->name, t,
+						obj->type, obj->last_update));
 		}
 
 		if (new) {
-			status = sdb_avltree_insert(parent_tree, SDB_OBJ(new));
+			status = sdb_avltree_insert(obj->parent_tree, SDB_OBJ(new));
 
 			/* pass control to the tree or destroy in case of an error */
 			sdb_object_deref(SDB_OBJ(new));
@@ -417,7 +407,7 @@ store_obj(sdb_store_obj_t *parent, sdb_avltree_t *parent_tree,
 		else {
 			char errbuf[1024];
 			sdb_log(SDB_LOG_ERR, "store: Failed to create %s '%s': %s",
-					SDB_STORE_TYPE_TO_NAME(type), name,
+					SDB_STORE_TYPE_TO_NAME(obj->type), obj->name,
 					sdb_strerror(errno, errbuf, sizeof(errbuf)));
 			status = -1;
 		}
@@ -427,56 +417,34 @@ store_obj(sdb_store_obj_t *parent, sdb_avltree_t *parent_tree,
 		return status;
 	assert(new);
 
-	if (new->parent != parent) {
+	if (new->parent != obj->parent) {
 		// Avoid circular self-references which are not handled
 		// correctly by the ref-count based management layer.
 		//sdb_object_deref(SDB_OBJ(new->parent));
-		//sdb_object_ref(SDB_OBJ(parent));
-		new->parent = parent;
+		//sdb_object_ref(SDB_OBJ(obj->parent));
+		new->parent = obj->parent;
 	}
 
 	if (updated_obj)
 		*updated_obj = new;
 
-	if (record_backend(new))
+	if (record_backends(new, obj->backends, obj->backends_num))
 		return -1;
 	return status;
 } /* 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;
@@ -498,7 +466,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))
@@ -515,92 +483,88 @@ get_host_children(sdb_host_t *host, int type)
 		return host->services;
 } /* get_host_children */
 
-/*
- * ts_tojson serializes a time-series to JSON.
- *
- * The function never returns an error. Rather, an error message will be part
- * of the serialized data.
- */
-static void
-ts_tojson(sdb_timeseries_t *ts, sdb_strbuf_t *buf)
-{
-	char start_str[64];
-	char end_str[64];
-
-	size_t i;
-
-	/* TODO: make time format configurable */
-	if (! sdb_strftime(start_str, sizeof(start_str), ts->start))
-		snprintf(start_str, sizeof(start_str), "<error>");
-	start_str[sizeof(start_str) - 1] = '\0';
-	if (! sdb_strftime(end_str, sizeof(end_str), ts->end))
-		snprintf(end_str, sizeof(end_str), "<error>");
-	end_str[sizeof(end_str) - 1] = '\0';
-
-	sdb_strbuf_append(buf, "{\"start\": \"%s\", \"end\": \"%s\", \"data\": {",
-			start_str, end_str);
-
-	for (i = 0; i < ts->data_names_len; ++i) {
-		size_t j;
-		sdb_strbuf_append(buf, "\"%s\": [", ts->data_names[i]);
-
-		for (j = 0; j < ts->data_len; ++j) {
-			char time_str[64];
-
-			if (! sdb_strftime(time_str, sizeof(time_str), ts->data[i][j].timestamp))
-				snprintf(time_str, sizeof(time_str), "<error>");
-			time_str[sizeof(time_str) - 1] = '\0';
-
-			/* Some GNU libc versions may print '-nan' which we dont' want */
-			if (isnan(ts->data[i][j].value))
-				sdb_strbuf_append(buf, "{\"timestamp\": \"%s\", "
-						"\"value\": \"nan\"}", time_str);
-			else
-				sdb_strbuf_append(buf, "{\"timestamp\": \"%s\", "
-						"\"value\": \"%f\"}", time_str, ts->data[i][j].value);
-
-			if (j < ts->data_len - 1)
-				sdb_strbuf_append(buf, ",");
-		}
-
-		if (i < ts->data_names_len - 1)
-			sdb_strbuf_append(buf, "],");
-		else
-			sdb_strbuf_append(buf, "]");
-	}
-	sdb_strbuf_append(buf, "}}");
-} /* ts_tojson */
-
 /*
  * store writer API
  */
 
 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);
+	store_obj_t obj = STORE_OBJ_INIT;
+	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;
 	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 = */ 0);
-	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:
+		obj.parent = STORE_OBJ(host);
+		obj.parent_tree = 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) {
+		obj.parent = STORE_OBJ(sdb_avltree_lookup(children, attr->parent));
+		if (! obj.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
+			obj.parent_tree = attr->parent_type == SDB_SERVICE
+				? SVC(obj.parent)->attributes
+				: METRIC(obj.parent)->attributes;
+	}
+
+	obj.type = SDB_ATTRIBUTE;
+	obj.name = attr->key;
+	obj.last_update = attr->last_update;
+	obj.backends = attr->backends;
+	obj.backends_num = attr->backends_num;
 	if (! status)
-		status = store_attr(STORE_OBJ(host), attrs, key, value, last_update);
+		status = store_obj(&obj, &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 (obj.parent != STORE_OBJ(host))
+		sdb_object_deref(SDB_OBJ(obj.parent));
 	sdb_object_deref(SDB_OBJ(host));
 	pthread_rwlock_unlock(&st->host_lock);
 
@@ -608,190 +572,94 @@ 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);
+	store_obj_t obj = { NULL, st->hosts, SDB_HOST, NULL, 0, NULL, 0 };
 	int status = 0;
 
-	if (! name)
+	if ((! host) || (! host->name))
 		return -1;
 
+	obj.name = host->name;
+	obj.last_update = host->last_update;
+	obj.backends = host->backends;
+	obj.backends_num = host->backends_num;
 	pthread_rwlock_wrlock(&st->host_lock);
-	status = store_obj(NULL, st->hosts,
-			SDB_HOST, name, last_update, NULL);
+	status = store_obj(&obj, NULL);
 	pthread_rwlock_unlock(&st->host_lock);
 
 	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)
+store_service(sdb_store_service_t *service, sdb_object_t *user_data)
 {
 	sdb_store_t *st = SDB_STORE(user_data);
+	store_obj_t obj = STORE_OBJ_INIT;
+	host_t *host;
 
-	sdb_host_t *host;
-	sdb_service_t *svc;
-	sdb_avltree_t *services;
 	int status = 0;
 
-	if ((! hostname) || (! service) || (! key))
+	if ((! service) || (! service->hostname) || (! service->name))
 		return -1;
 
 	pthread_rwlock_wrlock(&st->host_lock);
-	host = lookup_host(st, hostname, /* canonicalize = */ 0);
-	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)
-{
-	sdb_store_t *st = SDB_STORE(user_data);
-
-	sdb_host_t *host;
-	sdb_avltree_t *services;
-	sdb_data_t d;
-
-	int status = 0;
-
-	if ((! hostname) || (! name))
-		return -1;
-
-	pthread_rwlock_wrlock(&st->host_lock);
-	host = lookup_host(st, hostname, /* canonicalize = */ 0);
-	services = get_host_children(host, SDB_SERVICE);
-	if (! services) {
+	host = HOST(sdb_avltree_lookup(st->hosts, service->hostname));
+	obj.parent = STORE_OBJ(host);
+	obj.parent_tree = get_host_children(host, SDB_SERVICE);
+	obj.type = SDB_SERVICE;
+	if (! obj.parent_tree) {
 		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;
 	}
 
+	obj.name = service->name;
+	obj.last_update = service->last_update;
+	obj.backends = service->backends;
+	obj.backends_num = service->backends_num;
 	if (! status)
-		status = store_obj(STORE_OBJ(host), services, SDB_SERVICE,
-				name, last_update, NULL);
+		status = store_obj(&obj, 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)
+store_metric(sdb_store_metric_t *metric, sdb_object_t *user_data)
 {
 	sdb_store_t *st = SDB_STORE(user_data);
+	store_obj_t obj = STORE_OBJ_INIT;
+	sdb_store_obj_t *new = NULL;
+	host_t *host;
 
-	sdb_avltree_t *metrics;
-	sdb_host_t *host;
-	sdb_metric_t *m;
 	int status = 0;
 
-	if ((! hostname) || (! metric) || (! key))
+	if ((! metric) || (! metric->hostname) || (! metric->name))
 		return -1;
 
-	pthread_rwlock_wrlock(&st->host_lock);
-	host = lookup_host(st, hostname, /* canonicalize = */ 0);
-	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);
+	if ((metric->store.type != NULL) != (metric->store.id != NULL))
 		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)
-{
-	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;
-
-	int status = 0;
-
-	if ((! hostname) || (! name))
-		return -1;
-
-	if (store) {
-		if ((store->type != NULL) != (store->id != NULL))
-			return -1;
-		else if (! store->type)
-			store = NULL;
-	}
 
 	pthread_rwlock_wrlock(&st->host_lock);
-	host = lookup_host(st, hostname, /* canonicalize = */ 0);
-	metrics = get_host_children(host, SDB_METRIC);
-	if (! metrics) {
+	host = HOST(sdb_avltree_lookup(st->hosts, metric->hostname));
+	obj.parent = STORE_OBJ(host);
+	obj.parent_tree = get_host_children(host, SDB_METRIC);
+	obj.type = SDB_METRIC;
+	if (! obj.parent_tree) {
 		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;
 	}
 
+	obj.name = metric->name;
+	obj.last_update = metric->last_update;
+	obj.backends = metric->backends;
+	obj.backends_num = metric->backends_num;
 	if (! status)
-		status = store_obj(STORE_OBJ(host), metrics, SDB_METRIC,
-				name, last_update, &obj);
+		status = store_obj(&obj, &new);
 	sdb_object_deref(SDB_OBJ(host));
 
 	if (status) {
@@ -799,32 +667,18 @@ store_metric(const char *hostname, const char *name,
 		return status;
 	}
 
-	assert(obj);
-	metric = METRIC(obj);
-
-	if (store)
-		if (store_metric_store(metric, store))
+	assert(new);
+	if (metric->store.type && metric->store.id)
+		if (store_metric_store(METRIC(new), 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,
@@ -835,11 +689,11 @@ prepare_query(sdb_ast_node_t *ast,
 
 static int
 execute_query(sdb_object_t *q,
-		sdb_strbuf_t *buf, sdb_strbuf_t *errbuf,
+		sdb_store_writer_t *w, sdb_object_t *wd, sdb_strbuf_t *errbuf,
 		sdb_object_t *user_data)
 {
 	return sdb_store_query_execute(SDB_STORE(user_data),
-			QUERY(q), buf, errbuf);
+			QUERY(q), w, wd, errbuf);
 } /* execute_query */
 
 sdb_store_reader_t sdb_store_reader = {
@@ -859,28 +713,47 @@ sdb_store_create(void)
 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
@@ -888,8 +761,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
@@ -897,19 +775,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(sdb_store_t *store, const char *name)
 {
-	sdb_host_t *host;
+	host_t *host;
 
 	if ((! store) || (! name))
 		return NULL;
 
-	host = lookup_host(store, name, /* canonicalize = */ 0);
+	host = HOST(sdb_avltree_lookup(store->hosts, name));
 	if (! host)
 		return NULL;
 
@@ -1020,75 +903,6 @@ sdb_store_get_attr(sdb_store_obj_t *obj, const char *name, sdb_data_t *res,
 	return 0;
 } /* sdb_store_get_attr */
 
-/* TODO: sdb_store_fetch_timeseries should move into the plugin module */
-
-int
-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;
-	sdb_metric_t *m;
-
-	sdb_timeseries_t *ts;
-
-	int status = 0;
-
-	if ((! store) || (! hostname) || (! metric) || (! opts) || (! buf))
-		return -1;
-
-	pthread_rwlock_rdlock(&store->host_lock);
-	host = lookup_host(store, 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 fetch time-series '%s/%s' "
-				"- host '%s' not found", hostname, metric, hostname);
-		pthread_rwlock_unlock(&store->host_lock);
-		return -1;
-	}
-
-	m = METRIC(sdb_avltree_lookup(metrics, 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(&store->host_lock);
-		return -1;
-	}
-
-	if ((! m->store.type) || (! m->store.id)) {
-		sdb_log(SDB_LOG_ERR, "store: Failed to fetch time-series '%s/%s' "
-				"- no data-store configured for the stored metric",
-				hostname, metric);
-		sdb_object_deref(SDB_OBJ(m));
-		pthread_rwlock_unlock(&store->host_lock);
-		return -1;
-	}
-
-	{
-		char type[strlen(m->store.type) + 1];
-		char id[strlen(m->store.id) + 1];
-
-		strncpy(type, m->store.type, sizeof(type));
-		strncpy(id, m->store.id, sizeof(id));
-		pthread_rwlock_unlock(&store->host_lock);
-
-		ts = sdb_plugin_fetch_timeseries(type, id, opts);
-		if (! ts) {
-			sdb_log(SDB_LOG_ERR, "store: Failed to fetch time-series '%s/%s' "
-					"- %s fetcher callback returned no data for '%s'",
-					hostname, metric, type, id);
-			status = -1;
-		}
-	}
-
-	ts_tojson(ts, buf);
-	sdb_object_deref(SDB_OBJ(m));
-	sdb_timeseries_destroy(ts);
-	return status;
-} /* sdb_store_fetch_timeseries */
-
 int
 sdb_store_scan(sdb_store_t *store, int type,
 		sdb_store_matcher_t *m, sdb_store_matcher_t *filter,