![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index 1eb387e34b855f0625b110715f2d7e919e6d3892..44e9c96c0bd4ad9aea2aa0232c086e028cbc3492 100644 (file)
--- a/t/unit/core/store_test.c
+++ b/t/unit/core/store_test.c
sdb_data_t datum;
sdb_store_host("h1", 1);
- sdb_store_host("h2", 1);
+ sdb_store_host("h2", 3);
datum.type = SDB_TYPE_STRING;
datum.data.string = "v1";
sdb_store_attribute("h1", "k3", &datum, 2);
sdb_store_service("h2", "s1", 1);
- sdb_store_service("h2", "s2", 1);
+ sdb_store_service("h2", "s2", 2);
+
+ datum.type = SDB_TYPE_INTEGER;
+ datum.data.integer = 123;
+ sdb_store_service_attr("h2", "s2", "k1", &datum, 2);
+ datum.data.integer = 4711;
+ sdb_store_service_attr("h2", "s2", "k2", &datum, 1);
+
+ /* don't overwrite k1 */
+ datum.data.integer = 666;
+ sdb_store_service_attr("h2", "s2", "k1", &datum, 2);
} /* populate */
START_TEST(test_store_host)
size_t i;
struct {
+ struct {
+ sdb_store_matcher_t *(*m)(sdb_store_cond_t *);
+ int field;
+ sdb_data_t value;
+ } filter;
int flags;
const char *expected;
} golden_data[] = {
- { 0, "{\"hosts\":["
+ { { NULL, 0, SDB_DATA_INIT }, 0,
+ "{\"hosts\":["
"{\"name\": \"h1\", \"last_update\": \"1970-01-01 00:00:00 +0000\", "
"\"update_interval\": \"0s\", \"backends\": [], "
"\"attributes\": ["
"\"services\": ["
"{\"name\": \"s1\", "
"\"last_update\": \"1970-01-01 00:00:00 +0000\", "
- "\"update_interval\": \"0s\", \"backends\": []},"
+ "\"update_interval\": \"0s\", \"backends\": [], "
+ "\"attributes\": []},"
"{\"name\": \"s2\", "
"\"last_update\": \"1970-01-01 00:00:00 +0000\", "
- "\"update_interval\": \"0s\", \"backends\": []}"
+ "\"update_interval\": \"0s\", \"backends\": [], "
+ "\"attributes\": ["
+ "{\"name\": \"k1\", \"value\": 123, "
+ "\"last_update\": \"1970-01-01 00:00:00 +0000\", "
+ "\"update_interval\": \"0s\", \"backends\": []},"
+ "{\"name\": \"k2\", \"value\": 4711, "
+ "\"last_update\": \"1970-01-01 00:00:00 +0000\", "
+ "\"update_interval\": \"0s\", \"backends\": []}"
+ "]}"
"]}"
"]}" },
- { SDB_SKIP_SERVICES,
+ { { NULL, 0, SDB_DATA_INIT }, SDB_SKIP_SERVICES,
"{\"hosts\":["
"{\"name\": \"h1\", \"last_update\": \"1970-01-01 00:00:00 +0000\", "
"\"update_interval\": \"0s\", \"backends\": [], "
"\"update_interval\": \"0s\", \"backends\": [], "
"\"attributes\": []}"
"]}" },
- { SDB_SKIP_ATTRIBUTES,
+ { { NULL, 0, SDB_DATA_INIT }, SDB_SKIP_ATTRIBUTES,
"{\"hosts\":["
"{\"name\": \"h1\", \"last_update\": \"1970-01-01 00:00:00 +0000\", "
"\"update_interval\": \"0s\", \"backends\": [], "
"\"update_interval\": \"0s\", \"backends\": []}"
"]}"
"]}" },
- { SDB_SKIP_SERVICES | SDB_SKIP_ATTRIBUTES,
+ { { NULL, 0, SDB_DATA_INIT }, SDB_SKIP_SERVICES | SDB_SKIP_ATTRIBUTES,
"{\"hosts\":["
"{\"name\": \"h1\", \"last_update\": \"1970-01-01 00:00:00 +0000\", "
"\"update_interval\": \"0s\", \"backends\": []},"
"{\"name\": \"h2\", \"last_update\": \"1970-01-01 00:00:00 +0000\", "
"\"update_interval\": \"0s\", \"backends\": []}"
"]}" },
+ { { sdb_store_gt_matcher, SDB_FIELD_LAST_UPDATE,
+ { SDB_TYPE_DATETIME, { .datetime = 1 } } }, 0,
+ "{\"hosts\":["
+ "{\"name\": \"h2\", \"last_update\": \"1970-01-01 00:00:00 +0000\", "
+ "\"update_interval\": \"0s\", \"backends\": [], "
+ "\"attributes\": [], "
+ "\"services\": ["
+ "{\"name\": \"s2\", "
+ "\"last_update\": \"1970-01-01 00:00:00 +0000\", "
+ "\"update_interval\": \"0s\", \"backends\": [], "
+ "\"attributes\": ["
+ "{\"name\": \"k1\", \"value\": 123, "
+ "\"last_update\": \"1970-01-01 00:00:00 +0000\", "
+ "\"update_interval\": \"0s\", \"backends\": []},"
+ "]}"
+ "]}"
+ "]}" },
+ { { sdb_store_le_matcher, SDB_FIELD_LAST_UPDATE,
+ { SDB_TYPE_DATETIME, { .datetime = 1 } } }, 0,
+ "{\"hosts\":["
+ "{\"name\": \"h1\", \"last_update\": \"1970-01-01 00:00:00 +0000\", "
+ "\"update_interval\": \"0s\", \"backends\": [], "
+ "\"attributes\": ["
+ "{\"name\": \"k1\", \"value\": \"v1\", "
+ "\"last_update\": \"1970-01-01 00:00:00 +0000\", "
+ "\"update_interval\": \"0s\", \"backends\": []},"
+ "], "
+ "\"services\": []}"
+ "]}" },
+ { { sdb_store_ge_matcher, SDB_FIELD_LAST_UPDATE,
+ { SDB_TYPE_DATETIME, { .datetime = 3 } } }, 0,
+ "{\"hosts\":["
+ "{\"name\": \"h2\", \"last_update\": \"1970-01-01 00:00:00 +0000\", "
+ "\"update_interval\": \"0s\", \"backends\": [], "
+ "\"attributes\": [], "
+ "\"services\": []}"
+ "]}" },
};
buf = sdb_strbuf_create(0);
populate();
for (i = 0; i < SDB_STATIC_ARRAY_LEN(golden_data); ++i) {
+ sdb_store_matcher_t *filter = NULL;
int status;
sdb_strbuf_clear(buf);
- status = sdb_store_tojson(buf, golden_data[i].flags);
+ if (golden_data[i].filter.m) {
+ sdb_store_expr_t *expr;
+ sdb_store_cond_t *c = NULL;
+
+ expr = sdb_store_expr_constvalue(&golden_data[i].filter.value);
+ fail_unless(expr != NULL,
+ "INTERNAL ERROR: sdb_store_expr_constvalue() = NULL");
+ c = sdb_store_obj_cond(golden_data[i].filter.field, expr);
+ sdb_object_deref(SDB_OBJ(expr));
+ fail_unless(c != NULL,
+ "INTERNAL ERROR: sdb_store_obj_cond() = NULL");
+ filter = golden_data[i].filter.m(c);
+ sdb_object_deref(SDB_OBJ(c));
+ fail_unless(filter != NULL,
+ "INTERNAL ERROR: sdb_store_*_matcher() = NULL");
+ }
+
+ status = sdb_store_tojson(buf, filter, golden_data[i].flags);
fail_unless(status == 0,
"sdb_store_tojson(%x) = %d; expected: 0",
golden_data[i].flags, status);
verify_json_output(buf, golden_data[i].expected, golden_data[i].flags);
+ sdb_object_deref(SDB_OBJ(filter));
}
sdb_strbuf_destroy(buf);
}
fail_unless(host->interval == 10,
"sdb_store_host() did not calculate interval correctly: "
- "got: %"PRIscTIME"; expected: %"PRIscTIME, host->interval, 10);
+ "got: %"PRIsdbTIME"; expected: %"PRIsdbTIME, host->interval, 10);
/* multiple updates for the same timestamp don't modify the interval */
sdb_store_host("host", 40);
fail_unless(host->interval == 10,
"sdb_store_host() changed interval when doing multiple updates "
- "using the same timestamp; got: %"PRIscTIME"; "
- "expected: %"PRIscTIME, host->interval, 10);
+ "using the same timestamp; got: %"PRIsdbTIME"; "
+ "expected: %"PRIsdbTIME, host->interval, 10);
/* multiple updates using an timestamp don't modify the interval */
sdb_store_host("host", 20);
fail_unless(host->interval == 10,
"sdb_store_host() changed interval when doing multiple updates "
- "using an old timestamp; got: %"PRIscTIME"; expected: %"PRIscTIME,
+ "using an old timestamp; got: %"PRIsdbTIME"; expected: %"PRIsdbTIME,
host->interval, 10);
/* new interval: 20 us */
sdb_store_host("host", 60);
fail_unless(host->interval == 11,
"sdb_store_host() did not calculate interval correctly: "
- "got: %"PRIscTIME"; expected: %"PRIscTIME, host->interval, 11);
+ "got: %"PRIsdbTIME"; expected: %"PRIsdbTIME, host->interval, 11);
/* new interval: 40 us */
sdb_store_host("host", 100);
fail_unless(host->interval == 13,
"sdb_store_host() did not calculate interval correctly: "
- "got: %"PRIscTIME"; expected: %"PRIscTIME, host->interval, 11);
+ "got: %"PRIsdbTIME"; expected: %"PRIsdbTIME, host->interval, 11);
sdb_object_deref(SDB_OBJ(host));
}