X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Funit%2Fcore%2Fstore_lookup_test.c;h=805de03e7deb6f6645aaa37be3d85c4344680cc3;hb=33c80b1c2a05192e6b912558f99d19a4d7f9ef06;hp=82688833f2f1e1c3fa76cbc12a72bcac12f89d04;hpb=90ada5c7c86cf280b2a4468e285671e9314e0d29;p=sysdb.git diff --git a/t/unit/core/store_lookup_test.c b/t/unit/core/store_lookup_test.c index 8268883..805de03 100644 --- a/t/unit/core/store_lookup_test.c +++ b/t/unit/core/store_lookup_test.c @@ -30,6 +30,8 @@ #include "frontend/parser.h" #include "libsysdb_test.h" +#include + #include #include @@ -38,6 +40,15 @@ populate(void) { 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; @@ -55,6 +66,7 @@ populate(void) } 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; @@ -66,6 +78,14 @@ populate(void) 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); @@ -104,6 +124,16 @@ START_TEST(test_store_match_name) { 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, "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, NULL, 0, 1 }, { SDB_SERVICE, NULL, 1, 1 }, { SDB_SERVICE, "s1", 0, 1 }, @@ -134,7 +164,6 @@ START_TEST(test_store_match_name) for (i = 0; i < SDB_STATIC_ARRAY_LEN(golden_data); ++i) { sdb_store_matcher_t *m, *n; - char buf[1024]; int status; m = sdb_store_name_matcher(golden_data[i].type, @@ -146,10 +175,9 @@ START_TEST(test_store_match_name) status = sdb_store_matcher_matches(m, obj, /* filter */ NULL); fail_unless(status == golden_data[i].expected, - "sdb_store_matcher_matches(%s, , NULL) = %d; " - "expected: %d", - sdb_store_matcher_tostring(m, buf, sizeof(buf)), - status, golden_data[i].expected); + "sdb_store_matcher_matches(%s->%s, , 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, @@ -159,10 +187,9 @@ START_TEST(test_store_match_name) /* 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(%s, , NULL) = %d; " - "expected: %d", - sdb_store_matcher_tostring(n, buf, sizeof(buf)), - status, !golden_data[i].expected); + "sdb_store_matcher_matches(%s->%s, , 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)); } @@ -213,7 +240,6 @@ START_TEST(test_store_match_attr) for (i = 0; i < SDB_STATIC_ARRAY_LEN(golden_data); ++i) { sdb_store_matcher_t *m, *n; - char buf[1024]; int status; m = sdb_store_attr_matcher(golden_data[i].attr_name, @@ -223,10 +249,9 @@ START_TEST(test_store_match_attr) status = sdb_store_matcher_matches(m, obj, /* filter */ NULL); fail_unless(status == golden_data[i].expected, - "sdb_store_matcher_matches({%s, , NULL) = %d; " - "expected: %d", - sdb_store_matcher_tostring(m, buf, sizeof(buf)), - status, golden_data[i].expected); + "sdb_store_matcher_matches(attribute[%s] = %s, " + ", 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, @@ -236,9 +261,9 @@ START_TEST(test_store_match_attr) /* 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({%s, , NULL) = %d; " - "expected: %d", - sdb_store_matcher_tostring(n, buf, sizeof(buf)), + "sdb_store_matcher_matches(attribute[%s] = %s, " + ", 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)); @@ -260,6 +285,7 @@ START_TEST(test_attr_cond) { "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 }, @@ -268,8 +294,8 @@ START_TEST(test_attr_cond) { "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, 0, 0 }, - { "k2", { SDB_TYPE_STRING, { .string = "123" } }, 0, 0, 0, 0, 0 }, + { "k1", { SDB_TYPE_INTEGER, { .integer = 0 } }, 0, 0, 0, 1, 1 }, + { "k2", { SDB_TYPE_STRING, { .string = "123" } }, 0, 1, 1, 1, 0 }, }; int status; @@ -312,7 +338,6 @@ START_TEST(test_attr_cond) for (j = 0; j < SDB_STATIC_ARRAY_LEN(tests); ++j) { sdb_store_matcher_t *m; - char m_str[1024]; m = tests[j].matcher(c); fail_unless(m != NULL, @@ -320,10 +345,8 @@ START_TEST(test_attr_cond) status = sdb_store_matcher_matches(m, obj, /* filter */ NULL); fail_unless(status == tests[j].expected, - "sdb_store_matcher_matches(%s, , NULL) = %d; " - "expected: %d", - sdb_store_matcher_tostring(m, m_str, sizeof(m_str)), - status, tests[j].expected); + "sdb_store_matcher_matches(, , NULL) = %d; " + "expected: %d", status, tests[j].expected); sdb_object_deref(SDB_OBJ(m)); } @@ -335,7 +358,7 @@ START_TEST(test_attr_cond) } END_TEST -START_TEST(test_obj_cond) +START_TEST(test_cmp_obj) { struct { const char *host; @@ -343,6 +366,12 @@ START_TEST(test_obj_cond) const sdb_data_t value; int expected_lt, expected_le, expected_eq, expected_ge, expected_gt; } golden_data[] = { + { "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 }, @@ -359,6 +388,8 @@ START_TEST(test_obj_cond) { "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, @@ -367,68 +398,84 @@ START_TEST(test_obj_cond) { 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; for (i = 0; i < SDB_STATIC_ARRAY_LEN(golden_data); ++i) { - sdb_store_obj_t *obj; - sdb_store_expr_t *expr; - 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 { - sdb_store_matcher_t *(*matcher)(sdb_store_cond_t *); + 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 }, + { sdb_store_cmp_lt, golden_data[i].expected_lt }, + { sdb_store_cmp_le, golden_data[i].expected_le }, + { sdb_store_cmp_eq, golden_data[i].expected_eq }, + { sdb_store_cmp_ge, golden_data[i].expected_ge }, + { sdb_store_cmp_gt, golden_data[i].expected_gt }, }; + char *op_str[] = { "<", "<=", "=", ">=", ">" }; + + assert(SDB_STATIC_ARRAY_LEN(tests) == SDB_STATIC_ARRAY_LEN(op_str)); - obj = sdb_store_get_host(golden_data[i].host); - fail_unless(obj != NULL, + host = sdb_store_get_host(golden_data[i].host); + fail_unless(host != NULL, "sdb_store_get_host(%s) = NULL; expected: ", golden_data[i].host); sdb_data_format(&golden_data[i].value, - buf, sizeof(buf), SDB_UNQUOTED); + value_str, sizeof(value_str), SDB_UNQUOTED); - expr = sdb_store_expr_constvalue(&golden_data[i].value); - fail_unless(expr != NULL, - "sdb_store_expr_constvalue(%s) = NULL; expected: ", - buf); + field = sdb_store_expr_fieldvalue(golden_data[i].field); + fail_unless(field != NULL, + "sdb_store_expr_fieldvalue(%d) = NULL; " + "expected: ", golden_data[i].field); - c = sdb_store_obj_cond(golden_data[i].field, expr); - sdb_object_deref(SDB_OBJ(expr)); - fail_unless(c != NULL, - "sdb_store_obj_cond(%d, expr{%s}) = NULL; expected: ", - golden_data[i].field, buf); + value = sdb_store_expr_constvalue(&golden_data[i].value); + fail_unless(value != NULL, + "sdb_store_expr_constvalue(%s) = NULL; " + "expected: ", value_str); for (j = 0; j < SDB_STATIC_ARRAY_LEN(tests); ++j) { - sdb_store_matcher_t *m; 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__matcher() = NULL; expected: "); - status = sdb_store_matcher_matches(m, obj, /* filter */ NULL); + status = sdb_store_matcher_matches(m, host, /* filter */ NULL); fail_unless(status == tests[j].expected, - "sdb_store_matcher_matches(%s, , NULL) = %d; " - "expected: %d", - sdb_store_matcher_tostring(m, m_str, sizeof(m_str)), - status, tests[j].expected); + "sdb_store_matcher_matches(<%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(c)); - sdb_object_deref(SDB_OBJ(obj)); + sdb_object_deref(SDB_OBJ(field)); + sdb_object_deref(SDB_OBJ(value)); + sdb_object_deref(SDB_OBJ(host)); } } END_TEST @@ -505,9 +552,11 @@ 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_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_data_t attrvalue = { SDB_TYPE_INTEGER, { .integer = 4711 } }; sdb_store_matcher_t *check; @@ -520,54 +569,70 @@ START_TEST(test_parse_cmp) const sdb_data_t *value; int expected; } golden_data[] = { - { "host", NULL, "=", &hostname, MATCHER_NAME }, - { "host", NULL, "!=", &hostname, MATCHER_NOT }, - { "host", NULL, "=~", &hostname, MATCHER_NAME }, - { "host", NULL, "!~", &hostname, MATCHER_NOT }, - { "host", "attr", "=", &hostname, -1 }, - { "host", "attr", "!=", &hostname, -1 }, - { "host", NULL, "&^", &hostname, -1 }, - { "host", NULL, "<", &hostname, -1 }, - { "host", NULL, "<=", &hostname, -1 }, - { "host", NULL, ">=", &hostname, -1 }, - { "host", NULL, ">", &hostname, -1 }, - { "host", NULL, "=", NULL, -1 }, - { "service", NULL, "=", &srvname, MATCHER_NAME }, - { "service", NULL, "!=", &srvname, MATCHER_NOT }, - { "service", NULL, "=~", &srvname, MATCHER_NAME }, - { "service", NULL, "!~", &srvname, MATCHER_NOT }, - { "service", "attr", "=", &srvname, -1 }, - { "service", "attr", "!=", &srvname, -1 }, - { "service", NULL, "&^", &srvname, -1 }, - { "service", NULL, "<", &srvname, -1 }, - { "service", NULL, "<=", &srvname, -1 }, - { "service", NULL, ">=", &srvname, -1 }, - { "service", NULL, ">", &srvname, -1 }, - { "service", NULL, "=", NULL, -1 }, - { "attribute", NULL, "=", &attrname, MATCHER_NAME }, - { "attribute", NULL, "!=", &attrname, MATCHER_NOT }, - { "attribute", NULL, "=~", &attrname, MATCHER_NAME }, - { "attribute", NULL, "!~", &attrname, MATCHER_NOT }, - { "attribute", NULL, "<", &attrname, -1 }, - { "attribute", NULL, "<=", &attrname, -1 }, - { "attribute", NULL, ">=", &attrname, -1 }, - { "attribute", NULL, ">", &attrname, -1 }, - { "attribute", NULL, "=", NULL, -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", "<", NULL, -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 }, - { "attribute", "attr", "IS", &attrname, -1 }, - { "foo", NULL, "=", &attrname, -1 }, - { "foo", "attr", "=", &attrname, -1 }, + { "host", NULL, "=", &hostname, MATCHER_NAME }, + { "host", NULL, "!=", &hostname, MATCHER_NOT }, + { "host", NULL, "=~", &hostname, MATCHER_NAME }, + { "host", NULL, "!~", &hostname, MATCHER_NOT }, + { "host", "attr", "=", &hostname, -1 }, + { "host", "attr", "!=", &hostname, -1 }, + { "host", "attr", "!=", &attrvalue, -1 }, + { "host", "attr", "<=", &attrvalue, -1 }, + { "host", NULL, "&^", &hostname, -1 }, + { "host", NULL, "<", &hostname, -1 }, + { "host", NULL, "<=", &hostname, -1 }, + { "host", NULL, ">=", &hostname, -1 }, + { "host", NULL, ">", &hostname, -1 }, + { "host", NULL, "=", NULL, -1 }, + { "metric", NULL, "=", &metricname, MATCHER_NAME }, + { "metric", NULL, "!=", &metricname, MATCHER_NOT }, + { "metric", NULL, "=~", &metricname, MATCHER_NAME }, + { "metric", NULL, "!~", &metricname, MATCHER_NOT }, + { "metric", "attr", "=", &metricname, -1 }, + { "metric", "attr", "!=", &metricname, -1 }, + { "metric", "attr", "!=", &attrvalue, -1 }, + { "metric", "attr", "<=", &attrvalue, -1 }, + { "metric", NULL, "&^", &metricname, -1 }, + { "metric", NULL, "<", &metricname, -1 }, + { "metric", NULL, "<=", &metricname, -1 }, + { "metric", NULL, ">=", &metricname, -1 }, + { "metric", NULL, ">", &metricname, -1 }, + { "metric", NULL, "=", NULL, -1 }, + { "service", NULL, "=", &srvname, MATCHER_NAME }, + { "service", NULL, "!=", &srvname, MATCHER_NOT }, + { "service", NULL, "=~", &srvname, MATCHER_NAME }, + { "service", NULL, "!~", &srvname, MATCHER_NOT }, + { "service", "attr", "=", &srvname, -1 }, + { "service", "attr", "!=", &srvname, -1 }, + { "service", "attr", "!=", &attrvalue, -1 }, + { "service", "attr", "<=", &attrvalue, -1 }, + { "service", NULL, "&^", &srvname, -1 }, + { "service", NULL, "<", &srvname, -1 }, + { "service", NULL, "<=", &srvname, -1 }, + { "service", NULL, ">=", &srvname, -1 }, + { "service", NULL, ">", &srvname, -1 }, + { "service", NULL, "=", NULL, -1 }, + { "attribute", NULL, "=", &attrname, MATCHER_NAME }, + { "attribute", NULL, "!=", &attrname, MATCHER_NOT }, + { "attribute", NULL, "=~", &attrname, MATCHER_NAME }, + { "attribute", NULL, "!~", &attrname, MATCHER_NOT }, + { "attribute", NULL, "<", &attrname, -1 }, + { "attribute", NULL, "<=", &attrname, -1 }, + { "attribute", NULL, ">=", &attrname, -1 }, + { "attribute", NULL, ">", &attrname, -1 }, + { "attribute", NULL, "=", NULL, -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", "<", NULL, -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 }, + { "foo", NULL, "=", &attrname, -1 }, + { "foo", "attr", "=", &attrname, -1 }, }; for (i = 0; i < SDB_STATIC_ARRAY_LEN(golden_data); ++i) { @@ -597,7 +662,7 @@ START_TEST(test_parse_cmp) fail_unless(check != NULL, "sdb_store_matcher_parse_cmp(%s, %s, %s, %s) = %p; " - "expected: NULL", golden_data[i].obj_type, + "expected: ", 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 " @@ -610,90 +675,6 @@ START_TEST(test_parse_cmp) } END_TEST -START_TEST(test_parse_field_cmp) -{ - sdb_data_t datetime = { SDB_TYPE_DATETIME, { .datetime = 1 } }; - sdb_data_t string = { SDB_TYPE_STRING, { .string = "s" } }; - - struct { - const char *field; - const char *op; - const sdb_data_t *value; - int expected; - } golden_data[] = { - { "last_update", "<", &datetime, MATCHER_LT }, - { "last_update", "<=", &datetime, MATCHER_LE }, - { "last_update", "=", &datetime, MATCHER_EQ }, - { "last_update", ">=", &datetime, MATCHER_GE }, - { "last_update", ">", &datetime, MATCHER_GT }, - { "last_update", "!=", &datetime, MATCHER_NOT }, - { "age", "<", &datetime, MATCHER_LT }, - { "age", "<=", &datetime, MATCHER_LE }, - { "age", "=", &datetime, MATCHER_EQ }, - { "age", ">=", &datetime, MATCHER_GE }, - { "age", ">", &datetime, MATCHER_GT }, - { "age", "!=", &datetime, MATCHER_NOT }, - { "interval", "<", &datetime, MATCHER_LT }, - { "interval", "<=", &datetime, MATCHER_LE }, - { "interval", "=", &datetime, MATCHER_EQ }, - { "interval", ">=", &datetime, MATCHER_GE }, - { "interval", ">", &datetime, MATCHER_GT }, - { "interval", "!=", &datetime, MATCHER_NOT }, - { "backend", "=", &string, MATCHER_EQ }, - { "backend", "!=", &string, MATCHER_NOT }, - /* the behavior for other operators on :backend - * is currently unspecified */ - { "last_update", "=", NULL, -1 }, - { "last_update", "IS", NULL, -1 }, - { "age", "=", NULL, -1 }, - { "interval", "=", NULL, -1 }, - { "backend", "=", NULL, -1 }, - { "backend", "=~", &string, -1 }, - }; - - size_t i; - - for (i = 0; i < SDB_STATIC_ARRAY_LEN(golden_data); ++i) { - sdb_store_matcher_t *check; - 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: ", - buf); - - check = sdb_store_matcher_parse_field_cmp(golden_data[i].field, - 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_field_cmp(%s, %s, expr{%s}) = %p; " - "expected: NULL", golden_data[i].field, - golden_data[i].op, buf, check); - continue; - } - - fail_unless(check != NULL, - "sdb_store_matcher_parse_field_cmp(%s, %s, %s) = %p; " - "expected: NULL", golden_data[i].field, - golden_data[i].op, buf, check); - fail_unless(M(check)->type == golden_data[i].expected, - "sdb_store_matcher_parse_field_cmp(%s, %s, %s) returned " - "matcher of type %d; expected: %d", golden_data[i].field, - 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) { @@ -712,77 +693,56 @@ scan_cb(sdb_store_obj_t *obj, void *user_data) START_TEST(test_scan) { -#define PTR_RE "0x[0-9a-f]+" struct { const char *query; const char *filter; int expected; - const char *tostring_re; } golden_data[] = { - { "host = 'a'", NULL, 1, - "OBJ\\[host\\]\\{ NAME\\{ 'a', \\(nil\\) \\} \\}" }, - { "host = 'a'", "host = 'x'", 0, /* filter never matches */ - "OBJ\\[host\\]\\{ NAME\\{ 'a', \\(nil\\) \\} \\}" }, + { "host = 'a'", NULL, 1 }, + { "host = 'a'", "host = 'x'", 0 }, /* filter never matches */ { "host = 'a'", - "NOT attribute.x = ''", 1, /* filter always matches */ - "OBJ\\[host\\]\\{ NAME\\{ 'a', \\(nil\\) \\} \\}" }, - { "host =~ 'a|b'", NULL, 2, - "OBJ\\[host\\]\\{ NAME\\{ NULL, "PTR_RE" \\} \\}" }, - { "host =~ 'host'", NULL, 0, - "OBJ\\[host\\]\\{ NAME\\{ NULL, "PTR_RE" \\} \\}" }, - { "host =~ '.'", NULL, 3, - "OBJ\\[host\\]\\{ NAME\\{ NULL, "PTR_RE" \\} \\}" }, - { "service = 's1'", NULL, 2, - "OBJ\\[service\\]\\{ NAME\\{ 's1', \\(nil\\) } \\}" }, - { "service = 's1'", "host = 'x'", 0, /* filter never matches */ - "OBJ\\[service\\]\\{ NAME\\{ 's1', \\(nil\\) } \\}" }, + "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 */ - "OBJ\\[service\\]\\{ NAME\\{ 's1', \\(nil\\) } \\}" }, - { "service =~ 's'", NULL, 2, - "OBJ\\[service\\]\\{ NAME\\{ NULL, "PTR_RE" } \\}" }, - { "service !~ 's'", NULL, 1, - "\\(NOT, OBJ\\[service\\]\\{ NAME\\{ NULL, "PTR_RE" } \\}\\)" }, - { "attribute = 'k1'", NULL, 1, - "OBJ\\[attribute\\]\\{ NAME\\{ 'k1', \\(nil\\) \\} " }, - { "attribute = 'k1'", "host = 'x'", 0, /* filter never matches */ - "OBJ\\[attribute\\]\\{ NAME\\{ 'k1', \\(nil\\) \\} " }, + "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 = ''", 1, /* filter always matches */ - "OBJ\\[attribute\\]\\{ NAME\\{ 'k1', \\(nil\\) \\} " }, - { "attribute = 'x'", NULL, 0, - "OBJ\\[attribute\\]\\{ NAME\\{ 'x', \\(nil\\) \\}" }, - { "attribute.k1 = 'v1'", NULL, 1, - "ATTR\\[k1\\]\\{ VALUE\\{ 'v1', \\(nil\\) \\} \\}" }, - { "attribute.k1 IS NULL", NULL, 2, - "\\(IS NULL, ATTR\\[k1\\]\\)" }, - { "attribute.x1 IS NULL", NULL, 3, - "\\(IS NULL, ATTR\\[x1\\]\\)" }, - { "attribute.k1 IS NOT NULL", NULL, 1, - "\\(NOT, \\(IS NULL, ATTR\\[k1\\]\\)\\)" }, - { "attribute.x1 IS NOT NULL", NULL, 0, - "\\(NOT, \\(IS NULL, ATTR\\[x1\\]\\)\\)" }, - { "attribute.k2 < 123", NULL, 0, - "ATTR\\[k2\\]\\{ < 123 \\}" }, - { "attribute.k2 <= 123", NULL, 1, - "ATTR\\[k2\\]\\{ <= 123 \\}" }, - { "attribute.k2 >= 123", NULL, 1, - "ATTR\\[k2\\]\\{ >= 123 \\}" }, - { "attribute.k2 > 123", NULL, 0, - "ATTR\\[k2\\]\\{ > 123 \\}" }, - { "attribute.k2 = 123", NULL, 1, - "ATTR\\[k2\\]\\{ = 123 \\}" }, - { "attribute.k2 != 123", NULL, 2, - "\\(NOT, ATTR\\[k2\\]\\{ = 123 \\}\\)" }, - { "attribute.k1 != 'v1'", NULL, 2, - "\\(NOT, ATTR\\[k1\\]\\{ VALUE\\{ 'v1', \\(nil\\) \\} \\}\\)" }, - { "attribute.k1 != 'v2'", NULL, 3, - "\\(NOT, ATTR\\[k1\\]\\{ VALUE\\{ 'v2', \\(nil\\) \\} \\}\\)" }, + "NOT attribute['x'] = ''", 2 }, /* filter always matches */ + { "attribute = 'x'", NULL, 0 }, + { "attribute['k1'] = 'v1'", NULL, 1 }, + { "attribute['k1'] =~ 'v'", NULL, 2 }, + { "attribute['k1'] !~ 'v'", 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, - "\\(AND, " - "\\(NOT, OBJ\\[attribute\\]\\{ NAME\\{ 'x', \\(nil\\) \\} \\}\\), " - "\\(NOT, ATTR\\[y\\]\\{ VALUE\\{ NULL, "PTR_RE" \\} \\}\\)\\)" }, + "AND attribute['y'] !~ 'x'", NULL, 3 }, }; int check, n; @@ -798,7 +758,6 @@ START_TEST(test_scan) for (i = 0; i < SDB_STATIC_ARRAY_LEN(golden_data); ++i) { sdb_store_matcher_t *m, *filter = NULL; - char buf[4096]; m = sdb_fe_parse_matcher(golden_data[i].query, -1); fail_unless(m != NULL, @@ -812,13 +771,6 @@ START_TEST(test_scan) "expected: ", golden_data[i].filter); } - 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); - n = 0; sdb_store_scan(m, filter, scan_cb, &n); fail_unless(n == golden_data[i].expected, @@ -842,10 +794,9 @@ core_store_lookup_suite(void) tcase_add_test(tc, test_store_match_name); tcase_add_test(tc, test_store_match_attr); tcase_add_test(tc, test_attr_cond); - tcase_add_test(tc, test_obj_cond); + 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_parse_field_cmp); tcase_add_test(tc, test_scan); suite_add_tcase(s, tc);