X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=src%2Ffrontend%2Fquery.c;h=d04aca980273374423eaf80ca98cd2ff12e234c2;hp=aef0ddcc6d7112300f6d1aca90fbd42062b43650;hb=816e3e1e9fea25d37504e3f0f51b758a41e60ae3;hpb=20155f4dc6bbb49695ded1d12041d044d48be6f3

diff --git a/src/frontend/query.c b/src/frontend/query.c
index aef0ddc..d04aca9 100644
--- a/src/frontend/query.c
+++ b/src/frontend/query.c
@@ -25,11 +25,16 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#ifdef HAVE_CONFIG_H
+#	include "config.h"
+#endif
+
 #include "sysdb.h"
 
 #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"
@@ -42,21 +47,46 @@
  */
 
 static int
-list_tojson(sdb_store_obj_t *obj,
-		sdb_store_matcher_t __attribute__((unused)) *filter,
-		void *user_data)
+query_exec(sdb_conn_t *conn, sdb_ast_node_t *ast)
 {
-	sdb_store_json_formatter_t *f = user_data;
-	return sdb_store_json_emit(f, obj);
-} /* list_tojson */
+	sdb_store_query_t *q;
+	sdb_strbuf_t *buf;
+	int status;
 
-static int
-lookup_tojson(sdb_store_obj_t *obj, sdb_store_matcher_t *filter,
-		void *user_data)
-{
-	sdb_store_json_formatter_t *f = user_data;
-	return sdb_store_json_emit_full(f, obj, filter);
-} /* lookup_tojson */
+	if (! ast) {
+		sdb_strbuf_sprintf(conn->errbuf, "out of memory");
+		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);
+	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);
+	}
+	else
+		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 status < 0 ? status : 0;
+} /* query_exec */
 
 /*
  * public API
@@ -66,13 +96,13 @@ int
 sdb_fe_query(sdb_conn_t *conn)
 {
 	sdb_llist_t *parsetree;
-	sdb_conn_node_t *node = NULL;
+	sdb_ast_node_t *ast = 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 +119,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,15 +132,14 @@ 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));
+	if (ast) {
+		status = query_exec(conn, ast);
+		sdb_object_deref(SDB_OBJ(ast));
 	}
-
 	sdb_llist_destroy(parsetree);
 	return status;
 } /* sdb_fe_query */
@@ -118,8 +147,11 @@ sdb_fe_query(sdb_conn_t *conn)
 int
 sdb_fe_fetch(sdb_conn_t *conn)
 {
+	sdb_ast_node_t *ast;
+	char hostname[conn->cmd_len + 1];
 	char name[conn->cmd_len + 1];
 	uint32_t type;
+	int status;
 
 	if ((! conn) || (conn->cmd != SDB_CONNECTION_FETCH))
 		return -1;
@@ -132,18 +164,29 @@ sdb_fe_fetch(sdb_conn_t *conn)
 		return -1;
 	}
 
+	/* TODO: support other types besides hosts */
+	hostname[0] = '\0';
+
 	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, (int)type, name, NULL, /* filter = */ NULL);
+
+	ast = sdb_ast_fetch_create((int)type,
+			hostname[0] ? strdup(hostname) : NULL,
+			name[0] ? strdup(name) : NULL,
+			/* filter = */ NULL);
+	status = query_exec(conn, ast);
+	sdb_object_deref(SDB_OBJ(ast));
+	return status;
 } /* sdb_fe_fetch */
 
 int
 sdb_fe_list(sdb_conn_t *conn)
 {
+	sdb_ast_node_t *ast;
 	uint32_t type = SDB_HOST;
+	int status;
 
 	if ((! conn) || (conn->cmd != SDB_CONNECTION_LIST))
 		return -1;
@@ -157,27 +200,23 @@ sdb_fe_list(sdb_conn_t *conn)
 				conn->cmd_len);
 		return -1;
 	}
