X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=src%2Ffrontend%2Fquery.c;h=7fcdbe2c338fb8c43f46d96ac22194c735d4b275;hp=933ca04cae5a887156400b27fb78c086d0fc6c33;hb=29aa1f75c4840710671488420208a2e029a308a9;hpb=147e814d602f90e411a948613e85e627f5858018

diff --git a/src/frontend/query.c b/src/frontend/query.c
index 933ca04..7fcdbe2 100644
--- a/src/frontend/query.c
+++ b/src/frontend/query.c
@@ -29,7 +29,8 @@
 
 #include "core/store.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"
@@ -66,13 +67,16 @@ int
 sdb_fe_query(sdb_conn_t *conn)
 {
 	sdb_llist_t *parsetree;
-	sdb_conn_node_t *node = NULL;
+	sdb_ast_node_t *ast = NULL;
+
+	sdb_store_query_t *q;
+	sdb_strbuf_t *buf = 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 +93,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 +106,54 @@ 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));
+	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");
+		status = -1;
+	} else {
+		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);
+		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);
+		}
 	}
-
+	sdb_object_deref(SDB_OBJ(ast));
 	sdb_llist_destroy(parsetree);
-	return status;
+
+	if (status < 0) {
+		sdb_object_deref(SDB_OBJ(q));
+		sdb_strbuf_destroy(buf);
+		return status;
+	}
+
+	assert(buf);
+	sdb_connection_send(conn, status,
+			(uint32_t)sdb_strbuf_len(buf), sdb_strbuf_string(buf));
+
+	sdb_strbuf_destroy(buf);
+	sdb_object_deref(SDB_OBJ(q));
+	return 0;
 } /* sdb_fe_query */
 
 int
 sdb_fe_fetch(sdb_conn_t *conn)
 {
 	char name[conn->cmd_len + 1];
-	int type;
+	uint32_t type;
 
 	if ((! conn) || (conn->cmd != SDB_CONNECTION_FETCH))
 		return -1;
@@ -132,24 +166,24 @@ sdb_fe_fetch(sdb_conn_t *conn)
 		return -1;
 	}
 
-	type = sdb_proto_unmarshal_int32(SDB_STRBUF_STR(conn->buf));
+	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);
+	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 != 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,7 +191,7 @@ sdb_fe_list(sdb_conn_t *conn)
 				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
@@ -167,7 +201,7 @@ sdb_fe_lookup(sdb_conn_t *conn)
 	const char *matcher;
 	size_t matcher_len;
 
-	int type;
+	uint32_t type;
 	int status;
 
 	conn_matcher_t m_node = {
@@ -188,7 +222,7 @@ 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);
@@ -203,7 +237,7 @@ sdb_fe_lookup(sdb_conn_t *conn)
 		return -1;
 	}
 
-	node.type = type;
+	node.type = (int)type;
 	m_node.matcher = m;
 
 	/* run analyzer separately; parse_matcher is missing
@@ -220,47 +254,14 @@ sdb_fe_lookup(sdb_conn_t *conn)
 		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 */
 
-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 */
+/*
+ * TODO: let the functions above build an AST; then drop sdb_fe_exec_*.
+ */
 
 int
 sdb_fe_exec_fetch(sdb_conn_t *conn, int type,
@@ -282,6 +283,8 @@ sdb_fe_exec_fetch(sdb_conn_t *conn, int type,
 				SDB_STORE_TYPE_TO_NAME(type), hostname, name);
 		return -1;
 	}
+	if (type == SDB_HOST)
+		name = hostname;
 
 	host = sdb_store_get_host(hostname);
 	if ((! host) || (filter
@@ -289,6 +292,7 @@ sdb_fe_exec_fetch(sdb_conn_t *conn, int type,
 		sdb_strbuf_sprintf(conn->errbuf, "Failed to fetch %s %s: "
 				"host %s not found", SDB_STORE_TYPE_TO_NAME(type),
 				name, hostname);
+		sdb_object_deref(SDB_OBJ(host));
 		return -1;
 	}
 	if (type == SDB_HOST) {
@@ -301,10 +305,14 @@ sdb_fe_exec_fetch(sdb_conn_t *conn, int type,
 			sdb_strbuf_sprintf(conn->errbuf, "Failed to fetch %s %s.%s: "
 					"%s not found", SDB_STORE_TYPE_TO_NAME(type),
 					hostname, name, name);
+			if (obj)
+				sdb_object_deref(SDB_OBJ(obj));
+			sdb_object_deref(SDB_OBJ(host));
 			return -1;
 		}
 		sdb_object_deref(SDB_OBJ(host));
 	}
+	host = NULL;
 
 	buf = sdb_strbuf_create(1024);
 	if (! buf) {