X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=src%2Ffrontend%2Fquery.c;h=4580e57e9714753682b55bb0bebd2de96f231647;hp=b806dcd52c2489dc4d74bae90ac80f582bf2cf61;hb=3d184d708cdbf864eb96c15e1a0f08b57c118009;hpb=44a02f37e6bfa9e24ddd35162249779e530b7da4

diff --git a/src/frontend/query.c b/src/frontend/query.c
index b806dcd..4580e57 100644
--- a/src/frontend/query.c
+++ b/src/frontend/query.c
@@ -69,24 +69,24 @@ sdb_fe_query(sdb_conn_t *conn)
 	sdb_conn_node_t *node = NULL;
 	int status = 0;
 
-	if ((! conn) || (conn->cmd != CONNECTION_QUERY))
+	if ((! conn) || (conn->cmd != SDB_CONNECTION_QUERY))
 		return -1;
 
 	parsetree = sdb_fe_parse(sdb_strbuf_string(conn->buf),
-			(int)conn->cmd_len);
+			(int)conn->cmd_len, conn->errbuf);
 	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);
+		sdb_log(SDB_LOG_ERR, "frontend: Failed to parse query '%s': %s",
+				query, sdb_strbuf_string(conn->errbuf));
 		return -1;
 	}
 
 	switch (sdb_llist_len(parsetree)) {
 		case 0:
 			/* skipping empty command; send back an empty reply */
-			sdb_connection_send(conn, CONNECTION_DATA, 0, NULL);
+			sdb_connection_send(conn, SDB_CONNECTION_DATA, 0, NULL);
 			break;
 		case 1:
 			node = SDB_CONN_NODE(sdb_llist_get(parsetree, 0));
@@ -107,16 +107,7 @@ sdb_fe_query(sdb_conn_t *conn)
 	}
 
 	if (node) {
-		if (sdb_fe_analyze(node)) {
-			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 verify query '%s'",
-					query);
-			status = -1;
-		}
-		else
-			status = sdb_fe_exec(conn, node);
+		status = sdb_fe_exec(conn, node);
 		sdb_object_deref(SDB_OBJ(node));
 	}
 
@@ -130,10 +121,10 @@ sdb_fe_fetch(sdb_conn_t *conn)
 	char name[conn->cmd_len + 1];
 	int type;
 
-	if ((! conn) || (conn->cmd != CONNECTION_FETCH))
+	if ((! conn) || (conn->cmd != SDB_CONNECTION_FETCH))
 		return -1;
 
