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

diff --git a/src/frontend/query.c b/src/frontend/query.c
index e5a1fc4..aef0ddc 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));
@@ -119,9 +119,9 @@ int
 sdb_fe_fetch(sdb_conn_t *conn)
 {
 	char name[conn->cmd_len + 1];
-	int type;
+	uint32_t type;
 
-	if ((! conn) || (conn->cmd != CONNECTION_FETCH))
+	if ((! conn) || (conn->cmd != SDB_CONNECTION_FETCH))
 		return -1;
 
 	if (conn->cmd_len < sizeof(uint32_t)) {
@@ -132,24 +132,24 @@ sdb_fe_fetch(sdb_conn_t *conn)
 		return -1;
 	}
 
-	type = sdb_proto_get_int(conn->buf, 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, type, name, NULL, /* filter = */ NULL);
+	return sdb_fe_exec_fetch(conn, (int)type, name, NULL, /* filter = */ NULL);
 } /* sdb_fe_fetch */
 
 int
 sdb_fe_list(sdb_conn_t *conn)
 {
-	int type = SDB_HOST;
+	uint32_t 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);
+		sdb_proto_unmarshal_int32(SDB_STRBUF_STR(conn->buf), &type);
 	else if (conn->cmd_len) {
 		sdb_log(SDB_LOG_ERR, "frontend: Invalid command length %d for "
 				"LIST command", conn->cmd_len);
@@ -157,7 +157,7 @@ sdb_fe_list(sdb_conn_t *conn)
 				conn->cmd_len);
 		return -1;
 	}
-	return sdb_fe_exec_list(conn, type, /* filter = */ NULL);
+	return sdb_fe_exec_list(conn, (int)type, /* filter = */ NULL);
 } /* sdb_fe_list */
 
 int
@@ -167,18 +167,18 @@ sdb_fe_lookup(sdb_conn_t *conn)
 	const char *matcher;
 	size_t matcher_len;
 
-	int type;
+	uint32_t 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(uint32_t)) {
@@ -188,35 +188,39 @@ sdb_fe_lookup(sdb_conn_t *conn)
 				conn->cmd_len);
 		return -1;
 	}
-	type = sdb_proto_get_int(conn->buf, 0);
+	sdb_proto_unmarshal_int32(SDB_STRBUF_STR(conn->buf), &type);
 
 	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);
+	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;
+	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))) {
+	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
-		status = sdb_fe_exec_lookup(conn, type, m, /* filter = */ NULL);
+		status = sdb_fe_exec_lookup(conn, (int)type, m, /* filter = */ NULL);
 	sdb_object_deref(SDB_OBJ(m));
 	return status;
 } /* sdb_fe_lookup */
@@ -230,23 +234,53 @@ 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_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);
@@ -262,7 +296,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;
@@ -278,6 +312,8 @@ sdb_fe_exec_fetch(sdb_conn_t *conn, int type,
 				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
@@ -297,10 +333,14 @@ sdb_fe_exec_fetch(sdb_conn_t *conn, int type,
 			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) {
@@ -340,7 +380,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);
@@ -351,7 +391,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;
@@ -390,7 +430,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);
@@ -401,20 +441,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];
@@ -439,16 +470,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);
@@ -461,7 +494,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) {
@@ -482,7 +515,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;