![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/core/store_exec.c b/src/core/store_exec.c
index 436b36e4aeb25f1784257eeef5a818100e805aca..5daaa143105558c133f6649d8d44e7c24e0f9307 100644 (file)
--- a/src/core/store_exec.c
+++ b/src/core/store_exec.c
*/
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_strbuf_t *buf, 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);
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: "
"%s %s.%s to JSON", SDB_STORE_TYPE_TO_NAME(type),
hostname, name);
sdb_strbuf_sprintf(errbuf, "Out of memory");
- free(f);
+ 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);
- free(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_strbuf_t *buf, 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;
}
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, f)) {
sdb_log(SDB_LOG_ERR, "frontend: Failed to serialize "
"store to JSON");
sdb_strbuf_sprintf(errbuf, "Out of memory");
- free(f);
+ sdb_object_deref(SDB_OBJ(f));
return -1;
}
sdb_store_json_finish(f);
- free(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_strbuf_t *buf, 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;
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, f)) {
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));
- free(f);
+ sdb_object_deref(SDB_OBJ(f));
return -1;
}
sdb_store_json_finish(f);
- free(f);
+ sdb_object_deref(SDB_OBJ(f));
return SDB_CONNECTION_DATA;
} /* exec_lookup */
} /* exec_store */
static int
-exec_timeseries(sdb_strbuf_t *buf, sdb_strbuf_t *errbuf,
+exec_timeseries(sdb_store_t *store, 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)) {
+ if (sdb_store_fetch_timeseries(store, 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;
*/
int
-sdb_store_query_execute(sdb_store_query_t *m,
+sdb_store_query_execute(sdb_store_t *store, sdb_store_query_t *q,
sdb_strbuf_t *buf, 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, buf, 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, buf, 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);
+ return exec_lookup(store, buf, errbuf, SDB_AST_LOOKUP(ast)->obj_type,
+ q->matcher, q->filter);
case SDB_AST_TYPE_STORE:
if (ast->type != SDB_AST_TYPE_STORE) {
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,
+ return exec_timeseries(store, buf, errbuf,
+ SDB_AST_TIMESERIES(ast)->hostname,
SDB_AST_TIMESERIES(ast)->metric, &ts_opts);
default: