diff --git a/src/core/store_json.c b/src/core/store_json.c
index 5d0408a75fee33ad7b0a3718efcd081944ea2013..56baa46d476d33f9f83974046ecbb982d375a2fa 100644 (file)
--- a/src/core/store_json.c
+++ b/src/core/store_json.c
#endif /* HAVE_CONFIG_H */
#include "sysdb.h"
-#include "core/store-private.h"
+#include "core/store.h"
#include "utils/error.h"
#include <assert.h>
metric->name,
/* value */ NULL,
- /* timeseries */ metric->store.type != NULL,
+ /* timeseries */ metric->stores_num > 0,
metric->last_update,
metric->interval,
buf, type, flags));
} /* sdb_store_json_formatter */
-int
-sdb_store_json_emit(sdb_store_json_formatter_t *f, sdb_store_obj_t *obj)
-{
- if ((! f) || (! obj))
- return -1;
-
- {
- obj_t o = {
- obj->type,
- obj->_name,
-
- /* value */ NULL,
- /* timeseries */ -1,
-
- obj->last_update,
- obj->interval,
- obj->backends_num,
- (const char * const *)obj->backends,
- };
-
- if (obj->type == SDB_ATTRIBUTE)
- o.value = &ATTR(obj)->value;
- if (obj->type == SDB_METRIC)
- o.timeseries = METRIC(obj)->store.type != NULL;
-
- return json_emit(f, &o);
- }
-} /* sdb_store_json_emit */
-
-int
-sdb_store_json_emit_full(sdb_store_json_formatter_t *f, sdb_store_obj_t *obj,
- sdb_store_matcher_t *filter)
-{
- sdb_avltree_t *trees[] = { NULL, NULL, NULL };
- size_t i;
-
- if (sdb_store_json_emit(f, obj))
- return -1;
-
- if (obj->type == SDB_HOST) {
- trees[0] = HOST(obj)->attributes;
- trees[1] = HOST(obj)->metrics;
- trees[2] = HOST(obj)->services;
- }
- else if (obj->type == SDB_SERVICE)
- trees[0] = SVC(obj)->attributes;
- else if (obj->type == SDB_METRIC)
- trees[0] = METRIC(obj)->attributes;
- else if (obj->type == SDB_ATTRIBUTE)
- return 0;
- else
- return -1;
-
- for (i = 0; i < SDB_STATIC_ARRAY_LEN(trees); ++i) {
- sdb_avltree_iter_t *iter;
-
- if (! trees[i])
- continue;
-
- iter = sdb_avltree_get_iter(trees[i]);
- while (sdb_avltree_iter_has_next(iter)) {
- sdb_store_obj_t *child;
- child = STORE_OBJ(sdb_avltree_iter_get_next(iter));
-
- if (filter && (! sdb_store_matcher_matches(filter, child, NULL)))
- continue;
-
- if (sdb_store_json_emit_full(f, child, filter)) {
- sdb_avltree_iter_destroy(iter);
- return -1;
- }
- }
- sdb_avltree_iter_destroy(iter);
- }
- return 0;
-} /* sdb_store_json_emit_full */
-
int
sdb_store_json_finish(sdb_store_json_formatter_t *f)
{