![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/frontend/query.c b/src/frontend/query.c
index d04aca980273374423eaf80ca98cd2ff12e234c2..724144aafb91a63369efb98cd0c97a55b5a7f8a9 100644 (file)
--- a/src/frontend/query.c
+++ b/src/frontend/query.c
#include "sysdb.h"
-#include "core/store.h"
+#include "core/plugin.h"
#include "frontend/connection-private.h"
#include "parser/ast.h"
#include "parser/parser.h"
* private helper functions
*/
+static char *
+sstrdup(const char *s)
+{
+ return s ? strdup(s) : NULL;
+} /* sstrdup */
+
static int
query_exec(sdb_conn_t *conn, sdb_ast_node_t *ast)
{
- sdb_store_query_t *q;
sdb_strbuf_t *buf;
int status;
return -1;
}
- q = sdb_store_query_prepare(ast);
- if (! q) {
- /* this shouldn't happen */
- sdb_strbuf_sprintf(conn->errbuf, "failed to compile AST");
- sdb_log(SDB_LOG_ERR, "frontend: failed to compile AST");
- return -1;
- }
-
buf = sdb_strbuf_create(1024);
if (! buf) {
sdb_strbuf_sprintf(conn->errbuf, "Out of memory");
- sdb_object_deref(SDB_OBJ(q));
return -1;
}
- status = sdb_store_query_execute(q, buf, conn->errbuf);
+ status = sdb_plugin_query(ast, buf, conn->errbuf);
if (status < 0) {
char query[conn->cmd_len + 1];
strncpy(query, sdb_strbuf_string(conn->buf), conn->cmd_len);
(uint32_t)sdb_strbuf_len(buf), sdb_strbuf_string(buf));
sdb_strbuf_destroy(buf);
- sdb_object_deref(SDB_OBJ(q));
return status < 0 ? status : 0;
} /* query_exec */
*/
int
-sdb_fe_query(sdb_conn_t *conn)
+sdb_conn_query(sdb_conn_t *conn)
{
sdb_llist_t *parsetree;
sdb_ast_node_t *ast = NULL;
}
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];
status = query_exec(conn, ast);
sdb_object_deref(SDB_OBJ(ast));
return status;
-} /* sdb_fe_fetch */
+} /* sdb_conn_fetch */
int
-sdb_fe_list(sdb_conn_t *conn)
+sdb_conn_list(sdb_conn_t *conn)
{
sdb_ast_node_t *ast;
uint32_t type = SDB_HOST;
status = query_exec(conn, ast);
sdb_object_deref(SDB_OBJ(ast));
return status;
-} /* sdb_fe_list */
+} /* sdb_conn_list */
int
-sdb_fe_lookup(sdb_conn_t *conn)
+sdb_conn_lookup(sdb_conn_t *conn)
{
sdb_ast_node_t *ast, *m;
const char *matcher;
sdb_object_deref(SDB_OBJ(m));
sdb_object_deref(SDB_OBJ(ast));
return status;
-} /* sdb_fe_lookup */
+} /* sdb_conn_lookup */
+
+int
+sdb_conn_store(sdb_conn_t *conn)
+{
+ sdb_ast_node_t *ast;
+ const char *buf = sdb_strbuf_string(conn->buf);
+ size_t len = conn->cmd_len;
+ uint32_t type;
+ ssize_t n;
+ int status;
+
+ if ((! conn) || (conn->cmd != SDB_CONNECTION_STORE))
+ return -1;
+
+ 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;
+ }
+
+ 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;
+ }
+
+ 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);
+ }
+
+ 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;
+ }
+
+ status = sdb_parser_analyze(ast, conn->errbuf);
+ if (! status)
+ status = query_exec(conn, ast);
+ sdb_object_deref(SDB_OBJ(ast));
+ return status;
+} /* sdb_conn_store */
/* vim: set tw=78 sw=4 ts=4 noexpandtab : */