![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/frontend/query.c b/src/frontend/query.c
index 585222d25a56fbe971b57c6655df9a7f5e5b9565..dddf8424ad0d89fc5c9a4b10be757c353b669aa0 100644 (file)
--- a/src/frontend/query.c
+++ b/src/frontend/query.c
#include "frontend/connection-private.h"
#include "frontend/parser.h"
#include "utils/error.h"
+#include "utils/proto.h"
#include "utils/strbuf.h"
#include <errno.h>
* private helper functions
*/
-typedef struct {
- sdb_strbuf_t *buf;
- sdb_store_matcher_t *filter;
-
- size_t last_len;
-} tojson_data_t;
-
static int
-lookup_tojson(sdb_store_obj_t *obj, void *user_data)
+lookup_tojson(sdb_store_obj_t *obj, sdb_store_matcher_t *filter,
+ void *user_data)
{
- tojson_data_t *data = user_data;
- int status;
-
- if (data->filter && (! sdb_store_matcher_matches(data->filter, obj, NULL)))
- return 0;
-
- 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);
- return status;
+ sdb_store_json_formatter_t *f = user_data;
+ return sdb_store_json_emit_full(f, obj, filter);
} /* lookup_tojson */
/*
sdb_conn_node_t *node = NULL;
int status = 0;
+ if ((! conn) || (conn->cmd != CONNECTION_QUERY))
+ return -1;
+
parsetree = sdb_fe_parse(sdb_strbuf_string(conn->buf),
(int)conn->cmd_len);
if (! parsetree) {
switch (sdb_llist_len(parsetree)) {
case 0:
- /* skipping empty command */
+ /* skipping empty command; send back an empty reply */
+ sdb_connection_send(conn, CONNECTION_DATA, 0, NULL);
break;
case 1:
node = SDB_CONN_NODE(sdb_llist_get(parsetree, 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_WARNING, "frontend: Ignoring %d command%s "
+ sdb_log(SDB_LOG_WARNING, "frontend: Ignoring %zu command%s "
"in multi-statement query '%s'",
sdb_llist_len(parsetree) - 1,
sdb_llist_len(parsetree) == 2 ? "" : "s",
}
if (node) {
- status = sdb_fe_exec(conn, node);
+ if (sdb_fe_analyze(node)) {
+ 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 verify query '%s'",
+ query);
+ status = -1;
+ }
+ else
+ status = sdb_fe_exec(conn, node);
sdb_object_deref(SDB_OBJ(node));
}
int
sdb_fe_fetch(sdb_conn_t *conn)
{
- char hostname[conn->cmd_len + 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);
+ char name[conn->cmd_len + 1];
+ int type;
+
+ if ((! conn) || (conn->cmd != CONNECTION_FETCH))
+ return -1;
+
+ if (conn->cmd_len < sizeof(type)) {
+ 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;
+ }
+
+ type = sdb_proto_get_int(conn->buf, 0);
+ strncpy(name, sdb_strbuf_string(conn->buf) + sizeof(type),
+ conn->cmd_len - sizeof(type));
+ name[sizeof(name) - 1] = '\0';
+ return sdb_fe_exec_fetch(conn, type, name, /* filter = */ NULL);
} /* sdb_fe_fetch */
int
sdb_fe_list(sdb_conn_t *conn)
{
- return sdb_fe_exec_list(conn, /* filter = */ NULL);
+ int type = SDB_HOST;
+
+ if ((! conn) || (conn->cmd != CONNECTION_LIST))
+ return -1;
+
+ if (conn->cmd_len == sizeof(uint32_t))
+ type = sdb_proto_get_int(conn->buf, 0);
+ 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 sdb_fe_exec_list(conn, type, /* filter = */ NULL);
} /* sdb_fe_list */
int
sdb_fe_lookup(sdb_conn_t *conn)
{
sdb_store_matcher_t *m;
+ const char *matcher;
+ size_t matcher_len;
+
+ uint32_t type;
int status;
- m = sdb_fe_parse_matcher(sdb_strbuf_string(conn->buf),
- (int)conn->cmd_len);
+ conn_matcher_t m_node = {
+ { SDB_OBJECT_INIT, CONNECTION_MATCHER }, NULL
+ };
+ conn_lookup_t node = {
+ { SDB_OBJECT_INIT, CONNECTION_LOOKUP },
+ -1, &m_node, NULL
+ };
+
+ if ((! conn) || (conn->cmd != CONNECTION_LOOKUP))
+ return -1;
+
+ if (conn->cmd_len < sizeof(type)) {
+ 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;
+ }
+ type = sdb_proto_get_int(conn->buf, 0);
+
+ matcher = sdb_strbuf_string(conn->buf) + sizeof(type);
+ matcher_len = conn->cmd_len - sizeof(type);
+ m = sdb_fe_parse_matcher(matcher, (int)matcher_len);
if (! m) {
- char expr[conn->cmd_len + 1];
- strncpy(expr, sdb_strbuf_string(conn->buf), conn->cmd_len);
+ 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'", expr);
return -1;
}
- status = sdb_fe_exec_lookup(conn, m, /* filter = */ NULL);
+ node.type = type;
+ m_node.matcher = m;
+
+ if (sdb_fe_analyze(SDB_CONN_NODE(&node))) {
+ char expr[matcher_len + 1];
+ strncpy(expr, matcher, sizeof(expr));
+ expr[sizeof(expr) - 1] = '\0';
+ sdb_log(SDB_LOG_ERR, "frontend: Failed to verify "
+ "lookup condition '%s'", expr);
+ 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 CONNECTION_FETCH:
- return sdb_fe_exec_fetch(conn, CONN_FETCH(node)->name,
- /* filter = */ NULL);
+ if (CONN_FETCH(node)->filter)
+ filter = CONN_FETCH(node)->filter->matcher;
+ return sdb_fe_exec_fetch(conn, CONN_FETCH(node)->type,
+ CONN_FETCH(node)->name, filter);
case CONNECTION_LIST:
- return sdb_fe_exec_list(conn, /* filter = */ NULL);
+ if (CONN_LIST(node)->filter)
+ filter = CONN_LIST(node)->filter->matcher;
+ return sdb_fe_exec_list(conn, CONN_LIST(node)->type, filter);
case CONNECTION_LOOKUP:
- {
- sdb_store_matcher_t *m = NULL, *filter = NULL;
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);
- }
+ return sdb_fe_exec_lookup(conn,
+ CONN_LOOKUP(node)->type, 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);
} /* sdb_fe_exec */
int
-sdb_fe_exec_fetch(sdb_conn_t *conn, const char *name,
+sdb_fe_exec_fetch(sdb_conn_t *conn, int type, const char *name,
sdb_store_matcher_t *filter)
{
sdb_strbuf_t *buf;
sdb_store_obj_t *host;
+ uint32_t res_type = htonl(CONNECTION_FETCH);
+
+ /* XXX: support other types */
+ if (type != SDB_HOST) {
+ sdb_log(SDB_LOG_ERR, "frontend: Invalid object type %d "
+ "in FETCH command", type);
+ sdb_strbuf_sprintf(conn->errbuf,
+ "FETCH: Invalid object type %d", type);
+ return -1;
+ }
host = sdb_store_get_host(name);
if (! host) {
return -1;
}
+ sdb_strbuf_memcpy(buf, &res_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);
return -1;
}
- sdb_connection_send(conn, CONNECTION_OK,
+ 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));
} /* sdb_fe_exec_fetch */
int
-sdb_fe_exec_list(sdb_conn_t *conn, sdb_store_matcher_t *filter)
+sdb_fe_exec_list(sdb_conn_t *conn, int type, sdb_store_matcher_t *filter)
{
sdb_strbuf_t *buf;
+ uint32_t res_type = htonl(CONNECTION_LIST);
+
+ int flags;
+
+ if (type == SDB_HOST)
+ flags = SDB_SKIP_ALL;
+ else if (type == SDB_SERVICE)
+ flags = (SDB_SKIP_ALL & (~SDB_SKIP_SERVICES))
+ | SDB_SKIP_EMPTY_SERVICES;
+ else if (type == SDB_METRIC)
+ flags = (SDB_SKIP_ALL & (~SDB_SKIP_METRICS))
+ | SDB_SKIP_EMPTY_METRICS;
+ else {
+ sdb_log(SDB_LOG_ERR, "frontend: Invalid object type %d "
+ "for LIST command", type);
+ sdb_strbuf_sprintf(conn->errbuf,
+ "LIST: Invalid object type %d", type);
+ return -1;
+ }
buf = sdb_strbuf_create(1024);
if (! buf) {
return -1;
}
- if (sdb_store_tojson(buf, filter, /* flags = */ SDB_SKIP_ALL)) {
+ sdb_strbuf_memcpy(buf, &res_type, sizeof(uint32_t));
+ if (sdb_store_tojson(buf, filter, flags)) {
sdb_log(SDB_LOG_ERR, "frontend: Failed to serialize "
"store to JSON");
sdb_strbuf_sprintf(conn->errbuf, "Out of memory");
return -1;
}
- sdb_connection_send(conn, CONNECTION_OK,
+ 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)
+sdb_fe_exec_lookup(sdb_conn_t *conn, int type,
+ sdb_store_matcher_t *m, sdb_store_matcher_t *filter)
{
- tojson_data_t data = { NULL, filter, 0 };
+ uint32_t res_type = htonl(CONNECTION_LOOKUP);
- data.buf = sdb_strbuf_create(1024);
- if (! data.buf) {
+ sdb_store_json_formatter_t *f;
+ sdb_strbuf_t *buf;
+
+ /* XXX: support other types */
+ if (type != SDB_HOST) {
+ sdb_log(SDB_LOG_ERR, "frontend: Invalid object type %d "
+ "in LOOKUP command", type);
+ sdb_strbuf_sprintf(conn->errbuf,
+ "LOOKUP: Invalid object type %d", type);
+ return -1;
+ }
+
+ 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_strbuf_sprintf(conn->errbuf, "Out of memory");
- sdb_strbuf_destroy(data.buf);
+ return -1;
+ }
+ f = sdb_store_json_formatter(buf);
+ 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);
return -1;
}
- sdb_strbuf_append(data.buf, "[");
+ sdb_strbuf_memcpy(buf, &res_type, sizeof(uint32_t));
+ sdb_strbuf_append(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)) {
+ if (sdb_store_scan(SDB_HOST, m, filter, lookup_tojson, f)) {
sdb_log(SDB_LOG_ERR, "frontend: Failed to lookup hosts");
sdb_strbuf_sprintf(conn->errbuf, "Failed to lookup hosts");
- sdb_strbuf_destroy(data.buf);
+ sdb_strbuf_destroy(buf);
+ free(f);
return -1;
}
+ sdb_store_json_finish(f);
- sdb_strbuf_append(data.buf, "]");
+ sdb_strbuf_append(buf, "]");
- sdb_connection_send(conn, CONNECTION_OK,
- (uint32_t)sdb_strbuf_len(data.buf), sdb_strbuf_string(data.buf));
- sdb_strbuf_destroy(data.buf);
+ sdb_connection_send(conn, 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(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;
+ }
+
+ 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);
+ 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 */
+
/* vim: set tw=78 sw=4 ts=4 noexpandtab : */