-	return sdb_fe_exec_list(conn, (int)type, /* filter = */ NULL);
+
+	ast = sdb_ast_list_create((int)type, /* filter = */ NULL);
+	status = query_exec(conn, ast);
+	sdb_object_deref(SDB_OBJ(ast));
+	return status;
 } /* sdb_fe_list */
 
 int
 sdb_fe_lookup(sdb_conn_t *conn)
 {
-	sdb_store_matcher_t *m;
+	sdb_ast_node_t *ast, *m;
 	const char *matcher;
 	size_t matcher_len;
 
 	uint32_t type;
 	int status;
 
-	conn_matcher_t m_node = {
-		{ SDB_OBJECT_INIT, SDB_CONNECTION_MATCHER }, NULL
-	};
-	conn_lookup_t node = {
-		{ SDB_OBJECT_INIT, SDB_CONNECTION_LOOKUP },
-		-1, &m_node, NULL
-	};
-
 	if ((! conn) || (conn->cmd != SDB_CONNECTION_LOOKUP))
 		return -1;
 
@@ -192,334 +231,35 @@ sdb_fe_lookup(sdb_conn_t *conn)
 
 	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);
+	m = sdb_parser_parse_conditional(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': %s", expr,
-				sdb_strbuf_string(conn->errbuf));
+		sdb_log(SDB_LOG_ERR, "frontend: Failed to parse lookup condition '%s': %s",
+				expr, sdb_strbuf_string(conn->errbuf));
 		return -1;
 	}
 
