Added __attribute__((format(printf, ...))) where appropriate.

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

diff --git a/src/frontend/query.c b/src/frontend/query.c
index 50f0fed6bb4997856e8692e2a994ab185ee94734..bbf98530afedcb106abc34174e9c61e9dc8a55ae 100644 (file)
--- a/src/frontend/query.c
+++ b/src/frontend/query.c
@@ -102,7 +102,7 @@ sdb_fe_query(sdb_conn_t *conn)
                                char query[conn->cmd_len + 1];
                                strncpy(query, sdb_strbuf_string(conn->buf), conn->cmd_len);
                                query[sizeof(query) - 1] = '\0';
-                               sdb_log(SDB_LOG_WARNING, "frontend: Ignoring %d command%s "
+                               sdb_log(SDB_LOG_WARNING, "frontend: Ignoring %zu command%s "
                                                "in multi-statement query '%s'",
                                                sdb_llist_len(parsetree) - 1,
                                                sdb_llist_len(parsetree) == 2 ? "" : "s",
@@ -167,24 +167,30 @@ sdb_fe_lookup(sdb_conn_t *conn)
 int
 sdb_fe_exec(sdb_conn_t *conn, sdb_conn_node_t *node)
 {
+       sdb_store_matcher_t *m = NULL, *filter = NULL;
+
        if (! node)
                return -1;
 
        switch (node->cmd) {
                case CONNECTION_FETCH:
-                       return sdb_fe_exec_fetch(conn, CONN_FETCH(node)->name,
-                                       /* filter = */ NULL);
+                       if (CONN_FETCH(node)->filter)
+                               filter = CONN_FETCH(node)->filter->matcher;
+                       return sdb_fe_exec_fetch(conn, CONN_FETCH(node)->name, filter);
                case CONNECTION_LIST:
-                       return sdb_fe_exec_list(conn, /* filter = */ NULL);
+                       if (CONN_LIST(node)->filter)
+                               filter = CONN_LIST(node)->filter->matcher;
+                       return sdb_fe_exec_list(conn, filter);
                case CONNECTION_LOOKUP:
-               {
-                       sdb_store_matcher_t *m = NULL, *filter = NULL;
                        if (CONN_LOOKUP(node)->matcher)
                                m = CONN_LOOKUP(node)->matcher->matcher;
                        if (CONN_LOOKUP(node)->filter)
                                filter = CONN_LOOKUP(node)->filter->matcher;
                        return sdb_fe_exec_lookup(conn, m, filter);
-               }
+               case CONNECTION_TIMESERIES:
+                       return sdb_fe_exec_timeseries(conn,
+                                       CONN_TS(node)->hostname, CONN_TS(node)->metric,
+                                       &CONN_TS(node)->opts);
 
                default:
                        sdb_log(SDB_LOG_ERR, "frontend: Unknown command %i", node->cmd);
@@ -308,5 +314,36 @@ sdb_fe_exec_lookup(sdb_conn_t *conn, sdb_store_matcher_t *m,
        return 0;
 } /* sdb_fe_exec_lookup */
 
+int
+sdb_fe_exec_timeseries(sdb_conn_t *conn,
+               const char *hostname, const char *metric,
+               sdb_timeseries_opts_t *opts)
+{
+       sdb_strbuf_t *buf;
+
+       buf = sdb_strbuf_create(1024);
+       if (! buf) {
+               char errbuf[1024];
+               sdb_log(SDB_LOG_ERR, "frontend: Failed to create "
+                               "buffer to handle TIMESERIES command: %s",
+                               sdb_strerror(errno, errbuf, sizeof(errbuf)));
+
+               sdb_strbuf_sprintf(conn->errbuf, "Out of memory");
+               return -1;
+       }
+
+       if (sdb_store_fetch_timeseries(hostname, metric, opts, buf)) {
+               sdb_log(SDB_LOG_ERR, "frontend: Failed to fetch time-series");
+               sdb_strbuf_sprintf(conn->errbuf, "Failed to fetch time-series");
+               sdb_strbuf_destroy(buf);
+               return -1;
+       }
+
+       sdb_connection_send(conn, CONNECTION_OK,
+                       (uint32_t)sdb_strbuf_len(buf), sdb_strbuf_string(buf));
+       sdb_strbuf_destroy(buf);
+       return 0;
+} /* sdb_fe_exec_timeseries */
+
 /* vim: set tw=78 sw=4 ts=4 noexpandtab : */