Code

frontend: Improved parser error reporting.
[sysdb.git] / t / unit / core / store_lookup_test.c
index af680f033865d773a35ed680176818d865c7110d..c256b232ae049096eaace1a86652ff84a77b6e5d 100644 (file)
@@ -30,6 +30,8 @@
 #include "frontend/parser.h"
 #include "libsysdb_test.h"
 
+#include <assert.h>
+
 #include <check.h>
 #include <string.h>
 
@@ -64,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;
@@ -100,19 +103,17 @@ populate(void)
        }
 } /* 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 },
@@ -121,8 +122,6 @@ 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 },
@@ -131,8 +130,6 @@ START_TEST(test_store_match_name)
                { 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 },
@@ -142,8 +139,6 @@ START_TEST(test_store_match_name)
                { 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 },
@@ -155,105 +150,52 @@ START_TEST(test_store_match_name)
 
        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;
-               char buf[1024];
                int status;
 
-               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: <matcher>", golden_data[i].type,
-                               golden_data[i].name, golden_data[i].re);
-
-               status = sdb_store_matcher_matches(m, obj, /* filter */ NULL);
-               fail_unless(status == golden_data[i].expected,
-                               "sdb_store_matcher_matches(%s, <host a>, NULL) = %d; "
-                               "expected: %d",
-                               sdb_store_matcher_tostring(m, buf, sizeof(buf)),
-                               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(%s, <host a>, NULL) = %d; "
-                               "expected: %d",
-                               sdb_store_matcher_tostring(n, buf, sizeof(buf)),
-                               status, !golden_data[i].expected);
-
-               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;
+               datum.type = SDB_TYPE_STRING;
+               datum.data.string = golden_data[i].name;
 
-               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;
-               char buf[1024];
-               int status;
-
-               m = sdb_store_attr_matcher(golden_data[i].attr_name,
-                               golden_data[i].attr_value, golden_data[i].re);
+               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_attr_matcher() = NULL; expected: <matcher>");
+                               "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, <host a>, NULL) = %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,
@@ -261,23 +203,22 @@ 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, /* filter */ NULL);
+               status = sdb_store_matcher_matches(n, host, /* filter */ NULL);
                fail_unless(status == !golden_data[i].expected,
-                               "sdb_store_matcher_matches({%s, <host a>, NULL) = %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(obj));
+       sdb_object_deref(SDB_OBJ(host));
 }
 END_TEST
 
-START_TEST(test_attr_cond)
+START_TEST(test_cmp_attr)
 {
-       sdb_store_obj_t *obj;
+       sdb_store_obj_t *host;
 
        struct {
                const char *attr;
@@ -303,18 +244,19 @@ START_TEST(test_attr_cond)
        int status;
        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_expr_t *expr;
-               sdb_store_cond_t *c;
-               char buf[1024];
+               sdb_store_expr_t *attr;
+               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 },
@@ -324,46 +266,48 @@ START_TEST(test_attr_cond)
                        { 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,
-                               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: <expr>",
-                               buf);
+               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);
 
-               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, expr{%s}) = NULL; expected: <cond>",
-                               golden_data[i].attr, buf);
+               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;
-                       char m_str[1024];
 
-                       m = tests[j].matcher(c);
+                       m = tests[j].matcher(attr, value);
                        fail_unless(m != NULL,
                                        "sdb_store_<cond>_matcher() = NULL; expected: <matcher>");
 
-                       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, <obj>, NULL) = %d; "
-                                       "expected: %d",
-                                       sdb_store_matcher_tostring(m, m_str, sizeof(m_str)),
+                                       "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(c));
+               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
 
-START_TEST(test_obj_cond)
+START_TEST(test_cmp_obj)
 {
        struct {
                const char *host;
@@ -371,6 +315,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 },
@@ -407,14 +357,15 @@ START_TEST(test_obj_cond)
        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 },
@@ -423,46 +374,52 @@ START_TEST(test_obj_cond)
                        { sdb_store_ge_matcher, golden_data[i].expected_ge },
                        { sdb_store_gt_matcher, golden_data[i].expected_gt },
                };
+               char *op_str[] = { "<", "<=", "=", ">=", ">" };
 
-               obj = sdb_store_get_host(golden_data[i].host);
-               fail_unless(obj != NULL,
+               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,
-                               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: <expr>",
-                               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);
 
-               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: <cond>",
-                               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: <expr>", 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;
+
+                       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(c);
+                       m = tests[j].matcher(field, value);
                        fail_unless(m != NULL,
                                        "sdb_store_<cond>_matcher() = NULL; expected: <matcher>");
 
-                       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, <obj>, NULL) = %d; "
-                                       "expected: %d",
-                                       sdb_store_matcher_tostring(m, m_str, sizeof(m_str)),
-                                       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(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
@@ -471,8 +428,11 @@ START_TEST(test_store_match_op)
 {
        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;
@@ -532,227 +492,20 @@ START_TEST(test_store_match_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_data_t attrvalue  = { SDB_TYPE_INTEGER, { .integer = 4711 } };
-
-       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",      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];
-
-               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].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, expr{%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
-
-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: <expr>",
-                               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)
+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>");
@@ -766,97 +519,89 @@ 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\\) \\} \\}" },
+               /* 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 */
-                       "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" \\} \\}" },
-               { "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 =~ '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\\) \\} " },
-               { "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\\) \\} \\}\\)" },
-               { "attribute != 'x' "
-                 "AND attribute[y] !~ 'x'", NULL,   3,
-                       "\\(AND, "
-                               "\\(NOT, OBJ\\[attribute\\]\\{ NAME\\{ 'x', \\(nil\\) \\} \\}\\), "
-                               "\\(NOT, ATTR\\[y\\]\\{ VALUE\\{ NULL, "PTR_RE" \\} \\}\\)\\)" },
+                       "NOT attribute['x'] = ''",         1 }, /* filter always matches */
+               { "host =~ 'a|b'", NULL,               2 },
+               { "host =~ 'host'", NULL,              0 },
+               { "host =~ '.'", NULL,                 3 },
+               { "ANY metric = 'm1'", NULL,           2 },
+               { "ANY metric= 'm1'", "host = 'x'",    0 }, /* filter never matches */
+               { "ANY metric = 'm1'",
+                       "NOT attribute['x'] = ''",         2 }, /* filter always matches */
+               { "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 */
+               { "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 */
+               { "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['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 },
+               { "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);
@@ -865,36 +610,32 @@ 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);
+               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));
                }
 
-               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);
+               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
 
@@ -906,13 +647,10 @@ core_store_lookup_suite(void)
 
        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_attr_cond);
-       tcase_add_test(tc, test_obj_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_parse_cmp);
-       tcase_add_test(tc, test_parse_field_cmp);
        tcase_add_test(tc, test_scan);
        suite_add_tcase(s, tc);