frontend: Connection-specific functions now use the sdb_conn_ prefix.

[sysdb.git] / src / frontend / query.c

diff --git a/src/frontend/query.c b/src/frontend/query.c
index 97698fd300be6af87607c13d9b7c2336cea54b48..724144aafb91a63369efb98cd0c97a55b5a7f8a9 100644 (file)
--- a/src/frontend/query.c
+++ b/src/frontend/query.c
@@ -31,7 +31,7 @@
 
 #include "sysdb.h"
 
-#include "core/store.h"
+#include "core/plugin.h"
 #include "frontend/connection-private.h"
 #include "parser/ast.h"
 #include "parser/parser.h"
@@ -55,7 +55,6 @@ sstrdup(const char *s)
 static int
 query_exec(sdb_conn_t *conn, sdb_ast_node_t *ast)
 {
-       sdb_store_query_t *q;
        sdb_strbuf_t *buf;
        int status;
 
@@ -64,21 +63,12 @@ query_exec(sdb_conn_t *conn, sdb_ast_node_t *ast)
                return -1;
        }
 
-       q = sdb_store_query_prepare(ast);
-       if (! q) {
-               /* this shouldn't happen */
-               sdb_strbuf_sprintf(conn->errbuf, "failed to compile AST");
-               sdb_log(SDB_LOG_ERR, "frontend: failed to compile AST");
-               return -1;
-       }
-
        buf = sdb_strbuf_create(1024);
        if (! buf) {
                sdb_strbuf_sprintf(conn->errbuf, "Out of memory");
-               sdb_object_deref(SDB_OBJ(q));
                return -1;
        }
-       status = sdb_store_query_execute(q, buf, conn->errbuf);
+       status = sdb_plugin_query(ast, buf, conn->errbuf);
        if (status < 0) {
                char query[conn->cmd_len + 1];
                strncpy(query, sdb_strbuf_string(conn->buf), conn->cmd_len);
@@ -90,7 +80,6 @@ query_exec(sdb_conn_t *conn, sdb_ast_node_t *ast)
                                (uint32_t)sdb_strbuf_len(buf), sdb_strbuf_string(buf));
 
        sdb_strbuf_destroy(buf);
-       sdb_object_deref(SDB_OBJ(q));
        return status < 0 ? status : 0;
 } /* query_exec */
 
@@ -99,7 +88,7 @@ query_exec(sdb_conn_t *conn, sdb_ast_node_t *ast)
  */
 
 int
-sdb_fe_query(sdb_conn_t *conn)
+sdb_conn_query(sdb_conn_t *conn)
 {
        sdb_llist_t *parsetree;
        sdb_ast_node_t *ast = NULL;
@@ -148,10 +137,10 @@ sdb_fe_query(sdb_conn_t *conn)
        }
        sdb_llist_destroy(parsetree);
        return status;
-} /* sdb_fe_query */
+} /* sdb_conn_query */
 
 int
-sdb_fe_fetch(sdb_conn_t *conn)
+sdb_conn_fetch(sdb_conn_t *conn)
 {
        sdb_ast_node_t *ast;
        char hostname[conn->cmd_len + 1];
@@ -185,10 +174,10 @@ sdb_fe_fetch(sdb_conn_t *conn)
        status = query_exec(conn, ast);
        sdb_object_deref(SDB_OBJ(ast));
        return status;
-} /* sdb_fe_fetch */
+} /* sdb_conn_fetch */
 
 int
-sdb_fe_list(sdb_conn_t *conn)
+sdb_conn_list(sdb_conn_t *conn)
 {
        sdb_ast_node_t *ast;
        uint32_t type = SDB_HOST;
@@ -211,10 +200,10 @@ sdb_fe_list(sdb_conn_t *conn)
        status = query_exec(conn, ast);
        sdb_object_deref(SDB_OBJ(ast));
        return status;
-} /* sdb_fe_list */
+} /* sdb_conn_list */
 
 int
-sdb_fe_lookup(sdb_conn_t *conn)
+sdb_conn_lookup(sdb_conn_t *conn)
 {
        sdb_ast_node_t *ast, *m;
        const char *matcher;
@@ -265,10 +254,10 @@ sdb_fe_lookup(sdb_conn_t *conn)
                sdb_object_deref(SDB_OBJ(m));
        sdb_object_deref(SDB_OBJ(ast));
        return status;
-} /* sdb_fe_lookup */
+} /* sdb_conn_lookup */
 
 int
-sdb_fe_store(sdb_conn_t *conn)
+sdb_conn_store(sdb_conn_t *conn)
 {
        sdb_ast_node_t *ast;
        const char *buf = sdb_strbuf_string(conn->buf);
@@ -370,7 +359,7 @@ sdb_fe_store(sdb_conn_t *conn)
                status = query_exec(conn, ast);
        sdb_object_deref(SDB_OBJ(ast));
        return status;
-} /* sdb_fe_store */
+} /* sdb_conn_store */
 
 /* vim: set tw=78 sw=4 ts=4 noexpandtab : */