Code

frontend/query: Simplified code a little.
[sysdb.git] / src / frontend / query.c
index 933ca04cae5a887156400b27fb78c086d0fc6c33..2e2832469e8d2fed9beb2a405faa513f05edd09c 100644 (file)
  * 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>
 
+/*
+ * metric fetcher:
+ * Implements the callbacks necessary to read a metric object.
+ */
+
+typedef struct {
+       char *type;
+       char *id;
+} 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;
+
+       if ((! metric->store.type) || (! metric->store.id))
+               return 0;
+
+       st->type = strdup(metric->store.type);
+       st->id = strdup(metric->store.id);
+       if ((! st->type) || (! st->id))
+               return -1;
+       return 0;
+} /* metric_fetcher_metric */
+
+static sdb_store_writer_t metric_fetcher = {
+       metric_fetcher_host, NULL, metric_fetcher_metric, NULL,
+};
+
 /*
  * private helper functions
  */
 
+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
+exec_query(sdb_ast_node_t *ast, sdb_strbuf_t *buf, sdb_strbuf_t *errbuf)
+{
+       sdb_store_json_formatter_t *f;
+       int type = 0, flags = 0;
+       uint32_t res_type = 0;
+       int status;
+
+       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;
+       }
+
+       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), errbuf);
+       if (status < 0)
+               sdb_strbuf_clear(buf);
+       sdb_store_json_finish(f);
+       sdb_object_deref(SDB_OBJ(f));
+       return status;
+} /* exec_query */
+
 static int
-list_tojson(sdb_store_obj_t *obj,
-               sdb_store_matcher_t __attribute__((unused)) *filter,
-               void *user_data)
+exec_store(sdb_ast_store_t *st, sdb_strbuf_t *buf, sdb_strbuf_t *errbuf)
 {
-       sdb_store_json_formatter_t *f = user_data;
-       return sdb_store_json_emit(f, obj);
-} /* list_tojson */
+       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;
+               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
-lookup_tojson(sdb_store_obj_t *obj, sdb_store_matcher_t *filter,
-               void *user_data)
+exec_timeseries(sdb_ast_timeseries_t *ts, sdb_strbuf_t *buf, sdb_strbuf_t *errbuf)
 {
-       sdb_store_json_formatter_t *f = user_data;
-       return sdb_store_json_emit_full(f, obj, filter);
-} /* lookup_tojson */
+       metric_store_t st = { NULL, NULL };
+       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 };
+       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.start = ts->start;
+       opts.end = ts->end;
+
+       status = sdb_plugin_query(SDB_AST_NODE(&fetch),
+                       &metric_fetcher, SDB_OBJ(&obj), 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) {
+                       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 != SDB_CONNECTION_QUERY))
                return -1;
 
-       parsetree = sdb_fe_parse(sdb_strbuf_string(conn->buf),
+       parsetree = sdb_parser_parse(sdb_strbuf_string(conn->buf),
                        (int)conn->cmd_len, conn->errbuf);
        if (! parsetree) {
                char query[conn->cmd_len + 1];
@@ -89,7 +338,7 @@ sdb_fe_query(sdb_conn_t *conn)
                        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:
@@ -102,24 +351,26 @@ 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];
        char name[conn->cmd_len + 1];
-       int type;
+       uint32_t type;
+       int status;
 
        if ((! conn) || (conn->cmd != SDB_CONNECTION_FETCH))
                return -1;
@@ -132,24 +383,36 @@ sdb_fe_fetch(sdb_conn_t *conn)
                return -1;
        }
 
-       type = sdb_proto_unmarshal_int32(SDB_STRBUF_STR(conn->buf));
+       /* 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';
-       /* TODO: support other types besides hosts */
-       return sdb_fe_exec_fetch(conn, type, name, NULL, /* filter = */ NULL);
-} /* sdb_fe_fetch */
+
+       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_conn_fetch */
 
 int
-sdb_fe_list(sdb_conn_t *conn)
+sdb_conn_list(sdb_conn_t *conn)
 {
-       int type = SDB_HOST;
+       sdb_ast_node_t *ast;
+       uint32_t type = SDB_HOST;
+       int status;
 
        if ((! conn) || (conn->cmd != SDB_CONNECTION_LIST))
                return -1;
 
        if (conn->cmd_len == sizeof(uint32_t))
-               type = sdb_proto_unmarshal_int32(SDB_STRBUF_STR(conn->buf));
+               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);
@@ -157,27 +420,23 @@ sdb_fe_list(sdb_conn_t *conn)
                                conn->cmd_len);
                return -1;
        }
