![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/frontend/query.c b/src/frontend/query.c
index 057d5b8e4a3b1ec07b2456de8afbeb06b157c96c..63ec226c6dc17cea869c3187a66908f28b26117f 100644 (file)
--- a/src/frontend/query.c
+++ b/src/frontend/query.c
/*
* 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
sdb_conn_node_t *node = 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);
+ (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));
}
if (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);
+ status = sdb_fe_exec(conn, node);
sdb_object_deref(SDB_OBJ(node));
}
sdb_fe_fetch(sdb_conn_t *conn)
{
char name[conn->cmd_len + 1];
- int type;
+ uint32_t type;
- if ((! conn) || (conn->cmd != CONNECTION_FETCH))
+ if ((! conn) || (conn->cmd != SDB_CONNECTION_FETCH))
return -1;
- if (conn->cmd_len < sizeof(type)) {
+ 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",
return -1;
}
- type = sdb_proto_get_int(conn->buf, 0);
- strncpy(name, sdb_strbuf_string(conn->buf) + sizeof(type),
- conn->cmd_len - sizeof(type));
+ 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';
- return sdb_fe_exec_fetch(conn, type, name, /* filter = */ NULL);
+ /* TODO: support other types besides hosts */
+ return sdb_fe_exec_fetch(conn, (int)type, name, NULL, /* filter = */ NULL);
} /* sdb_fe_fetch */
int
sdb_fe_list(sdb_conn_t *conn)
{
- int type = SDB_HOST;
+ uint32_t type = SDB_HOST;
- if ((! conn) || (conn->cmd != CONNECTION_LIST))
+ if ((! conn) || (conn->cmd != SDB_CONNECTION_LIST))
return -1;
if (conn->cmd_len == sizeof(uint32_t))
- type = sdb_proto_get_int(conn->buf, 0);
+ 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);
conn->cmd_len);
return -1;
}
- return sdb_fe_exec_list(conn, type, /* filter = */ NULL);
+ return sdb_fe_exec_list(conn, (int)type, /* filter = */ NULL);
} /* sdb_fe_list */
int
int status;
conn_matcher_t m_node = {
- { SDB_OBJECT_INIT, CONNECTION_MATCHER }, NULL
+ { SDB_OBJECT_INIT, SDB_CONNECTION_MATCHER }, NULL
};
conn_lookup_t node = {
- { SDB_OBJECT_INIT, CONNECTION_LOOKUP },
+ { SDB_OBJECT_INIT, SDB_CONNECTION_LOOKUP },
-1, &m_node, NULL
};
- if ((! conn) || (conn->cmd != CONNECTION_LOOKUP))
+ if ((! conn) || (conn->cmd != SDB_CONNECTION_LOOKUP))
return -1;
- if (conn->cmd_len < sizeof(type)) {
+ 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;
}
- type = sdb_proto_get_int(conn->buf, 0);
+ sdb_proto_unmarshal_int32(SDB_STRBUF_STR(conn->buf), &type);
- matcher = sdb_strbuf_string(conn->buf) + sizeof(type);
- matcher_len = conn->cmd_len - sizeof(type);
- m = sdb_fe_parse_matcher(matcher, (int)matcher_len);
+ 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);
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'", expr);
+ "lookup condition '%s': %s", expr,
+ sdb_strbuf_string(conn->errbuf));
return -1;
}
- node.type = type;
+ node.type = (int)type;
m_node.matcher = m;
- if (sdb_fe_analyze(SDB_CONN_NODE(&node))) {
+ /* 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';
- sdb_log(SDB_LOG_ERR, "frontend: Failed to verify "
- "lookup condition '%s'", expr);
+ snprintf(err, sizeof(err), "Failed to parse "
+ "lookup condition '%s': %s", expr,
+ sdb_strbuf_string(conn->errbuf));
+ sdb_strbuf_sprintf(conn->errbuf, "%s", err);
status = -1;
}
else
- status = sdb_fe_exec_lookup(conn, type, m, /* filter = */ NULL);
+ status = sdb_fe_exec_lookup(conn, (int)type, m, /* filter = */ NULL);
sdb_object_deref(SDB_OBJ(m));
return status;
} /* sdb_fe_lookup */
return -1;
switch (node->cmd) {
- case CONNECTION_FETCH:
+ 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)->name, filter);
- case CONNECTION_LIST:
+ 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 CONNECTION_LOOKUP:
+ 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 CONNECTION_TIMESERIES:
+ case SDB_CONNECTION_TIMESERIES:
return sdb_fe_exec_timeseries(conn,
CONN_TS(node)->hostname, CONN_TS(node)->metric,
&CONN_TS(node)->opts);
} /* sdb_fe_exec */
int
-sdb_fe_exec_fetch(sdb_conn_t *conn, int type, const char *name,
- sdb_store_matcher_t *filter)
+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;
- uint32_t res_type = htonl(CONNECTION_FETCH);
+ sdb_store_obj_t *obj;
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 FETCH command", type);
- sdb_strbuf_sprintf(conn->errbuf,
- "FETCH: Invalid object type %d", type);
+ 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(name);
+ host = sdb_store_get_host(hostname);
if ((! host) || (filter
&& (! sdb_store_matcher_matches(filter, host, NULL)))) {
- sdb_log(SDB_LOG_DEBUG, "frontend: Failed to fetch host '%s': "
- "not found", name);
-
- sdb_strbuf_sprintf(conn->errbuf, "Host %s not found", name);
+ 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) {
sdb_strbuf_sprintf(conn->errbuf, "Out of memory");
sdb_strbuf_destroy(buf);
- sdb_object_deref(SDB_OBJ(host));
+ sdb_object_deref(SDB_OBJ(obj));
return -1;
}
f = sdb_store_json_formatter(buf, type, /* flags = */ 0);
sdb_strbuf_sprintf(conn->errbuf, "Out of memory");
sdb_strbuf_destroy(buf);
- sdb_object_deref(SDB_OBJ(host));
+ sdb_object_deref(SDB_OBJ(obj));
return -1;
}
sdb_strbuf_memcpy(buf, &res_type, sizeof(uint32_t));
- if (sdb_store_json_emit_full(f, host, filter)) {
+ if (sdb_store_json_emit_full(f, obj, filter)) {
sdb_log(SDB_LOG_ERR, "frontend: Failed to serialize "
- "host '%s' to JSON", name);
+ "%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(host));
+ sdb_object_deref(SDB_OBJ(obj));
return -1;
}
sdb_store_json_finish(f);
- sdb_connection_send(conn, CONNECTION_DATA,
+ 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(host));
+ 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(CONNECTION_LIST);
+ uint32_t res_type = htonl(SDB_CONNECTION_LIST);
sdb_store_json_formatter_t *f;
sdb_strbuf_t *buf;
}
sdb_store_json_finish(f);
- sdb_connection_send(conn, CONNECTION_DATA,
+ sdb_connection_send(conn, SDB_CONNECTION_DATA,
(uint32_t)sdb_strbuf_len(buf), sdb_strbuf_string(buf));
sdb_strbuf_destroy(buf);
free(f);
sdb_fe_exec_lookup(sdb_conn_t *conn, int type,
sdb_store_matcher_t *m, sdb_store_matcher_t *filter)
{
- uint32_t res_type = htonl(CONNECTION_LOOKUP);
+ uint32_t res_type = htonl(SDB_CONNECTION_LOOKUP);
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_strbuf_memcpy(buf, &res_type, sizeof(uint32_t));
- 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");
+ 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;
}
sdb_store_json_finish(f);
- sdb_connection_send(conn, CONNECTION_DATA,
+ sdb_connection_send(conn, SDB_CONNECTION_DATA,
(uint32_t)sdb_strbuf_len(buf), sdb_strbuf_string(buf));
sdb_strbuf_destroy(buf);
free(f);
sdb_timeseries_opts_t *opts)
{
sdb_strbuf_t *buf;
- uint32_t res_type = htonl(CONNECTION_TIMESERIES);
+ uint32_t res_type = htonl(SDB_CONNECTION_TIMESERIES);
buf = sdb_strbuf_create(1024);
if (! buf) {
return -1;
}
- sdb_connection_send(conn, CONNECTION_DATA,
+ sdb_connection_send(conn, SDB_CONNECTION_DATA,
(uint32_t)sdb_strbuf_len(buf), sdb_strbuf_string(buf));
sdb_strbuf_destroy(buf);
return 0;