![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index 1eb5262ffaa758c2e49be9489ad2b93094acc9d6..6d528dede366fe9bce639e9e6eb10eba4cb7a268 100644 (file)
--- a/t/unit/core/store_test.c
+++ b/t/unit/core/store_test.c
# include "config.h"
#endif
+#include "core/plugin.h"
#include "core/store.h"
#include "core/store-private.h"
#include "testutils.h"
#include <string.h>
#include <strings.h>
+static void
+init(void)
+{
+ sdb_store_init();
+}
+
static void
populate(void)
{
sdb_data_t datum;
- sdb_store_host("h1", 1);
- sdb_store_host("h2", 3);
+ sdb_plugin_store_host("h1", 1);
+ sdb_plugin_store_host("h2", 3);
datum.type = SDB_TYPE_STRING;
datum.data.string = "v1";
- sdb_store_attribute("h1", "k1", &datum, 1);
+ sdb_plugin_store_attribute("h1", "k1", &datum, 1);
datum.data.string = "v2";
- sdb_store_attribute("h1", "k2", &datum, 2);
+ sdb_plugin_store_attribute("h1", "k2", &datum, 2);
datum.data.string = "v3";
- sdb_store_attribute("h1", "k3", &datum, 2);
+ sdb_plugin_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_plugin_store_attribute("h1", "k2", &datum, 1);
+ sdb_plugin_store_attribute("h1", "k3", &datum, 2);
- sdb_store_metric("h1", "m1", /* store */ NULL, 2);
- sdb_store_metric("h1", "m2", /* store */ NULL, 1);
- sdb_store_metric("h2", "m1", /* store */ NULL, 1);
+ sdb_plugin_store_metric("h1", "m1", /* store */ NULL, 2);
+ sdb_plugin_store_metric("h1", "m2", /* store */ NULL, 1);
+ sdb_plugin_store_metric("h2", "m1", /* store */ NULL, 1);
- sdb_store_service("h2", "s1", 1);
- sdb_store_service("h2", "s2", 2);
+ sdb_plugin_store_service("h2", "s1", 1);
+ sdb_plugin_store_service("h2", "s2", 2);
datum.type = SDB_TYPE_INTEGER;
datum.data.integer = 42;
- sdb_store_metric_attr("h1", "m1", "k3", &datum, 2);
+ sdb_plugin_store_metric_attribute("h1", "m1", "k3", &datum, 2);
datum.data.integer = 123;
- sdb_store_service_attr("h2", "s2", "k1", &datum, 2);
+ sdb_plugin_store_service_attribute("h2", "s2", "k1", &datum, 2);
datum.data.integer = 4711;
- sdb_store_service_attr("h2", "s2", "k2", &datum, 1);
+ sdb_plugin_store_service_attribute("h2", "s2", "k2", &datum, 1);
/* don't overwrite k1 */
datum.data.integer = 666;
- sdb_store_service_attr("h2", "s2", "k1", &datum, 2);
+ sdb_plugin_store_service_attribute("h2", "s2", "k1", &datum, 2);
} /* populate */
START_TEST(test_store_host)
struct {
const char *name;
- _Bool has;
+ bool have;
} golden_hosts[] = {
{ "a", 1 == 1 },
{ "b", 1 == 1 },
for (i = 0; i < SDB_STATIC_ARRAY_LEN(golden_data); ++i) {
int status;
- status = sdb_store_host(golden_data[i].name,
+ status = sdb_plugin_store_host(golden_data[i].name,
golden_data[i].last_update);
fail_unless(status == golden_data[i].expected,
- "sdb_store_host(%s, %d) = %d; expected: %d",
+ "sdb_plugin_store_host(%s, %d) = %d; expected: %d",
golden_data[i].name, (int)golden_data[i].last_update,
status, golden_data[i].expected);
}
for (i = 0; i < SDB_STATIC_ARRAY_LEN(golden_hosts); ++i) {
- _Bool has;
-
- has = sdb_store_has_host(golden_hosts[i].name);
- fail_unless(has == golden_hosts[i].has,
- "sdb_store_has_host(%s) = %d; expected: %d",
- golden_hosts[i].name, has, golden_hosts[i].has);
+ sdb_store_obj_t *have;
+
+ have = sdb_store_get_host(golden_hosts[i].name);
+ fail_unless((have != NULL) == golden_hosts[i].have,
+ "sdb_store_get_host(%s) = %p; expected: %s",
+ golden_hosts[i].name, have,
+ golden_hosts[i].have ? "<host>" : "NULL");
+ sdb_object_deref(SDB_OBJ(have));
}
}
END_TEST
size_t i;
for (i = 0; i < SDB_STATIC_ARRAY_LEN(golden_hosts); ++i) {
- int status = sdb_store_host(golden_hosts[i], 1);
+ int status = sdb_plugin_store_host(golden_hosts[i], 1);
fail_unless(status >= 0,
- "sdb_store_host(%s) = %d; expected: >=0",
+ "sdb_plugin_store_host(%s) = %d; expected: >=0",
golden_hosts[i], status);
}
sdb_store_obj_t *sobj1, *sobj2;
int ref_cnt;
- fail_unless(sdb_store_has_host(golden_hosts[i]),
- "sdb_store_has_host(%s) = FALSE; expected: TRUE",
- golden_hosts[i]);
-
sobj1 = sdb_store_get_host(golden_hosts[i]);
fail_unless(sobj1 != NULL,
"sdb_store_get_host(%s) = NULL; expected: <host>",
for (i = 0; i < SDB_STATIC_ARRAY_LEN(unknown_hosts); ++i) {
sdb_store_obj_t *sobj;
- fail_unless(!sdb_store_has_host(unknown_hosts[i]),
- "sdb_store_has_host(%s) = TRUE; expected: FALSE",
- unknown_hosts[i]);
-
sobj = sdb_store_get_host(unknown_hosts[i]);
fail_unless(!sobj, "sdb_store_get_host(%s) = <host:%s>; expected: NULL",
unknown_hosts[i], sobj ? SDB_OBJ(sobj)->name : "NULL");
size_t i;
- sdb_store_host("l", 1);
- sdb_store_host("m", 1);
+ sdb_plugin_store_host("l", 1);
+ sdb_plugin_store_host("m", 1);
for (i = 0; i < SDB_STATIC_ARRAY_LEN(golden_data); ++i) {
sdb_data_t datum;
int status;
datum.type = SDB_TYPE_STRING;
datum.data.string = golden_data[i].value;
- status = sdb_store_attribute(golden_data[i].host,
+ status = sdb_plugin_store_attribute(golden_data[i].host,
golden_data[i].key, &datum,
golden_data[i].last_update);
fail_unless(status == golden_data[i].expected,
- "sdb_store_attribute(%s, %s, %s, %d) = %d; expected: %d",
+ "sdb_plugin_store_attribute(%s, %s, %s, %d) = %d; expected: %d",
golden_data[i].host, golden_data[i].key, golden_data[i].value,
golden_data[i].last_update, status, golden_data[i].expected);
}
size_t i;
- sdb_store_host("m", 1);
- sdb_store_host("l", 1);
+ sdb_plugin_store_host("m", 1);
+ sdb_plugin_store_host("l", 1);
for (i = 0; i < SDB_STATIC_ARRAY_LEN(golden_data); ++i) {
int status;
- status = sdb_store_metric(golden_data[i].host,
+ status = sdb_plugin_store_metric(golden_data[i].host,
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, %p, %d) = %d; expected: %d",
+ "sdb_plugin_store_metric(%s, %s, %p, %d) = %d; expected: %d",
golden_data[i].host, golden_data[i].metric,
golden_data[i].store, golden_data[i].last_update,
status, golden_data[i].expected);
size_t i;
- sdb_store_host("m", 1);
- sdb_store_host("l", 1);
- sdb_store_metric("m", "m1", NULL, 1);
- sdb_store_metric("l", "m1", NULL, 1);
- sdb_store_metric("l", "m2", NULL, 1);
+ sdb_plugin_store_host("m", 1);
+ sdb_plugin_store_host("l", 1);
+ sdb_plugin_store_metric("m", "m1", NULL, 1);
+ sdb_plugin_store_metric("l", "m1", NULL, 1);
+ sdb_plugin_store_metric("l", "m2", NULL, 1);
for (i = 0; i < SDB_STATIC_ARRAY_LEN(golden_data); ++i) {
int status;
- status = sdb_store_metric_attr(golden_data[i].host,
+ status = sdb_plugin_store_metric_attribute(golden_data[i].host,
golden_data[i].metric, golden_data[i].attr,
&golden_data[i].value, golden_data[i].last_update);
fail_unless(status == golden_data[i].expected,
- "sdb_store_metric_attr(%s, %s, %s, %d, %d) = %d; "
+ "sdb_plugin_store_metric_attribute(%s, %s, %s, %d, %d) = %d; "
"expected: %d", golden_data[i].host, golden_data[i].metric,
golden_data[i].attr, golden_data[i].value.data.integer,
golden_data[i].last_update, status, golden_data[i].expected);
size_t i;
- sdb_store_host("m", 1);
- sdb_store_host("l", 1);
+ sdb_plugin_store_host("m", 1);
+ sdb_plugin_store_host("l", 1);
for (i = 0; i < SDB_STATIC_ARRAY_LEN(golden_data); ++i) {
int status;
- status = sdb_store_service(golden_data[i].host,
+ status = sdb_plugin_store_service(golden_data[i].host,
golden_data[i].svc, golden_data[i].last_update);
fail_unless(status == golden_data[i].expected,
- "sdb_store_service(%s, %s, %d) = %d; expected: %d",
+ "sdb_plugin_store_service(%s, %s, %d) = %d; expected: %d",
golden_data[i].host, golden_data[i].svc,
golden_data[i].last_update, status, golden_data[i].expected);
}
size_t i;
- sdb_store_host("m", 1);
- sdb_store_host("l", 1);
- sdb_store_service("m", "s1", 1);
- sdb_store_service("l", "s1", 1);
- sdb_store_service("l", "s2", 1);
+ sdb_plugin_store_host("m", 1);
+ sdb_plugin_store_host("l", 1);
+ sdb_plugin_store_service("m", "s1", 1);
+ sdb_plugin_store_service("l", "s1", 1);
+ sdb_plugin_store_service("l", "s2", 1);
for (i = 0; i < SDB_STATIC_ARRAY_LEN(golden_data); ++i) {
int status;
- status = sdb_store_service_attr(golden_data[i].host,
+ status = sdb_plugin_store_service_attribute(golden_data[i].host,
golden_data[i].svc, golden_data[i].attr,
&golden_data[i].value, golden_data[i].last_update);
fail_unless(status == golden_data[i].expected,
- "sdb_store_service_attr(%s, %s, %s, %d, %d) = %d; "
+ "sdb_plugin_store_service_attribute(%s, %s, %s, %d, %d) = %d; "
"expected: %d", golden_data[i].host, golden_data[i].svc,
golden_data[i].attr, golden_data[i].value.data.integer,
golden_data[i].last_update, status, golden_data[i].expected);
static struct {
const char *hostname;
+ const char *attr; /* optional */
int field;
int expected;
sdb_data_t value;
} get_field_data[] = {
- { NULL, 0, -1, { SDB_TYPE_NULL, { 0 } } },
- { NULL, SDB_FIELD_LAST_UPDATE, -1, { SDB_TYPE_NULL, { 0 } } },
- { NULL, SDB_FIELD_NAME, -1, { SDB_TYPE_NULL, { 0 } } },
- { "host", SDB_FIELD_LAST_UPDATE, 0, { SDB_TYPE_DATETIME, { .datetime = 20 } } },
- { "host", SDB_FIELD_INTERVAL, 0, { SDB_TYPE_DATETIME, { .datetime = 10 } } },
+ { NULL, NULL, 0, -1, { SDB_TYPE_NULL, { 0 } } },
+ { NULL, NULL, SDB_FIELD_LAST_UPDATE, -1, { SDB_TYPE_NULL, { 0 } } },
+ { NULL, NULL, SDB_FIELD_INTERVAL, -1, { SDB_TYPE_NULL, { 0 } } },
+ { NULL, NULL, SDB_FIELD_AGE, -1, { SDB_TYPE_NULL, { 0 } } },
+ { NULL, NULL, SDB_FIELD_NAME, -1, { SDB_TYPE_NULL, { 0 } } },
+ { NULL, NULL, SDB_FIELD_BACKEND, -1, { SDB_TYPE_NULL, { 0 } } },
+ { NULL, NULL, SDB_FIELD_VALUE, -1, { SDB_TYPE_NULL, { 0 } } },
+ { "host", NULL, SDB_FIELD_LAST_UPDATE, 0, { SDB_TYPE_DATETIME, { .datetime = 20 } } },
+ { "host", NULL, SDB_FIELD_INTERVAL, 0, { SDB_TYPE_DATETIME, { .datetime = 10 } } },
/* the test will handle AGE specially */
- { "host", SDB_FIELD_AGE, 0, { SDB_TYPE_NULL, { 0 } } },
- { "host", SDB_FIELD_NAME, 0, { SDB_TYPE_STRING, { .string = "host" } } },
- { "host", SDB_FIELD_BACKEND, 0, { SDB_TYPE_ARRAY | SDB_TYPE_STRING, { .array = { 0, NULL } } } },
+ { "host", NULL, SDB_FIELD_AGE, 0, { SDB_TYPE_NULL, { 0 } } },
+ { "host", NULL, SDB_FIELD_NAME, 0, { SDB_TYPE_STRING, { .string = "host" } } },
+ { "host", NULL, SDB_FIELD_BACKEND, 0, { SDB_TYPE_ARRAY | SDB_TYPE_STRING, { .array = { 0, NULL } } } },
+ { "host", NULL, SDB_FIELD_VALUE, -1, { SDB_TYPE_NULL, { 0 } } },
+ { "host", "attr", SDB_FIELD_LAST_UPDATE, 0, { SDB_TYPE_DATETIME, { .datetime = 20 } } },
+ { "host", "attr", SDB_FIELD_INTERVAL, 0, { SDB_TYPE_DATETIME, { .datetime = 10 } } },
+ /* the test will handle AGE specially */
+ { "host", "attr", SDB_FIELD_AGE, 0, { SDB_TYPE_NULL, { 0 } } },
+ { "host", "attr", SDB_FIELD_NAME, 0, { SDB_TYPE_STRING, { .string = "attr" } } },
+ { "host", "attr", SDB_FIELD_BACKEND, 0, { SDB_TYPE_ARRAY | SDB_TYPE_STRING, { .array = { 0, NULL } } } },
+ { "host", "attr", SDB_FIELD_VALUE, 0, { SDB_TYPE_INTEGER, { .integer = 1 } } },
+ { "host", "attr", SDB_FIELD_VALUE, 0, { SDB_TYPE_DECIMAL, { .decimal = 2.0 } } },
+ { "host", "attr", SDB_FIELD_VALUE, 0, { SDB_TYPE_STRING, { .string = "foo" } } },
+ { "host", "attr", SDB_FIELD_VALUE, 0, { SDB_TYPE_DATETIME, { .datetime = 1234567890L } } },
+ { "host", "a", SDB_FIELD_LAST_UPDATE, -1, { SDB_TYPE_NULL, { 0 } } },
+ { "host", "a", SDB_FIELD_INTERVAL, -1, { SDB_TYPE_NULL, { 0 } } },
+ { "host", "a", SDB_FIELD_AGE, -1, { SDB_TYPE_NULL, { 0 } } },
+ { "host", "a", SDB_FIELD_NAME, -1, { SDB_TYPE_NULL, { 0 } } },
+ { "host", "a", SDB_FIELD_BACKEND, -1, { SDB_TYPE_NULL, { 0 } } },
+ { "host", "a", SDB_FIELD_VALUE, -1, { SDB_TYPE_NULL, { 0 } } },
+ { "host", "a", SDB_FIELD_VALUE, -1, { SDB_TYPE_NULL, { 0 } } },
+ { "host", "a", SDB_FIELD_VALUE, -1, { SDB_TYPE_NULL, { 0 } } },
+ { "host", "a", SDB_FIELD_VALUE, -1, { SDB_TYPE_NULL, { 0 } } },
};
+/* returns a tuple <type> <name> */
+#define OBJ_NAME(obj) \
+ (obj) ? SDB_STORE_TYPE_TO_NAME(obj->type) : "NULL", \
+ (obj) ? SDB_OBJ(obj)->name : ""
START_TEST(test_get_field)
{
- sdb_store_obj_t *host = NULL;
+ sdb_store_obj_t *obj = NULL;
sdb_data_t value = SDB_DATA_INIT;
char value_str[128], expected_value_str[128];
sdb_time_t now = sdb_gettime();
int check;
- sdb_store_host("host", 10);
- sdb_store_host("host", 20);
+ sdb_plugin_store_host("host", 10);
+ sdb_plugin_store_host("host", 20);
+ sdb_plugin_store_attribute("host", "attr", &get_field_data[_i].value, 10);
+ sdb_plugin_store_attribute("host", "attr", &get_field_data[_i].value, 20);
if (get_field_data[_i].hostname) {
- host = sdb_store_get_host(get_field_data[_i].hostname);
- ck_assert(host != NULL);
+ obj = sdb_store_get_host(get_field_data[_i].hostname);
+ ck_assert(obj != NULL);
+
+ if (get_field_data[_i].attr) {
+ sdb_store_obj_t *tmp = sdb_store_get_child(obj,
+ SDB_ATTRIBUTE, get_field_data[_i].attr);
+ sdb_object_deref(SDB_OBJ(obj));
+ obj = tmp;
+ }
}
- check = sdb_store_get_field(host, get_field_data[_i].field, NULL);
+ check = sdb_store_get_field(obj, get_field_data[_i].field, NULL);
fail_unless(check == get_field_data[_i].expected,
- "sdb_store_get_field(%s, %s, NULL) = %d; expected: %d",
- host ? "<host>" : "NULL", SDB_FIELD_TO_NAME(get_field_data[_i].field),
+ "sdb_store_get_field(%s %s, %s, NULL) = %d; expected: %d",
+ OBJ_NAME(obj), SDB_FIELD_TO_NAME(get_field_data[_i].field),
check, get_field_data[_i].expected);
- check = sdb_store_get_field(host, get_field_data[_i].field, &value);
+ check = sdb_store_get_field(obj, get_field_data[_i].field, &value);
fail_unless(check == get_field_data[_i].expected,
- "sdb_store_get_field(%s, %s, <value>) = %d; expected: %d",
- host ? "<host>" : "NULL", SDB_FIELD_TO_NAME(get_field_data[_i].field),
+ "sdb_store_get_field(%s %s, %s, <value>) = %d; expected: %d",
+ OBJ_NAME(obj), SDB_FIELD_TO_NAME(get_field_data[_i].field),
check, get_field_data[_i].expected);
- if (get_field_data[_i].expected)
+ if (get_field_data[_i].expected) {
+ sdb_object_deref(SDB_OBJ(obj));
return;
+ }
if (get_field_data[_i].field == SDB_FIELD_AGE) {
get_field_data[_i].value.type = SDB_TYPE_DATETIME;
if (get_field_data[_i].field == SDB_FIELD_AGE) {
fail_unless((value.type == SDB_TYPE_DATETIME)
&& (value.data.datetime >= now),
- "sdb_store_get_field(<host>, %s, <value>) "
- "returned value %s; expected >=%s",
+ "sdb_store_get_field(%s %s, %s, <value>) "
+ "returned value %s; expected >=%s", OBJ_NAME(obj),
SDB_FIELD_TO_NAME(get_field_data[_i].field),
value_str, expected_value_str);
}
else {
fail_unless(! sdb_data_cmp(&value, &get_field_data[_i].value),
- "sdb_store_get_field(<host>, %s, <value>) "
- "returned value %s; expected %s",
+ "sdb_store_get_field(%s %s, %s, <value>) "
+ "returned value %s; expected %s", OBJ_NAME(obj),
SDB_FIELD_TO_NAME(get_field_data[_i].field),
value_str, expected_value_str);
}
sdb_data_free_datum(&value);
+ sdb_object_deref(SDB_OBJ(obj));
}
END_TEST
+#undef OBJ_NAME
START_TEST(test_get_child)
{
sdb_store_obj_t *host;
/* 10 us interval */
- sdb_store_host("host", 10);
- sdb_store_host("host", 20);
- sdb_store_host("host", 30);
- sdb_store_host("host", 40);
+ sdb_plugin_store_host("host", 10);
+ sdb_plugin_store_host("host", 20);
+ sdb_plugin_store_host("host", 30);
+ sdb_plugin_store_host("host", 40);
host = sdb_store_get_host("host");
fail_unless(host != NULL,
"INTERNAL ERROR: store doesn't have host after adding it");
fail_unless(host->interval == 10,
- "sdb_store_host() did not calculate interval correctly: "
+ "sdb_plugin_store_host() did not calculate interval correctly: "
"got: %"PRIsdbTIME"; expected: %"PRIsdbTIME, host->interval, 10);
/* multiple updates for the same timestamp don't modify the interval */
- sdb_store_host("host", 40);
- sdb_store_host("host", 40);
- sdb_store_host("host", 40);
- sdb_store_host("host", 40);
+ sdb_plugin_store_host("host", 40);
+ sdb_plugin_store_host("host", 40);
+ sdb_plugin_store_host("host", 40);
+ sdb_plugin_store_host("host", 40);
fail_unless(host->interval == 10,
- "sdb_store_host() changed interval when doing multiple updates "
+ "sdb_plugin_store_host() changed interval when doing multiple updates "
"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);
- sdb_store_host("host", 20);
- sdb_store_host("host", 20);
- sdb_store_host("host", 20);
+ sdb_plugin_store_host("host", 20);
+ sdb_plugin_store_host("host", 20);
+ sdb_plugin_store_host("host", 20);
+ sdb_plugin_store_host("host", 20);
fail_unless(host->interval == 10,
- "sdb_store_host() changed interval when doing multiple updates "
+ "sdb_plugin_store_host() changed interval when doing multiple updates "
"using an old timestamp; got: %"PRIsdbTIME"; expected: %"PRIsdbTIME,
host->interval, 10);
/* new interval: 20 us */
- sdb_store_host("host", 60);
+ sdb_plugin_store_host("host", 60);
fail_unless(host->interval == 11,
- "sdb_store_host() did not calculate interval correctly: "
+ "sdb_plugin_store_host() did not calculate interval correctly: "
"got: %"PRIsdbTIME"; expected: %"PRIsdbTIME, host->interval, 11);
/* new interval: 40 us */
- sdb_store_host("host", 100);
+ sdb_plugin_store_host("host", 100);
fail_unless(host->interval == 13,
- "sdb_store_host() did not calculate interval correctly: "
+ "sdb_plugin_store_host() did not calculate interval correctly: "
"got: %"PRIsdbTIME"; expected: %"PRIsdbTIME, host->interval, 11);
sdb_object_deref(SDB_OBJ(host));
tcase_add_test(tc, test_get_child);
tcase_add_test(tc, test_interval);
tcase_add_test(tc, test_scan);
- tcase_add_unchecked_fixture(tc, NULL, sdb_store_clear);
+ tcase_add_unchecked_fixture(tc, init, sdb_store_clear);
ADD_TCASE(tc);
}
TEST_MAIN_END