store: Added quaryable field ‘name’.

[sysdb.git] / src / core / store.c

diff --git a/src/core/store.c b/src/core/store.c
index 3bc111496ab9a64f5c79a517ccec41e8298f24f2..f4f2b58f0d700c0df8967aafddd6429261732af8 100644 (file)
--- a/src/core/store.c
+++ b/src/core/store.c
@@ -555,7 +555,7 @@ ts_tojson(sdb_timeseries_t *ts, sdb_strbuf_t *buf)
                snprintf(end_str, sizeof(end_str), "<error>");
        end_str[sizeof(end_str) - 1] = '\0';
 
-       sdb_strbuf_append(buf, "{\"start\": \"%s\", \"end\": \"%s\", {",
+       sdb_strbuf_append(buf, "{\"start\": \"%s\", \"end\": \"%s\", \"data\": {",
                        start_str, end_str);
 
        for (i = 0; i < ts->data_names_len; ++i) {
@@ -894,10 +894,19 @@ sdb_store_fetch_timeseries(const char *hostname, const char *metric,
 int
 sdb_store_get_field(sdb_store_obj_t *obj, int field, sdb_data_t *res)
 {
+       sdb_data_t tmp;
+
        if ((! obj) || (! res))
                return -1;
 
        switch (field) {
+               case SDB_FIELD_NAME:
+                       tmp.type = SDB_TYPE_STRING;
+                       tmp.data.string = strdup(SDB_OBJ(obj)->name);
+                       if (! tmp.data.string)
+                               return -1;
+                       *res = tmp;
+                       break;
                case SDB_FIELD_LAST_UPDATE:
                        res->type = SDB_TYPE_DATETIME;
                        res->data.datetime = obj->last_update;
@@ -928,6 +937,10 @@ sdb_store_host_tojson(sdb_store_obj_t *h, sdb_strbuf_t *buf,
        if ((! h) || (h->type != SDB_HOST) || (! buf))
                return -1;
 
+       /* This function ignores SKIP_EMPTY flags given that the current
+        * implementation sucks and it's nut currently used when calling this
+        * function directly. */
+
        sdb_strbuf_append(buf, "{\"name\": \"%s\", ", SDB_OBJ(host)->name);
        store_common_tojson(h, buf);
 
@@ -950,6 +963,26 @@ sdb_store_host_tojson(sdb_store_obj_t *h, sdb_strbuf_t *buf,
        return 0;
 } /* sdb_store_host_tojson */
 
+static _Bool
+has_children(sdb_avltree_t *tree, sdb_store_matcher_t *filter)
+{
+       sdb_avltree_iter_t *iter;
+
+       if (! filter)
+               return sdb_avltree_size(tree) > 0;
+
+       iter = sdb_avltree_get_iter(tree);
+       while (sdb_avltree_iter_has_next(iter)) {
+               sdb_store_obj_t *sobj = STORE_OBJ(sdb_avltree_iter_get_next(iter));
+               if (sdb_store_matcher_matches(filter, sobj, NULL)) {
+                       sdb_avltree_iter_destroy(iter);
+                       return 1;
+               }
+       }
+       sdb_avltree_iter_destroy(iter);
+       return 0;
+} /* has_children */
+
 int
 sdb_store_tojson(sdb_strbuf_t *buf, sdb_store_matcher_t *filter, int flags)
 {
@@ -967,7 +1000,7 @@ sdb_store_tojson(sdb_strbuf_t *buf, sdb_store_matcher_t *filter, int flags)
                return -1;
        }
 
-       sdb_strbuf_append(buf, "{\"hosts\":[");
+       sdb_strbuf_append(buf, "[");
 
        len = sdb_strbuf_len(buf);
        while (sdb_avltree_iter_has_next(host_iter)) {
@@ -979,6 +1012,19 @@ sdb_store_tojson(sdb_strbuf_t *buf, sdb_store_matcher_t *filter, int flags)
                if (filter && (! sdb_store_matcher_matches(filter, host, NULL)))
                        continue;
 
+               /*
+                * XXX: This approach sucks but it's the best we can do at the moment.
+                * In the future, all store lookups should be split into multiple
+                * steps instead: first, retrieve all relevant objects and apply all
+                * pre-processing operations and then format it for the wire.
+                */
+               if ((flags & SDB_SKIP_EMPTY_SERVICES)
+                               && (! has_children(HOST(host)->services, filter)))
+                       continue;
+               if ((flags & SDB_SKIP_EMPTY_METRICS)
+                               && (! has_children(HOST(host)->metrics, filter)))
+                       continue;
+
                if (sdb_strbuf_len(buf) > len)
                        sdb_strbuf_append(buf, ",");
                len = sdb_strbuf_len(buf);
@@ -987,7 +1033,7 @@ sdb_store_tojson(sdb_strbuf_t *buf, sdb_store_matcher_t *filter, int flags)
                        return -1;
        }
 
-       sdb_strbuf_append(buf, "]}");
+       sdb_strbuf_append(buf, "]");
 
        sdb_avltree_iter_destroy(host_iter);
        pthread_rwlock_unlock(&host_lock);