X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Ffrontend%2Fquery.c;h=a30bee3e4b8f274730ff650d2ca84cc168fee58d;hb=b4d485cde96751e1ec832d0e75a3e6081006a1a4;hp=d7476d345d48791f7cac512daca7ebfcfae49782;hpb=033aa984a8b4be78ced113a3715422841a48d9a8;p=sysdb.git

diff --git a/src/frontend/query.c b/src/frontend/query.c
index d7476d3..a30bee3 100644
--- a/src/frontend/query.c
+++ b/src/frontend/query.c
@@ -29,41 +29,164 @@
 
 #include "core/store.h"
 #include "frontend/connection-private.h"
+#include "frontend/parser.h"
 #include "utils/error.h"
 #include "utils/strbuf.h"
 
 #include <errno.h>
+#include <string.h>
 
 /*
  * private helper functions
  */
 
+typedef struct {
+	sdb_strbuf_t *buf;
+	sdb_store_matcher_t *filter;
+
+	size_t last_len;
+} tojson_data_t;
+
 static int
 lookup_tojson(sdb_store_obj_t *obj, void *user_data)
 {
-	sdb_strbuf_t *buf = user_data;
-	if (sdb_strbuf_len(buf) > 1)
-		sdb_strbuf_append(buf, ",");
-	return sdb_store_host_tojson(obj, buf, /* flags = */ 0);
+	tojson_data_t *data = user_data;
+	int status;
+
+	if (data->filter && (! sdb_store_matcher_matches(data->filter, obj, NULL)))
+		return 0;
+
+	if (sdb_strbuf_len(data->buf) > data->last_len)
+		sdb_strbuf_append(data->buf, ",");
+	data->last_len = sdb_strbuf_len(data->buf);
+	status = sdb_store_host_tojson(obj, data->buf,
+			data->filter, /* flags = */ 0);
+	return status;
 } /* lookup_tojson */
 
 /*
  * public API
  */
 
+int
+sdb_fe_query(sdb_conn_t *conn)
+{
+	sdb_llist_t *parsetree;
+	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) {
+		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);
+		return -1;
+	}
+
+	switch (sdb_llist_len(parsetree)) {
+		case 0:
+			/* skipping empty command */
+			break;
+		case 1:
+			node = SDB_CONN_NODE(sdb_llist_get(parsetree, 0));
+			break;
+
+		default:
+			{
+				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 "
+						"in multi-statement query '%s'",
+						sdb_llist_len(parsetree) - 1,
+						sdb_llist_len(parsetree) == 2 ? "" : "s",
+						query);
+				node = SDB_CONN_NODE(sdb_llist_get(parsetree, 0));
+			}
+	}
+
+	if (node) {
+		status = sdb_fe_exec(conn, node);
+		sdb_object_deref(SDB_OBJ(node));
+	}
+
+	sdb_llist_destroy(parsetree);
+	return status;
+} /* sdb_fe_query */
+
+int
+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);
+} /* sdb_fe_fetch */
+
+int
+sdb_fe_list(sdb_conn_t *conn)
+{
+	if ((! conn) || (conn->cmd != CONNECTION_LIST))
+		return -1;
+	return sdb_fe_exec_list(conn, /* filter = */ NULL);
+} /* sdb_fe_list */
+
+int
+sdb_fe_lookup(sdb_conn_t *conn)
+{
+	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) {
+		char expr[conn->cmd_len + 1];
+		strncpy(expr, sdb_strbuf_string(conn->buf), conn->cmd_len);
+		expr[sizeof(expr) - 1] = '\0';
+		sdb_log(SDB_LOG_ERR, "frontend: Failed to parse "
+				"lookup condition '%s'", expr);
+		return -1;
+	}
+
+	status = sdb_fe_exec_lookup(conn, 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 CONNECTION_FETCH:
-			return sdb_fe_fetch(conn, CONN_FETCH(node)->name);
+			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_list(conn);
+			if (CONN_LIST(node)->filter)
+				filter = CONN_LIST(node)->filter->matcher;
+			return sdb_fe_exec_list(conn, filter);
 		case CONNECTION_LOOKUP:
-			return sdb_fe_lookup(conn, CONN_LOOKUP(node)->matcher->matcher);
+			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);
 
 		default:
 			sdb_log(SDB_LOG_ERR, "frontend: Unknown command %i", node->cmd);
@@ -73,7 +196,8 @@ sdb_fe_exec(sdb_conn_t *conn, sdb_conn_node_t *node)
 } /* sdb_fe_exec */
 
 int
