X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=src%2Ffrontend%2Fquery.c;h=2a1954abc9a87ebc966dff97e1af47244f76645a;hp=f55975edda8c55188410cfbfc68acab9d19dcd66;hb=HEAD;hpb=a5673017588c548a6a8e4fcb1ec44ffc27816d06

diff --git a/src/frontend/query.c b/src/frontend/query.c
index f55975e..2a1954a 100644
--- a/src/frontend/query.c
+++ b/src/frontend/query.c
@@ -1,6 +1,6 @@
 /*
  * SysDB - src/frontend/query.c
- * Copyright (C) 2013 Sebastian 'tokkee' Harl <sh@tokkee.org>
+ * Copyright (C) 2013-2014 Sebastian 'tokkee' Harl <sh@tokkee.org>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -25,77 +25,337 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#ifdef HAVE_CONFIG_H
+#	include "config.h"
+#endif
+
 #include "sysdb.h"
 
-#include "core/store.h"
+#include "core/plugin.h"
 #include "frontend/connection-private.h"
-#include "frontend/parser.h"
+#include "parser/ast.h"
+#include "parser/parser.h"
 #include "utils/error.h"
+#include "utils/proto.h"
 #include "utils/strbuf.h"
 
 #include <errno.h>
+#include <ctype.h>
 #include <string.h>
 
 /*
- * private helper functions
+ * metric fetcher:
+ * Implements the callbacks necessary to read a metric object.
  */
 
 typedef struct {
-	sdb_strbuf_t *buf;
-	sdb_store_matcher_t *filter;
+	char *type;
+	char *id;
+	sdb_time_t last_update;
+} metric_store_t;
+
+static int
+metric_fetcher_host(sdb_store_host_t __attribute__((unused)) *host,
+		sdb_object_t __attribute__((unused)) *user_data)
+{
+	return 0;
+} /* metric_fetcher_host */
+
+static int
+metric_fetcher_metric(sdb_store_metric_t *metric, sdb_object_t *user_data)
+{
+	metric_store_t *st = SDB_OBJ_WRAPPER(user_data)->data;
+	sdb_time_t last_update = 0;
+	size_t idx = 0, i;
+
+	if (! metric->stores_num)
+		return -1;
+
+	/* Find the most up to date data store.
+	 * TODO: Consider merging multiple results? */
+	for (i = 0; i < metric->stores_num; ++i) {
+		if (metric->stores[i].last_update > last_update) {
+			last_update = metric->stores[i].last_update;
+			idx = i;
+		}
+	}
+	st->type = strdup(metric->stores[idx].type);
+	st->id = strdup(metric->stores[idx].id);
+	st->last_update = metric->stores[idx].last_update;
+	return 0;
+} /* metric_fetcher_metric */
+
+static sdb_store_writer_t metric_fetcher = {
+	metric_fetcher_host, NULL, metric_fetcher_metric, NULL,
+};
+
+/*
+ * private helper functions
+ */
 
-	size_t last_len;
-} tojson_data_t;
+static char *
+sstrdup(const char *s)
+{
+	return s ? strdup(s) : NULL;
+} /* sstrdup */
+
+static size_t
+sstrlen(const char *s)
+{
+	return s ? strlen(s) : 0;
+} /* sstrlen */
 
 static int
