Let the network protocol and SysQL support last_update for metric stores.

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

diff --git a/src/frontend/query.c b/src/frontend/query.c
index 28e1e31c2b006fc7fb947e073456f7c5afa79df3..3f33a9914b7bfd342727f73e4ae74134ef9c1b11 100644 (file)
--- a/src/frontend/query.c
+++ b/src/frontend/query.c
@@ -51,6 +51,7 @@
 typedef struct {
        char *type;
        char *id;
+       sdb_time_t last_update;
 } metric_store_t;
 
 static int
@@ -70,6 +71,7 @@ metric_fetcher_metric(sdb_store_metric_t *metric, sdb_object_t *user_data)
 
        st->type = strdup(metric->store.type);
        st->id = strdup(metric->store.id);
+       st->last_update = metric->store.last_update;
        if ((! st->type) || (! st->id))
                return -1;
        return 0;
@@ -156,6 +158,7 @@ exec_store(sdb_ast_store_t *st, sdb_strbuf_t *buf, sdb_strbuf_t *errbuf)
                snprintf(name, sizeof(name), "%s.%s", st->hostname, st->name);
                metric_store.type = st->store_type;
                metric_store.id = st->store_id;
+               metric_store.last_update = st->store_last_update;
                status = sdb_plugin_store_metric(st->hostname, st->name,
                                &metric_store, st->last_update);
                break;
@@ -222,7 +225,7 @@ exec_store(sdb_ast_store_t *st, sdb_strbuf_t *buf, sdb_strbuf_t *errbuf)
 static int
 exec_timeseries(sdb_ast_timeseries_t *ts, sdb_strbuf_t *buf, sdb_strbuf_t *errbuf)
 {
-       metric_store_t st = { NULL, NULL };
+       metric_store_t st = { NULL, NULL, 0 };
        sdb_object_wrapper_t obj = SDB_OBJECT_WRAPPER_STATIC(&st);
        sdb_ast_fetch_t fetch = SDB_AST_FETCH_INIT;
        sdb_timeseries_opts_t opts = { 0, 0 };
@@ -248,7 +251,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 +265,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 +398,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 +481,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;
@@ -505,7 +510,7 @@ sdb_conn_store(sdb_conn_t *conn)
                        }
                        ast = sdb_ast_store_create(SDB_HOST, /* host */ NULL,
                                        /* parent */ 0, NULL, sstrdup(host.name), host.last_update,
-                                       /* metric store */ NULL, NULL, SDB_DATA_NULL);
+                                       /* metric store */ NULL, NULL, 0, SDB_DATA_NULL);
                }
                break;
 
@@ -519,7 +524,7 @@ sdb_conn_store(sdb_conn_t *conn)
                        }
                        ast = sdb_ast_store_create(SDB_SERVICE, sstrdup(svc.hostname),
                                        /* parent */ 0, NULL, sstrdup(svc.name), svc.last_update,
-                                       /* metric store */ NULL, NULL, SDB_DATA_NULL);
+                                       /* metric store */ NULL, NULL, 0, SDB_DATA_NULL);
                }
                break;
 
@@ -534,7 +539,7 @@ sdb_conn_store(sdb_conn_t *conn)
                        ast = sdb_ast_store_create(SDB_METRIC, sstrdup(metric.hostname),
                                        /* parent */ 0, NULL, sstrdup(metric.name), metric.last_update,
                                        sstrdup(metric.store_type), sstrdup(metric.store_id),
-                                       SDB_DATA_NULL);
+                                       metric.store_last_update, SDB_DATA_NULL);
                }
                break;
        }
@@ -560,7 +565,7 @@ sdb_conn_store(sdb_conn_t *conn)
                }
                ast = sdb_ast_store_create(SDB_ATTRIBUTE, sstrdup(hostname),
                                parent_type, sstrdup(parent), sstrdup(attr.key),
-                               attr.last_update, /* metric store */ NULL, NULL,
+                               attr.last_update, /* metric store */ NULL, NULL, 0,
                                attr.value);
        }