X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Finclude%2Fcore%2Fplugin.h;h=b12af783adc5f5cb4414496ef0d12704586684e2;hb=d67b2c8c66c51593bd9b6b636577825b24d7d46e;hp=1155a957cd3f06fc186b16d4250662c25aaaa9dd;hpb=eae5d03ff51ed65e77058aebb944dffa0a9bb142;p=sysdb.git

diff --git a/src/include/core/plugin.h b/src/include/core/plugin.h
index 1155a95..b12af78 100644
--- a/src/include/core/plugin.h
+++ b/src/include/core/plugin.h
@@ -123,9 +123,6 @@ typedef int (*sdb_plugin_shutdown_cb)(sdb_object_t *user_data);
 typedef int (*sdb_plugin_log_cb)(int prio, const char *msg,
 		sdb_object_t *user_data);
 
-typedef sdb_timeseries_t *(*sdb_plugin_fetch_ts_cb)(const char *id,
-		sdb_timeseries_opts_t *opts, sdb_object_t *user_data);
-
 /*
  * sdb_plugin_register_config:
  * Register a "config" function. This will be used to pass on the
@@ -240,11 +237,12 @@ sdb_plugin_register_log(const char *name, sdb_plugin_log_cb callback,
 		sdb_object_t *user_data);
 
 /*
- * sdb_plugin_register_ts_fetcher:
- * Register a "time-series fetcher" function to be called whenever retrieving
- * a time-series from a data-store. The callback will receive an identifier
- * describing where to retrieve the data from (e.g. a filename or some kind of
- * URL) and options which further describe the query.
+ * sdb_plugin_register_timeseries_fetcher:
+ * Register a "time-series fetcher" to be called whenever retrieving a
+ * time-series from a data-store or information about it. The fetch callback
+ * will receive an identifier describing where to retrieve the data from (e.g.
+ * a filename or some kind of URL) and options which further describe the
+ * query.
  *
  * The name is used literally (without prepending the plugin name) to look up
  * the appropriate fetcher callback.
@@ -256,8 +254,8 @@ sdb_plugin_register_log(const char *name, sdb_plugin_log_cb callback,
  *    use the object for other purposes, it should thus deref it.
  */
 int
-sdb_plugin_register_ts_fetcher(const char *name,
-		sdb_plugin_fetch_ts_cb callback, sdb_object_t *user_data);
+sdb_plugin_register_timeseries_fetcher(const char *name,
+		sdb_timeseries_fetcher_t *fetcher, sdb_object_t *user_data);
 
 /*
  * sdb_plugin_register_writer:
@@ -267,7 +265,7 @@ sdb_plugin_register_ts_fetcher(const char *name,
  *
  * Arguments:
  *  - user_data: If specified, this will be passed on to each call of the
- *    callback. The function will take ownership of the object, that is,
+ *    callbacks. The function will take ownership of the object, that is,
  *    increment the reference count by one. In case the caller does not longer
  *    use the object for other purposes, it should thus deref it.
  */
@@ -275,6 +273,22 @@ int
 sdb_plugin_register_writer(const char *name,
 		sdb_store_writer_t *writer, sdb_object_t *user_data);
 
+/*
+ * sdb_plugin_register_reader:
+ * Register a "reader" implementation for querying the store. It is invalid to
+ * register an incomplete reader which does not implement all of the reader
+ * interface.
+ *
+ * Arguments:
+ *  - user_data: If specified, this will be passed on to each call of the
+ *    callbacks. The function will take ownership of the object, that is,
+ *    increment the reference count by one. In case the caller does not longer
+ *    use the object for other purposes, it should thus deref it.
+ */
+int
+sdb_plugin_register_reader(const char *name,
+		sdb_store_reader_t *reader, sdb_object_t *user_data);
+
 /*
  * sdb_plugin_unregister_all:
  * Unregister all registered plugins and destruct their user-data objects.
@@ -420,6 +434,19 @@ sdb_timeseries_t *
 sdb_plugin_fetch_timeseries(const char *type, const char *id,
 		sdb_timeseries_opts_t *opts);
 
+/*
+ * sdb_plugin_query:
+ * Query the store using the query specified by 'ast'. The result will be
+ * written to 'buf' and any errors will be written to 'errbuf'.
+ *
+ * Returns:
+ *  - 0 on success
+ *  - a negative value else
+ */
+int
+sdb_plugin_query(sdb_ast_node_t *ast,
+		sdb_store_writer_t *w, sdb_object_t *wd, sdb_strbuf_t *errbuf);
+
 /*
  * sdb_plugin_store_host, sdb_plugin_store_service, sdb_plugin_store_metric,
  * sdb_plugin_store_attribute, sdb_plugin_store_service_attribute,