Renamed in-memory store types and functions to sdb_memstore*.

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

diff --git a/src/core/store_exec.c b/src/core/store_exec.c
index d4e308806bac8ece40c9a12a20885df768c2dffe..9b4ea0767828a0bfd45d6bd18ee73bb7415e0b56 100644 (file)
--- a/src/core/store_exec.c
+++ b/src/core/store_exec.c
@@ -43,40 +43,40 @@
  */
 
 typedef struct {
-       sdb_store_obj_t *current_host;
+       sdb_memstore_obj_t *current_host;
 
        sdb_store_writer_t *w;
        sdb_object_t *wd;
 } iter_t;
 
 static int
-maybe_emit_host(iter_t *iter, sdb_store_obj_t *obj)
+maybe_emit_host(iter_t *iter, sdb_memstore_obj_t *obj)
 {
        if ((obj->type == SDB_HOST) || (obj->type == SDB_ATTRIBUTE))
                return 0;
        if (iter->current_host == obj->parent)
                return 0;
        iter->current_host = obj->parent;
-       return sdb_store_emit(obj->parent, iter->w, iter->wd);
+       return sdb_memstore_emit(obj->parent, iter->w, iter->wd);
 } /* maybe_emit_host */
 
 static int
-list_tojson(sdb_store_obj_t *obj,
-               sdb_store_matcher_t __attribute__((unused)) *filter,
+list_tojson(sdb_memstore_obj_t *obj,
+               sdb_memstore_matcher_t __attribute__((unused)) *filter,
                void *user_data)
 {
        iter_t *iter = user_data;
        maybe_emit_host(iter, obj);
-       return sdb_store_emit(obj, iter->w, iter->wd);
+       return sdb_memstore_emit(obj, iter->w, iter->wd);
 } /* list_tojson */
 
 static int
-lookup_tojson(sdb_store_obj_t *obj, sdb_store_matcher_t *filter,
+lookup_tojson(sdb_memstore_obj_t *obj, sdb_memstore_matcher_t *filter,
                void *user_data)
 {
        iter_t *iter = user_data;
        maybe_emit_host(iter, obj);
-       return sdb_store_emit_full(obj, filter, iter->w, iter->wd);
+       return sdb_memstore_emit_full(obj, filter, iter->w, iter->wd);
 } /* lookup_tojson */
 
 /*
@@ -84,13 +84,13 @@ lookup_tojson(sdb_store_obj_t *obj, sdb_store_matcher_t *filter,
  */
 
 static int
-exec_fetch(sdb_store_t *store,
+exec_fetch(sdb_memstore_t *store,
                sdb_store_writer_t *w, sdb_object_t *wd, sdb_strbuf_t *errbuf,
                int type, const char *hostname, const char *name,
-               sdb_store_matcher_t *filter)
+               sdb_memstore_matcher_t *filter)
 {
-       sdb_store_obj_t *host;
-       sdb_store_obj_t *obj;
+       sdb_memstore_obj_t *host;
+       sdb_memstore_obj_t *obj;
 
        int status = 0;
 
@@ -105,9 +105,9 @@ exec_fetch(sdb_store_t *store,
        if (type == SDB_HOST)
                hostname = name;
 
-       host = sdb_store_get_host(store, hostname);
+       host = sdb_memstore_get_host(store, hostname);
        if ((! host)
-                       || (filter && (! sdb_store_matcher_matches(filter, host, NULL)))) {
+                       || (filter && (! sdb_memstore_matcher_matches(filter, host, NULL)))) {
                sdb_strbuf_sprintf(errbuf, "Failed to fetch %s %s: "
                                "host %s not found", SDB_STORE_TYPE_TO_NAME(type),
                                name, hostname);
@@ -118,9 +118,9 @@ exec_fetch(sdb_store_t *store,
                obj = host;
        }
        else {
-               obj = sdb_store_get_child(host, type, name);
+               obj = sdb_memstore_get_child(host, type, name);
                if ((! obj)
-                               || (filter && (! sdb_store_matcher_matches(filter, obj, NULL)))) {
+                               || (filter && (! sdb_memstore_matcher_matches(filter, obj, NULL)))) {
                        sdb_strbuf_sprintf(errbuf, "Failed to fetch %s %s.%s: "
                                        "%s not found", SDB_STORE_TYPE_TO_NAME(type),
                                        hostname, name, name);
@@ -134,8 +134,8 @@ exec_fetch(sdb_store_t *store,
        host = NULL;
 
        if (type != SDB_HOST)
-               status = sdb_store_emit(obj->parent, w, wd);
-       if (status || sdb_store_emit_full(obj, filter, w, wd)) {
+               status = sdb_memstore_emit(obj->parent, w, wd);
+       if (status || sdb_memstore_emit_full(obj, filter, w, wd)) {
                sdb_log(SDB_LOG_ERR, "frontend: Failed to serialize "
                                "%s %s.%s to JSON", SDB_STORE_TYPE_TO_NAME(type),
                                hostname, name);
@@ -149,13 +149,13 @@ exec_fetch(sdb_store_t *store,
 } /* exec_fetch */
 
 static int
-exec_list(sdb_store_t *store,
+exec_list(sdb_memstore_t *store,
                sdb_store_writer_t *w, sdb_object_t *wd, sdb_strbuf_t *errbuf,
-               int type, sdb_store_matcher_t *filter)
+               int type, sdb_memstore_matcher_t *filter)
 {
        iter_t iter = { NULL, w, wd };
 
-       if (sdb_store_scan(store, type, /* m = */ NULL, filter, list_tojson, &iter)) {
+       if (sdb_memstore_scan(store, type, /* m = */ NULL, filter, list_tojson, &iter)) {
                sdb_log(SDB_LOG_ERR, "frontend: Failed to serialize "
                                "store to JSON");
                sdb_strbuf_sprintf(errbuf, "Out of memory");
@@ -166,13 +166,13 @@ exec_list(sdb_store_t *store,
 } /* exec_list */
 
 static int
-exec_lookup(sdb_store_t *store,
+exec_lookup(sdb_memstore_t *store,
                sdb_store_writer_t *w, sdb_object_t *wd, sdb_strbuf_t *errbuf,
-               int type, sdb_store_matcher_t *m, sdb_store_matcher_t *filter)
+               int type, sdb_memstore_matcher_t *m, sdb_memstore_matcher_t *filter)
 {
        iter_t iter = { NULL, w, wd };
 
-       if (sdb_store_scan(store, type, m, filter, lookup_tojson, &iter)) {
+       if (sdb_memstore_scan(store, type, m, filter, lookup_tojson, &iter)) {
                sdb_log(SDB_LOG_ERR, "frontend: Failed to lookup %ss",
                                SDB_STORE_TYPE_TO_NAME(type));
                sdb_strbuf_sprintf(errbuf, "Failed to lookup %ss",
@@ -188,7 +188,7 @@ exec_lookup(sdb_store_t *store,
  */
 
 int
-sdb_store_query_execute(sdb_store_t *store, sdb_store_query_t *q,
+sdb_memstore_query_execute(sdb_memstore_t *store, sdb_memstore_query_t *q,
                sdb_store_writer_t *w, sdb_object_t *wd, sdb_strbuf_t *errbuf)
 {
        sdb_ast_node_t *ast;
@@ -222,6 +222,6 @@ sdb_store_query_execute(sdb_store_t *store, sdb_store_query_t *q,
        }
 
        return 0;
-} /* sdb_store_query_execute */
+} /* sdb_memstore_query_execute */
 
 /* vim: set tw=78 sw=4 ts=4 noexpandtab : */