frontend/query: Add the DATA type to TIMESERIES replies.

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

diff --git a/src/frontend/query.c b/src/frontend/query.c
index 28e1e31c2b006fc7fb947e073456f7c5afa79df3..f8d6a1f2dc8e518ca3843752794789f94361b3d4 100644 (file)
--- a/src/frontend/query.c
+++ b/src/frontend/query.c
@@ -248,7 +248,13 @@ 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) {
+                       uint32_t res_type = htonl(SDB_CONNECTION_TIMESERIES);
+                       sdb_strbuf_memcpy(buf, &res_type, sizeof(res_type));
+                       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);
@@ -256,11 +262,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)
@@ -394,6 +395,7 @@ 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,
                        /* full */ 1, /* filter = */ NULL);
        status = exec_cmd(conn, ast);
@@ -476,7 +478,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;