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

diff --git a/src/frontend/query.c b/src/frontend/query.c
index 6fa2a61..bbf9853 100644
--- a/src/frontend/query.c
+++ b/src/frontend/query.c
@@ -29,10 +29,12 @@
 
 #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
@@ -66,27 +68,129 @@ lookup_tojson(sdb_store_obj_t *obj, void *user_data)
  * 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 %zu 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,
-					/* filter = */ NULL);
+			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, /* filter = */ NULL);
+			if (CONN_LIST(node)->filter)
+				filter = CONN_LIST(node)->filter->matcher;
+			return sdb_fe_exec_list(conn, filter);
 		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);
-		}
+			return sdb_fe_exec_lookup(conn, m, filter);
+		case 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);
@@ -96,7 +200,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_store_matcher_t *filter)
+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;
@@ -137,10 +242,10 @@ sdb_fe_fetch(sdb_conn_t *conn, const char *name, sdb_store_matcher_t *filter)
 	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_store_matcher_t *filter)
+sdb_fe_exec_list(sdb_conn_t *conn, sdb_store_matcher_t *filter)
 {
 	sdb_strbuf_t *buf;
 
@@ -168,10 +273,10 @@ sdb_fe_list(sdb_conn_t *conn, sdb_store_matcher_t *filter)
 			(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)
 {
 	tojson_data_t data = { NULL, filter, 0 };
@@ -207,7 +312,38 @@ sdb_fe_lookup(sdb_conn_t *conn, sdb_store_matcher_t *m,
 			(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 */
+
+int
+sdb_fe_exec_timeseries(sdb_conn_t *conn,
+		const char *hostname, const char *metric,
+		sdb_timeseries_opts_t *opts)
+{
+	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 TIMESERIES command: %s",
+				sdb_strerror(errno, errbuf, sizeof(errbuf)));
+
+		sdb_strbuf_sprintf(conn->errbuf, "Out of memory");
+		return -1;
+	}
+
+	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, CONNECTION_OK,
+			(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 : */