Replaced sdb_store_<type> with sdb_plugin_store_<type>.

[sysdb.git] / src / core / store_exec.c

diff --git a/src/core/store_exec.c b/src/core/store_exec.c
index 949f9ff98fd74817bddb8c7f4757108d6a3d5b8e..436b36e4aeb25f1784257eeef5a818100e805aca 100644 (file)
--- a/src/core/store_exec.c
+++ b/src/core/store_exec.c
@@ -26,6 +26,7 @@
  */
 
 #include "core/object.h"
+#include "core/plugin.h"
 #include "core/store-private.h"
 #include "frontend/connection.h"
 #include "parser/ast.h"
@@ -227,19 +228,19 @@ exec_store(sdb_strbuf_t *buf, sdb_strbuf_t *errbuf, sdb_ast_store_t *st)
        switch (st->obj_type) {
        case SDB_HOST:
                strncpy(name, st->name, sizeof(name));
-               status = sdb_store_host(st->name, st->last_update);
+               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_store_service(st->hostname, st->name, st->last_update);
+               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_store_metric(st->hostname, st->name,
+               status = sdb_plugin_store_metric(st->hostname, st->name,
                                &metric_store, st->last_update);
                break;
 
@@ -255,17 +256,17 @@ exec_store(sdb_strbuf_t *buf, sdb_strbuf_t *errbuf, sdb_ast_store_t *st)
                switch (st->parent_type) {
                case 0:
                        type |= SDB_HOST;
-                       status = sdb_store_attribute(st->hostname,
+                       status = sdb_plugin_store_attribute(st->hostname,
                                        st->name, &st->value, st->last_update);
                        break;
 
                case SDB_SERVICE:
-                       status = sdb_store_service_attr(st->hostname, st->parent,
+                       status = sdb_plugin_store_service_attribute(st->hostname, st->parent,
                                        st->name, &st->value, st->last_update);
                        break;
 
                case SDB_METRIC:
-                       status = sdb_store_metric_attr(st->hostname, st->parent,
+                       status = sdb_plugin_store_metric_attribute(st->hostname, st->parent,
                                        st->name, &st->value, st->last_update);
                        break;
 
@@ -324,36 +325,33 @@ exec_timeseries(sdb_strbuf_t *buf, sdb_strbuf_t *errbuf,
  */
 
 int
-sdb_store_query_execute(sdb_store_matcher_t *m,
+sdb_store_query_execute(sdb_store_query_t *m,
                sdb_strbuf_t *buf, sdb_strbuf_t *errbuf)
 {
        sdb_timeseries_opts_t ts_opts;
        sdb_ast_node_t *ast;
 
-       if ((! m) || (m->type != MATCHER_QUERY)) {
-               int t = m ? m-> type : -1;
-               sdb_log(SDB_LOG_ERR, "store: Invalid query of type %s", MATCHER_SYM(t));
+       if (! m)
                return -1;
-       }
-       if (! QUERY_M(m)->ast) {
+       if (! QUERY(m)->ast) {
                sdb_log(SDB_LOG_ERR, "store: Invalid empty query");
                return -1;
        }
 
-       ast = QUERY_M(m)->ast;
+       ast = QUERY(m)->ast;
        switch (ast->type) {
        case SDB_AST_TYPE_FETCH:
                return exec_fetch(buf, errbuf, SDB_AST_FETCH(ast)->obj_type,
                                SDB_AST_FETCH(ast)->hostname, SDB_AST_FETCH(ast)->name,
-                               QUERY_M(m)->filter);
+                               QUERY(m)->filter);
 
        case SDB_AST_TYPE_LIST:
                return exec_list(buf, errbuf, SDB_AST_LIST(ast)->obj_type,
-                               QUERY_M(m)->filter);
+                               QUERY(m)->filter);
 
        case SDB_AST_TYPE_LOOKUP:
                return exec_lookup(buf, errbuf, SDB_AST_LOOKUP(ast)->obj_type,
-                               QUERY_M(m)->matcher, QUERY_M(m)->filter);
+                               QUERY(m)->matcher, QUERY(m)->filter);
 
        case SDB_AST_TYPE_STORE:
                if (ast->type != SDB_AST_TYPE_STORE) {