-lookup_tojson(sdb_store_obj_t *obj, void *user_data)
+exec_query(sdb_ast_node_t *ast, sdb_strbuf_t *buf, sdb_strbuf_t *errbuf)
 {
-	tojson_data_t *data = user_data;
+	sdb_store_json_formatter_t *f;
+	int type = 0, flags = 0;
+	uint32_t res_type = 0;
 	int status;
 
-	if (data->filter && (! sdb_store_matcher_matches(data->filter, obj, NULL)))
-		return 0;
+	switch (ast->type) {
+	case SDB_AST_TYPE_FETCH:
+		type = SDB_AST_FETCH(ast)->obj_type;
+		res_type = htonl(SDB_CONNECTION_FETCH);
+		break;
+	case SDB_AST_TYPE_LIST:
+		type = SDB_AST_LIST(ast)->obj_type;
+		flags = SDB_WANT_ARRAY;
+		res_type = htonl(SDB_CONNECTION_LIST);
+		break;
+	case SDB_AST_TYPE_LOOKUP:
+		type = SDB_AST_LOOKUP(ast)->obj_type;
+		flags = SDB_WANT_ARRAY;
+		res_type = htonl(SDB_CONNECTION_LOOKUP);
+		break;
+	default:
+		sdb_strbuf_sprintf(errbuf, "invalid command %s (%#x)",
+				SDB_AST_TYPE_TO_STRING(ast), ast->type);
+		return -1;
+	}
 
-	if (sdb_strbuf_len(data->buf) > data->last_len)
-		sdb_strbuf_append(data->buf, ",");
-	data->last_len = sdb_strbuf_len(data->buf);
-	status = sdb_store_host_tojson(obj, data->buf,
-			data->filter, /* flags = */ 0);
+	f = sdb_store_json_formatter(buf, type, flags);
+	sdb_strbuf_memcpy(buf, &res_type, sizeof(res_type));
+	status = sdb_plugin_query(ast, &sdb_store_json_writer, SDB_OBJ(f),
+			&(sdb_query_opts_t){ true }, errbuf);
+	if (status < 0)
+		sdb_strbuf_clear(buf);
+	sdb_store_json_finish(f);
+	sdb_object_deref(SDB_OBJ(f));
 	return status;
-} /* lookup_tojson */
+} /* exec_query */
+
+static int
+exec_store(sdb_ast_store_t *st, sdb_strbuf_t *buf, sdb_strbuf_t *errbuf)
+{
+	char name[sstrlen(st->hostname) + sstrlen(st->parent) + sstrlen(st->name) + 3];
+	sdb_metric_store_t metric_store;
+	int type = st->obj_type, status = -1;
+
+	switch (st->obj_type) {
+	case SDB_HOST:
+		strncpy(name, st->name, sizeof(name));
+		status = sdb_plugin_store_host(st->name, st->last_update);
+		break;
+
+	case SDB_SERVICE:
+		snprintf(name, sizeof(name), "%s.%s", st->hostname, st->name);
+		status = sdb_plugin_store_service(st->hostname, st->name, st->last_update);
+		break;
+
+	case SDB_METRIC:
+		snprintf(name, sizeof(name), "%s.%s", st->hostname, st->name);
+		metric_store.type = st->store_type;
+		metric_store.id = st->store_id;
+		metric_store.last_update = st->store_last_update;
+		status = sdb_plugin_store_metric(st->hostname, st->name,
+				&metric_store, st->last_update);
+		break;
+
+	case SDB_ATTRIBUTE:
+		type |= st->parent_type;
+
+		if (st->parent)
+			snprintf(name, sizeof(name), "%s.%s.%s",
+					st->hostname, st->parent, st->name);
+		else
+			snprintf(name, sizeof(name), "%s.%s", st->hostname, st->name);
+
+		switch (st->parent_type) {
+		case 0:
+			type |= SDB_HOST;
+			status = sdb_plugin_store_attribute(st->hostname,
+					st->name, &st->value, st->last_update);
+			break;
+
+		case SDB_SERVICE:
+			status = sdb_plugin_store_service_attribute(st->hostname, st->parent,
+					st->name, &st->value, st->last_update);
+			break;
+
+		case SDB_METRIC:
+			status = sdb_plugin_store_metric_attribute(st->hostname, st->parent,
+					st->name, &st->value, st->last_update);
+			break;
+
+		default:
+			sdb_log(SDB_LOG_ERR, "store: Invalid parent type in STORE: %s",
+					SDB_STORE_TYPE_TO_NAME(st->parent_type));
+			return -1;
+		}
+		break;
+
+	default:
+		sdb_log(SDB_LOG_ERR, "store: Invalid object type in STORE: %s",
+				SDB_STORE_TYPE_TO_NAME(st->obj_type));
+		return -1;
+	}
+
+	if (status < 0) {
+		sdb_strbuf_sprintf(errbuf, "STORE: Failed to store %s object",
+				SDB_STORE_TYPE_TO_NAME(type));
+		return -1;
+	}
+
+	if (! status) {
+		sdb_strbuf_sprintf(buf, "Successfully stored %s %s",
+				SDB_STORE_TYPE_TO_NAME(type), name);
+	}
+	else {
+		char type_str[32];
+		strncpy(type_str, SDB_STORE_TYPE_TO_NAME(type), sizeof(type_str));
+		type_str[0] = (char)toupper((int)type_str[0]);
+		sdb_strbuf_sprintf(buf, "%s %s already up to date", type_str, name);
+	}
+
+	return SDB_CONNECTION_OK;
+} /* exec_store */
+
+static int
+exec_timeseries(sdb_ast_timeseries_t *ts, sdb_strbuf_t *buf, sdb_strbuf_t *errbuf)
+{
+	metric_store_t st = { NULL, NULL, 0 };
+	sdb_object_wrapper_t obj = SDB_OBJECT_WRAPPER_STATIC(&st);
+	sdb_ast_fetch_t fetch = SDB_AST_FETCH_INIT;
+	sdb_timeseries_opts_t opts = { 0, 0, NULL, 0 };
+	sdb_timeseries_t *series = NULL;
+	int status;
+
+	if ((! ts) || (! ts->hostname) || (! ts->metric))
+		return -1;
+
+	fetch.obj_type = SDB_METRIC;
+	fetch.hostname = strdup(ts->hostname);
+	fetch.name = strdup(ts->metric);
+	opts.data_names = (const char * const *)ts->data_names;
+	opts.data_names_len = ts->data_names_len;
+	opts.start = ts->start;
+	opts.end = ts->end;
+
+	status = sdb_plugin_query(SDB_AST_NODE(&fetch),
+			&metric_fetcher, SDB_OBJ(&obj),
+			&(sdb_query_opts_t){ true }, errbuf);
+	if ((status < 0) || (! st.type) || (! st.id)) {
+		sdb_log(SDB_LOG_ERR, "frontend: Failed to fetch time-series '%s/%s' "
+				"- no data-store configured for the stored metric",
+				ts->hostname, ts->metric);
+		status = -1;
+	}
+	if (status >= 0) {
+		series = sdb_plugin_fetch_timeseries(st.type, st.id, &opts);
+		if (series) {
+			uint32_t res_type = htonl(SDB_CONNECTION_TIMESERIES);
+			sdb_strbuf_memcpy(buf, &res_type, sizeof(res_type));
+			sdb_timeseries_tojson(series, buf);
+			sdb_timeseries_destroy(series);
+		}
+		else {
+			sdb_log(SDB_LOG_ERR, "frontend: Failed to fetch time-series '%s/%s' "
+					"- %s fetcher callback returned no data for '%s'",
+					ts->hostname, ts->metric, st.type, st.id);
+			status = -1;
+		}
+	}
+
+	free(fetch.hostname);
+	free(fetch.name);
+	if (st.type)
+		free(st.type);
+	if (st.id)
+		free(st.id);
+	return status;
+} /* exec_timeseries */
+
+static int
+exec_cmd(sdb_conn_t *conn, sdb_ast_node_t *ast)
+{
+	sdb_strbuf_t *buf;
+	int status;
+
+	if (! ast) {
+		sdb_strbuf_sprintf(conn->errbuf, "out of memory");
+		return -1;
+	}
+
+	buf = sdb_strbuf_create(1024);
+	if (! buf) {
+		sdb_strbuf_sprintf(conn->errbuf, "Out of memory");
+		return -1;
+	}
+
+	if (ast->type == SDB_AST_TYPE_STORE)
+		status = exec_store(SDB_AST_STORE(ast), buf, conn->errbuf);
+	else if (ast->type == SDB_AST_TYPE_TIMESERIES)
+		status = exec_timeseries(SDB_AST_TIMESERIES(ast), buf, conn->errbuf);
+	else
+		status = exec_query(ast, buf, conn->errbuf);
+
+	if (status < 0) {
+		char query[conn->cmd_len + 1];
+		strncpy(query, sdb_strbuf_string(conn->buf), conn->cmd_len);
+		query[sizeof(query) - 1] = '\0';
+		sdb_log(SDB_LOG_ERR, "frontend: failed to execute query '%s'", query);
+	}
+	else
+		sdb_connection_send(conn, status,
+				(uint32_t)sdb_strbuf_len(buf), sdb_strbuf_string(buf));
+
+	sdb_strbuf_destroy(buf);
+	return status < 0 ? status : 0;
+} /* exec_cmd */
 
 /*
  * public API
  */
 
 int