-sdb_fe_fetch(sdb_conn_t *conn, const char *name)
+sdb_fe_exec_fetch(sdb_conn_t *conn, const char *name,
+		sdb_store_matcher_t *filter)
 {
 	sdb_strbuf_t *buf;
 	sdb_store_obj_t *host;
@@ -100,7 +224,7 @@ sdb_fe_fetch(sdb_conn_t *conn, const char *name)
 		return -1;
 	}
 
-	if (sdb_store_host_tojson(host, buf, /* flags = */ 0)) {
+	if (sdb_store_host_tojson(host, buf, filter, /* flags = */ 0)) {
 		sdb_log(SDB_LOG_ERR, "frontend: Failed to serialize "
 				"host '%s' to JSON", name);
 		sdb_strbuf_sprintf(conn->errbuf, "Out of memory");
@@ -114,10 +238,10 @@ sdb_fe_fetch(sdb_conn_t *conn, const char *name)
 	sdb_strbuf_destroy(buf);
 	sdb_object_deref(SDB_OBJ(host));
 	return 0;
-} /* sdb_fe_fetch */
+} /* sdb_fe_exec_fetch */
 
 int
-sdb_fe_list(sdb_conn_t *conn)
+sdb_fe_exec_list(sdb_conn_t *conn, sdb_store_matcher_t *filter)
 {
 	sdb_strbuf_t *buf;
 
@@ -133,7 +257,7 @@ sdb_fe_list(sdb_conn_t *conn)
 		return -1;
 	}
 
-	if (sdb_store_tojson(buf, /* flags = */ SDB_SKIP_ALL)) {
+	if (sdb_store_tojson(buf, filter, /* flags = */ SDB_SKIP_ALL)) {
 		sdb_log(SDB_LOG_ERR, "frontend: Failed to serialize "
 				"store to JSON");
 		sdb_strbuf_sprintf(conn->errbuf, "Out of memory");
@@ -145,41 +269,46 @@ sdb_fe_list(sdb_conn_t *conn)
 			(uint32_t)sdb_strbuf_len(buf), sdb_strbuf_string(buf));
 	sdb_strbuf_destroy(buf);
 	return 0;
-} /* sdb_fe_list */
+} /* sdb_fe_exec_list */
 
 int
-sdb_fe_lookup(sdb_conn_t *conn, sdb_store_matcher_t *m)
+sdb_fe_exec_lookup(sdb_conn_t *conn, sdb_store_matcher_t *m,
+		sdb_store_matcher_t *filter)
 {
-	sdb_strbuf_t *buf;
+	tojson_data_t data = { NULL, filter, 0 };
 
-	buf = sdb_strbuf_create(1024);
-	if (! buf) {
+	data.buf = sdb_strbuf_create(1024);
+	if (! data.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");
-		sdb_strbuf_destroy(buf);
+		sdb_strbuf_destroy(data.buf);
 		return -1;
 	}
 
-	sdb_strbuf_append(buf, "[");
+	sdb_strbuf_append(data.buf, "[");
 
-	if (sdb_store_lookup(m, lookup_tojson, buf)) {
+	/* Let the JSON serializer handle the filter instead of the scanner. Else,
+	 * we'd have to filter twice -- once in the scanner and then again in the
+	 * serializer. */
+	data.last_len = sdb_strbuf_len(data.buf);
+	if (sdb_store_scan(m, /* filter */ NULL, lookup_tojson, &data)) {
 		sdb_log(SDB_LOG_ERR, "frontend: Failed to lookup hosts");
 		sdb_strbuf_sprintf(conn->errbuf, "Failed to lookup hosts");
-		sdb_strbuf_destroy(buf);
+		sdb_strbuf_destroy(data.buf);
 		return -1;
 	}
 
-	sdb_strbuf_append(buf, "]");
+	sdb_strbuf_append(data.buf, "]");
 
 	sdb_connection_send(conn, CONNECTION_OK,
-			(uint32_t)sdb_strbuf_len(buf), sdb_strbuf_string(buf));
-	sdb_strbuf_destroy(buf);
+			(uint32_t)sdb_strbuf_len(data.buf), sdb_strbuf_string(data.buf));
+	sdb_strbuf_destroy(data.buf);
 	return 0;
-} /* sdb_fe_lookup */
+} /* sdb_fe_exec_lookup */
 
 /* vim: set tw=78 sw=4 ts=4 noexpandtab : */