store: Don't overwrite attribute values if the new timestamp is too old.

Also, extended the unit tests to catch this error.

diff --git a/src/core/store.c b/src/core/store.c
index 323ed778b7c52fa76c8d492447781b2920695995..7de75b1ee546e6a49509746fa0a13410834ba779 100644 (file)
--- a/src/core/store.c
+++ b/src/core/store.c
@@ -324,7 +324,7 @@ store_attr(sdb_llist_t *attributes, const char *key, const sdb_data_t *value,
        int status;
 
        status = store_obj(attributes, SDB_ATTRIBUTE, key, last_update, &attr);
-       if (status < 0)
+       if (status)
                return status;
 
        assert(attr);

diff --git a/t/unit/core/store_test.c b/t/unit/core/store_test.c
index 6715a5b0868a49714b3a9e3664ff586e6455166c..1eb387e34b855f0625b110715f2d7e919e6d3892 100644 (file)
--- a/t/unit/core/store_test.c
+++ b/t/unit/core/store_test.c
@@ -44,9 +44,14 @@ populate(void)
        datum.data.string = "v1";
        sdb_store_attribute("h1", "k1", &datum, 1);
        datum.data.string = "v2";
-       sdb_store_attribute("h1", "k2", &datum, 1);
+       sdb_store_attribute("h1", "k2", &datum, 2);
        datum.data.string = "v3";
-       sdb_store_attribute("h1", "k3", &datum, 1);
+       sdb_store_attribute("h1", "k3", &datum, 2);
+
+       /* make sure that older updates don't overwrite existing values */
+       datum.data.string = "fail";
+       sdb_store_attribute("h1", "k2", &datum, 1);
+       sdb_store_attribute("h1", "k3", &datum, 2);
 
        sdb_store_service("h2", "s1", 1);
        sdb_store_service("h2", "s2", 1);