X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Funit%2Fcore%2Fstore_lookup_test.c;h=3b0e956e327404f11c42e96d8391dce60bb08b3b;hb=ff53c1c6b145e1a0315ee42d316a858f29f7d0a1;hp=1d4bf7aa267bda7a358de48ce58dd788391691aa;hpb=a253fa4a57c8ac8abd2e0801d55f8556b87ef836;p=sysdb.git diff --git a/t/unit/core/store_lookup_test.c b/t/unit/core/store_lookup_test.c index 1d4bf7a..3b0e956 100644 --- a/t/unit/core/store_lookup_test.c +++ b/t/unit/core/store_lookup_test.c @@ -38,6 +38,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; @@ -66,6 +75,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 +121,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 }, @@ -140,12 +167,14 @@ START_TEST(test_store_match_name) m = sdb_store_name_matcher(golden_data[i].type, golden_data[i].name, golden_data[i].re); fail_unless(m != NULL, - "sdb_store_service_matcher(%d, %s, %d) = NULL; expected: ", - golden_data[i].type, golden_data[i].name, golden_data[i].re); + "sdb_store_service_matcher(%d, %s, %d) = NULL; " + "expected: ", golden_data[i].type, + golden_data[i].name, golden_data[i].re); - status = sdb_store_matcher_matches(m, obj); + status = sdb_store_matcher_matches(m, obj, /* filter */ NULL); fail_unless(status == golden_data[i].expected, - "sdb_store_matcher_matches(%s, ) = %d; expected: %d", + "sdb_store_matcher_matches(%s, , NULL) = %d; " + "expected: %d", sdb_store_matcher_tostring(m, buf, sizeof(buf)), status, golden_data[i].expected); @@ -155,9 +184,10 @@ START_TEST(test_store_match_name) 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, obj, /* filter */ NULL); fail_unless(status == !golden_data[i].expected, - "sdb_store_matcher_matches(%s, ) = %d; expected: %d", + "sdb_store_matcher_matches(%s, , NULL) = %d; " + "expected: %d", sdb_store_matcher_tostring(n, buf, sizeof(buf)), status, !golden_data[i].expected); @@ -218,9 +248,10 @@ START_TEST(test_store_match_attr) fail_unless(m != NULL, "sdb_store_attr_matcher() = NULL; expected: "); - status = sdb_store_matcher_matches(m, obj); + status = sdb_store_matcher_matches(m, obj, /* filter */ NULL); fail_unless(status == golden_data[i].expected, - "sdb_store_matcher_matches({%s, ) = %d; expected: %d", + "sdb_store_matcher_matches({%s, , NULL) = %d; " + "expected: %d", sdb_store_matcher_tostring(m, buf, sizeof(buf)), status, golden_data[i].expected); @@ -230,9 +261,10 @@ START_TEST(test_store_match_attr) 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, obj, /* filter */ NULL); fail_unless(status == !golden_data[i].expected, - "sdb_store_matcher_matches({%s, ) = %d; expected: %d", + "sdb_store_matcher_matches({%s, , NULL) = %d; " + "expected: %d", sdb_store_matcher_tostring(n, buf, sizeof(buf)), status, !golden_data[i].expected); @@ -243,7 +275,7 @@ START_TEST(test_store_match_attr) } END_TEST -START_TEST(test_store_cond) +START_TEST(test_attr_cond) { sdb_store_obj_t *obj; @@ -255,6 +287,7 @@ START_TEST(test_store_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 }, @@ -263,8 +296,8 @@ START_TEST(test_store_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; @@ -275,28 +308,34 @@ START_TEST(test_store_cond) "sdb_store_get_host(a) = NULL; expected: "); for (i = 0; i < SDB_STATIC_ARRAY_LEN(golden_data); ++i) { + sdb_store_expr_t *expr; sdb_store_cond_t *c; char buf[1024]; size_t j; struct { sdb_store_matcher_t *(*matcher)(sdb_store_cond_t *); - int *expected; + 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_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_data_format(&golden_data[i].value, buf, sizeof(buf), SDB_UNQUOTED); - c = sdb_store_attr_cond(golden_data[i].attr, - &golden_data[i].value); + expr = sdb_store_expr_constvalue(&golden_data[i].value); + fail_unless(expr != NULL, + "sdb_store_expr_constvalue(%s) = NULL; expected: ", + buf); + + c = sdb_store_attr_cond(golden_data[i].attr, expr); + sdb_object_deref(SDB_OBJ(expr)); fail_unless(c != NULL, - "sdb_store_attr_cond(%s, %s) = NULL; expected: ", + "sdb_store_attr_cond(%s, expr{%s}) = NULL; expected: ", golden_data[i].attr, buf); for (j = 0; j < SDB_STATIC_ARRAY_LEN(tests); ++j) { @@ -307,11 +346,12 @@ START_TEST(test_store_cond) fail_unless(m != NULL, "sdb_store__matcher() = NULL; expected: "); - status = sdb_store_matcher_matches(m, obj); - fail_unless(status == *tests[j].expected, - "sdb_store_matcher_matches(%s) = %d; expected: %d", + 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); + status, tests[j].expected); sdb_object_deref(SDB_OBJ(m)); } @@ -323,6 +363,116 @@ START_TEST(test_store_cond) } END_TEST +START_TEST(test_obj_cond) +{ + struct { + const char *host; + int field; + 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 }, + { "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 */ + { "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; + + 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]; + size_t j; + + struct { + sdb_store_matcher_t *(*matcher)(sdb_store_cond_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 }, + }; + + obj = sdb_store_get_host(golden_data[i].host); + fail_unless(obj != NULL, + "sdb_store_get_host(%s) = NULL; expected: ", + golden_data[i].host); + + sdb_data_format(&golden_data[i].value, + buf, sizeof(buf), SDB_UNQUOTED); + + expr = sdb_store_expr_constvalue(&golden_data[i].value); + fail_unless(expr != NULL, + "sdb_store_expr_constvalue(%s) = NULL; expected: ", + buf); + + 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); + + 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, + "sdb_store__matcher() = NULL; expected: "); + + 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_object_deref(SDB_OBJ(m)); + } + + sdb_object_deref(SDB_OBJ(c)); + sdb_object_deref(SDB_OBJ(obj)); + } +} +END_TEST + START_TEST(test_store_match_op) { sdb_store_obj_t *obj; @@ -351,10 +501,10 @@ START_TEST(test_store_match_op) 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"); - 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"); @@ -375,9 +525,9 @@ START_TEST(test_store_match_op) #define TO_NAME(v) (((v) == always) ? "always" \ : ((v) == never) ? "never" : "") - status = sdb_store_matcher_matches(m, obj); + status = sdb_store_matcher_matches(m, obj, /* filter */ NULL); 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); @@ -395,9 +545,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; @@ -407,67 +559,97 @@ START_TEST(test_parse_cmp) const char *obj_type; const char *attr; const char *op; - const sdb_data_t value; + 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 }, - { "foo", "name", "=", 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 }, + { "attribute", "attr", "IS", NULL, MATCHER_ISNULL }, + { "attribute", "attr", "IS", &attrname, -1 }, + { "foo", NULL, "=", &attrname, -1 }, + { "foo", "attr", "=", &attrname, -1 }, }; for (i = 0; i < SDB_STATIC_ARRAY_LEN(golden_data); ++i) { + sdb_store_expr_t *expr; 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, + 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_cmp(golden_data[i].obj_type, + golden_data[i].attr, 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, %s, %s) = %p; " + "sdb_store_matcher_parse_cmp(%s, %s, %s, expr{%s}) = %p; " "expected: NULL", golden_data[i].obj_type, golden_data[i].attr, golden_data[i].op, buf, check); continue; @@ -488,68 +670,195 @@ 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[] = { + { "name", "<", &string, MATCHER_LT }, + { "name", "<=", &string, MATCHER_LE }, + { "name", "=", &string, MATCHER_EQ }, + { "name", ">=", &string, MATCHER_GE }, + { "name", ">", &string, MATCHER_GT }, + { "name", "!=", &string, MATCHER_NOT }, + { "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 -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, - "sdb_store_lookup callback received NULL obj; expected: " + "sdb_store_scan callback received NULL obj; expected: " ""); fail_unless(i != NULL, - "sdb_store_lookup callback received NULL user_data; " + "sdb_store_scan callback received NULL user_data; " "expected: "); ++(*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; + const char *filter; int expected; const char *tostring_re; } golden_data[] = { - { "host.name = 'a'", 1, + { "host = 'a'", NULL, 1, + "OBJ\\[host\\]\\{ NAME\\{ 'a', \\(nil\\) \\} \\}" }, + { "host = 'a'", "host = 'x'", 0, /* filter never matches */ "OBJ\\[host\\]\\{ NAME\\{ 'a', \\(nil\\) \\} \\}" }, - { "host.name =~ 'a|b'", 2, + { "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.name =~ 'host'", 0, + { "host =~ 'host'", NULL, 0, "OBJ\\[host\\]\\{ NAME\\{ NULL, "PTR_RE" \\} \\}" }, - { "host.name =~ '.'", 3, + { "host =~ '.'", NULL, 3, "OBJ\\[host\\]\\{ NAME\\{ NULL, "PTR_RE" \\} \\}" }, - { "service.name = 's1'", 2, + { "metric = 'm1'", NULL, 2, + "OBJ\\[metric\\]\\{ NAME\\{ 'm1', \\(nil\\) } \\}" }, + { "metric= 'm1'", "host = 'x'", 0, /* filter never matches */ + "OBJ\\[metric\\]\\{ NAME\\{ 'm1', \\(nil\\) } \\}" }, + { "metric = 'm1'", + "NOT attribute[x] = ''", 2, /* filter always matches */ + "OBJ\\[metric\\]\\{ NAME\\{ 'm1', \\(nil\\) } \\}" }, + { "metric =~ 'm'", NULL, 2, + "OBJ\\[metric\\]\\{ NAME\\{ NULL, "PTR_RE" } \\}" }, + { "metric !~ 'm'", NULL, 1, + "\\(NOT, OBJ\\[metric\\]\\{ NAME\\{ NULL, "PTR_RE" } \\}\\)" }, + { "metric =~ 'x'", NULL, 0, + "OBJ\\[metric\\]\\{ 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\\) } \\}" }, + { "service = 's1'", + "NOT attribute[x] = ''", 2, /* filter always matches */ "OBJ\\[service\\]\\{ NAME\\{ 's1', \\(nil\\) } \\}" }, - { "service.name =~ 's'", 2, + { "service =~ 's'", NULL, 2, "OBJ\\[service\\]\\{ NAME\\{ NULL, "PTR_RE" } \\}" }, - { "service.name !~ 's'", 1, + { "service !~ 's'", NULL, 1, "\\(NOT, OBJ\\[service\\]\\{ NAME\\{ NULL, "PTR_RE" } \\}\\)" }, - { "attribute.name = 'k1'", 1, + { "attribute = 'k1'", NULL, 1, "OBJ\\[attribute\\]\\{ NAME\\{ 'k1', \\(nil\\) \\} " }, - { "attribute.name = 'x'", 0, + { "attribute = 'k1'", "host = 'x'", 0, /* filter never matches */ + "OBJ\\[attribute\\]\\{ NAME\\{ 'k1', \\(nil\\) \\} " }, + { "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'", 1, + { "attribute[k1] = 'v1'", NULL, 1, "ATTR\\[k1\\]\\{ VALUE\\{ 'v1', \\(nil\\) \\} \\}" }, - { "attribute.k2 < 123", 0, + { "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", 1, + { "attribute[k2] <= 123", NULL, 1, "ATTR\\[k2\\]\\{ <= 123 \\}" }, - { "attribute.k2 >= 123", 1, + { "attribute[k2] >= 123", NULL, 1, "ATTR\\[k2\\]\\{ >= 123 \\}" }, - { "attribute.k2 > 123", 0, + { "attribute[k2] > 123", NULL, 0, "ATTR\\[k2\\]\\{ > 123 \\}" }, - { "attribute.k2 = 123", 1, + { "attribute[k2] = 123", NULL, 1, "ATTR\\[k2\\]\\{ = 123 \\}" }, - { "attribute.k2 != 123", 2, + { "attribute[k2] != 123", NULL, 2, "\\(NOT, ATTR\\[k2\\]\\{ = 123 \\}\\)" }, - { "attribute.k1 != 'v1'", 2, + { "attribute[k1] != 'v1'", NULL, 2, "\\(NOT, ATTR\\[k1\\]\\{ VALUE\\{ 'v1', \\(nil\\) \\} \\}\\)" }, - { "attribute.k1 != 'v2'", 3, + { "attribute[k1] != 'v2'", NULL, 3, "\\(NOT, ATTR\\[k1\\]\\{ VALUE\\{ 'v2', \\(nil\\) \\} \\}\\)" }, - { "attribute.name != 'x' " - "AND attribute.y !~ 'x'", 3, + { "attribute != 'x' " + "AND attribute[y] !~ 'x'", NULL, 3, "\\(AND, " "\\(NOT, OBJ\\[attribute\\]\\{ NAME\\{ 'x', \\(nil\\) \\} \\}\\), " "\\(NOT, ATTR\\[y\\]\\{ VALUE\\{ NULL, "PTR_RE" \\} \\}\\)\\)" }, @@ -559,20 +868,29 @@ START_TEST(test_lookup) 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, - "sdb_store_lookup() = %d; expected: 0", check); + "sdb_store_scan() = %d; expected: 0", check); 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) { - sdb_store_matcher_t *m; + sdb_store_matcher_t *m, *filter = NULL; char buf[4096]; m = sdb_fe_parse_matcher(golden_data[i].query, -1); fail_unless(m != NULL, "sdb_fe_parse_matcher(%s, -1) = NULL; expected: ", golden_data[i].query); + + 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: ", 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", @@ -581,10 +899,12 @@ START_TEST(test_lookup) golden_data[i].tostring_re); n = 0; - sdb_store_lookup(m, lookup_cb, &n); + sdb_store_scan(m, filter, scan_cb, &n); 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)); } } @@ -600,10 +920,12 @@ core_store_lookup_suite(void) 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_attr_cond); + tcase_add_test(tc, test_obj_cond); 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_parse_field_cmp); + tcase_add_test(tc, test_scan); suite_add_tcase(s, tc); return s;