X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=src%2Fcore%2Fplugin.c;h=3611be4966b51d296557620e9ed77abda9d7ce48;hp=83ef6ead9cb150aa447515ba60036691eedfd451;hb=9a96acd759c31211aa512e174339a9c178c4eb83;hpb=b75718ea9fe4d6c90f1794e517a0712729553c0c

diff --git a/src/core/plugin.c b/src/core/plugin.c
index 83ef6ea..3611be4 100644
--- a/src/core/plugin.c
+++ b/src/core/plugin.c
@@ -662,7 +662,7 @@ plugin_add_callback(sdb_llist_t **list, const char *type,
 } /* plugin_add_callback */
 
 static void
-get_backend(const char **backends, size_t *backends_num)
+get_backend(char **backends, size_t *backends_num)
 {
 	const sdb_plugin_info_t *info;
 
@@ -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;
 
@@ -1485,7 +1486,7 @@ int
 sdb_plugin_store_host(const char *name, sdb_time_t last_update)
 {
 	sdb_store_host_t host = { 0 };
-	const char *backends[1];
+	char *backends[1];
 	char *cname;
 
 	sdb_llist_iter_t *iter;
@@ -1508,8 +1509,8 @@ sdb_plugin_store_host(const char *name, sdb_time_t last_update)
 
 	host.name = cname;
 	host.last_update = last_update;
-	host.backends = backends;
-	get_backend(host.backends, &host.backends_num);
+	host.backends = (const char * const *)backends;
+	get_backend(backends, &host.backends_num);
 
 	iter = sdb_llist_get_iter(writer_list);
 	while (sdb_llist_iter_has_next(iter)) {
@@ -1530,7 +1531,7 @@ sdb_plugin_store_service(const char *hostname, const char *name,
 		sdb_time_t last_update)
 {
 	sdb_store_service_t service = { 0 };
-	const char *backends[1];
+	char *backends[1];
 	char *cname;
 
 	sdb_llist_iter_t *iter;
@@ -1556,8 +1557,8 @@ sdb_plugin_store_service(const char *hostname, const char *name,
 	service.hostname = cname;
 	service.name = name;
 	service.last_update = last_update;
-	service.backends = backends;
-	get_backend(service.backends, &service.backends_num);
+	service.backends = (const char * const *)backends;
+	get_backend(backends, &service.backends_num);
 
 	iter = sdb_llist_get_iter(writer_list);
 	while (sdb_llist_iter_has_next(iter)) {
@@ -1588,7 +1589,7 @@ 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 };
-	const char *backends[1];
+	char *backends[1];
 	char *cname;
 
 	sdb_llist_iter_t *iter;
@@ -1621,8 +1622,8 @@ sdb_plugin_store_metric(const char *hostname, const char *name,
 		metric.store.id = store->id;
 	}
 	metric.last_update = last_update;
-	metric.backends = backends;
-	get_backend(metric.backends, &metric.backends_num);
+	metric.backends = (const char * const *)backends;
+	get_backend(backends, &metric.backends_num);
 
 	iter = sdb_llist_get_iter(writer_list);
 	while (sdb_llist_iter_has_next(iter)) {
@@ -1653,7 +1654,7 @@ 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 };
-	const char *backends[1];
+	char *backends[1];
 	char *cname;
 
 	sdb_llist_iter_t *iter;
@@ -1679,8 +1680,8 @@ sdb_plugin_store_attribute(const char *hostname, const char *key,
 	attr.key = key;
 	attr.value = *value;
 	attr.last_update = last_update;
-	attr.backends = backends;
-	get_backend(attr.backends, &attr.backends_num);
+	attr.backends = (const char * const *)backends;
+	get_backend(backends, &attr.backends_num);
 
 	iter = sdb_llist_get_iter(writer_list);
 	while (sdb_llist_iter_has_next(iter)) {
@@ -1701,7 +1702,7 @@ 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 };
-	const char *backends[1];
+	char *backends[1];
 	char *cname;
 
 	sdb_llist_iter_t *iter;
@@ -1728,8 +1729,8 @@ sdb_plugin_store_service_attribute(const char *hostname, const char *service,
 	attr.key = key;
 	attr.value = *value;
 	attr.last_update = last_update;
-	attr.backends = backends;
-	get_backend(attr.backends, &attr.backends_num);
+	attr.backends = (const char * const *)backends;
+	get_backend(backends, &attr.backends_num);
 
 	iter = sdb_llist_get_iter(writer_list);
 	while (sdb_llist_iter_has_next(iter)) {
@@ -1750,7 +1751,7 @@ 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 };
-	const char *backends[1];
+	char *backends[1];
 	char *cname;
 
 	sdb_llist_iter_t *iter;
@@ -1777,8 +1778,8 @@ sdb_plugin_store_metric_attribute(const char *hostname, const char *metric,
 	attr.key = key;
 	attr.value = *value;
 	attr.last_update = last_update;
-	attr.backends = backends;
-	get_backend(attr.backends, &attr.backends_num);
+	attr.backends = (const char * const *)backends;
+	get_backend(backends, &attr.backends_num);
 
 	iter = sdb_llist_get_iter(writer_list);
 	while (sdb_llist_iter_has_next(iter)) {