store: Use full initializers for store objects.

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

diff --git a/src/core/plugin.c b/src/core/plugin.c
index 897769926584b201fab1657ecd0885719486cce4..728e20c1740815d83b2d1366ac852b20ec19c140 100644 (file)
--- a/src/core/plugin.c
+++ b/src/core/plugin.c
@@ -1437,7 +1437,8 @@ sdb_plugin_fetch_timeseries(const char *type, const char *id,
 } /* sdb_plugin_fetch_timeseries */
 
 int
-sdb_plugin_query(sdb_ast_node_t *ast, sdb_strbuf_t *buf, sdb_strbuf_t *errbuf)
+sdb_plugin_query(sdb_ast_node_t *ast,
+               sdb_store_writer_t *w, sdb_object_t *wd, sdb_strbuf_t *errbuf)
 {
        size_t n = sdb_llist_len(reader_list);
        reader_t *reader;
@@ -1449,8 +1450,7 @@ sdb_plugin_query(sdb_ast_node_t *ast, sdb_strbuf_t *buf, sdb_strbuf_t *errbuf)
 
        if ((ast->type != SDB_AST_TYPE_FETCH)
                        && (ast->type != SDB_AST_TYPE_LIST)
-                       && (ast->type != SDB_AST_TYPE_LOOKUP)
-                       && (ast->type != SDB_AST_TYPE_TIMESERIES)) {
+                       && (ast->type != SDB_AST_TYPE_LOOKUP)) {
                sdb_log(SDB_LOG_ERR, "core: Cannot execute query of type %s",
                                SDB_AST_TYPE_TO_STRING(ast));
                sdb_strbuf_sprintf(errbuf, "Cannot execute query of type %s",
@@ -1472,7 +1472,8 @@ sdb_plugin_query(sdb_ast_node_t *ast, sdb_strbuf_t *buf, sdb_strbuf_t *errbuf)
 
        q = reader->impl.prepare_query(ast, errbuf, reader->r_user_data);
        if (q)
-               status = reader->impl.execute_query(q, buf, errbuf, reader->r_user_data);
+               status = reader->impl.execute_query(q, w, SDB_OBJ(wd),
+                               errbuf, reader->r_user_data);
        else
                status = -1;
 
@@ -1484,7 +1485,7 @@ sdb_plugin_query(sdb_ast_node_t *ast, sdb_strbuf_t *buf, sdb_strbuf_t *errbuf)
 int
 sdb_plugin_store_host(const char *name, sdb_time_t last_update)
 {
-       sdb_store_host_t host = { 0 };
+       sdb_store_host_t host = SDB_STORE_HOST_INIT;
        char *backends[1];
        char *cname;
 
@@ -1529,7 +1530,7 @@ int
 sdb_plugin_store_service(const char *hostname, const char *name,
                sdb_time_t last_update)
 {
-       sdb_store_service_t service = { 0 };
+       sdb_store_service_t service = SDB_STORE_SERVICE_INIT;
        char *backends[1];
        char *cname;
 
@@ -1587,7 +1588,7 @@ int
 sdb_plugin_store_metric(const char *hostname, const char *name,
                sdb_metric_store_t *store, sdb_time_t last_update)
 {
-       sdb_store_metric_t metric = { 0 };
+       sdb_store_metric_t metric = SDB_STORE_METRIC_INIT;
        char *backends[1];
        char *cname;
 
@@ -1652,7 +1653,7 @@ int
 sdb_plugin_store_attribute(const char *hostname, const char *key,
                const sdb_data_t *value, sdb_time_t last_update)
 {
-       sdb_store_attribute_t attr = { 0 };
+       sdb_store_attribute_t attr = SDB_STORE_ATTRIBUTE_INIT;
        char *backends[1];
        char *cname;
 
@@ -1700,7 +1701,7 @@ int
 sdb_plugin_store_service_attribute(const char *hostname, const char *service,
                const char *key, const sdb_data_t *value, sdb_time_t last_update)
 {
-       sdb_store_attribute_t attr = { 0 };
+       sdb_store_attribute_t attr = SDB_STORE_ATTRIBUTE_INIT;
        char *backends[1];
        char *cname;
 
@@ -1749,7 +1750,7 @@ int
 sdb_plugin_store_metric_attribute(const char *hostname, const char *metric,
                const char *key, const sdb_data_t *value, sdb_time_t last_update)
 {
-       sdb_store_attribute_t attr = { 0 };
+       sdb_store_attribute_t attr = SDB_STORE_ATTRIBUTE_INIT;
        char *backends[1];
        char *cname;