index d6a71e566aea8e0919819984cec6814d55ef0c82..65cbc62d04ed53a4858ab577007800970e50071c 100644 (file)
#include "frontend/parser.h"
#include "libsysdb_test.h"
#include "frontend/parser.h"
#include "libsysdb_test.h"
+#include <assert.h>
+
#include <check.h>
#include <string.h>
#include <check.h>
#include <string.h>
{
const char *hosts[] = { "a", "b", "c" };
{
const char *hosts[] = { "a", "b", "c" };
+ struct {
+ const char *host;
+ const char *metric;
+ } metrics[] = {
+ { "a", "m1" },
+ { "b", "m1" },
+ { "b", "m2" },
+ };
+
struct {
const char *host;
const char *service;
struct {
const char *host;
const char *service;
} attrs[] = {
{ "a", "k1", { SDB_TYPE_STRING, { .string = "v1" } } },
{ "a", "k2", { SDB_TYPE_INTEGER, { .integer = 123 } } },
} attrs[] = {
{ "a", "k1", { SDB_TYPE_STRING, { .string = "v1" } } },
{ "a", "k2", { SDB_TYPE_INTEGER, { .integer = 123 } } },
+ { "b", "k1", { SDB_TYPE_STRING, { .string = "v2" } } },
};
size_t i;
};
size_t i;
hosts[i], status);
}
hosts[i], status);
}
+ for (i = 0; i < SDB_STATIC_ARRAY_LEN(metrics); ++i) {
+ int status = sdb_store_metric(metrics[i].host,
+ metrics[i].metric, /* store */ NULL, 1);
+ fail_unless(status == 0,
+ "sdb_store_metric(%s, %s, NULL, 1) = %d; expected: 0",
+ metrics[i].host, metrics[i].metric, status);
+ }
+
for (i = 0; i < SDB_STATIC_ARRAY_LEN(services); ++i) {
int status = sdb_store_service(services[i].host,
services[i].service, 1);
for (i = 0; i < SDB_STATIC_ARRAY_LEN(services); ++i) {
int status = sdb_store_service(services[i].host,
services[i].service, 1);
}
} /* populate */
}
} /* populate */
-START_TEST(test_store_match_name)
+START_TEST(test_cmp_name)
{
{
- sdb_store_obj_t *obj;
+ sdb_store_obj_t *host;
struct {
int type;
struct {
int type;
- const char *name;
+ char *name;
_Bool re;
int expected;
} golden_data[] = {
_Bool re;
int expected;
} golden_data[] = {
- { SDB_HOST, NULL, 0, 1 },
- { SDB_HOST, NULL, 1, 1 },
{ SDB_HOST, "a", 0, 1 },
{ SDB_HOST, "a", 1, 1 },
{ SDB_HOST, "b", 0, 0 },
{ SDB_HOST, "a", 0, 1 },
{ SDB_HOST, "a", 1, 1 },
{ SDB_HOST, "b", 0, 0 },
{ SDB_HOST, "^b$", 1, 0 },
{ SDB_HOST, "^a$", 0, 0 },
{ SDB_HOST, "^b$", 0, 0 },
{ SDB_HOST, "^b$", 1, 0 },
{ SDB_HOST, "^a$", 0, 0 },
{ SDB_HOST, "^b$", 0, 0 },
- { SDB_SERVICE, NULL, 0, 1 },
- { SDB_SERVICE, NULL, 1, 1 },
+ { SDB_METRIC, "m1", 0, 1 },
+ { SDB_METRIC, "m1", 1, 1 },
+ { SDB_METRIC, "^m1$", 1, 1 },
+ { SDB_METRIC, "m", 1, 1 },
+ { SDB_METRIC, "s", 1, 0 },
+ { SDB_METRIC, "m2", 0, 0 },
+ { SDB_METRIC, "x1", 0, 0 },
+ { SDB_METRIC, "x1", 1, 0 },
{ SDB_SERVICE, "s1", 0, 1 },
{ SDB_SERVICE, "s2", 0, 1 },
{ SDB_SERVICE, "s3", 0, 0 },
{ SDB_SERVICE, "s1", 0, 1 },
{ SDB_SERVICE, "s2", 0, 1 },
{ SDB_SERVICE, "s3", 0, 0 },
{ SDB_SERVICE, "x1", 0, 0 },
{ SDB_SERVICE, "x1", 1, 0 },
{ SDB_SERVICE, "x", 1, 0 },
{ SDB_SERVICE, "x1", 0, 0 },
{ SDB_SERVICE, "x1", 1, 0 },
{ SDB_SERVICE, "x", 1, 0 },
- { SDB_ATTRIBUTE, NULL, 0, 1 },
- { SDB_ATTRIBUTE, NULL, 1, 1 },
{ SDB_ATTRIBUTE, "k1", 0, 1 },
{ SDB_ATTRIBUTE, "k2", 0, 1 },
{ SDB_ATTRIBUTE, "k3", 0, 0 },
{ SDB_ATTRIBUTE, "k1", 0, 1 },
{ SDB_ATTRIBUTE, "k2", 0, 1 },
{ SDB_ATTRIBUTE, "k3", 0, 0 },
size_t i;
size_t i;
- obj = sdb_store_get_host("a");
- fail_unless(obj != NULL,
+ host = sdb_store_get_host("a");
+ fail_unless(host != NULL,
"sdb_store_get_host(a) = NULL; expected: <host>");
for (i = 0; i < SDB_STATIC_ARRAY_LEN(golden_data); ++i) {
"sdb_store_get_host(a) = NULL; expected: <host>");
for (i = 0; i < SDB_STATIC_ARRAY_LEN(golden_data); ++i) {
+ sdb_data_t datum;
+ sdb_store_expr_t *obj, *value;
sdb_store_matcher_t *m, *n;
sdb_store_matcher_t *m, *n;
- char buf[1024];
int status;
int status;
- m = sdb_store_name_matcher(golden_data[i].type,
- golden_data[i].name, golden_data[i].re);
+ datum.type = SDB_TYPE_STRING;
+ datum.data.string = golden_data[i].name;
+
+ obj = sdb_store_expr_fieldvalue(SDB_FIELD_NAME);
+ fail_unless(obj != NULL,
+ "sdb_store_expr_fieldvalue(SDB_STORE_NAME) = NULL; "
+ "expected: <expr>");
+ value = sdb_store_expr_constvalue(&datum);
+ fail_unless(value != NULL,
+ "sdb_store_expr_constvalue(%s) = NULL; "
+ "expected: <expr>", golden_data[i].name);
+
+ if (golden_data[i].re)
+ m = sdb_store_regex_matcher(obj, value);
+ else
+ m = sdb_store_eq_matcher(obj, value);
+ if (golden_data[i].type != SDB_HOST) {
+ sdb_store_matcher_t *tmp;
+ tmp = sdb_store_child_matcher(golden_data[i].type, m);
+ sdb_object_deref(SDB_OBJ(m));
+ m = tmp;
+ }
+ sdb_object_deref(SDB_OBJ(obj));
+ sdb_object_deref(SDB_OBJ(value));
fail_unless(m != NULL,
fail_unless(m != NULL,
- "sdb_store_service_matcher(%d, %s, %d) = NULL; expected: <matcher>",
- golden_data[i].type, golden_data[i].name, golden_data[i].re);
+ "sdb_store_%s_matcher(%s, %s) = NULL; "
+ "expected: <matcher>",
+ golden_data[i].re ? "regex" : "eq",
+ SDB_STORE_TYPE_TO_NAME(golden_data[i].type),
+ golden_data[i].name);
- status = sdb_store_matcher_matches(m, obj);
+ status = sdb_store_matcher_matches(m, host, /* filter */ NULL);
fail_unless(status == golden_data[i].expected,
fail_unless(status == golden_data[i].expected,
- "sdb_store_matcher_matches(%s, <host a>) = %d; expected: %d",
- sdb_store_matcher_tostring(m, buf, sizeof(buf)),
- status, golden_data[i].expected);
+ "sdb_store_matcher_matches(%s->%s, <host a>, NULL) = %d; "
+ "expected: %d", SDB_STORE_TYPE_TO_NAME(golden_data[i].type),
+ golden_data[i].name, status, golden_data[i].expected);
n = sdb_store_inv_matcher(m);
fail_unless(n != NULL,
n = sdb_store_inv_matcher(m);
fail_unless(n != NULL,
sdb_object_deref(SDB_OBJ(m));
/* now match the inverted set of objects */
sdb_object_deref(SDB_OBJ(m));
/* now match the inverted set of objects */
- status = sdb_store_matcher_matches(n, obj);
+ status = sdb_store_matcher_matches(n, host, /* filter */ NULL);
fail_unless(status == !golden_data[i].expected,
fail_unless(status == !golden_data[i].expected,
- "sdb_store_matcher_matches(%s, <host a>) = %d; expected: %d",
- sdb_store_matcher_tostring(n, buf, sizeof(buf)),
- status, !golden_data[i].expected);
+ "sdb_store_matcher_matches(%s->%s, <host a>, NULL) = %d; "
+ "expected: %d", SDB_STORE_TYPE_TO_NAME(golden_data[i].type),
+ golden_data[i].name, status, !golden_data[i].expected);
sdb_object_deref(SDB_OBJ(n));
}
sdb_object_deref(SDB_OBJ(n));
}
- sdb_object_deref(SDB_OBJ(obj));
+ sdb_object_deref(SDB_OBJ(host));
}
END_TEST
}
END_TEST
-START_TEST(test_store_match_attr)
+START_TEST(test_cmp_attr)
{
{
- sdb_store_obj_t *obj;
+ sdb_store_obj_t *host;
struct {
struct {
- const char *attr_name;
- const char *attr_value;
- _Bool re;
-
- int expected;
+ const char *attr;
+ const sdb_data_t value;
+ int expected_lt, expected_le, expected_eq, expected_ge, expected_gt;
} golden_data[] = {
} golden_data[] = {
- { "k1", NULL, 0, 1 },
- { "k", NULL, 1, 0 },
- { "1", NULL, 1, 0 },
- { "k3", NULL, 0, 0 },
- { "k3", NULL, 1, 0 },
- { "k1", "v1", 0, 1 },
- { "k1", "v1", 1, 1 },
- { "k1", "^v1$", 1, 1 },
- { "k1", "v", 1, 1 },
- { "k1", "1", 1, 1 },
- { "k1", "v2", 0, 0 },
- { "k1", "v2", 1, 0 },
- { "k", "v1", 0, 0 },
- { "k", "v1", 1, 0 },
- { "k3", "1", 0, 0 },
- { "k3", "1", 1, 0 },
+ { "k1", { SDB_TYPE_STRING, { .string = "v1" } }, 0, 1, 1, 1, 0 },
+ { "k1", { SDB_TYPE_STRING, { .string = "v2" } }, 1, 1, 0, 0, 0 },
+ { "k1", { SDB_TYPE_STRING, { .string = "v0" } }, 0, 0, 0, 1, 1 },
+ { "k1", { SDB_TYPE_STRING, { .string = "0" } }, 0, 0, 0, 1, 1 },
+ { "k2", { SDB_TYPE_INTEGER, { .integer = 123 } }, 0, 1, 1, 1, 0 },
+ { "k2", { SDB_TYPE_INTEGER, { .integer = 124 } }, 1, 1, 0, 0, 0 },
+ { "k2", { SDB_TYPE_INTEGER, { .integer = 122 } }, 0, 0, 0, 1, 1 },
+ /* key does not exist */
+ { "k3", { SDB_TYPE_STRING, { .string = "v1" } }, 0, 0, 0, 0, 0 },
+ { "k3", { SDB_TYPE_STRING, { .string = "123" } }, 0, 0, 0, 0, 0 },
+ { "k3", { SDB_TYPE_INTEGER, { .integer = 123 } }, 0, 0, 0, 0, 0 },
+ /* type mismatch */
+ { "k1", { SDB_TYPE_INTEGER, { .integer = 0 } }, 0, 0, 0, 1, 1 },
+ { "k2", { SDB_TYPE_STRING, { .string = "123" } }, 0, 1, 1, 1, 0 },
};
};
+ int status;
size_t i;
size_t i;
- obj = sdb_store_get_host("a");
- fail_unless(obj != NULL,
+ host = sdb_store_get_host("a");
+ fail_unless(host != NULL,
"sdb_store_get_host(a) = NULL; expected: <host>");
"sdb_store_get_host(a) = NULL; expected: <host>");
- fail_unless(sdb_store_attr_matcher(NULL, "re", 0) == NULL,
- "sdb_store_attr_matcher(NULL, \"re\", 0) = <m>; expected: NULL");
- fail_unless(sdb_store_attr_matcher(NULL, "re", 1) == NULL,
- "sdb_store_attr_matcher(NULL, \"re\", 1) = <m>; expected: NULL");
-
for (i = 0; i < SDB_STATIC_ARRAY_LEN(golden_data); ++i) {
for (i = 0; i < SDB_STATIC_ARRAY_LEN(golden_data); ++i) {
- sdb_store_matcher_t *m, *n;
- char buf[1024];
- int status;
+ sdb_store_expr_t *attr;
+ sdb_store_expr_t *value;
+ char value_str[1024];
+ size_t j;
- m = sdb_store_attr_matcher(golden_data[i].attr_name,
- golden_data[i].attr_value, golden_data[i].re);
- fail_unless(m != NULL,
- "sdb_store_attr_matcher() = NULL; expected: <matcher>");
+ struct {
+ sdb_store_matcher_t *(*matcher)(sdb_store_expr_t *,
+ sdb_store_expr_t *);
+ int expected;
+ } tests[] = {
+ { sdb_store_lt_matcher, golden_data[i].expected_lt },
+ { sdb_store_le_matcher, golden_data[i].expected_le },
+ { sdb_store_eq_matcher, golden_data[i].expected_eq },
+ { sdb_store_ge_matcher, golden_data[i].expected_ge },
+ { sdb_store_gt_matcher, golden_data[i].expected_gt },
+ };
- status = sdb_store_matcher_matches(m, obj);
- fail_unless(status == golden_data[i].expected,
- "sdb_store_matcher_matches({%s, <host a>) = %d; expected: %d",
- sdb_store_matcher_tostring(m, buf, sizeof(buf)),
- status, golden_data[i].expected);
+ const char *op_str[] = { "<", "<=", "=", ">=", ">" };
+ assert(SDB_STATIC_ARRAY_LEN(tests) == SDB_STATIC_ARRAY_LEN(op_str));
- n = sdb_store_inv_matcher(m);
- fail_unless(n != NULL,
- "sdb_store_inv_matcher() = NULL; expected: <matcher>");
- sdb_object_deref(SDB_OBJ(m));
+ sdb_data_format(&golden_data[i].value,
+ value_str, sizeof(value_str), SDB_UNQUOTED);
- /* now match the inverted set of objects */
- status = sdb_store_matcher_matches(n, obj);
- fail_unless(status == !golden_data[i].expected,
- "sdb_store_matcher_matches({%s, <host a>) = %d; expected: %d",
- sdb_store_matcher_tostring(n, buf, sizeof(buf)),
- status, !golden_data[i].expected);
+ attr = sdb_store_expr_attrvalue(golden_data[i].attr);
+ fail_unless(attr != NULL,
+ "sdb_store_expr_attrvalue(%s) = NULL; expected: <expr>",
+ golden_data[i].attr);
- sdb_object_deref(SDB_OBJ(n));
+ value = sdb_store_expr_constvalue(&golden_data[i].value);
+ fail_unless(value != NULL,
+ "sdb_store_expr_constvalue(%s) = NULL; expected: <expr>",
+ value_str);
+
+ for (j = 0; j < SDB_STATIC_ARRAY_LEN(tests); ++j) {
+ sdb_store_matcher_t *m;
+
+ m = tests[j].matcher(attr, value);
+ fail_unless(m != NULL,
+ "sdb_store_<cond>_matcher() = NULL; expected: <matcher>");
+
+ status = sdb_store_matcher_matches(m, host, /* filter */ NULL);
+ fail_unless(status == tests[j].expected,
+ "sdb_store_matcher_matches(<attr[%s] %s %s>, "
+ "<host>, NULL) = %d; expected: %d",
+ golden_data[i].attr, op_str[j], value_str,
+ status, tests[j].expected);
+
+ sdb_object_deref(SDB_OBJ(m));
+ }
+
+ sdb_object_deref(SDB_OBJ(attr));
+ sdb_object_deref(SDB_OBJ(value));
}
}
- sdb_object_deref(SDB_OBJ(obj));
+ sdb_object_deref(SDB_OBJ(host));
}
END_TEST
}
END_TEST
-START_TEST(test_store_cond)
+START_TEST(test_cmp_obj)
{
{
- sdb_store_obj_t *obj;
-
struct {
struct {
- const char *attr;
+ const char *host;
+ int field;
const sdb_data_t value;
int expected_lt, expected_le, expected_eq, expected_ge, expected_gt;
} golden_data[] = {
const sdb_data_t value;
int expected_lt, expected_le, expected_eq, expected_ge, expected_gt;
} golden_data[] = {
- { "k1", { SDB_TYPE_STRING, { .string = "v1" } }, 0, 1, 1, 1, 0 },
- { "k1", { SDB_TYPE_STRING, { .string = "v2" } }, 1, 1, 0, 0, 0 },
- { "k1", { SDB_TYPE_STRING, { .string = "v0" } }, 0, 0, 0, 1, 1 },
- { "k2", { SDB_TYPE_INTEGER, { .integer = 123 } }, 0, 1, 1, 1, 0 },
- { "k2", { SDB_TYPE_INTEGER, { .integer = 124 } }, 1, 1, 0, 0, 0 },
- { "k2", { SDB_TYPE_INTEGER, { .integer = 122 } }, 0, 0, 0, 1, 1 },
- /* key does not exist */
- { "k3", { SDB_TYPE_STRING, { .string = "v1" } }, 0, 0, 0, 0, 0 },
- { "k3", { SDB_TYPE_STRING, { .string = "123" } }, 0, 0, 0, 0, 0 },
- { "k3", { SDB_TYPE_INTEGER, { .integer = 123 } }, 0, 0, 0, 0, 0 },
+ { "b", SDB_FIELD_NAME,
+ { SDB_TYPE_STRING, { .string = "a" } }, 0, 0, 0, 1, 1 },
+ { "b", SDB_FIELD_NAME,
+ { SDB_TYPE_STRING, { .string = "b" } }, 0, 1, 1, 1, 0 },
+ { "b", SDB_FIELD_NAME,
+ { SDB_TYPE_STRING, { .string = "c" } }, 1, 1, 0, 0, 0 },
+ /* last-update = 1 for all objects */
+ { "a", SDB_FIELD_LAST_UPDATE,
+ { SDB_TYPE_DATETIME, { .datetime = 1 } }, 0, 1, 1, 1, 0 },
+ { "a", SDB_FIELD_LAST_UPDATE,
+ { SDB_TYPE_DATETIME, { .datetime = 2 } }, 1, 1, 0, 0, 0 },
+ { "a", SDB_FIELD_LAST_UPDATE,
+ { SDB_TYPE_DATETIME, { .datetime = 0 } }, 0, 0, 0, 1, 1 },
+ /* age > 0 for all objects */
+ { "a", SDB_FIELD_AGE,
+ { SDB_TYPE_DATETIME, { .datetime = 0 } }, 0, 0, 0, 1, 1 },
+ /* interval = 0 for all objects */
+ { "a", SDB_FIELD_INTERVAL,
+ { SDB_TYPE_DATETIME, { .datetime = 0 } }, 0, 1, 1, 1, 0 },
+ { "a", SDB_FIELD_INTERVAL,
+ { SDB_TYPE_DATETIME, { .datetime = 1 } }, 1, 1, 0, 0, 0 },
/* type mismatch */
/* type mismatch */
- { "k1", { SDB_TYPE_INTEGER, { .integer = 0 } }, 0, 0, 0, 0, 0 },
- { "k2", { SDB_TYPE_STRING, { .string = "123" } }, 0, 0, 0, 0, 0 },
+ { "a", SDB_FIELD_LAST_UPDATE,
+ { SDB_TYPE_INTEGER, { .integer = 0 } }, 0, 0, 0, 0, 0 },
+ { "a", SDB_FIELD_AGE,
+ { SDB_TYPE_INTEGER, { .integer = 0 } }, 0, 0, 0, 0, 0 },
+ { "a", SDB_FIELD_INTERVAL,
+ { SDB_TYPE_INTEGER, { .integer = 0 } }, 0, 0, 0, 0, 0 },
+ { "a", SDB_FIELD_BACKEND,
+ { SDB_TYPE_INTEGER, { .integer = 0 } }, 0, 0, 0, 0, 0 },
+ { "a", SDB_FIELD_BACKEND,
+ { SDB_TYPE_INTEGER, { .integer = 0 } }, 0, 0, 0, 0, 0 },
+ /* (64bit) integer value without zero-bytes */
+ { "a", SDB_FIELD_BACKEND,
+ { SDB_TYPE_INTEGER, { .integer = 0xffffffffffffffffL } },
+ 0, 0, 0, 0, 0 },
};
int status;
size_t i;
};
int status;
size_t i;
- obj = sdb_store_get_host("a");
- fail_unless(obj != NULL,
- "sdb_store_get_host(a) = NULL; expected: <host>");
-
for (i = 0; i < SDB_STATIC_ARRAY_LEN(golden_data); ++i) {
for (i = 0; i < SDB_STATIC_ARRAY_LEN(golden_data); ++i) {
- sdb_store_cond_t *c;
- char buf[1024];
+ sdb_store_obj_t *host;
+ sdb_store_expr_t *field;
+ sdb_store_expr_t *value;
+ char value_str[1024];
size_t j;
struct {
size_t j;
struct {
- sdb_store_matcher_t *(*matcher)(sdb_store_cond_t *);
- int *expected;
+ sdb_store_matcher_t *(*matcher)(sdb_store_expr_t *,
+ sdb_store_expr_t *);
+ int expected;
} tests[] = {
} tests[] = {
- { sdb_store_lt_matcher, &golden_data[i].expected_lt },
- { sdb_store_le_matcher, &golden_data[i].expected_le },
- { sdb_store_eq_matcher, &golden_data[i].expected_eq },
- { sdb_store_ge_matcher, &golden_data[i].expected_ge },
- { sdb_store_gt_matcher, &golden_data[i].expected_gt },
+ { sdb_store_lt_matcher, golden_data[i].expected_lt },
+ { sdb_store_le_matcher, golden_data[i].expected_le },
+ { sdb_store_eq_matcher, golden_data[i].expected_eq },
+ { sdb_store_ge_matcher, golden_data[i].expected_ge },
+ { sdb_store_gt_matcher, golden_data[i].expected_gt },
};
};
+ char *op_str[] = { "<", "<=", "=", ">=", ">" };
+
+ assert(SDB_STATIC_ARRAY_LEN(tests) == SDB_STATIC_ARRAY_LEN(op_str));
+
+ host = sdb_store_get_host(golden_data[i].host);
+ fail_unless(host != NULL,
+ "sdb_store_get_host(%s) = NULL; expected: <host>",
+ golden_data[i].host);
sdb_data_format(&golden_data[i].value,
sdb_data_format(&golden_data[i].value,
- buf, sizeof(buf), SDB_UNQUOTED);
+ value_str, sizeof(value_str), SDB_UNQUOTED);
- c = sdb_store_attr_cond(golden_data[i].attr,
- &golden_data[i].value);
- fail_unless(c != NULL,
- "sdb_store_attr_cond(%s, %s) = NULL; expected: <cond>",
- golden_data[i].attr, buf);
+ field = sdb_store_expr_fieldvalue(golden_data[i].field);
+ fail_unless(field != NULL,
+ "sdb_store_expr_fieldvalue(%d) = NULL; "
+ "expected: <expr>", golden_data[i].field);
+
+ value = sdb_store_expr_constvalue(&golden_data[i].value);
+ fail_unless(value != NULL,
+ "sdb_store_expr_constvalue(%s) = NULL; "
+ "expected: <expr>", value_str);
for (j = 0; j < SDB_STATIC_ARRAY_LEN(tests); ++j) {
for (j = 0; j < SDB_STATIC_ARRAY_LEN(tests); ++j) {
- sdb_store_matcher_t *m;
char m_str[1024];
char m_str[1024];
+ sdb_store_matcher_t *m;
- m = tests[j].matcher(c);
+ snprintf(m_str, sizeof(m_str), "%s %s %s",
+ SDB_FIELD_TO_NAME(golden_data[i].field),
+ op_str[j], value_str);
+
+ m = tests[j].matcher(field, value);
fail_unless(m != NULL,
"sdb_store_<cond>_matcher() = NULL; expected: <matcher>");
fail_unless(m != NULL,
"sdb_store_<cond>_matcher() = NULL; expected: <matcher>");
- status = sdb_store_matcher_matches(m, obj);
- fail_unless(status == *tests[j].expected,
- "sdb_store_matcher_matches(%s) = %d; expected: %d",
- sdb_store_matcher_tostring(m, m_str, sizeof(m_str)),
- status, *tests[j].expected);
+ status = sdb_store_matcher_matches(m, host, /* filter */ NULL);
+ fail_unless(status == tests[j].expected,
+ "sdb_store_matcher_matches(<%s>, <host '%s'>, NULL) = %d; "
+ "expected: %d", m_str, golden_data[i].host, status,
+ tests[j].expected);
sdb_object_deref(SDB_OBJ(m));
}
sdb_object_deref(SDB_OBJ(m));
}
- sdb_object_deref(SDB_OBJ(c));
+ sdb_object_deref(SDB_OBJ(field));
+ sdb_object_deref(SDB_OBJ(value));
+ sdb_object_deref(SDB_OBJ(host));
}
}
-
- sdb_object_deref(SDB_OBJ(obj));
}
END_TEST
}
END_TEST
{
sdb_store_obj_t *obj;
{
sdb_store_obj_t *obj;
- sdb_store_matcher_t *always = sdb_store_name_matcher(SDB_HOST, "a", 0);
- sdb_store_matcher_t *never = sdb_store_name_matcher(SDB_HOST, "z", 0);
+ sdb_data_t d = { SDB_TYPE_STRING, { .string = "a" } };
+ sdb_store_expr_t *e = sdb_store_expr_constvalue(&d);
+
+ sdb_store_matcher_t *always = sdb_store_isnnull_matcher(e);
+ sdb_store_matcher_t *never = sdb_store_isnull_matcher(e);
struct {
const char *op;
struct {
const char *op;
obj = sdb_store_get_host("a");
obj = sdb_store_get_host("a");
- status = sdb_store_matcher_matches(always, obj);
+ status = sdb_store_matcher_matches(always, obj, /* filter */ NULL);
fail_unless(status == 1,
"INTERNAL ERROR: 'always' did not match host");
fail_unless(status == 1,
"INTERNAL ERROR: 'always' did not match host");
- status = sdb_store_matcher_matches(never, obj);
+ status = sdb_store_matcher_matches(never, obj, /* filter */ NULL);
fail_unless(status == 0,
"INTERNAL ERROR: 'never' matches host");
fail_unless(status == 0,
"INTERNAL ERROR: 'never' matches host");
#define TO_NAME(v) (((v) == always) ? "always" \
: ((v) == never) ? "never" : "<unknown>")
#define TO_NAME(v) (((v) == always) ? "always" \
: ((v) == never) ? "never" : "<unknown>")
- status = sdb_store_matcher_matches(m, obj);
+ status = sdb_store_matcher_matches(m, obj, /* filter */ NULL);
fail_unless(status == golden_data[i].expected,
fail_unless(status == golden_data[i].expected,
- "%s(%s, %s) = %d; expected: %d", golden_data[i].op,
+ "%s(%s, %s, NULL) = %d; expected: %d", golden_data[i].op,
TO_NAME(golden_data[i].left), TO_NAME(golden_data[i].right),
status, golden_data[i].expected);
TO_NAME(golden_data[i].left), TO_NAME(golden_data[i].right),
status, golden_data[i].expected);
sdb_object_deref(SDB_OBJ(always));
sdb_object_deref(SDB_OBJ(never));
sdb_object_deref(SDB_OBJ(always));
sdb_object_deref(SDB_OBJ(never));
+ sdb_object_deref(SDB_OBJ(e));
sdb_object_deref(SDB_OBJ(obj));
}
END_TEST
sdb_object_deref(SDB_OBJ(obj));
}
END_TEST
-START_TEST(test_parse_cmp)
-{
- sdb_data_t hostname = { SDB_TYPE_STRING, { .string = "hostname" } };
- sdb_data_t srvname = { SDB_TYPE_STRING, { .string = "srvname" } };
- sdb_data_t attrname = { SDB_TYPE_STRING, { .string = "attrname" } };
-
- sdb_store_matcher_t *check;
-
- size_t i;
-
- struct {
- const char *obj_type;
- const char *attr;
- const char *op;
- const sdb_data_t *value;
- int expected;
- } golden_data[] = {
- { "host", "name", "=", &hostname, MATCHER_NAME },
- { "host", "name", "!=", &hostname, MATCHER_NOT },
- { "host", "name", "=~", &hostname, MATCHER_NAME },
- { "host", "name", "!~", &hostname, MATCHER_NOT },
- { "host", "attr", "=", &hostname, -1 },
- { "host", "attr", "!=", &hostname, -1 },
- { "host", "name", "&^", &hostname, -1 },
- { "host", "name", "<", &hostname, -1 },
- { "host", "name", "<=", &hostname, -1 },
- { "host", "name", ">=", &hostname, -1 },
- { "host", "name", ">", &hostname, -1 },
- { "service", "name", "=", &srvname, MATCHER_NAME },
- { "service", "name", "!=", &srvname, MATCHER_NOT },
- { "service", "name", "=~", &srvname, MATCHER_NAME },
- { "service", "name", "!~", &srvname, MATCHER_NOT },
- { "service", "attr", "=", &srvname, -1 },
- { "service", "attr", "!=", &srvname, -1 },
- { "service", "name", "&^", &srvname, -1 },
- { "service", "name", "<", &srvname, -1 },
- { "service", "name", "<=", &srvname, -1 },
- { "service", "name", ">=", &srvname, -1 },
- { "service", "name", ">", &srvname, -1 },
- { "attribute", "name", "=", &attrname, MATCHER_NAME },
- { "attribute", "name", "!=", &attrname, MATCHER_NOT },
- { "attribute", "name", "=~", &attrname, MATCHER_NAME },
- { "attribute", "name", "!~", &attrname, MATCHER_NOT },
- { "attribute", "name", "<", &attrname, -1 },
- { "attribute", "name", "<=", &attrname, -1 },
- { "attribute", "name", ">=", &attrname, -1 },
- { "attribute", "name", ">", &attrname, -1 },
- { "attribute", "attr", "=", &attrname, MATCHER_ATTR },
- { "attribute", "attr", "!=", &attrname, MATCHER_NOT },
- { "attribute", "attr", "=~", &attrname, MATCHER_ATTR },
- { "attribute", "attr", "!~", &attrname, MATCHER_NOT },
- { "attribute", "attr", "&^", &attrname, -1 },
- { "attribute", "attr", "<", &attrname, MATCHER_LT },
- { "attribute", "attr", "<=", &attrname, MATCHER_LE },
-/* { "attribute", "attr", "=", &attrname, MATCHER_EQ }, */
- { "attribute", "attr", ">=", &attrname, MATCHER_GE },
- { "attribute", "attr", ">", &attrname, MATCHER_GT },
- { "attribute", "attr", "IS", NULL, MATCHER_ISNULL },
- { "foo", "name", "=", &attrname, -1 },
- { "foo", "attr", "=", &attrname, -1 },
- };
-
- for (i = 0; i < SDB_STATIC_ARRAY_LEN(golden_data); ++i) {
- char buf[1024];
-
- check = sdb_store_matcher_parse_cmp(golden_data[i].obj_type,
- golden_data[i].attr, golden_data[i].op,
- golden_data[i].value);
-
- if (sdb_data_format(golden_data[i].value,
- buf, sizeof(buf), SDB_UNQUOTED) < 0)
- snprintf(buf, sizeof(buf), "ERR");
-
- if (golden_data[i].expected == -1) {
- fail_unless(check == NULL,
- "sdb_store_matcher_parse_cmp(%s, %s, %s, %s) = %p; "
- "expected: NULL", golden_data[i].obj_type,
- golden_data[i].attr, golden_data[i].op, buf, check);
- continue;
- }
-
- fail_unless(check != NULL,
- "sdb_store_matcher_parse_cmp(%s, %s, %s, %s) = %p; "
- "expected: NULL", golden_data[i].obj_type,
- golden_data[i].attr, golden_data[i].op, buf, check);
- fail_unless(M(check)->type == golden_data[i].expected,
- "sdb_store_matcher_parse_cmp(%s, %s, %s, %s) returned matcher "
- "of type %d; expected: %d", golden_data[i].obj_type,
- golden_data[i].attr, golden_data[i].op, buf,
- M(check)->type, golden_data[i].expected);
-
- sdb_object_deref(SDB_OBJ(check));
- }
-}
-END_TEST
-
static int
static int
-lookup_cb(sdb_store_obj_t *obj, void *user_data)
+scan_cb(sdb_store_obj_t *obj, void *user_data)
{
int *i = user_data;
fail_unless(obj != NULL,
{
int *i = user_data;
fail_unless(obj != NULL,
- "sdb_store_lookup callback received NULL obj; expected: "
+ "sdb_store_scan callback received NULL obj; expected: "
"<store base obj>");
fail_unless(i != NULL,
"<store base obj>");
fail_unless(i != NULL,
- "sdb_store_lookup callback received NULL user_data; "
+ "sdb_store_scan callback received NULL user_data; "
"expected: <pointer to data>");
++(*i);
return 0;
"expected: <pointer to data>");
++(*i);
return 0;
-} /* lookup_cb */
+} /* scan_cb */
-START_TEST(test_lookup)
+START_TEST(test_scan)
{
{
-#define PTR_RE "0x[0-9a-f]+"
struct {
const char *query;
struct {
const char *query;
+ const char *filter;
int expected;
int expected;
- const char *tostring_re;
} golden_data[] = {
} golden_data[] = {
- { "host.name = 'a'", 1,
- "OBJ\\[host\\]\\{ NAME\\{ 'a', \\(nil\\) \\} \\}" },
- { "host.name =~ 'a|b'", 2,
- "OBJ\\[host\\]\\{ NAME\\{ NULL, "PTR_RE" \\} \\}" },
- { "host.name =~ 'host'", 0,
- "OBJ\\[host\\]\\{ NAME\\{ NULL, "PTR_RE" \\} \\}" },
- { "host.name =~ '.'", 3,
- "OBJ\\[host\\]\\{ NAME\\{ NULL, "PTR_RE" \\} \\}" },
- { "service.name = 's1'", 2,
- "OBJ\\[service\\]\\{ NAME\\{ 's1', \\(nil\\) } \\}" },
- { "service.name =~ 's'", 2,
- "OBJ\\[service\\]\\{ NAME\\{ NULL, "PTR_RE" } \\}" },
- { "service.name !~ 's'", 1,
- "\\(NOT, OBJ\\[service\\]\\{ NAME\\{ NULL, "PTR_RE" } \\}\\)" },
- { "attribute.name = 'k1'", 1,
- "OBJ\\[attribute\\]\\{ NAME\\{ 'k1', \\(nil\\) \\} " },
- { "attribute.name = 'x'", 0,
- "OBJ\\[attribute\\]\\{ NAME\\{ 'x', \\(nil\\) \\}" },
- { "attribute.k1 = 'v1'", 1,
- "ATTR\\[k1\\]\\{ VALUE\\{ 'v1', \\(nil\\) \\} \\}" },
- { "attribute.k1 IS NULL", 2,
- "\\(IS NULL, ATTR\\[k1\\]\\)" },
- { "attribute.x1 IS NULL", 3,
- "\\(IS NULL, ATTR\\[x1\\]\\)" },
- { "attribute.k1 IS NOT NULL", 1,
- "\\(NOT, \\(IS NULL, ATTR\\[k1\\]\\)\\)" },
- { "attribute.x1 IS NOT NULL", 0,
- "\\(NOT, \\(IS NULL, ATTR\\[x1\\]\\)\\)" },
- { "attribute.k2 < 123", 0,
- "ATTR\\[k2\\]\\{ < 123 \\}" },
- { "attribute.k2 <= 123", 1,
- "ATTR\\[k2\\]\\{ <= 123 \\}" },
- { "attribute.k2 >= 123", 1,
- "ATTR\\[k2\\]\\{ >= 123 \\}" },
- { "attribute.k2 > 123", 0,
- "ATTR\\[k2\\]\\{ > 123 \\}" },
- { "attribute.k2 = 123", 1,
- "ATTR\\[k2\\]\\{ = 123 \\}" },
- { "attribute.k2 != 123", 2,
- "\\(NOT, ATTR\\[k2\\]\\{ = 123 \\}\\)" },
- { "attribute.k1 != 'v1'", 2,
- "\\(NOT, ATTR\\[k1\\]\\{ VALUE\\{ 'v1', \\(nil\\) \\} \\}\\)" },
- { "attribute.k1 != 'v2'", 3,
- "\\(NOT, ATTR\\[k1\\]\\{ VALUE\\{ 'v2', \\(nil\\) \\} \\}\\)" },
- { "attribute.name != 'x' "
- "AND attribute.y !~ 'x'", 3,
- "\\(AND, "
- "\\(NOT, OBJ\\[attribute\\]\\{ NAME\\{ 'x', \\(nil\\) \\} \\}\\), "
- "\\(NOT, ATTR\\[y\\]\\{ VALUE\\{ NULL, "PTR_RE" \\} \\}\\)\\)" },
+ /* TODO: check the name of the expected hosts */
+ { "host = 'a'", NULL, 1 },
+ { "host = 'a'", "host = 'x'", 0 }, /* filter never matches */
+ { "host = 'a'",
+ "NOT attribute['x'] = ''", 1 }, /* filter always matches */
+ { "host =~ 'a|b'", NULL, 2 },
+ { "host =~ 'host'", NULL, 0 },
+ { "host =~ '.'", NULL, 3 },
+ { "metric = 'm1'", NULL, 2 },
+ { "metric= 'm1'", "host = 'x'", 0 }, /* filter never matches */
+ { "metric = 'm1'",
+ "NOT attribute['x'] = ''", 2 }, /* filter always matches */
+ { "metric =~ 'm'", NULL, 2 },
+ { "metric !~ 'm'", NULL, 1 },
+ { "metric =~ 'x'", NULL, 0 },
+ { "service = 's1'", NULL, 2 },
+ { "service = 's1'", "host = 'x'", 0 }, /* filter never matches */
+ { "service = 's1'",
+ "NOT attribute['x'] = ''", 2 }, /* filter always matches */
+ { "service =~ 's'", NULL, 2 },
+ { "service !~ 's'", NULL, 1 },
+ { "attribute = 'k1'", NULL, 2 },
+ { "attribute = 'k1'", "host = 'x'", 0 }, /* filter never matches */
+ { "attribute = 'k1'",
+ "NOT attribute['x'] = ''", 2 }, /* filter always matches */
+ { "attribute =~ 'k'", NULL, 2 },
+ { "attribute =~ '1'", NULL, 2 },
+ { "attribute =~ '2'", NULL, 1 },
+ { "attribute = 'x'", NULL, 0 },
+ { "attribute =~ 'x'", NULL, 0 },
+ { "attribute['k1'] = 'v1'", NULL, 1 },
+ { "attribute['k1'] =~ 'v1'", NULL, 1 },
+ { "attribute['k1'] =~ '^v1$'", NULL, 1 },
+ { "attribute['k1'] =~ 'v'", NULL, 2 },
+ { "attribute['k1'] =~ '1'", NULL, 1 },
+ { "attribute['k1'] !~ 'v'", NULL, 1 },
+ { "attribute['k1'] = 'v2'", NULL, 1 },
+ { "attribute['k1'] =~ 'v2'", NULL, 1 },
+ { "attribute['x1'] =~ 'v'", NULL, 0 },
+ { "attribute['x1'] =~ 'NULL'", NULL, 0 },
+ { "attribute['x1'] !~ 'v'", NULL, 3 },
+ { "attribute['k1'] IS NULL", NULL, 1 },
+ { "attribute['x1'] IS NULL", NULL, 3 },
+ { "attribute['k1'] IS NOT NULL", NULL, 2 },
+ { "attribute['x1'] IS NOT NULL", NULL, 0 },
+ { "attribute['k2'] < 123", NULL, 0 },
+ { "attribute['k2'] <= 123", NULL, 1 },
+ { "attribute['k2'] >= 123", NULL, 1 },
+ { "attribute['k2'] > 123", NULL, 0 },
+ { "attribute['k2'] = 123", NULL, 1 },
+ { "attribute['k2'] != 123", NULL, 0 },
+ { "attribute['k1'] != 'v1'", NULL, 1 },
+ { "attribute['k1'] != 'v2'", NULL, 1 },
+ { "attribute != 'x' "
+ "AND attribute['y'] !~ 'x'", NULL, 3 },
};
int check, n;
size_t i;
n = 0;
};
int check, n;
size_t i;
n = 0;
- check = sdb_store_lookup(NULL, lookup_cb, &n);
+ check = sdb_store_scan(/* matcher */ NULL, /* filter */ NULL,
+ scan_cb, &n);
fail_unless(check == 0,
fail_unless(check == 0,
- "sdb_store_lookup() = %d; expected: 0", check);
+ "sdb_store_scan() = %d; expected: 0", check);
fail_unless(n == 3,
fail_unless(n == 3,
- "sdb_store_lookup called callback %d times; expected: 3", (int)n);
+ "sdb_store_scan called callback %d times; expected: 3", (int)n);
for (i = 0; i < SDB_STATIC_ARRAY_LEN(golden_data); ++i) {
for (i = 0; i < SDB_STATIC_ARRAY_LEN(golden_data); ++i) {
- sdb_store_matcher_t *m;
- char buf[4096];
+ sdb_store_matcher_t *m, *filter = NULL;
m = sdb_fe_parse_matcher(golden_data[i].query, -1);
fail_unless(m != NULL,
"sdb_fe_parse_matcher(%s, -1) = NULL; expected: <matcher>",
golden_data[i].query);
m = sdb_fe_parse_matcher(golden_data[i].query, -1);
fail_unless(m != NULL,
"sdb_fe_parse_matcher(%s, -1) = NULL; expected: <matcher>",
golden_data[i].query);
- fail_unless(sdb_regmatches(golden_data[i].tostring_re,
- sdb_store_matcher_tostring(m, buf, sizeof(buf))) == 0,
- "sdb_fe_parse_matcher(%s, -1) = %s; expected: %s",
- golden_data[i].query,
- sdb_store_matcher_tostring(m, buf, sizeof(buf)),
- golden_data[i].tostring_re);
+
+ if (golden_data[i].filter) {
+ filter = sdb_fe_parse_matcher(golden_data[i].filter, -1);
+ fail_unless(filter != NULL,
+ "sdb_fe_parse_matcher(%s, -1) = NULL; "
+ "expected: <matcher>", golden_data[i].filter);
+ }
n = 0;
n = 0;
- sdb_store_lookup(m, lookup_cb, &n);
+ sdb_store_scan(m, filter, scan_cb, &n);
fail_unless(n == golden_data[i].expected,
fail_unless(n == golden_data[i].expected,
- "sdb_store_lookup(matcher{%s}) found %d hosts; expected: %d",
- golden_data[i].query, n, golden_data[i].expected);
+ "sdb_store_scan(matcher{%s}, filter{%s}) found %d hosts; "
+ "expected: %d", golden_data[i].query, golden_data[i].filter,
+ n, golden_data[i].expected);
+ sdb_object_deref(SDB_OBJ(filter));
sdb_object_deref(SDB_OBJ(m));
}
}
sdb_object_deref(SDB_OBJ(m));
}
}
tc = tcase_create("core");
tcase_add_checked_fixture(tc, populate, sdb_store_clear);
tc = tcase_create("core");
tcase_add_checked_fixture(tc, populate, sdb_store_clear);
- tcase_add_test(tc, test_store_match_name);
- tcase_add_test(tc, test_store_match_attr);
- tcase_add_test(tc, test_store_cond);
+ tcase_add_test(tc, test_cmp_name);
+ tcase_add_test(tc, test_cmp_attr);
+ tcase_add_test(tc, test_cmp_obj);
tcase_add_test(tc, test_store_match_op);
tcase_add_test(tc, test_store_match_op);
- tcase_add_test(tc, test_parse_cmp);
- tcase_add_test(tc, test_lookup);
+ tcase_add_test(tc, test_scan);
suite_add_tcase(s, tc);
return s;
suite_add_tcase(s, tc);
return s;