store: Serialize attribute values using sdb_data_format().

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

diff --git a/src/core/store.c b/src/core/store.c
index 5a36e29eef5817e2988d445accd19b352fbe6f61..753b9815b0bd4b23be3bee71cfcfacb651060f28 100644 (file)
--- a/src/core/store.c
+++ b/src/core/store.c
@@ -71,7 +71,7 @@ struct sdb_store_base {
 typedef struct {
        sdb_store_base_t super;
 
-       char *value;
+       sdb_data_t value;
 } sdb_attribute_t;
 #define SDB_ATTR(obj) ((sdb_attribute_t *)(obj))
 #define SDB_CONST_ATTR(obj) ((const sdb_attribute_t *)(obj))
@@ -158,20 +158,19 @@ sdb_store_obj_destroy(sdb_object_t *obj)
 static int
 sdb_attr_init(sdb_object_t *obj, va_list ap)
 {
-       const char *value;
+       const sdb_data_t *value;
        int ret;
 
-       /* this will consume the first argument (type) of ap */
+       /* this will consume the first two arguments
+        * (type and last_update) of ap */
        ret = store_base_init(obj, ap);
        if (ret)
                return ret;
-       value = va_arg(ap, const char *);
+       value = va_arg(ap, const sdb_data_t *);
 
-       if (value) {
-               SDB_ATTR(obj)->value = strdup(value);
-               if (! SDB_ATTR(obj)->value)
+       if (value)
+               if (sdb_data_copy(&SDB_ATTR(obj)->value, value))
                        return -1;
-       }
        return 0;
 } /* sdb_attr_init */
 
@@ -181,9 +180,7 @@ sdb_attr_destroy(sdb_object_t *obj)
        assert(obj);
 
        store_base_destroy(obj);
-
-       if (SDB_ATTR(obj)->value)
-               free(SDB_ATTR(obj)->value);
+       sdb_data_free_datum(&SDB_ATTR(obj)->value);
 } /* sdb_attr_destroy */
 
 static sdb_type_t sdb_store_obj_type = {
@@ -205,7 +202,7 @@ static sdb_type_t sdb_attribute_type = {
  */
 
 static sdb_store_obj_t *
-sdb_store_lookup_in_list(sdb_llist_t *l, int type, const char *name)
+store_lookup_in_list(sdb_llist_t *l, int type, const char *name)
 {
        sdb_llist_iter_t *iter;
 
@@ -230,7 +227,7 @@ sdb_store_lookup_in_list(sdb_llist_t *l, int type, const char *name)
                if ((type != SDB_HOST) && (STORE_BASE(sobj)->type == SDB_HOST))
                        continue;
 
-               sobj = sdb_store_lookup_in_list(sobj->children, type, name);
+               sobj = store_lookup_in_list(sobj->children, type, name);
                if (sobj) {
                        sdb_llist_iter_destroy(iter);
                        return sobj;
@@ -238,13 +235,13 @@ sdb_store_lookup_in_list(sdb_llist_t *l, int type, const char *name)
        }
        sdb_llist_iter_destroy(iter);
        return NULL;
-} /* sdb_store_lookup_in_list */
+} /* store_lookup_in_list */
 
 static sdb_store_obj_t *
-sdb_store_lookup(int type, const char *name)
+store_lookup(int type, const char *name)
 {
-       return sdb_store_lookup_in_list(obj_list, type, name);
-} /* sdb_store_lookup */
+       return store_lookup_in_list(obj_list, type, name);
+} /* store_lookup */
 
 /* The obj_lock has to be acquired before calling this function. */
 static int
@@ -298,7 +295,7 @@ store_obj(int parent_type, const char *parent_name,
        if (parent_type && parent_name) {
                sdb_store_obj_t *parent;
 
-               parent = sdb_store_lookup(parent_type, parent_name);
+               parent = store_lookup(parent_type, parent_name);
                if (! parent) {
                        sdb_log(SDB_LOG_ERR, "store: Failed to store %s '%s' - "
                                        "parent %s '%s' not found", TYPE_TO_NAME(type), name,
@@ -316,14 +313,14 @@ store_obj(int parent_type, const char *parent_name,
 
        if (type == SDB_HOST)
                /* make sure that each host is unique */
-               old = STORE_BASE(sdb_store_lookup_in_list(obj_list, type, name));
+               old = STORE_BASE(store_lookup_in_list(obj_list, type, name));
        else if (type == SDB_ATTRIBUTE)
                /* look into attributes of this host */
                old = STORE_BASE(sdb_llist_search_by_name(parent_list, name));
        else
-               /* look into services assigned to this host (sdb_store_lookup_in_list
+               /* look into services assigned to this host (store_lookup_in_list
                 * does not look up services from hierarchical hosts) */
-               old = STORE_BASE(sdb_store_lookup_in_list(parent_list, type, name));
+               old = STORE_BASE(store_lookup_in_list(parent_list, type, name));
 
        if (old) {
                if (old->last_update > last_update) {
@@ -415,10 +412,13 @@ store_obj_tojson(sdb_llist_t *list, int type, sdb_strbuf_t *buf)
                time_str[sizeof(time_str) - 1] = '\0';
 
                sdb_strbuf_append(buf, "{\"name\": \"%s\", ", SDB_OBJ(sobj)->name);
-               if (type == SDB_ATTRIBUTE)
-                       sdb_strbuf_append(buf, "\"value\": \"%s\", ",
-                                       SDB_ATTR(sobj)->value);
-               sdb_strbuf_append(buf, "\"last_update\": \"%s\"}", time_str);
+               if (type == SDB_ATTRIBUTE) {
+                       sdb_strbuf_append(buf, "\"value\": ");
+                       sdb_data_format(&SDB_ATTR(sobj)->value, buf);
+                       sdb_strbuf_append(buf, ", \"last_update\": \"%s\"}", time_str);
+               }
+               else
+                       sdb_strbuf_append(buf, "\"last_update\": \"%s\"}", time_str);
 
                if (sdb_llist_iter_has_next(iter))
                        sdb_strbuf_append(buf, ",");
@@ -456,12 +456,29 @@ sdb_store_has_host(const char *name)
        if (! name)
                return NULL;
 
-       host = sdb_store_lookup(SDB_HOST, name);
+       host = store_lookup(SDB_HOST, name);
        return host != NULL;
 } /* sdb_store_has_host */
 
+sdb_store_base_t *
+sdb_store_get_host(const char *name)
+{
+       sdb_store_obj_t *host;
+
+       if (! name)
+               return NULL;
+
+       host = store_lookup(SDB_HOST, name);
+       if (! host)
+               return NULL;
+
+       sdb_object_ref(SDB_OBJ(host));
+       return STORE_BASE(host);
+} /* sdb_store_get_host */
+
 int
-sdb_store_attribute(const char *hostname, const char *key, const char *value,
+sdb_store_attribute(const char *hostname,
+               const char *key, const sdb_data_t *value,
                sdb_time_t last_update)
 {
        int status;
@@ -478,8 +495,7 @@ sdb_store_attribute(const char *hostname, const char *key, const char *value,
 
        if (status >= 0) {
                assert(updated_attr);
-               SDB_ATTR(updated_attr)->value = strdup(value);
-               if (! SDB_ATTR(updated_attr)->value) {
+               if (sdb_data_copy(&SDB_ATTR(updated_attr)->value, value)) {
                        sdb_object_deref(SDB_OBJ(updated_attr));
                        status = -1;
                }