-	node.type = (int)type;
-	m_node.matcher = m;
-
-	/* run analyzer separately; parse_matcher is missing
-	 * the right context to do so */
-	if (sdb_fe_analyze(SDB_CONN_NODE(&node), conn->errbuf)) {
+	ast = sdb_ast_lookup_create((int)type, m, /* filter = */ NULL);
+	/* run analyzer using the full context */
+	if (ast && sdb_parser_analyze(ast, 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';
-		snprintf(err, sizeof(err), "Failed to parse "
-				"lookup condition '%s': %s", expr,
-				sdb_strbuf_string(conn->errbuf));
+		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, (int)type, m, /* filter = */ NULL);
-	sdb_object_deref(SDB_OBJ(m));
+		status = query_exec(conn, ast);
+	if (! ast)
+		sdb_object_deref(SDB_OBJ(m));
+	sdb_object_deref(SDB_OBJ(ast));
 	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_STORE_HOST:
-		{
-			conn_store_host_t *n = CONN_STORE_HOST(node);
-			sdb_proto_host_t host = { n->last_update, n->name };
-			return sdb_fe_store_host(conn, &host);
-		}
-		case SDB_CONNECTION_STORE_SERVICE:
-		{
-			conn_store_svc_t *n = CONN_STORE_SVC(node);
-			sdb_proto_service_t svc = { n->last_update, n->hostname, n->name };
-			return sdb_fe_store_service(conn, &svc);
-		}
-		case SDB_CONNECTION_STORE_METRIC:
-		{
-			conn_store_metric_t *n = CONN_STORE_METRIC(node);
-			sdb_proto_metric_t metric = {
-				n->last_update, n->hostname, n->name,
-				n->store_type, n->store_id
-			};
-			return sdb_fe_store_metric(conn, &metric);
-		}
-		case SDB_CONNECTION_STORE_ATTRIBUTE:
-		{
-			conn_store_attr_t *n = CONN_STORE_ATTR(node);
-			sdb_proto_attribute_t attr = {
-				n->last_update, n->parent_type, n->hostname, n->parent,
-				n->key, n->value
-			};
-			return sdb_fe_store_attribute(conn, &attr);
-		}
-		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 */
-
-int
-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;
-	sdb_store_obj_t *obj;
-
-	sdb_store_json_formatter_t *f;
-	sdb_strbuf_t *buf;
-
-	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;
-	}
-	if (type == SDB_HOST)
-		name = hostname;
-
-	host = sdb_store_get_host(hostname);
-	if ((! host) || (filter
-				&& (! sdb_store_matcher_matches(filter, host, NULL)))) {
-		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);
-			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) {
-		char errbuf[1024];
-		sdb_log(SDB_LOG_ERR, "frontend: Failed to create "
-				"buffer to handle FETCH command: %s",
-				sdb_strerror(errno, errbuf, sizeof(errbuf)));
-
-		sdb_strbuf_sprintf(conn->errbuf, "Out of memory");
-		sdb_strbuf_destroy(buf);
-		sdb_object_deref(SDB_OBJ(obj));
-		return -1;
-	}
-	f = sdb_store_json_formatter(buf, type, /* flags = */ 0);
-	if (! f) {
-		char errbuf[1024];
-		sdb_log(SDB_LOG_ERR, "frontend: Failed to create "
-				"JSON formatter to handle FETCH command: %s",
-				sdb_strerror(errno, errbuf, sizeof(errbuf)));
-
-		sdb_strbuf_sprintf(conn->errbuf, "Out of memory");
-		sdb_strbuf_destroy(buf);
-		sdb_object_deref(SDB_OBJ(obj));
-		return -1;
-	}
-
-	sdb_strbuf_memcpy(buf, &res_type, sizeof(uint32_t));
-	if (sdb_store_json_emit_full(f, obj, filter)) {
-		sdb_log(SDB_LOG_ERR, "frontend: Failed to serialize "
-				"%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(obj));
-		return -1;
-	}
-	sdb_store_json_finish(f);
-
-	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(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(SDB_CONNECTION_LIST);
-
-	sdb_store_json_formatter_t *f;
-	sdb_strbuf_t *buf;
-
-	buf = sdb_strbuf_create(1024);
-	if (! buf) {
-		char errbuf[1024];
-		sdb_log(SDB_LOG_ERR, "frontend: Failed to create "
-				"buffer to handle LIST command: %s",
-				sdb_strerror(errno, errbuf, sizeof(errbuf)));
-
-		sdb_strbuf_sprintf(conn->errbuf, "Out of memory");
-		sdb_strbuf_destroy(buf);
-		return -1;
-	}
-	f = sdb_store_json_formatter(buf, type, SDB_WANT_ARRAY);
-	if (! f) {
-		char errbuf[1024];
-		sdb_log(SDB_LOG_ERR, "frontend: Failed to create "
-				"JSON formatter to handle LIST command: %s",
-				sdb_strerror(errno, errbuf, sizeof(errbuf)));
-
-		sdb_strbuf_sprintf(conn->errbuf, "Out of memory");
-		sdb_strbuf_destroy(buf);
-		return -1;
-	}
-
-	sdb_strbuf_memcpy(buf, &res_type, sizeof(uint32_t));
-	if (sdb_store_scan(type, /* m = */ NULL, filter, list_tojson, f)) {
-		sdb_log(SDB_LOG_ERR, "frontend: Failed to serialize "
-				"store to JSON");
-		sdb_strbuf_sprintf(conn->errbuf, "Out of memory");
-		sdb_strbuf_destroy(buf);
-		free(f);
-		return -1;
-	}
-	sdb_store_json_finish(f);
-
-	sdb_connection_send(conn, SDB_CONNECTION_DATA,
-			(uint32_t)sdb_strbuf_len(buf), sdb_strbuf_string(buf));
-	sdb_strbuf_destroy(buf);
-	free(f);
-	return 0;
-} /* sdb_fe_exec_list */
-
-int
-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(SDB_CONNECTION_LOOKUP);
-
-	sdb_store_json_formatter_t *f;
-	sdb_strbuf_t *buf;
-
-	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");
-		return -1;
-	}
-	f = sdb_store_json_formatter(buf, type, SDB_WANT_ARRAY);
-	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_memcpy(buf, &res_type, sizeof(uint32_t));
-
-	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, SDB_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(SDB_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, SDB_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 : */