![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index d80a5990b4dbd4a52efb2248419e1af58c0ac63c..c256b232ae049096eaace1a86652ff84a77b6e5d 100644 (file)
}
} /* 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;
- const char *name;
+ char *name;
_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, "^b$", 1, 0 },
{ SDB_HOST, "^a$", 0, 0 },
{ SDB_HOST, "^b$", 0, 0 },
- { SDB_METRIC, NULL, 0, 1 },
- { SDB_METRIC, NULL, 1, 1 },
{ SDB_METRIC, "m1", 0, 1 },
{ SDB_METRIC, "m1", 1, 1 },
{ SDB_METRIC, "^m1$", 1, 1 },
{ SDB_METRIC, "m2", 0, 0 },
{ SDB_METRIC, "x1", 0, 0 },
{ SDB_METRIC, "x1", 1, 0 },
- { SDB_SERVICE, NULL, 0, 1 },
- { SDB_SERVICE, NULL, 1, 1 },
{ 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_ATTRIBUTE, NULL, 0, 1 },
- { SDB_ATTRIBUTE, NULL, 1, 1 },
{ SDB_ATTRIBUTE, "k1", 0, 1 },
{ SDB_ATTRIBUTE, "k2", 0, 1 },
{ SDB_ATTRIBUTE, "k3", 0, 0 },
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_data_t datum;
+ sdb_store_expr_t *obj, *value;
sdb_store_matcher_t *m, *n;
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_any_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,
- "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, /* filter */ NULL);
+ status = sdb_store_matcher_matches(m, host, /* filter */ NULL);
fail_unless(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),
sdb_object_deref(SDB_OBJ(m));
/* now match the inverted set of objects */
- status = sdb_store_matcher_matches(n, obj, /* filter */ NULL);
+ status = sdb_store_matcher_matches(n, host, /* filter */ NULL);
fail_unless(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),
sdb_object_deref(SDB_OBJ(n));
}
- sdb_object_deref(SDB_OBJ(obj));
-}
-END_TEST
-
-START_TEST(test_store_match_attr)
-{
- sdb_store_obj_t *obj;
-
- struct {
- const char *attr_name;
- const char *attr_value;
- _Bool re;
-
- int expected;
- } 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 },
- };
-
- size_t i;
-
- obj = sdb_store_get_host("a");
- fail_unless(obj != NULL,
- "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) {
- sdb_store_matcher_t *m, *n;
- int status;
-
- 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>");
-
- status = sdb_store_matcher_matches(m, obj, /* filter */ NULL);
- fail_unless(status == golden_data[i].expected,
- "sdb_store_matcher_matches(attribute[%s] = %s, "
- "<host a>, NULL) = %d; expected: %d", golden_data[i].attr_name,
- golden_data[i].attr_value, status, golden_data[i].expected);
-
- n = sdb_store_inv_matcher(m);
- fail_unless(n != NULL,
- "sdb_store_inv_matcher() = NULL; expected: <matcher>");
- sdb_object_deref(SDB_OBJ(m));
-
- /* now match the inverted set of objects */
- status = sdb_store_matcher_matches(n, obj, /* filter */ NULL);
- fail_unless(status == !golden_data[i].expected,
- "sdb_store_matcher_matches(attribute[%s] = %s, "
- "<host a>, NULL) = %d; expected: %d",
- golden_data[i].attr_name, golden_data[i].attr_value,
- status, !golden_data[i].expected);
-
- sdb_object_deref(SDB_OBJ(n));
- }
-
- sdb_object_deref(SDB_OBJ(obj));
+ sdb_object_deref(SDB_OBJ(host));
}
END_TEST
{ sdb_store_gt_matcher, golden_data[i].expected_gt },
};
+ const char *op_str[] = { "<", "<=", "=", ">=", ">" };
+ assert(SDB_STATIC_ARRAY_LEN(tests) == SDB_STATIC_ARRAY_LEN(op_str));
+
sdb_data_format(&golden_data[i].value,
value_str, sizeof(value_str), SDB_UNQUOTED);
status = sdb_store_matcher_matches(m, host, /* filter */ NULL);
fail_unless(status == tests[j].expected,
- "sdb_store_matcher_matches(<m>, <host>, NULL) = %d; "
- "expected: %d", 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));
}
{ "a", SDB_FIELD_INTERVAL,
{ SDB_TYPE_DATETIME, { .datetime = 1 } }, 1, 1, 0, 0, 0 },
/* type mismatch */
- /* TODO: let matchers only use data_strcmp for attributes
- * everything else has a well-known type
{ "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_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;
{
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;
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
-START_TEST(test_parse_cmp)
-{
- sdb_data_t hostname = { SDB_TYPE_STRING, { .string = "hostname" } };
- sdb_data_t metricname = { SDB_TYPE_STRING, { .string = "metricname" } };
- 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 *op;
- const sdb_data_t *value;
- int expected;
- } golden_data[] = {
- { "host", "=", &hostname, MATCHER_NAME },
- { "host", "!=", &hostname, MATCHER_NOT },
- { "host", "=~", &hostname, MATCHER_NAME },
- { "host", "!~", &hostname, MATCHER_NOT },
- { "host", "&^", &hostname, -1 },
- { "host", "<", &hostname, -1 },
- { "host", "<=", &hostname, -1 },
- { "host", ">=", &hostname, -1 },
- { "host", ">", &hostname, -1 },
- { "host", "=", NULL, -1 },
- { "metric", "=", &metricname, MATCHER_NAME },
- { "metric", "!=", &metricname, MATCHER_NOT },
- { "metric", "=~", &metricname, MATCHER_NAME },
- { "metric", "!~", &metricname, MATCHER_NOT },
- { "metric", "&^", &metricname, -1 },
- { "metric", "<", &metricname, -1 },
- { "metric", "<=", &metricname, -1 },
- { "metric", ">=", &metricname, -1 },
- { "metric", ">", &metricname, -1 },
- { "metric", "=", NULL, -1 },
- { "service", "=", &srvname, MATCHER_NAME },
- { "service", "!=", &srvname, MATCHER_NOT },
- { "service", "=~", &srvname, MATCHER_NAME },
- { "service", "!~", &srvname, MATCHER_NOT },
- { "service", "&^", &srvname, -1 },
- { "service", "<", &srvname, -1 },
- { "service", "<=", &srvname, -1 },
- { "service", ">=", &srvname, -1 },
- { "service", ">", &srvname, -1 },
- { "service", "=", NULL, -1 },
- { "attribute", "=", &attrname, MATCHER_NAME },
- { "attribute", "!=", &attrname, MATCHER_NOT },
- { "attribute", "=~", &attrname, MATCHER_NAME },
- { "attribute", "!~", &attrname, MATCHER_NOT },
- { "attribute", "<", &attrname, -1 },
- { "attribute", "<=", &attrname, -1 },
- { "attribute", ">=", &attrname, -1 },
- { "attribute", ">", &attrname, -1 },
- { "attribute", "=", NULL, -1 },
- { "foo", "=", &attrname, -1 },
- };
-
- for (i = 0; i < SDB_STATIC_ARRAY_LEN(golden_data); ++i) {
- sdb_store_expr_t *expr;
- char buf[1024];
-
- if (sdb_data_format(golden_data[i].value,
- buf, sizeof(buf), SDB_UNQUOTED) < 0)
- snprintf(buf, sizeof(buf), "ERR");
-
- expr = sdb_store_expr_constvalue(golden_data[i].value);
- fail_unless(expr != NULL || golden_data[i].value == NULL,
- "sdb_store_expr_constvalue(%s) = NULL; expected: <expr>",
- buf);
-
- check = sdb_store_matcher_parse_cmp(golden_data[i].obj_type,
- golden_data[i].op, expr);
- sdb_object_deref(SDB_OBJ(expr));
-
- if (golden_data[i].expected == -1) {
- fail_unless(check == NULL,
- "sdb_store_matcher_parse_cmp(%s, %s, expr{%s}) = %p; "
- "expected: NULL", golden_data[i].obj_type,
- golden_data[i].op, buf, check);
- continue;
- }
-
- fail_unless(check != NULL,
- "sdb_store_matcher_parse_cmp(%s, %s, %s) = %p; "
- "expected: <expr>", golden_data[i].obj_type,
- golden_data[i].op, buf, check);
- fail_unless(M(check)->type == golden_data[i].expected,
- "sdb_store_matcher_parse_cmp(%s, %s, %s) returned matcher "
- "of type %d; expected: %d", golden_data[i].obj_type,
- golden_data[i].op, buf, M(check)->type, golden_data[i].expected);
-
- sdb_object_deref(SDB_OBJ(check));
- }
-}
-END_TEST
-
static int
-scan_cb(sdb_store_obj_t *obj, void *user_data)
+scan_cb(sdb_store_obj_t *obj, sdb_store_matcher_t *filter, void *user_data)
{
int *i = user_data;
+ if (! sdb_store_matcher_matches(filter, obj, NULL))
+ return 0;
+
fail_unless(obj != NULL,
"sdb_store_scan callback received NULL obj; expected: "
"<store base obj>");
const char *filter;
int expected;
} golden_data[] = {
+ /* TODO: check the name of the expected hosts */
{ "host = 'a'", NULL, 1 },
{ "host = 'a'", "host = 'x'", 0 }, /* filter never matches */
{ "host = 'a'",
{ "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'",
+ { "ANY metric = 'm1'", NULL, 2 },
+ { "ANY metric= 'm1'", "host = 'x'", 0 }, /* filter never matches */
+ { "ANY 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'",
+ { "ANY metric =~ 'm'", NULL, 2 },
+ { "ALL metric =~ 'm'", NULL, 3 },
+ { "ANY metric =~ 'm'", "name !~ '1'", 1 },
+ { "ANY metric =~ 'm'", "name !~ 'm'", 0 },
+ { "ALL metric =~ '1'", NULL, 2 },
+ { "ALL metric =~ '2'", NULL, 1 },
+ { "ANY metric !~ 'm'", NULL, 0 },
+ { "ALL metric !~ 'm'", NULL, 1 },
+ { "ANY metric =~ 'x'", NULL, 0 },
+ { "ANY service = 's1'", NULL, 2 },
+ { "ANY service = 's1'", "host = 'x'", 0 }, /* filter never matches */
+ { "ANY 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'",
+ { "ANY service =~ 's'", NULL, 2 },
+ { "ANY service =~ 's'", "name !~ 's'", 0 },
+ { "ANY service =~ 's'", "name !~ '1'", 2 },
+ { "ANY service !~ 's'", NULL, 0 },
+ { "ANY attribute = 'k1'", NULL, 2 },
+ { "ANY attribute = 'k1'", "host = 'x'",0 }, /* filter never matches */
+ { "ANY attribute = 'k1'",
"NOT attribute['x'] = ''", 2 }, /* filter always matches */
- { "attribute = 'x'", NULL, 0 },
+ { "ANY attribute =~ 'k'", NULL, 2 },
+ { "ANY attribute =~ 'k'",
+ "name !~ '1'", 1 },
+ { "ANY attribute =~ 'k'",
+ "name !~ 'k'", 0 },
+ { "ANY attribute =~ '1'", NULL, 2 },
+ { "ANY attribute =~ '2'", NULL, 1 },
+ { "ANY attribute = 'x'", NULL, 0 },
+ { "ANY attribute =~ 'x'", NULL, 0 },
+ { "ALL attribute = 'k1'", NULL, 2 },
{ "attribute['k1'] = 'v1'", NULL, 1 },
+ { "attribute['k1'] = 'v1'",
+ "name != 'k1'", 0 },
+ { "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['k2'] != 123", NULL, 0 },
{ "attribute['k1'] != 'v1'", NULL, 1 },
{ "attribute['k1'] != 'v2'", NULL, 1 },
- { "attribute != 'x' "
- "AND attribute['y'] !~ 'x'", NULL, 3 },
+ { "ANY attribute != 'x' "
+ "AND attribute['y'] !~ 'x'", NULL, 2 },
};
+ sdb_strbuf_t *errbuf = sdb_strbuf_create(64);
int check, n;
size_t i;
n = 0;
- check = sdb_store_scan(/* matcher */ NULL, /* filter */ NULL,
+ check = sdb_store_scan(SDB_HOST, /* matcher */ NULL, /* filter */ NULL,
scan_cb, &n);
fail_unless(check == 0,
"sdb_store_scan() = %d; expected: 0", check);
for (i = 0; i < SDB_STATIC_ARRAY_LEN(golden_data); ++i) {
sdb_store_matcher_t *m, *filter = NULL;
- m = sdb_fe_parse_matcher(golden_data[i].query, -1);
+ m = sdb_fe_parse_matcher(golden_data[i].query, -1, errbuf);
fail_unless(m != NULL,
- "sdb_fe_parse_matcher(%s, -1) = NULL; expected: <matcher>",
- golden_data[i].query);
+ "sdb_fe_parse_matcher(%s, -1) = NULL; expected: <matcher> "
+ "(parser error: %s)", golden_data[i].query,
+ sdb_strbuf_string(errbuf));
if (golden_data[i].filter) {
- filter = sdb_fe_parse_matcher(golden_data[i].filter, -1);
+ filter = sdb_fe_parse_matcher(golden_data[i].filter, -1, errbuf);
fail_unless(filter != NULL,
"sdb_fe_parse_matcher(%s, -1) = NULL; "
- "expected: <matcher>", golden_data[i].filter);
+ "expected: <matcher> (parser error: %s)",
+ golden_data[i].filter, sdb_strbuf_string(errbuf));
}
n = 0;
- sdb_store_scan(m, filter, scan_cb, &n);
+ sdb_store_scan(SDB_HOST, m, filter, scan_cb, &n);
fail_unless(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_store_scan(HOST, 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_strbuf_destroy(errbuf);
}
END_TEST
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_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_parse_cmp);
tcase_add_test(tc, test_scan);
suite_add_tcase(s, tc);