![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/frontend/query.c b/src/frontend/query.c
index 585222d25a56fbe971b57c6655df9a7f5e5b9565..1751ba57e7a9a241b148cbc4f4dc391787cf0c44 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>
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",
sdb_fe_fetch(sdb_conn_t *conn)
{
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);
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_store_matcher_t *m;
int status;
+ if ((! conn) || (conn->cmd != CONNECTION_LOOKUP))
+ return -1;
+
m = sdb_fe_parse_matcher(sdb_strbuf_string(conn->buf),
(int)conn->cmd_len);
if (! m) {
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)->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);
- }
+ 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_strbuf_t *buf;
sdb_store_obj_t *host;
+ uint32_t res_type = htonl(CONNECTION_FETCH);
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_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) {
return -1;
}
+ sdb_strbuf_memcpy(data.buf, &res_type, sizeof(uint32_t));
sdb_strbuf_append(data.buf, "[");
/* Let the JSON serializer handle the filter instead of the scanner. Else,
sdb_strbuf_append(data.buf, "]");
- sdb_connection_send(conn, CONNECTION_OK,
+ 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 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 : */