-sdb_fe_query(sdb_conn_t *conn)
+sdb_conn_query(sdb_conn_t *conn)
 {
 	sdb_llist_t *parsetree;
-	sdb_conn_node_t *node = NULL;
+	sdb_ast_node_t *ast = NULL;
 	int status = 0;
 
-	if ((! conn) || (conn->cmd != CONNECTION_QUERY))
+	if ((! conn) || (conn->cmd != SDB_CONNECTION_QUERY))
 		return -1;
 
-	parsetree = sdb_fe_parse(sdb_strbuf_string(conn->buf),
-			(int)conn->cmd_len);
+	parsetree = sdb_parser_parse(sdb_strbuf_string(conn->buf),
+			(int)conn->cmd_len, conn->errbuf);
 	if (! parsetree) {
 		char query[conn->cmd_len + 1];
 		strncpy(query, sdb_strbuf_string(conn->buf), conn->cmd_len);
 		query[sizeof(query) - 1] = '\0';
-		sdb_log(SDB_LOG_ERR, "frontend: Failed to parse query '%s'",
-				query);
+		sdb_log(SDB_LOG_ERR, "frontend: Failed to parse query '%s': %s",
+				query, sdb_strbuf_string(conn->errbuf));
 		return -1;
 	}
 
 	switch (sdb_llist_len(parsetree)) {
 		case 0:
 			/* skipping empty command; send back an empty reply */
-			sdb_connection_send(conn, CONNECTION_DATA, 0, NULL);
+			sdb_connection_send(conn, SDB_CONNECTION_DATA, 0, NULL);
 			break;
 		case 1:
-			node = SDB_CONN_NODE(sdb_llist_get(parsetree, 0));
+			ast = SDB_AST_NODE(sdb_llist_get(parsetree, 0));
 			break;
 
 		default:
@@ -108,251 +368,232 @@ sdb_fe_query(sdb_conn_t *conn)
 						sdb_llist_len(parsetree) - 1,
 						sdb_llist_len(parsetree) == 2 ? "" : "s",
 						query);
-				node = SDB_CONN_NODE(sdb_llist_get(parsetree, 0));
+				ast = SDB_AST_NODE(sdb_llist_get(parsetree, 0));
 			}
 	}
 
