X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Ffrontend%2Fquery.c;h=6fa2a619dcaa3d635dc3201b5cbe85f6698c0139;hb=3f0db5bd32f136de9e7cfa8250f0c20469261241;hp=96c46d28db6f2b3425d90cd1079a363882779983;hpb=9ae83505d8025ab32a8bdf7904ff4df8f9e661bf;p=sysdb.git

diff --git a/src/frontend/query.c b/src/frontend/query.c
index 96c46d2..6fa2a61 100644
--- a/src/frontend/query.c
+++ b/src/frontend/query.c
@@ -34,6 +34,34 @@
 
 #include <errno.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)
+{
+	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
  */
@@ -46,9 +74,19 @@ sdb_fe_exec(sdb_conn_t *conn, sdb_conn_node_t *node)
 
 	switch (node->cmd) {
 		case CONNECTION_FETCH:
-			return sdb_fe_fetch(conn, CONN_FETCH(node)->name);
+			return sdb_fe_fetch(conn, CONN_FETCH(node)->name,
+					/* filter = */ NULL);
 		case CONNECTION_LIST:
-			return sdb_fe_list(conn);
+			return sdb_fe_list(conn, /* filter = */ NULL);
+		case CONNECTION_LOOKUP:
+		{
+			sdb_store_matcher_t *m = NULL, *filter = NULL;
+			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_lookup(conn, m, filter);
+		}
 
 		default:
 			sdb_log(SDB_LOG_ERR, "frontend: Unknown command %i", node->cmd);
@@ -58,10 +96,10 @@ 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_fetch(sdb_conn_t *conn, const char *name, sdb_store_matcher_t *filter)
 {
 	sdb_strbuf_t *buf;
-	sdb_store_base_t *host;
+	sdb_store_obj_t *host;
 
 	host = sdb_store_get_host(name);
 	if (! host) {
@@ -85,7 +123,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");
@@ -102,7 +140,7 @@ sdb_fe_fetch(sdb_conn_t *conn, const char *name)
 } /* sdb_fe_fetch */
 
 int
-sdb_fe_list(sdb_conn_t *conn)
+sdb_fe_list(sdb_conn_t *conn, sdb_store_matcher_t *filter)
 {
 	sdb_strbuf_t *buf;
 
@@ -118,7 +156,7 @@ sdb_fe_list(sdb_conn_t *conn)
 		return -1;
 	}
 
-	if (sdb_store_tojson(buf, /* flags = */ 0)) {
+	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");
@@ -132,5 +170,44 @@ sdb_fe_list(sdb_conn_t *conn)
 	return 0;
 } /* sdb_fe_list */
 
+int
+sdb_fe_lookup(sdb_conn_t *conn, sdb_store_matcher_t *m,
+		sdb_store_matcher_t *filter)
+{
+	tojson_data_t data = { NULL, filter, 0 };
+
+	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(data.buf);
+		return -1;
+	}
+
+	sdb_strbuf_append(data.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(data.buf);
+		return -1;
+	}
+
+	sdb_strbuf_append(data.buf, "]");
+
+	sdb_connection_send(conn, CONNECTION_OK,
+			(uint32_t)sdb_strbuf_len(data.buf), sdb_strbuf_string(data.buf));
+	sdb_strbuf_destroy(data.buf);
+	return 0;
+} /* sdb_fe_lookup */
+
 /* vim: set tw=78 sw=4 ts=4 noexpandtab : */