![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index c056ac7c6d23e132f4a32d83a82ac2dc61173952..ddf5ff29a1bb62385fc3f7158cc8e8d22a4fbd8c 100644 (file)
--- a/t/unit/core/store_test.c
+++ b/t/unit/core/store_test.c
sdb_store_attribute("h1", "k2", &datum, 1);
sdb_store_attribute("h1", "k3", &datum, 2);
- sdb_store_metric("h1", "m1", 2);
- sdb_store_metric("h1", "m2", 1);
+ sdb_store_metric("h1", "m1", /* store */ NULL, 2);
+ sdb_store_metric("h1", "m2", /* store */ NULL, 1);
sdb_store_service("h2", "s1", 1);
sdb_store_service("h2", "s2", 2);
START_TEST(test_store_metric)
{
+ sdb_metric_store_t store1 = { "dummy-type1", "dummy-id1" };
+ sdb_metric_store_t store2 = { "dummy-type2", "dummy-id2" };
+
struct {
const char *host;
const char *metric;
+ sdb_metric_store_t *store;
sdb_time_t last_update;
int expected;
} golden_data[] = {
- { "k", "m", 1, -1 },
- { "k", "m", 1, -1 }, /* retry to ensure the host is not created */
- { "l", "m1", 1, 0 },
- { "l", "m1", 2, 0 },
- { "l", "m1", 2, 1 },
- { "l", "m2", 1, 0 },
- { "m", "m", 1, 0 },
- { "m", "m", 1, 1 },
+ { "k", "m", NULL, 1, -1 },
+ { "k", "m", NULL, 1, -1 }, /* retry to ensure the host is not created */
+ { "k", "m", &store1, 1, -1 },
+ { "l", "m1", NULL, 1, 0 },
+ { "l", "m1", &store1, 2, 0 },
+ { "l", "m1", &store1, 3, 0 },
+ { "l", "m1", NULL, 3, 1 },
+ { "l", "m2", &store1, 1, 0 },
+ { "l", "m2", &store2, 2, 0 },
+ { "l", "m2", NULL, 3, 0 },
+ { "m", "m", &store1, 1, 0 },
+ { "m", "m", NULL, 2, 0 },
+ { "m", "m", NULL, 2, 1 },
+ { "m", "m", &store1, 3, 0 },
+ { "m", "m", &store2, 4, 0 },
+ { "m", "m", NULL, 5, 0 },
};
size_t i;
int status;
status = sdb_store_metric(golden_data[i].host,
- golden_data[i].metric, golden_data[i].last_update);
+ golden_data[i].metric, golden_data[i].store,
+ golden_data[i].last_update);
fail_unless(status == golden_data[i].expected,
- "sdb_store_metric(%s, %s, %d) = %d; expected: %d",
+ "sdb_store_metric(%s, %s, %p, %d) = %d; expected: %d",
golden_data[i].host, golden_data[i].metric,
- golden_data[i].last_update, status, golden_data[i].expected);
+ golden_data[i].store, golden_data[i].last_update,
+ status, golden_data[i].expected);
}
}
END_TEST
sdb_store_host("m", 1);
sdb_store_host("l", 1);
- sdb_store_metric("m", "m1", 1);
- sdb_store_metric("l", "m1", 1);
- sdb_store_metric("l", "m2", 1);
+ sdb_store_metric("m", "m1", NULL, 1);
+ sdb_store_metric("l", "m1", NULL, 1);
+ sdb_store_metric("l", "m2", NULL, 1);
for (i = 0; i < SDB_STATIC_ARRAY_LEN(golden_data); ++i) {
int status;
static void
verify_json_output(sdb_strbuf_t *buf, const char *expected,
- const char *filter_str, int flags)
+ sdb_store_matcher_t *filter, int flags)
{
int pos;
size_t len1, len2;
}
fail_unless(pos == -1,
- "sdb_store_tojson(<buf>, %s, %x) returned unexpected result\n"
+ "sdb_store_tojson(<buf>, %p, %x) returned unexpected result\n"
" got: %s\n %*s\n expected: %s",
- filter_str, flags, sdb_strbuf_string(buf), pos + 1, "^",
+ filter, flags, sdb_strbuf_string(buf), pos + 1, "^",
expected);
} /* verify_json_output */
const char *expected;
} golden_data[] = {
{ { NULL, 0, SDB_DATA_INIT }, 0,
- "{\"hosts\":["
+ "["
"{\"name\": \"h1\", \"last_update\": \"1970-01-01 00:00:00 +0000\", "
"\"update_interval\": \"0s\", \"backends\": [], "
"\"attributes\": ["
"\"update_interval\": \"0s\", \"backends\": []}"
"]}"
"]}"
- "]}" },
+ "]" },
{ { NULL, 0, SDB_DATA_INIT }, SDB_SKIP_SERVICES,
- "{\"hosts\":["
+ "["
"{\"name\": \"h1\", \"last_update\": \"1970-01-01 00:00:00 +0000\", "
"\"update_interval\": \"0s\", \"backends\": [], "
"\"attributes\": ["
"\"update_interval\": \"0s\", \"backends\": [], "
"\"attributes\": [], "
"\"metrics\": []}"
- "]}" },
+ "]" },
{ { NULL, 0, SDB_DATA_INIT }, SDB_SKIP_METRICS,
- "{\"hosts\":["
+ "["
"{\"name\": \"h1\", \"last_update\": \"1970-01-01 00:00:00 +0000\", "
"\"update_interval\": \"0s\", \"backends\": [], "
"\"attributes\": ["
"\"update_interval\": \"0s\", \"backends\": []}"
"]}"
"]}"
- "]}" },
+ "]" },
{ { NULL, 0, SDB_DATA_INIT }, SDB_SKIP_ATTRIBUTES,
- "{\"hosts\":["
+ "["
"{\"name\": \"h1\", \"last_update\": \"1970-01-01 00:00:00 +0000\", "
"\"update_interval\": \"0s\", \"backends\": [], "
"\"metrics\": ["
"\"last_update\": \"1970-01-01 00:00:00 +0000\", "
"\"update_interval\": \"0s\", \"backends\": []}"
"]}"
- "]}" },
+ "]" },
{ { NULL, 0, SDB_DATA_INIT }, SDB_SKIP_ALL,
- "{\"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_eq_matcher, SDB_FIELD_NAME,
+ { SDB_TYPE_STRING, { .string = "h1" } } }, 0,
+ "["
+ "{\"name\": \"h1\", \"last_update\": \"1970-01-01 00:00:00 +0000\", "
+ "\"update_interval\": \"0s\", \"backends\": [], "
+ "\"attributes\": [], \"metrics\": [], \"services\": []}"
+ "]" },
{ { 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\": [], "
"\"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\": ["
"\"attributes\": []}"
"], "
"\"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\": [], "
"\"metrics\": [], "
"\"services\": []}"
- "]}" },
+ "]" },
};
buf = sdb_strbuf_create(0);
for (i = 0; i < SDB_STATIC_ARRAY_LEN(golden_data); ++i) {
sdb_store_matcher_t *filter = NULL;
- char filter_str[1024] = "<none>";
int status;
sdb_strbuf_clear(buf);
sdb_object_deref(SDB_OBJ(c));
fail_unless(filter != NULL,
"INTERNAL ERROR: sdb_store_*_matcher() = NULL");
-
- if (sdb_store_matcher_tostring(filter,
- filter_str, sizeof(filter_str)))
- snprintf(filter_str, sizeof(filter_str), "ERR");
}
status = sdb_store_tojson(buf, filter, golden_data[i].flags);
fail_unless(status == 0,
- "sdb_store_tojson(<buf>, %s, %x) = %d; expected: 0",
- filter_str, golden_data[i].flags, status);
+ "sdb_store_tojson(<buf>, %p, %x) = %d; expected: 0",
+ filter, golden_data[i].flags, status);
verify_json_output(buf, golden_data[i].expected,
- filter_str, golden_data[i].flags);
+ filter, golden_data[i].flags);
sdb_object_deref(SDB_OBJ(filter));
}
sdb_strbuf_destroy(buf);
fail_unless(check < 0,
"sdb_store_get_field(NULL, SDB_FIELD_LAST_UPDATE, NULL) = %d; "
"expected: <0");
- check = sdb_store_get_field(host, SDB_FIELD_LAST_UPDATE, NULL);
- fail_unless(check < 0,
- "sdb_store_get_field(<host>, SDB_FIELD_LAST_UPDATE, NULL) = %d; "
- "expected: <0");
check = sdb_store_get_field(NULL, SDB_FIELD_LAST_UPDATE, &value);
fail_unless(check < 0,
"sdb_store_get_field(NULL, SDB_FIELD_LAST_UPDATE, <value>) = %d; "
"expected: <0");
+ check = sdb_store_get_field(host, SDB_FIELD_LAST_UPDATE, NULL);
+ fail_unless(check == 0,
+ "sdb_store_get_field(<host>, SDB_FIELD_LAST_UPDATE, NULL) = %d; "
+ "expected: 0");
+ /* 'name' is dynamically allocated; make sure it's not leaked even
+ * if there is no result parameter */
+ check = sdb_store_get_field(host, SDB_FIELD_NAME, NULL);
+ fail_unless(check == 0,
+ "sdb_store_get_field(<host>, SDB_FIELD_LAST_UPDATE, NULL) = %d; "
+ "expected: 0");
+
+ check = sdb_store_get_field(host, SDB_FIELD_NAME, &value);
+ fail_unless(check == 0,
+ "sdb_store_get_field(<host>, SDB_FIELD_NAME, <value>) = "
+ "%d; expected: 0");
+ fail_unless((value.type == SDB_TYPE_STRING)
+ && (! strcmp(value.data.string, "host")),
+ "sdb_store_get_field(<host>, SDB_FIELD_NAME, <value>) "
+ "returned value {%d, %s}; expected {%d, host}",
+ value.type, value.data.string, SDB_TYPE_STRING);
+ sdb_data_free_datum(&value);
+
check = sdb_store_get_field(host, SDB_FIELD_LAST_UPDATE, &value);
fail_unless(check == 0,
"sdb_store_get_field(<host>, SDB_FIELD_LAST_UPDATE, <value>) = "
"sdb_store_get_field(<host>, SDB_FIELD_INTERVAL, <value>) "
"returned value {%d, %lu}; expected {%d, 10}",
value.type, value.data.datetime, SDB_TYPE_DATETIME);
+
+ check = sdb_store_get_field(host, SDB_FIELD_BACKEND, &value);
+ fail_unless(check == 0,
+ "sdb_store_get_field(<host>, SDB_FIELD_BACKEND, <value>) = "
+ "%d; expected: 0");
+ /* there are no backends in this test */
+ fail_unless((value.type == (SDB_TYPE_ARRAY | SDB_TYPE_STRING))
+ && (value.data.array.length == 0)
+ && (value.data.array.values == NULL),
+ "sdb_store_get_field(<host>, SDB_FIELD_BACKEND, <value>) "
+ "returned value {%d, %lu, %p}; expected {%d, 0, NULL}",
+ value.type, value.data.array.length, value.data.array.values,
+ SDB_TYPE_ARRAY | SDB_TYPE_STRING);
}
END_TEST