-	if (node) {
-		status = sdb_fe_exec(conn, node);
-		sdb_object_deref(SDB_OBJ(node));
+	if (ast) {
+		status = exec_cmd(conn, ast);
+		sdb_object_deref(SDB_OBJ(ast));
 	}
-
 	sdb_llist_destroy(parsetree);
 	return status;
-} /* sdb_fe_query */
+} /* sdb_conn_query */
 
 int
-sdb_fe_fetch(sdb_conn_t *conn)
+sdb_conn_fetch(sdb_conn_t *conn)
 {
+	sdb_ast_node_t *ast;
 	char hostname[conn->cmd_len + 1];
-	if ((! conn) || (conn->cmd != CONNECTION_FETCH))
-		return -1;
-	strncpy(hostname, sdb_strbuf_string(conn->buf), conn->cmd_len);
-	hostname[sizeof(hostname) - 1] = '\0';
-	return sdb_fe_exec_fetch(conn, hostname, /* filter = */ NULL);
-} /* sdb_fe_fetch */
-
-int
-sdb_fe_list(sdb_conn_t *conn)
-{
-	if ((! conn) || (conn->cmd != CONNECTION_LIST))
-		return -1;
-	return sdb_fe_exec_list(conn, /* filter = */ NULL);
-} /* sdb_fe_list */
-
-int
-sdb_fe_lookup(sdb_conn_t *conn)
-{
-	sdb_store_matcher_t *m;
+	char name[conn->cmd_len + 1];
+	uint32_t type;
 	int status;
 
-	if ((! conn) || (conn->cmd != CONNECTION_LOOKUP))
+	if ((! conn) || (conn->cmd != SDB_CONNECTION_FETCH))
 		return -1;
 
-	m = sdb_fe_parse_matcher(sdb_strbuf_string(conn->buf),
-			(int)conn->cmd_len);
-	if (! m) {
-		char expr[conn->cmd_len + 1];
-		strncpy(expr, sdb_strbuf_string(conn->buf), conn->cmd_len);
-		expr[sizeof(expr) - 1] = '\0';
-		sdb_log(SDB_LOG_ERR, "frontend: Failed to parse "
-				"lookup condition '%s'", expr);
+	if (conn->cmd_len < sizeof(uint32_t)) {
+		sdb_log(SDB_LOG_ERR, "frontend: Invalid command length %d for "
+				"FETCH command", conn->cmd_len);
+		sdb_strbuf_sprintf(conn->errbuf, "FETCH: Invalid command length %d",
+				conn->cmd_len);
 		return -1;
 	}
 
-	status = sdb_fe_exec_lookup(conn, m, /* filter = */ NULL);
-	sdb_object_deref(SDB_OBJ(m));
+	/* TODO: support other types besides hosts */
+	hostname[0] = '\0';
+
+	sdb_proto_unmarshal_int32(SDB_STRBUF_STR(conn->buf), &type);
+	strncpy(name, sdb_strbuf_string(conn->buf) + sizeof(uint32_t),
+			conn->cmd_len - sizeof(uint32_t));
+	name[sizeof(name) - 1] = '\0';
+
+	ast = sdb_ast_fetch_create((int)type,
+			hostname[0] ? strdup(hostname) : NULL,
+			-1, NULL,
+			name[0] ? strdup(name) : NULL,
+			/* full */ 1, /* filter = */ NULL);
+	status = exec_cmd(conn, ast);
+	sdb_object_deref(SDB_OBJ(ast));
 	return status;
-} /* sdb_fe_lookup */
+} /* sdb_conn_fetch */
 
 int
