X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=src%2Finclude%2Ffrontend%2Fconnection.h;h=349993224ebfe336ad7033d312274ee60ff9b99c;hp=98c41360a990ba11175f2a24150a922185769458;hb=ef3a4a955deddc45d5f381ce20653cac3ca51656;hpb=740f1a8839faaf3033ea23f4cf2eea0dc0209d13

diff --git a/src/include/frontend/connection.h b/src/include/frontend/connection.h
index 98c4136..3499932 100644
--- a/src/include/frontend/connection.h
+++ b/src/include/frontend/connection.h
@@ -146,26 +146,12 @@ sdb_connection_ping(sdb_conn_t *conn);
 int
 sdb_connection_server_version(sdb_conn_t *conn);
 
-/*
- * sdb_fe_parse:
- * Parse the query text specified in 'query' of length 'len' and return a list
- * of parse trees (for each command). The list has to be freed by the caller.
- * If 'len' is less than zero, parse the whole (nul-terminated) string. If
- * specified, errbuf will be used to record parse errors.
- *
- * Returns:
- *  - an sdb_llist_t object of sdb_conn_node_t on success
- *  - NULL in case of an error
- */
-sdb_llist_t *
-sdb_fe_parse(const char *query, int len, sdb_strbuf_t *errbuf);
-
 /*
  * session handling
  */
 
 /*
- * sdb_fe_session_start:
+ * sdb_conn_session_start:
  * Start a new user session on the specified connection.
  *
  * Returns:
@@ -173,14 +159,15 @@ sdb_fe_parse(const char *query, int len, sdb_strbuf_t *errbuf);
  *  - a negative value else
  */
 int
-sdb_fe_session_start(sdb_conn_t *conn);
+sdb_conn_session_start(sdb_conn_t *conn);
 
 /*
  * store access
  */
 
 /*
- * sdb_fe_query, sdb_fe_fetch, sdb_fe_list, sdb_fe_lookup, sdb_fe_store:
+ * sdb_conn_query, sdb_conn_fetch, sdb_conn_list, sdb_conn_lookup,
+ * sdb_conn_store:
  * Handle the SDB_CONNECTION_QUERY, SDB_CONNECTION_FETCH, SDB_CONNECTION_LIST,
  * SDB_CONNECTION_LOOKUP, and SDB_CONNECTION_STORE commands respectively. It
  * is expected that the current command has been initialized already.
@@ -190,76 +177,19 @@ sdb_fe_session_start(sdb_conn_t *conn);
  *  - a negative value else
  */
 int
-sdb_fe_query(sdb_conn_t *conn);
+sdb_conn_query(sdb_conn_t *conn);
 int
-sdb_fe_fetch(sdb_conn_t *conn);
+sdb_conn_fetch(sdb_conn_t *conn);
 int
-sdb_fe_list(sdb_conn_t *conn);
+sdb_conn_list(sdb_conn_t *conn);
 int
-sdb_fe_lookup(sdb_conn_t *conn);
-int
-sdb_fe_store(sdb_conn_t *conn);
-
-/*
- * sdb_fe_exec_fetch:
- * Execute the 'FETCH' command. Send the named object of the specified type,
- * serialized as JSON, to the client. If specified, only objects matching the
- * filter will be included.
- *
- * Returns:
- *  - 0 on success
- *  - a negative value else
- */
-int
-sdb_fe_exec_fetch(sdb_conn_t *conn, int type,
-		const char *hostname, const char *name, sdb_store_matcher_t *filter);
-
-/*
- * sdb_fe_exec_list:
- * Execute the 'LIST' command. Send a complete listing of the store,
- * serialized as JSON, to the client. The listing includes all hosts and the
- * specified object type. If specified, only objects matching the filter will
- * be included.
- *
- * Returns:
- *  - 0 on success
- *  - a negative value else
- */
-int
-sdb_fe_exec_list(sdb_conn_t *conn, int type, sdb_store_matcher_t *filter);
-
-/*
- * sdb_fe_exec_lookup:
- * Execute the 'LOOKUP' command. Send a list of objects of the specified type
- * matching 'm', serialized as JSON, to the client. If specified, only objects
- * matching the filter will be included.
- *
- * Returns:
- *  - 0 on success
- *  - a negative value else
- */
-int
-sdb_fe_exec_lookup(sdb_conn_t *conn, int type,
-		sdb_store_matcher_t *m, sdb_store_matcher_t *filter);
-
-/*
- * sdb_fe_exec_timeseries:
- * Execute the 'TIMESERIES' command. Send the time-series for the specified
- * host's metric, serialized as JSON, to the client. See
- * sdb_store_fetch_timeseries for details.
- *
- * Returns:
- *  - 0 on success
- *  - a negative value else
- */
+sdb_conn_lookup(sdb_conn_t *conn);
 int
-sdb_fe_exec_timeseries(sdb_conn_t *conn,
-		const char *hostname, const char *metric,
-		sdb_timeseries_opts_t *opts);
+sdb_conn_store(sdb_conn_t *conn);
 
 /*
- * sdb_fe_store_host, sdb_fe_store_service, sdb_fe_store_metric,
- * sdb_fe_store_attribute:
+ * sdb_conn_store_host, sdb_conn_store_service, sdb_conn_store_metric,
+ * sdb_conn_store_attribute:
  * Execute the 'STORE' command for the respective object type.
  *
  * Returns:
@@ -267,13 +197,13 @@ sdb_fe_exec_timeseries(sdb_conn_t *conn,
  *  - a negative value else
  */
 int
-sdb_fe_store_host(sdb_conn_t *conn, const sdb_proto_host_t *host);
+sdb_conn_store_host(sdb_conn_t *conn, const sdb_proto_host_t *host);
 int
-sdb_fe_store_service(sdb_conn_t *conn, const sdb_proto_service_t *svc);
+sdb_conn_store_service(sdb_conn_t *conn, const sdb_proto_service_t *svc);
 int
-sdb_fe_store_metric(sdb_conn_t *conn, const sdb_proto_metric_t *metric);
+sdb_conn_store_metric(sdb_conn_t *conn, const sdb_proto_metric_t *metric);
 int
-sdb_fe_store_attribute(sdb_conn_t *conn, const sdb_proto_attribute_t *attr);
+sdb_conn_store_attribute(sdb_conn_t *conn, const sdb_proto_attribute_t *attr);
 
 #ifdef __cplusplus
 } /* extern "C" */