store: Let sdb_store_scan() support other object types besides hosts.

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

diff --git a/src/core/store.c b/src/core/store.c
index 8cb30efaea88a250284cb569db2ae07b05d7fa12..74cbea2703bdd727aca9011de1861a29b587d58f 100644 (file)
--- a/src/core/store.c
+++ b/src/core/store.c
@@ -894,31 +894,91 @@ 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)
 {
-       if ((! obj) || (! res))
+       sdb_data_t tmp;
+
+       if (! obj)
                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;
+                       break;
                case SDB_FIELD_LAST_UPDATE:
-                       res->type = SDB_TYPE_DATETIME;
-                       res->data.datetime = obj->last_update;
+                       tmp.type = SDB_TYPE_DATETIME;
+                       tmp.data.datetime = obj->last_update;
                        break;
                case SDB_FIELD_AGE:
-                       res->type = SDB_TYPE_DATETIME;
-                       res->data.datetime = sdb_gettime() - obj->last_update;
+                       tmp.type = SDB_TYPE_DATETIME;
+                       tmp.data.datetime = sdb_gettime() - obj->last_update;
                        break;
                case SDB_FIELD_INTERVAL:
-                       res->type = SDB_TYPE_DATETIME;
-                       res->data.datetime = obj->interval;
+                       tmp.type = SDB_TYPE_DATETIME;
+                       tmp.data.datetime = obj->interval;
                        break;
                case SDB_FIELD_BACKEND:
-                       /* TODO: add support for storing array values in a data object
-                        * for now, fall thru to the error case */
+               {
+                       tmp.type = SDB_TYPE_ARRAY | SDB_TYPE_STRING;
+                       tmp.data.array.length = obj->backends_num;
+                       tmp.data.array.values = obj->backends;
+                       return sdb_data_copy(res, &tmp);
+                       break;
+               }
                default:
                        return -1;
        }
+       if (res)
+               *res = tmp;
+       else
+               sdb_data_free_datum(&tmp);
        return 0;
 } /* sdb_store_get_field */
 
+int
+sdb_store_get_attr(sdb_store_obj_t *obj, const char *name, sdb_data_t *res,
+               sdb_store_matcher_t *filter)
+{
+       sdb_avltree_t *tree = NULL;
+       sdb_avltree_iter_t *iter = NULL;
+
+       if ((! obj) || (! name))
+               return -1;
+
+       if (obj->type == SDB_HOST)
+               tree = HOST(obj)->attributes;
+       else if (obj->type == SDB_SERVICE)
+               tree = SVC(obj)->attributes;
+       else if (obj->type == SDB_METRIC)
+               tree = METRIC(obj)->attributes;
+
+       if (! tree)
+               return -1;
+
+       iter = sdb_avltree_get_iter(tree);
+       while (sdb_avltree_iter_has_next(iter)) {
+               sdb_object_t *attr = sdb_avltree_iter_get_next(iter);
+
+               if (strcasecmp(SDB_OBJ(attr)->name, name))
+                       continue;
+
+               if (filter&& (! sdb_store_matcher_matches(filter,
+                                               STORE_OBJ(attr), NULL)))
+                       break; /* found it but it's filtered */
+
+               assert(STORE_OBJ(attr)->type == SDB_ATTRIBUTE);
+               if (res)
+                       sdb_data_copy(res, &ATTR(attr)->value);
+               sdb_avltree_iter_destroy(iter);
+               return 0;
+       }
+       sdb_avltree_iter_destroy(iter);
+
+       /* not found */
+       return -1;
+} /* sdb_store_get_attr */
+
 int
 sdb_store_host_tojson(sdb_store_obj_t *h, sdb_strbuf_t *buf,
                sdb_store_matcher_t *filter, int flags)
@@ -1031,13 +1091,19 @@ sdb_store_tojson(sdb_strbuf_t *buf, sdb_store_matcher_t *filter, int flags)
        return 0;
 } /* sdb_store_tojson */
 
-/* TODO: actually support hierarchical data */
 int
-sdb_store_iterate(sdb_store_iter_cb cb, void *user_data)
+sdb_store_scan(int type, sdb_store_matcher_t *m, sdb_store_matcher_t *filter,
+               sdb_store_lookup_cb cb, void *user_data)
 {
        sdb_avltree_iter_t *host_iter;
        int status = 0;
 
+       if (! cb)
+               return -1;
+
+       if ((type != SDB_HOST) && (type != SDB_SERVICE) && (type != SDB_METRIC))
+               return -1;
+
        pthread_rwlock_rdlock(&host_lock);
 
        host_iter = sdb_avltree_get_iter(hosts);
@@ -1047,20 +1113,47 @@ sdb_store_iterate(sdb_store_iter_cb cb, void *user_data)
        /* has_next returns false if the iterator is NULL */
        while (sdb_avltree_iter_has_next(host_iter)) {
                sdb_store_obj_t *host;
+               sdb_avltree_iter_t *iter = NULL;
 
                host = STORE_OBJ(sdb_avltree_iter_get_next(host_iter));
                assert(host);
 
-               if (cb(host, user_data)) {
-                       status = -1;
-                       break;
+               if (! sdb_store_matcher_matches(filter, host, NULL))
+                       continue;
+
+               if (type == SDB_SERVICE)
+                       iter = sdb_avltree_get_iter(HOST(host)->services);
+               else if (type == SDB_METRIC)
+                       iter = sdb_avltree_get_iter(HOST(host)->metrics);
+
+               if (iter) {
+                       while (sdb_avltree_iter_has_next(iter)) {
+                               sdb_store_obj_t *obj;
+                               obj = STORE_OBJ(sdb_avltree_iter_get_next(iter));
+                               assert(obj);
+
+                               if (sdb_store_matcher_matches(m, obj, filter)) {
+                                       if (cb(obj, user_data)) {
+                                               status = -1;
+                                               break;
+                                       }
+                               }
+                       }
+               }
+               else if (sdb_store_matcher_matches(m, host, filter)) {
+                       if (cb(host, user_data))
+                               status = -1;
                }
+
+               sdb_avltree_iter_destroy(iter);
+               if (status)
+                       break;
        }
 
        sdb_avltree_iter_destroy(host_iter);
        pthread_rwlock_unlock(&host_lock);
        return status;
-} /* sdb_store_iterate */
+} /* sdb_store_scan */
 
 /* vim: set tw=78 sw=4 ts=4 noexpandtab : */