-sdb_fe_exec(sdb_conn_t *conn, sdb_conn_node_t *node)
+sdb_conn_list(sdb_conn_t *conn)
 {
-	sdb_store_matcher_t *m = NULL, *filter = NULL;
+	sdb_ast_node_t *ast;
+	uint32_t type = SDB_HOST;
+	int status;
 
-	if (! node)
+	if ((! conn) || (conn->cmd != SDB_CONNECTION_LIST))
 		return -1;
 
-	switch (node->cmd) {
-		case CONNECTION_FETCH:
-			if (CONN_FETCH(node)->filter)
-				filter = CONN_FETCH(node)->filter->matcher;
-			return sdb_fe_exec_fetch(conn, CONN_FETCH(node)->name, filter);
-		case CONNECTION_LIST:
-			if (CONN_LIST(node)->filter)
-				filter = CONN_LIST(node)->filter->matcher;
-			return sdb_fe_exec_list(conn, filter);
-		case CONNECTION_LOOKUP:
-			if (CONN_LOOKUP(node)->matcher)
-				m = CONN_LOOKUP(node)->matcher->matcher;
-			if (CONN_LOOKUP(node)->filter)
-				filter = CONN_LOOKUP(node)->filter->matcher;
-			return sdb_fe_exec_lookup(conn, m, filter);
-		case CONNECTION_TIMESERIES:
-			return sdb_fe_exec_timeseries(conn,
-					CONN_TS(node)->hostname, CONN_TS(node)->metric,
-					&CONN_TS(node)->opts);
-
-		default:
-			sdb_log(SDB_LOG_ERR, "frontend: Unknown command %i", node->cmd);
-			return -1;
+	if (conn->cmd_len == sizeof(uint32_t))
+		sdb_proto_unmarshal_int32(SDB_STRBUF_STR(conn->buf), &type);
+	else if (conn->cmd_len) {
+		sdb_log(SDB_LOG_ERR, "frontend: Invalid command length %d for "
+				"LIST command", conn->cmd_len);
+		sdb_strbuf_sprintf(conn->errbuf, "LIST: Invalid command length %d",
+				conn->cmd_len);
+		return -1;
 	}
-	return -1;
-} /* sdb_fe_exec */
+
+	ast = sdb_ast_list_create((int)type, /* filter = */ NULL);
+	status = exec_cmd(conn, ast);
+	sdb_object_deref(SDB_OBJ(ast));
+	return status;
+} /* sdb_conn_list */
 
 int