-	if (conn->cmd_len < sizeof(type)) {
+	if (conn->cmd_len < sizeof(uint32_t)) {
 		sdb_log(SDB_LOG_ERR, "frontend: Invalid command length %d for "
 				"FETCH command", conn->cmd_len);
 		sdb_strbuf_sprintf(conn->errbuf, "FETCH: Invalid command length %d",
@@ -141,9 +132,9 @@ sdb_fe_fetch(sdb_conn_t *conn)
 		return -1;
 	}
 
-	type = sdb_proto_get_int(conn->buf, 0);
-	strncpy(name, sdb_strbuf_string(conn->buf) + sizeof(type),
-			conn->cmd_len - sizeof(type));
+	type = sdb_proto_unmarshal_int(conn->buf, 0);
+	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);
@@ -154,11 +145,11 @@ sdb_fe_list(sdb_conn_t *conn)
 {
 	int type = SDB_HOST;
 
-	if ((! conn) || (conn->cmd != CONNECTION_LIST))
+	if ((! conn) || (conn->cmd != SDB_CONNECTION_LIST))
 		return -1;
 
 	if (conn->cmd_len == sizeof(uint32_t))
-		type = sdb_proto_get_int(conn->buf, 0);
+		type = sdb_proto_unmarshal_int(conn->buf, 0);
 	else if (conn->cmd_len) {
 		sdb_log(SDB_LOG_ERR, "frontend: Invalid command length %d for "
 				"LIST command", conn->cmd_len);
@@ -176,50 +167,56 @@ sdb_fe_lookup(sdb_conn_t *conn)
 	const char *matcher;
 	size_t matcher_len;
 
-	uint32_t type;
+	int type;
 	int status;
 
 	conn_matcher_t m_node = {
-		{ SDB_OBJECT_INIT, CONNECTION_MATCHER }, NULL
+		{ SDB_OBJECT_INIT, SDB_CONNECTION_MATCHER }, NULL
 	};
 	conn_lookup_t node = {
-		{ SDB_OBJECT_INIT, CONNECTION_LOOKUP },
+		{ SDB_OBJECT_INIT, SDB_CONNECTION_LOOKUP },
 		-1, &m_node, NULL
 	};
 
-	if ((! conn) || (conn->cmd != CONNECTION_LOOKUP))
+	if ((! conn) || (conn->cmd != SDB_CONNECTION_LOOKUP))
 		return -1;
 
-	if (conn->cmd_len < sizeof(type)) {
+	if (conn->cmd_len < sizeof(uint32_t)) {
 		sdb_log(SDB_LOG_ERR, "frontend: Invalid command length %d for "
 				"LOOKUP command", conn->cmd_len);
 		sdb_strbuf_sprintf(conn->errbuf, "LOOKUP: Invalid command length %d",
 				conn->cmd_len);
 		return -1;
 	}
-	type = sdb_proto_get_int(conn->buf, 0);
+	type = sdb_proto_unmarshal_int(conn->buf, 0);
 
-	matcher = sdb_strbuf_string(conn->buf) + sizeof(type);
-	matcher_len = conn->cmd_len - sizeof(type);
-	m = sdb_fe_parse_matcher(matcher, (int)matcher_len);
+	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);
 	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'", expr);
+				"lookup condition '%s': %s", expr,
+				sdb_strbuf_string(conn->errbuf));
 		return -1;
 	}
 
 	node.type = type;
 	m_node.matcher = m;
 
-	if (sdb_fe_analyze(SDB_CONN_NODE(&node))) {
+	/* run analyzer separately; parse_matcher is missing
+	 * the right context to do so */
+	if (sdb_fe_analyze(SDB_CONN_NODE(&node), 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';
-		sdb_log(SDB_LOG_ERR, "frontend: Failed to verify "
-				"lookup condition '%s'", expr);
+		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
@@ -237,23 +234,23 @@ sdb_fe_exec(sdb_conn_t *conn, sdb_conn_node_t *node)
 		return -1;
 
 	switch (node->cmd) {
-		case CONNECTION_FETCH:
+		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 CONNECTION_LIST:
+		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 CONNECTION_LOOKUP:
+		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 CONNECTION_TIMESERIES:
+		case SDB_CONNECTION_TIMESERIES:
 			return sdb_fe_exec_timeseries(conn,
 					CONN_TS(node)->hostname, CONN_TS(node)->metric,
 					&CONN_TS(node)->opts);
@@ -269,7 +266,7 @@ 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(CONNECTION_FETCH);
+	uint32_t res_type = htonl(SDB_CONNECTION_FETCH);
 
 	sdb_store_obj_t *host;
 	sdb_store_obj_t *obj;
@@ -347,7 +344,7 @@ sdb_fe_exec_fetch(sdb_conn_t *conn, int type,
 	}
 	sdb_store_json_finish(f);
 
-	sdb_connection_send(conn, CONNECTION_DATA,
+	sdb_connection_send(conn, SDB_CONNECTION_DATA,
 			(uint32_t)sdb_strbuf_len(buf), sdb_strbuf_string(buf));
 	sdb_strbuf_destroy(buf);
 	free(f);
@@ -358,7 +355,7 @@ sdb_fe_exec_fetch(sdb_conn_t *conn, int type,
 int
 sdb_fe_exec_list(sdb_conn_t *conn, int type, sdb_store_matcher_t *filter)
 {
-	uint32_t res_type = htonl(CONNECTION_LIST);
+	uint32_t res_type = htonl(SDB_CONNECTION_LIST);
 
 	sdb_store_json_formatter_t *f;
 	sdb_strbuf_t *buf;
@@ -397,7 +394,7 @@ sdb_fe_exec_list(sdb_conn_t *conn, int type, sdb_store_matcher_t *filter)
 	}
 	sdb_store_json_finish(f);
 
-	sdb_connection_send(conn, CONNECTION_DATA,
+	sdb_connection_send(conn, SDB_CONNECTION_DATA,
 			(uint32_t)sdb_strbuf_len(buf), sdb_strbuf_string(buf));
 	sdb_strbuf_destroy(buf);
 	free(f);
@@ -408,20 +405,11 @@ 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(CONNECTION_LOOKUP);
+	uint32_t res_type = htonl(SDB_CONNECTION_LOOKUP);
 
 	sdb_store_json_formatter_t *f;
 	sdb_strbuf_t *buf;
 
-	/* XXX: support other types */
-	if (type != SDB_HOST) {
-		sdb_log(SDB_LOG_ERR, "frontend: Invalid object type %d "
-				"in LOOKUP command", type);
-		sdb_strbuf_sprintf(conn->errbuf,
-				"LOOKUP: Invalid object type %d", type);
-		return -1;
-	}
-
 	buf = sdb_strbuf_create(1024);
 	if (! buf) {
 		char errbuf[1024];
@@ -446,16 +434,18 @@ sdb_fe_exec_lookup(sdb_conn_t *conn, int type,
 
 	sdb_strbuf_memcpy(buf, &res_type, sizeof(uint32_t));
 
-	if (sdb_store_scan(SDB_HOST, m, filter, lookup_tojson, f)) {
-		sdb_log(SDB_LOG_ERR, "frontend: Failed to lookup hosts");
-		sdb_strbuf_sprintf(conn->errbuf, "Failed to lookup hosts");
+	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, CONNECTION_DATA,
+	sdb_connection_send(conn, SDB_CONNECTION_DATA,
 			(uint32_t)sdb_strbuf_len(buf), sdb_strbuf_string(buf));
 	sdb_strbuf_destroy(buf);
 	free(f);
@@ -468,7 +458,7 @@ sdb_fe_exec_timeseries(sdb_conn_t *conn,
 		sdb_timeseries_opts_t *opts)
 {
 	sdb_strbuf_t *buf;
-	uint32_t res_type = htonl(CONNECTION_TIMESERIES);
+	uint32_t res_type = htonl(SDB_CONNECTION_TIMESERIES);
 
 	buf = sdb_strbuf_create(1024);
 	if (! buf) {
@@ -489,7 +479,7 @@ sdb_fe_exec_timeseries(sdb_conn_t *conn,
 		return -1;
 	}
 
-	sdb_connection_send(conn, CONNECTION_DATA,
+	sdb_connection_send(conn, SDB_CONNECTION_DATA,
 			(uint32_t)sdb_strbuf_len(buf), sdb_strbuf_string(buf));
 	sdb_strbuf_destroy(buf);
 	return 0;