frontend/query: Simplified code a little.

[sysdb.git] / src / frontend / query.c

diff --git a/src/frontend/query.c b/src/frontend/query.c
index 9a157fb892d10888e35a74c84d77d5a18e635599..2e2832469e8d2fed9beb2a405faa513f05edd09c 100644 (file)
--- a/src/frontend/query.c
+++ b/src/frontend/query.c
@@ -46,8 +46,6 @@
 /*
  * metric fetcher:
  * Implements the callbacks necessary to read a metric object.
- * TODO: FETCH should allow to ignore child elements (attributes); then, we'd
- * only need store_host/store_metric.
  */
 
 typedef struct {
@@ -77,15 +75,8 @@ metric_fetcher_metric(sdb_store_metric_t *metric, sdb_object_t *user_data)
        return 0;
 } /* metric_fetcher_metric */
 
-static int
-metric_fetcher_attr(sdb_store_attribute_t __attribute__((unused)) *attr,
-               sdb_object_t __attribute__((unused)) *user_data)
-{
-       return 0;
-} /* metric_fetcher_attr */
-
 static sdb_store_writer_t metric_fetcher = {
-       metric_fetcher_host, NULL, metric_fetcher_metric, metric_fetcher_attr,
+       metric_fetcher_host, NULL, metric_fetcher_metric, NULL,
 };
 
 /*
@@ -257,7 +248,11 @@ exec_timeseries(sdb_ast_timeseries_t *ts, sdb_strbuf_t *buf, sdb_strbuf_t *errbu
        }
        if (status >= 0) {
                series = sdb_plugin_fetch_timeseries(st.type, st.id, &opts);
-               if (! series) {
+               if (series) {
+                       sdb_timeseries_tojson(series, buf);
+                       sdb_timeseries_destroy(series);
+               }
+               else {
                        sdb_log(SDB_LOG_ERR, "frontend: Failed to fetch time-series '%s/%s' "
                                        "- %s fetcher callback returned no data for '%s'",
                                        ts->hostname, ts->metric, st.type, st.id);
@@ -265,11 +260,6 @@ exec_timeseries(sdb_ast_timeseries_t *ts, sdb_strbuf_t *buf, sdb_strbuf_t *errbu
                }
        }
 
-       if (status >= 0) {
-               sdb_timeseries_tojson(series, buf);
-               sdb_timeseries_destroy(series);
-       }
-
        free(fetch.hostname);
        free(fetch.name);
        if (st.type)
@@ -403,8 +393,9 @@ sdb_conn_fetch(sdb_conn_t *conn)
 
        ast = sdb_ast_fetch_create((int)type,
                        hostname[0] ? strdup(hostname) : NULL,
+                       -1, NULL,
                        name[0] ? strdup(name) : NULL,
-                       /* filter = */ NULL);
+                       /* full */ 1, /* filter = */ NULL);
        status = exec_cmd(conn, ast);
        sdb_object_deref(SDB_OBJ(ast));
        return status;
@@ -485,7 +476,7 @@ sdb_conn_lookup(sdb_conn_t *conn)
 int
 sdb_conn_store(sdb_conn_t *conn)
 {
-       sdb_ast_node_t *ast;
+       sdb_ast_node_t *ast = NULL;
        const char *buf = sdb_strbuf_string(conn->buf);
        size_t len = conn->cmd_len;
        uint32_t type;