-sdb_fe_exec_fetch(sdb_conn_t *conn, const char *name,
-		sdb_store_matcher_t *filter)
+sdb_conn_lookup(sdb_conn_t *conn)
 {
-	sdb_strbuf_t *buf;
-	sdb_store_obj_t *host;
-	uint32_t type = htonl(CONNECTION_FETCH);
+	sdb_ast_node_t *ast, *m;
+	const char *matcher;
+	size_t matcher_len;
 
-	host = sdb_store_get_host(name);
-	if (! host) {
-		sdb_log(SDB_LOG_DEBUG, "frontend: Failed to fetch host '%s': "
-				"not found", name);
+	uint32_t type;
+	int status;
 
-		sdb_strbuf_sprintf(conn->errbuf, "Host %s not found", name);
+	if ((! conn) || (conn->cmd != SDB_CONNECTION_LOOKUP))
 		return -1;
-	}
-
-	buf = sdb_strbuf_create(1024);
-	if (! buf) {
-		char errbuf[1024];
-		sdb_log(SDB_LOG_ERR, "frontend: Failed to create "
-				"buffer to handle FETCH command: %s",
-				sdb_strerror(errno, errbuf, sizeof(errbuf)));
 
-		sdb_strbuf_sprintf(conn->errbuf, "Out of memory");
-		sdb_strbuf_destroy(buf);
-		sdb_object_deref(SDB_OBJ(host));
+	if (conn->cmd_len < sizeof(uint32_t)) {
+		sdb_log(SDB_LOG_ERR, "frontend: Invalid command length %d for "
+				"LOOKUP command", conn->cmd_len);
+		sdb_strbuf_sprintf(conn->errbuf, "LOOKUP: Invalid command length %d",
+				conn->cmd_len);
 		return -1;
 	}
+	sdb_proto_unmarshal_int32(SDB_STRBUF_STR(conn->buf), &type);
 
-	sdb_strbuf_memcpy(buf, &type, sizeof(uint32_t));
-	if (sdb_store_host_tojson(host, buf, filter, /* flags = */ 0)) {
-		sdb_log(SDB_LOG_ERR, "frontend: Failed to serialize "
-				"host '%s' to JSON", name);
-		sdb_strbuf_sprintf(conn->errbuf, "Out of memory");
-		sdb_strbuf_destroy(buf);
-		sdb_object_deref(SDB_OBJ(host));
+	matcher = sdb_strbuf_string(conn->buf) + sizeof(uint32_t);
+	matcher_len = conn->cmd_len - sizeof(uint32_t);
+	m = sdb_parser_parse_conditional((int)type,
+			matcher, (int)matcher_len, conn->errbuf);
+	if (! m) {
+		char expr[matcher_len + 1];
+		char err[sdb_strbuf_len(conn->errbuf) + sizeof(expr) + 64];
+		strncpy(expr, matcher, sizeof(expr));
+		expr[sizeof(expr) - 1] = '\0';
+		snprintf(err, sizeof(err), "Failed to parse lookup condition '%s': %s",
+				expr, sdb_strbuf_string(conn->errbuf));
+		sdb_log(SDB_LOG_ERR, "frontend: %s", err);
+		sdb_strbuf_sprintf(conn->errbuf, "%s", err);
 		return -1;
 	}
 
-	sdb_connection_send(conn, CONNECTION_DATA,
-			(uint32_t)sdb_strbuf_len(buf), sdb_strbuf_string(buf));
-	sdb_strbuf_destroy(buf);
-	sdb_object_deref(SDB_OBJ(host));
-	return 0;
-} /* sdb_fe_exec_fetch */
+	ast = sdb_ast_lookup_create((int)type, m, /* filter = */ NULL);
+	status = exec_cmd(conn, ast);
+	if (! ast)
+		sdb_object_deref(SDB_OBJ(m));
+	sdb_object_deref(SDB_OBJ(ast));
+	return status;
+} /* sdb_conn_lookup */
 
 int
-sdb_fe_exec_list(sdb_conn_t *conn, sdb_store_matcher_t *filter)
+sdb_conn_store(sdb_conn_t *conn)
 {
-	sdb_strbuf_t *buf;
-	uint32_t type = htonl(CONNECTION_LIST);
-
-	buf = sdb_strbuf_create(1024);
-	if (! buf) {
-		char errbuf[1024];
-		sdb_log(SDB_LOG_ERR, "frontend: Failed to create "
-				"buffer to handle LIST command: %s",
-				sdb_strerror(errno, errbuf, sizeof(errbuf)));
+	sdb_ast_node_t *ast = NULL;
+	const char *buf = sdb_strbuf_string(conn->buf);
+	size_t len = conn->cmd_len;
+	uint32_t type;
+	ssize_t n;
+	int status;
 
-		sdb_strbuf_sprintf(conn->errbuf, "Out of memory");
-		sdb_strbuf_destroy(buf);
+	if ((! conn) || (conn->cmd != SDB_CONNECTION_STORE))
 		return -1;
-	}
 
-	sdb_strbuf_memcpy(buf, &type, sizeof(uint32_t));
-	if (sdb_store_tojson(buf, filter, /* flags = */ SDB_SKIP_ALL)) {
-		sdb_log(SDB_LOG_ERR, "frontend: Failed to serialize "
-				"store to JSON");
-		sdb_strbuf_sprintf(conn->errbuf, "Out of memory");
-		sdb_strbuf_destroy(buf);
+	if ((n = sdb_proto_unmarshal_int32(buf, len, &type)) < 0) {
+		sdb_log(SDB_LOG_ERR, "frontend: Invalid command length %zu for "
+				"STORE command", len);
+		sdb_strbuf_sprintf(conn->errbuf,
+				"STORE: Invalid command length %zu", len);
 		return -1;
 	}
 
-	sdb_connection_send(conn, CONNECTION_DATA,
-			(uint32_t)sdb_strbuf_len(buf), sdb_strbuf_string(buf));
-	sdb_strbuf_destroy(buf);
-	return 0;
-} /* sdb_fe_exec_list */
-
-int
-sdb_fe_exec_lookup(sdb_conn_t *conn, sdb_store_matcher_t *m,
-		sdb_store_matcher_t *filter)
-{
-	tojson_data_t data = { NULL, filter, 0 };
-	uint32_t type = htonl(CONNECTION_LOOKUP);
-
-	data.buf = sdb_strbuf_create(1024);
-	if (! data.buf) {
-		char errbuf[1024];
-		sdb_log(SDB_LOG_ERR, "frontend: Failed to create "
-				"buffer to handle LOOKUP command: %s",
-				sdb_strerror(errno, errbuf, sizeof(errbuf)));
-
-		sdb_strbuf_sprintf(conn->errbuf, "Out of memory");
-		sdb_strbuf_destroy(data.buf);
-		return -1;
-	}
-
-	sdb_strbuf_memcpy(data.buf, &type, sizeof(uint32_t));
-	sdb_strbuf_append(data.buf, "[");
-
-	/* Let the JSON serializer handle the filter instead of the scanner. Else,
-	 * we'd have to filter twice -- once in the scanner and then again in the
-	 * serializer. */
-	data.last_len = sdb_strbuf_len(data.buf);
-	if (sdb_store_scan(m, /* filter */ NULL, lookup_tojson, &data)) {
-		sdb_log(SDB_LOG_ERR, "frontend: Failed to lookup hosts");
-		sdb_strbuf_sprintf(conn->errbuf, "Failed to lookup hosts");
-		sdb_strbuf_destroy(data.buf);
-		return -1;
+	switch (type) {
+		case SDB_HOST:
+		{
+			sdb_proto_host_t host;
+			if (sdb_proto_unmarshal_host(buf, len, &host) < 0) {
+				sdb_strbuf_sprintf(conn->errbuf,
+						"STORE: Failed to unmarshal host object");
+				return -1;
+			}
+			ast = sdb_ast_store_create(SDB_HOST, /* host */ NULL,
+					/* parent */ 0, NULL, sstrdup(host.name), host.last_update,
+					/* metric store */ NULL, NULL, 0, SDB_DATA_NULL);
+		}
+		break;
+
+		case SDB_SERVICE:
+		{
+			sdb_proto_service_t svc;
+			if (sdb_proto_unmarshal_service(buf, len, &svc) < 0) {
+				sdb_strbuf_sprintf(conn->errbuf,
+						"STORE: Failed to unmarshal service object");
+				return -1;
+			}
+			ast = sdb_ast_store_create(SDB_SERVICE, sstrdup(svc.hostname),
+					/* parent */ 0, NULL, sstrdup(svc.name), svc.last_update,
+					/* metric store */ NULL, NULL, 0, SDB_DATA_NULL);
+		}
+		break;
+
+		case SDB_METRIC:
+		{
+			sdb_proto_metric_t metric;
+			if (sdb_proto_unmarshal_metric(buf, len, &metric) < 0) {
+				sdb_strbuf_sprintf(conn->errbuf,
+						"STORE: Failed to unmarshal metric object");
+				return -1;
+			}
+			ast = sdb_ast_store_create(SDB_METRIC, sstrdup(metric.hostname),
+					/* parent */ 0, NULL, sstrdup(metric.name), metric.last_update,
+					sstrdup(metric.store_type), sstrdup(metric.store_id),
+					metric.store_last_update, SDB_DATA_NULL);
+		}
+		break;
 	}
 
-	sdb_strbuf_append(data.buf, "]");
-
-	sdb_connection_send(conn, CONNECTION_DATA,
-			(uint32_t)sdb_strbuf_len(data.buf), sdb_strbuf_string(data.buf));
-	sdb_strbuf_destroy(data.buf);
-	return 0;
-} /* sdb_fe_exec_lookup */
-
-int
-sdb_fe_exec_timeseries(sdb_conn_t *conn,
-		const char *hostname, const char *metric,
-		sdb_timeseries_opts_t *opts)
-{
-	sdb_strbuf_t *buf;
-	uint32_t type = htonl(CONNECTION_TIMESERIES);
-
-	buf = sdb_strbuf_create(1024);
-	if (! buf) {
-		char errbuf[1024];
-		sdb_log(SDB_LOG_ERR, "frontend: Failed to create "
-				"buffer to handle TIMESERIES command: %s",
-				sdb_strerror(errno, errbuf, sizeof(errbuf)));
-
-		sdb_strbuf_sprintf(conn->errbuf, "Out of memory");
-		return -1;
+	if (type & SDB_ATTRIBUTE) {
+		sdb_proto_attribute_t attr;
+		const char *hostname, *parent;
+		int parent_type;
+		if (sdb_proto_unmarshal_attribute(buf, len, &attr) < 0) {
+			sdb_strbuf_sprintf(conn->errbuf,
+					"STORE: Failed to unmarshal attribute object");
+			return -1;
+		}
+		if (attr.parent_type == SDB_HOST) {
+			hostname = attr.parent;
+			parent_type = 0;
+			parent = NULL;
+		}
+		else {
+			hostname = attr.hostname;
+			parent_type = attr.parent_type;
+			parent = attr.parent;
+		}
+		ast = sdb_ast_store_create(SDB_ATTRIBUTE, sstrdup(hostname),
+				parent_type, sstrdup(parent), sstrdup(attr.key),
+				attr.last_update, /* metric store */ NULL, NULL, 0,
+				attr.value);
 	}
 
-	sdb_strbuf_memcpy(buf, &type, sizeof(uint32_t));
-	if (sdb_store_fetch_timeseries(hostname, metric, opts, buf)) {
-		sdb_log(SDB_LOG_ERR, "frontend: Failed to fetch time-series");
-		sdb_strbuf_sprintf(conn->errbuf, "Failed to fetch time-series");
-		sdb_strbuf_destroy(buf);
+	if (! ast) {
+		sdb_log(SDB_LOG_ERR, "frontend: Invalid object type %d for "
+				"STORE COMMAND", type);
+		sdb_strbuf_sprintf(conn->errbuf, "STORE: Invalid object type %d", type);
 		return -1;
 	}
 
-	sdb_connection_send(conn, CONNECTION_DATA,
-			(uint32_t)sdb_strbuf_len(buf), sdb_strbuf_string(buf));
-	sdb_strbuf_destroy(buf);
-	return 0;
-} /* sdb_fe_exec_timeseries */
+	status = sdb_parser_analyze(ast, conn->errbuf);
+	if (! status)
+		status = exec_cmd(conn, ast);
+	sdb_object_deref(SDB_OBJ(ast));
+	return status;
+} /* sdb_conn_store */
 
 /* vim: set tw=78 sw=4 ts=4 noexpandtab : */