-       return sdb_fe_exec_list(conn, type, /* filter = */ NULL);
-} /* sdb_fe_list */
+
+       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_lookup(sdb_conn_t *conn)
+sdb_conn_lookup(sdb_conn_t *conn)
 {
-       sdb_store_matcher_t *m;
+       sdb_ast_node_t *ast, *m;
        const char *matcher;
        size_t matcher_len;
 
-       int type;
+       uint32_t type;
        int status;
 
-       conn_matcher_t m_node = {
-               { SDB_OBJECT_INIT, SDB_CONNECTION_MATCHER }, NULL
-       };
-       conn_lookup_t node = {
-               { SDB_OBJECT_INIT, SDB_CONNECTION_LOOKUP },
-               -1, &m_node, NULL
-       };
-
        if ((! conn) || (conn->cmd != SDB_CONNECTION_LOOKUP))
                return -1;
 
@@ -188,302 +447,136 @@ sdb_fe_lookup(sdb_conn_t *conn)
                                conn->cmd_len);
                return -1;
        }
-       type = sdb_proto_unmarshal_int32(SDB_STRBUF_STR(conn->buf));
+       sdb_proto_unmarshal_int32(SDB_STRBUF_STR(conn->buf), &type);
 
        matcher = sdb_strbuf_string(conn->buf) + sizeof(uint32_t);
        matcher_len = conn->cmd_len - sizeof(uint32_t);
-       m = sdb_fe_parse_matcher(matcher, (int)matcher_len, conn->errbuf);
+       m = sdb_parser_parse_conditional((int)type,
+                       matcher, (int)matcher_len, conn->errbuf);
        if (! m) {
-               char expr[matcher_len + 1];
-               strncpy(expr, matcher, sizeof(expr));
-               expr[sizeof(expr) - 1] = '\0';
-               sdb_log(SDB_LOG_ERR, "frontend: Failed to parse "
-                               "lookup condition '%s': %s", expr,
-                               sdb_strbuf_string(conn->errbuf));
-               return -1;
-       }
-
-       node.type = type;
-       m_node.matcher = m;
-
-       /* run analyzer separately; parse_matcher is missing
-        * the right context to do so */
-       if (sdb_fe_analyze(SDB_CONN_NODE(&node), conn->errbuf)) {
                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));
+               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);
-               status = -1;
-       }
-       else
-               status = sdb_fe_exec_lookup(conn, type, m, /* filter = */ NULL);
-       sdb_object_deref(SDB_OBJ(m));
-       return status;
-} /* sdb_fe_lookup */
-
-int
-sdb_fe_exec(sdb_conn_t *conn, sdb_conn_node_t *node)
-{
-       sdb_store_matcher_t *m = NULL, *filter = NULL;
-
-       if (! node)
-               return -1;
-
-       switch (node->cmd) {
-               case SDB_CONNECTION_FETCH:
-                       if (CONN_FETCH(node)->filter)
-                               filter = CONN_FETCH(node)->filter->matcher;
-                       return sdb_fe_exec_fetch(conn, CONN_FETCH(node)->type,
-                                       CONN_FETCH(node)->host, CONN_FETCH(node)->name, filter);
-               case SDB_CONNECTION_LIST:
-                       if (CONN_LIST(node)->filter)
-                               filter = CONN_LIST(node)->filter->matcher;
-                       return sdb_fe_exec_list(conn, CONN_LIST(node)->type, filter);
-               case SDB_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,
-                                       CONN_LOOKUP(node)->type, m, filter);
-               case SDB_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;
-       }
-       return -1;
-} /* sdb_fe_exec */
-
-int
-sdb_fe_exec_fetch(sdb_conn_t *conn, int type,
-               const char *hostname, const char *name, sdb_store_matcher_t *filter)
-{
-       uint32_t res_type = htonl(SDB_CONNECTION_FETCH);
-
-       sdb_store_obj_t *host;
-       sdb_store_obj_t *obj;
-
-       sdb_store_json_formatter_t *f;
-       sdb_strbuf_t *buf;
-
-       if ((! hostname) || ((type == SDB_HOST) && name)
-                       || ((type != SDB_HOST) && (! name))) {
-               /* This is a programming error, not something the client did wrong */
-               sdb_strbuf_sprintf(conn->errbuf, "INTERNAL ERROR: invalid "
-                               "arguments to sdb_fe_exec_fetch(%s, %s, %s)",
-                               SDB_STORE_TYPE_TO_NAME(type), hostname, name);
-               return -1;
-       }
-
-       host = sdb_store_get_host(hostname);
-       if ((! host) || (filter
-                               && (! sdb_store_matcher_matches(filter, host, NULL)))) {
-               sdb_strbuf_sprintf(conn->errbuf, "Failed to fetch %s %s: "
-                               "host %s not found", SDB_STORE_TYPE_TO_NAME(type),
-                               name, hostname);
-               return -1;
-       }
-       if (type == SDB_HOST) {
-               obj = host;
-       }
-       else {
-               obj = sdb_store_get_child(host, type, name);
-               if ((! obj) || (filter
-                                       && (! sdb_store_matcher_matches(filter, obj, NULL)))) {
-                       sdb_strbuf_sprintf(conn->errbuf, "Failed to fetch %s %s.%s: "
-                                       "%s not found", SDB_STORE_TYPE_TO_NAME(type),
-                                       hostname, name, name);
-                       return -1;
-               }
-               sdb_object_deref(SDB_OBJ(host));
-       }
-
-       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(obj));
-               return -1;
-       }
-       f = sdb_store_json_formatter(buf, type, /* flags = */ 0);
-       if (! f) {
-               char errbuf[1024];
-               sdb_log(SDB_LOG_ERR, "frontend: Failed to create "
-                               "JSON formatter 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(obj));
-               return -1;
-       }
-
-       sdb_strbuf_memcpy(buf, &res_type, sizeof(uint32_t));
-       if (sdb_store_json_emit_full(f, obj, filter)) {
-               sdb_log(SDB_LOG_ERR, "frontend: Failed to serialize "
-                               "%s %s.%s to JSON", SDB_STORE_TYPE_TO_NAME(type),
-                               hostname, name);
-               sdb_strbuf_sprintf(conn->errbuf, "Out of memory");
-               sdb_strbuf_destroy(buf);
-               free(f);
-               sdb_object_deref(SDB_OBJ(obj));
-               return -1;
-       }
-       sdb_store_json_finish(f);
-
-       sdb_connection_send(conn, SDB_CONNECTION_DATA,
-                       (uint32_t)sdb_strbuf_len(buf), sdb_strbuf_string(buf));
-       sdb_strbuf_destroy(buf);
-       free(f);
-       sdb_object_deref(SDB_OBJ(obj));
-       return 0;
-} /* sdb_fe_exec_fetch */
-
-int
-sdb_fe_exec_list(sdb_conn_t *conn, int type, sdb_store_matcher_t *filter)
-{
-       uint32_t res_type = htonl(SDB_CONNECTION_LIST);
-
-       sdb_store_json_formatter_t *f;
-       sdb_strbuf_t *buf;
-
-       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_strbuf_sprintf(conn->errbuf, "Out of memory");
-               sdb_strbuf_destroy(buf);
-               return -1;
-       }
-       f = sdb_store_json_formatter(buf, type, SDB_WANT_ARRAY);
-       if (! f) {
-               char errbuf[1024];
-               sdb_log(SDB_LOG_ERR, "frontend: Failed to create "
-                               "JSON formatter to handle LIST command: %s",
-                               sdb_strerror(errno, errbuf, sizeof(errbuf)));
-
-               sdb_strbuf_sprintf(conn->errbuf, "Out of memory");
-               sdb_strbuf_destroy(buf);
                return -1;
        }
 
