![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/core/store_exec.c b/src/core/store_exec.c
index 6a8e8e74d290aae483d0aee269a276537e1a50e9..d4e308806bac8ece40c9a12a20885df768c2dffe 100644 (file)
--- a/src/core/store_exec.c
+++ b/src/core/store_exec.c
#include <errno.h>
#include <arpa/inet.h>
-#include <ctype.h>
#include <stdlib.h>
#include <string.h>
* private helper functions
*/
+typedef struct {
+ sdb_store_obj_t *current_host;
+
+ sdb_store_writer_t *w;
+ sdb_object_t *wd;
+} iter_t;
+
+static int
+maybe_emit_host(iter_t *iter, sdb_store_obj_t *obj)
+{
+ if ((obj->type == SDB_HOST) || (obj->type == SDB_ATTRIBUTE))
+ return 0;
+ if (iter->current_host == obj->parent)
+ return 0;
+ iter->current_host = obj->parent;
+ return sdb_store_emit(obj->parent, iter->w, iter->wd);
+} /* maybe_emit_host */
+
static int
list_tojson(sdb_store_obj_t *obj,
sdb_store_matcher_t __attribute__((unused)) *filter,
void *user_data)
{
- sdb_store_json_formatter_t *f = user_data;
- return sdb_store_json_emit(f, obj);
+ iter_t *iter = user_data;
+ maybe_emit_host(iter, obj);
+ return sdb_store_emit(obj, iter->w, iter->wd);
} /* list_tojson */
static int
lookup_tojson(sdb_store_obj_t *obj, sdb_store_matcher_t *filter,
void *user_data)
{
- sdb_store_json_formatter_t *f = user_data;
- return sdb_store_json_emit_full(f, obj, filter);
+ iter_t *iter = user_data;
+ maybe_emit_host(iter, obj);
+ return sdb_store_emit_full(obj, filter, iter->w, iter->wd);
} /* lookup_tojson */
-static size_t
-sstrlen(const char *s)
-{
- return s ? strlen(s) : 0;
-} /* sstrlen */
-
/*
* query implementations
*/
static int
-exec_fetch(sdb_strbuf_t *buf, sdb_strbuf_t *errbuf, int type,
- const char *hostname, const char *name, sdb_store_matcher_t *filter)
+exec_fetch(sdb_store_t *store,
+ sdb_store_writer_t *w, sdb_object_t *wd, sdb_strbuf_t *errbuf,
+ int type, const char *hostname, const char *name,
+ sdb_store_matcher_t *filter)
{
- uint32_t res_type = htonl(SDB_CONNECTION_FETCH);
-
sdb_store_obj_t *host;
sdb_store_obj_t *obj;
- sdb_store_json_formatter_t *f;
+ int status = 0;
if ((! name) || ((type == SDB_HOST) && hostname)
|| ((type != SDB_HOST) && (! hostname))) {
if (type == SDB_HOST)
hostname = name;
- host = sdb_store_get_host(hostname);
+ host = sdb_store_get_host(store, hostname);
if ((! host)
|| (filter && (! sdb_store_matcher_matches(filter, host, NULL)))) {
sdb_strbuf_sprintf(errbuf, "Failed to fetch %s %s: "
}
host = NULL;
- f = sdb_store_json_formatter(buf, type, /* flags = */ 0);
- if (! f) {
- char err[1024];
- sdb_log(SDB_LOG_ERR, "frontend: Failed to create "
- "JSON formatter to handle FETCH command: %s",
- sdb_strerror(errno, err, sizeof(err)));
-
- sdb_strbuf_sprintf(errbuf, "Out of memory");
- sdb_object_deref(SDB_OBJ(obj));
- return -1;
- }
-
- sdb_strbuf_memcpy(buf, &res_type, sizeof(uint32_t));
- if (sdb_store_json_emit_full(f, obj, filter)) {
+ if (type != SDB_HOST)
+ status = sdb_store_emit(obj->parent, w, wd);
+ if (status || sdb_store_emit_full(obj, filter, w, wd)) {
sdb_log(SDB_LOG_ERR, "frontend: Failed to serialize "
"%s %s.%s to JSON", SDB_STORE_TYPE_TO_NAME(type),
hostname, name);
sdb_strbuf_sprintf(errbuf, "Out of memory");
- sdb_object_deref(SDB_OBJ(f));
sdb_object_deref(SDB_OBJ(obj));
return -1;
}
sdb_object_deref(SDB_OBJ(obj));
- sdb_store_json_finish(f);
- sdb_object_deref(SDB_OBJ(f));
-
return SDB_CONNECTION_DATA;
} /* exec_fetch */
static int
-exec_list(sdb_strbuf_t *buf, sdb_strbuf_t *errbuf, int type,
- sdb_store_matcher_t *filter)
+exec_list(sdb_store_t *store,
+ sdb_store_writer_t *w, sdb_object_t *wd, sdb_strbuf_t *errbuf,
+ int type, sdb_store_matcher_t *filter)
{
- uint32_t res_type = htonl(SDB_CONNECTION_LIST);
- sdb_store_json_formatter_t *f;
-
- f = sdb_store_json_formatter(buf, type, SDB_WANT_ARRAY);
- if (! f) {
- char err[1024];
- sdb_log(SDB_LOG_ERR, "frontend: Failed to create "
- "JSON formatter to handle LIST command: %s",
- sdb_strerror(errno, err, sizeof(err)));
+ iter_t iter = { NULL, w, wd };
- sdb_strbuf_sprintf(errbuf, "Out of memory");
- return -1;
- }
-
- sdb_strbuf_memcpy(buf, &res_type, sizeof(uint32_t));
- if (sdb_store_scan(type, /* m = */ NULL, filter, list_tojson, f)) {
+ if (sdb_store_scan(store, type, /* m = */ NULL, filter, list_tojson, &iter)) {
sdb_log(SDB_LOG_ERR, "frontend: Failed to serialize "
"store to JSON");
sdb_strbuf_sprintf(errbuf, "Out of memory");
- sdb_object_deref(SDB_OBJ(f));
return -1;
}
- sdb_store_json_finish(f);
- sdb_object_deref(SDB_OBJ(f));
-
return SDB_CONNECTION_DATA;
} /* exec_list */
static int
-exec_lookup(sdb_strbuf_t *buf, sdb_strbuf_t *errbuf, int type,
- sdb_store_matcher_t *m, sdb_store_matcher_t *filter)
+exec_lookup(sdb_store_t *store,
+ sdb_store_writer_t *w, sdb_object_t *wd, sdb_strbuf_t *errbuf,
+ int type, sdb_store_matcher_t *m, sdb_store_matcher_t *filter)
{
- uint32_t res_type = htonl(SDB_CONNECTION_LOOKUP);
- sdb_store_json_formatter_t *f;
+ iter_t iter = { NULL, w, wd };
- f = sdb_store_json_formatter(buf, type, SDB_WANT_ARRAY);
- if (! f) {
- char err[1024];
- sdb_log(SDB_LOG_ERR, "frontend: Failed to create "
- "JSON formatter to handle LOOKUP command: %s",
- sdb_strerror(errno, err, sizeof(err)));
-
- sdb_strbuf_sprintf(errbuf, "Out of memory");
- return -1;
- }
-
- sdb_strbuf_memcpy(buf, &res_type, sizeof(uint32_t));
-
- if (sdb_store_scan(type, m, filter, lookup_tojson, f)) {
+ if (sdb_store_scan(store, type, m, filter, lookup_tojson, &iter)) {
sdb_log(SDB_LOG_ERR, "frontend: Failed to lookup %ss",
SDB_STORE_TYPE_TO_NAME(type));
sdb_strbuf_sprintf(errbuf, "Failed to lookup %ss",
SDB_STORE_TYPE_TO_NAME(type));
- sdb_object_deref(SDB_OBJ(f));
return -1;
}
- sdb_store_json_finish(f);
- sdb_object_deref(SDB_OBJ(f));
-
return SDB_CONNECTION_DATA;
} /* exec_lookup */
-static int
-exec_store(sdb_strbuf_t *buf, sdb_strbuf_t *errbuf, sdb_ast_store_t *st)
-{
- char name[sstrlen(st->hostname) + sstrlen(st->parent) + sstrlen(st->name) + 3];
- sdb_metric_store_t metric_store;
- int type = st->obj_type, status = -1;
-
- switch (st->obj_type) {
- case SDB_HOST:
- strncpy(name, st->name, sizeof(name));
- status = sdb_plugin_store_host(st->name, st->last_update);
- break;
-
- case SDB_SERVICE:
- snprintf(name, sizeof(name), "%s.%s", st->hostname, st->name);
- status = sdb_plugin_store_service(st->hostname, st->name, st->last_update);
- break;
-
- case SDB_METRIC:
- snprintf(name, sizeof(name), "%s.%s", st->hostname, st->name);
- metric_store.type = st->store_type;
- metric_store.id = st->store_id;
- status = sdb_plugin_store_metric(st->hostname, st->name,
- &metric_store, st->last_update);
- break;
-
- case SDB_ATTRIBUTE:
- type |= st->parent_type;
-
- if (st->parent)
- snprintf(name, sizeof(name), "%s.%s.%s",
- st->hostname, st->parent, st->name);
- else
- snprintf(name, sizeof(name), "%s.%s", st->hostname, st->name);
-
- switch (st->parent_type) {
- case 0:
- type |= SDB_HOST;
- status = sdb_plugin_store_attribute(st->hostname,
- st->name, &st->value, st->last_update);
- break;
-
- case SDB_SERVICE:
- status = sdb_plugin_store_service_attribute(st->hostname, st->parent,
- st->name, &st->value, st->last_update);
- break;
-
- case SDB_METRIC:
- status = sdb_plugin_store_metric_attribute(st->hostname, st->parent,
- st->name, &st->value, st->last_update);
- break;
-
- default:
- sdb_log(SDB_LOG_ERR, "store: Invalid parent type in STORE: %s",
- SDB_STORE_TYPE_TO_NAME(st->parent_type));
- return -1;
- }
- break;
-
- default:
- sdb_log(SDB_LOG_ERR, "store: Invalid object type in STORE: %s",
- SDB_STORE_TYPE_TO_NAME(st->obj_type));
- return -1;
- }
-
- if (status < 0) {
- sdb_strbuf_sprintf(errbuf, "STORE: Failed to store %s object",
- SDB_STORE_TYPE_TO_NAME(type));
- return -1;
- }
-
- if (! status) {
- sdb_strbuf_sprintf(buf, "Successfully stored %s %s",
- SDB_STORE_TYPE_TO_NAME(type), name);
- }
- else {
- char type_str[32];
- strncpy(type_str, SDB_STORE_TYPE_TO_NAME(type), sizeof(type_str));
- type_str[0] = (char)toupper((int)type_str[0]);
- sdb_strbuf_sprintf(buf, "%s %s already up to date", type_str, name);
- }
-
- return SDB_CONNECTION_OK;
-} /* exec_store */
-
-static int
-exec_timeseries(sdb_strbuf_t *buf, sdb_strbuf_t *errbuf,
- const char *hostname, const char *metric,
- sdb_timeseries_opts_t *opts)
-{
- uint32_t res_type = htonl(SDB_CONNECTION_TIMESERIES);
-
- sdb_strbuf_memcpy(buf, &res_type, sizeof(uint32_t));
- if (sdb_store_fetch_timeseries(hostname, metric, opts, buf)) {
- sdb_log(SDB_LOG_ERR, "frontend: Failed to fetch time-series");
- sdb_strbuf_sprintf(errbuf, "Failed to fetch time-series");
- return -1;
- }
-
- return SDB_CONNECTION_DATA;
-} /* exec_timeseries */
-
/*
* public API
*/
int
-sdb_store_query_execute(sdb_store_query_t *m,
- sdb_strbuf_t *buf, sdb_strbuf_t *errbuf)
+sdb_store_query_execute(sdb_store_t *store, sdb_store_query_t *q,
+ sdb_store_writer_t *w, sdb_object_t *wd, sdb_strbuf_t *errbuf)
{
- sdb_timeseries_opts_t ts_opts;
sdb_ast_node_t *ast;
- if (! m)
+ if (! q)
return -1;
- if (! QUERY(m)->ast) {
+ if (! q->ast) {
sdb_log(SDB_LOG_ERR, "store: Invalid empty query");
return -1;
}
- ast = QUERY(m)->ast;
+ ast = q->ast;
switch (ast->type) {
case SDB_AST_TYPE_FETCH:
- return exec_fetch(buf, errbuf, SDB_AST_FETCH(ast)->obj_type,
+ return exec_fetch(store, w, wd, errbuf, SDB_AST_FETCH(ast)->obj_type,
SDB_AST_FETCH(ast)->hostname, SDB_AST_FETCH(ast)->name,
- QUERY(m)->filter);
+ q->filter);
case SDB_AST_TYPE_LIST:
- return exec_list(buf, errbuf, SDB_AST_LIST(ast)->obj_type,
- QUERY(m)->filter);
+ return exec_list(store, w, wd, errbuf, SDB_AST_LIST(ast)->obj_type,
+ q->filter);
case SDB_AST_TYPE_LOOKUP:
- return exec_lookup(buf, errbuf, SDB_AST_LOOKUP(ast)->obj_type,
- QUERY(m)->matcher, QUERY(m)->filter);
-
- case SDB_AST_TYPE_STORE:
- if (ast->type != SDB_AST_TYPE_STORE) {
- sdb_log(SDB_LOG_ERR, "store: Invalid AST node for STORE command: %s",
- SDB_AST_TYPE_TO_STRING(ast));
- return -1;
- }
- return exec_store(buf, errbuf, SDB_AST_STORE(ast));
-
- case SDB_AST_TYPE_TIMESERIES:
- ts_opts.start = SDB_AST_TIMESERIES(ast)->start;
- ts_opts.end = SDB_AST_TIMESERIES(ast)->end;
- return exec_timeseries(buf, errbuf, SDB_AST_TIMESERIES(ast)->hostname,
- SDB_AST_TIMESERIES(ast)->metric, &ts_opts);
+ return exec_lookup(store, w, wd, errbuf, SDB_AST_LOOKUP(ast)->obj_type,
+ q->matcher, q->filter);
default:
sdb_log(SDB_LOG_ERR, "store: Invalid query of type %s",