-       sdb_strbuf_memcpy(buf, &res_type, sizeof(uint32_t));
-       if (sdb_store_scan(type, /* m = */ NULL, filter, list_tojson, f)) {
-               sdb_log(SDB_LOG_ERR, "frontend: Failed to serialize "
-                               "store to JSON");
-               sdb_strbuf_sprintf(conn->errbuf, "Out of memory");
-               sdb_strbuf_destroy(buf);
-               free(f);
-               return -1;
-       }
-       sdb_store_json_finish(f);
-
-       sdb_connection_send(conn, SDB_CONNECTION_DATA,
-                       (uint32_t)sdb_strbuf_len(buf), sdb_strbuf_string(buf));
-       sdb_strbuf_destroy(buf);
-       free(f);
-       return 0;
-} /* sdb_fe_exec_list */
+       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_lookup(sdb_conn_t *conn, int type,
-               sdb_store_matcher_t *m, sdb_store_matcher_t *filter)
+sdb_conn_store(sdb_conn_t *conn)
 {
-       uint32_t res_type = htonl(SDB_CONNECTION_LOOKUP);
-
-       sdb_store_json_formatter_t *f;
-       sdb_strbuf_t *buf;
-
-       buf = sdb_strbuf_create(1024);
-       if (! 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_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");
+       if ((! conn) || (conn->cmd != SDB_CONNECTION_STORE))
                return -1;
-       }
-       f = sdb_store_json_formatter(buf, type, SDB_WANT_ARRAY);
-       if (! f) {
-               char errbuf[1024];
-               sdb_log(SDB_LOG_ERR, "frontend: Failed to create "
-                               "JSON formatter to handle LOOKUP command: %s",
-                               sdb_strerror(errno, errbuf, sizeof(errbuf)));
 
-               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_strbuf_memcpy(buf, &res_type, sizeof(uint32_t));
-
-       if (sdb_store_scan(type, m, filter, lookup_tojson, f)) {
-               sdb_log(SDB_LOG_ERR, "frontend: Failed to lookup %ss",
-                               SDB_STORE_TYPE_TO_NAME(type));
-               sdb_strbuf_sprintf(conn->errbuf, "Failed to lookup %ss",
-                               SDB_STORE_TYPE_TO_NAME(type));
-               sdb_strbuf_destroy(buf);
-               free(f);
-               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, 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, 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),
+                                       SDB_DATA_NULL);
+               }
+               break;
        }
-       sdb_store_json_finish(f);
-
-       sdb_connection_send(conn, SDB_CONNECTION_DATA,
-                       (uint32_t)sdb_strbuf_len(buf), sdb_strbuf_string(buf));
-       sdb_strbuf_destroy(buf);
-       free(f);
-       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 res_type = htonl(SDB_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,
+                               attr.value);
        }
 
-       sdb_strbuf_memcpy(buf, &res_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, SDB_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 : */