Code

store: Drop the special IS-NOT-NULL matcher.
[sysdb.git] / t / unit / core / store_lookup_test.c
index 0754a3b528fadb760e4a73dae8c4e062c60e7ce7..14d2209a933e0e398a620532a419fae0c27e0e19 100644 (file)
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if HAVE_CONFIG_H
+#      include "config.h"
+#endif
+
 #include "core/store.h"
 #include "core/store-private.h"
-#include "frontend/parser.h"
-#include "libsysdb_test.h"
+#include "parser/parser.h"
+#include "testutils.h"
+
+#include <assert.h>
 
 #include <check.h>
 #include <string.h>
@@ -38,6 +44,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 +70,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 +82,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);
@@ -83,245 +107,316 @@ populate(void)
        }
 } /* populate */
 
-START_TEST(test_store_match_name)
+struct {
+       int type;
+       char *name;
+       _Bool re;
+
+       int expected;
+} cmp_name_data[] = {
+       { SDB_HOST,      "a",    0, 1 },
+       { SDB_HOST,      "a",    1, 1 },
+       { SDB_HOST,      "b",    0, 0 },
+       { SDB_HOST,      "b",    1, 0 },
+       { SDB_HOST,      "^a$",  1, 1 },
+       { SDB_HOST,      "^b$",  1, 0 },
+       { SDB_HOST,      "^a$",  0, 0 },
+       { SDB_HOST,      "^b$",  0, 0 },
+       { SDB_METRIC,    "m1",   0, 1 },
+       { SDB_METRIC,    "m1",   1, 1 },
+       { SDB_METRIC,    "^m1$", 1, 1 },
+       { SDB_METRIC,    "m",    1, 1 },
+       { SDB_METRIC,    "s",    1, 0 },
+       { SDB_METRIC,    "m2",   0, 0 },
+       { SDB_METRIC,    "x1",   0, 0 },
+       { SDB_METRIC,    "x1",   1, 0 },
+       { SDB_SERVICE,   "s1",   0, 1 },
+       { SDB_SERVICE,   "s2",   0, 1 },
+       { SDB_SERVICE,   "s3",   0, 0 },
+       { SDB_SERVICE,   "s4",   0, 0 },
+       { SDB_SERVICE,   "^s1$", 1, 1 },
+       { SDB_SERVICE,   "^s1$", 0, 0 },
+       { SDB_SERVICE,   "x1",   0, 0 },
+       { SDB_SERVICE,   "x1",   1, 0 },
+       { SDB_SERVICE,   "x",    1, 0 },
+       { SDB_ATTRIBUTE, "k1",   0, 1 },
+       { SDB_ATTRIBUTE, "k2",   0, 1 },
+       { SDB_ATTRIBUTE, "k3",   0, 0 },
+       { SDB_ATTRIBUTE, "k4",   0, 0 },
+       { SDB_ATTRIBUTE, "k",    1, 1 },
+       { SDB_ATTRIBUTE, "1",    1, 1 },
+       { SDB_ATTRIBUTE, "3",    1, 0 },
+};
+
+START_TEST(test_cmp_name)
 {
-       sdb_store_obj_t *obj;
-
-       struct {
-               int type;
-               const char *name;
-               _Bool re;
-
-               int expected;
-       } golden_data[] = {
-               { SDB_HOST,      NULL,   0, 1 },
-               { SDB_HOST,      NULL,   1, 1 },
-               { SDB_HOST,      "a",    0, 1 },
-               { SDB_HOST,      "a",    1, 1 },
-               { SDB_HOST,      "b",    0, 0 },
-               { SDB_HOST,      "b",    1, 0 },
-               { SDB_HOST,      "^a$",  1, 1 },
-               { SDB_HOST,      "^b$",  1, 0 },
-               { SDB_HOST,      "^a$",  0, 0 },
-               { SDB_HOST,      "^b$",  0, 0 },
-               { SDB_SERVICE,   NULL,   0, 1 },
-               { SDB_SERVICE,   NULL,   1, 1 },
-               { SDB_SERVICE,   "s1",   0, 1 },
-               { SDB_SERVICE,   "s2",   0, 1 },
-               { SDB_SERVICE,   "s3",   0, 0 },
-               { SDB_SERVICE,   "s4",   0, 0 },
-               { SDB_SERVICE,   "^s1$", 1, 1 },
-               { SDB_SERVICE,   "^s1$", 0, 0 },
-               { SDB_SERVICE,   "x1",   0, 0 },
-               { SDB_SERVICE,   "x1",   1, 0 },
-               { SDB_SERVICE,   "x",    1, 0 },
-               { SDB_ATTRIBUTE, NULL,   0, 1 },
-               { SDB_ATTRIBUTE, NULL,   1, 1 },
-               { SDB_ATTRIBUTE, "k1",   0, 1 },
-               { SDB_ATTRIBUTE, "k2",   0, 1 },
-               { SDB_ATTRIBUTE, "k3",   0, 0 },
-               { SDB_ATTRIBUTE, "k4",   0, 0 },
-               { SDB_ATTRIBUTE, "k",    1, 1 },
-               { SDB_ATTRIBUTE, "1",    1, 1 },
-               { SDB_ATTRIBUTE, "3",    1, 0 },
-       };
-
-       size_t i;
+       sdb_store_obj_t *host;
+       sdb_data_t datum;
+       sdb_store_expr_t *obj = NULL, *value;
+       sdb_store_matcher_t *m, *n;
+       int status;
 
-       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_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);
-               fail_unless(status == golden_data[i].expected,
-                               "sdb_store_matcher_matches(%s, <host a>) = %d; expected: %d",
-                               sdb_store_matcher_tostring(m, buf, sizeof(buf)),
-                               status, golden_data[i].expected);
+       datum.type = SDB_TYPE_STRING;
+       datum.data.string = cmp_name_data[_i].name;
 
-               n = sdb_store_inv_matcher(m);
-               fail_unless(n != NULL,
-                               "sdb_store_inv_matcher() = NULL; expected: <matcher>");
+       if (cmp_name_data[_i].type == SDB_HOST) {
+               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>", cmp_name_data[_i].name);
+
+       if (cmp_name_data[_i].re)
+               m = sdb_store_regex_matcher(obj, value);
+       else
+               m = sdb_store_eq_matcher(obj, value);
+
+       if (cmp_name_data[_i].type != SDB_HOST) {
+               sdb_store_expr_t *iter;
+               sdb_store_matcher_t *tmp;
+               obj = sdb_store_expr_fieldvalue(SDB_FIELD_NAME);
+               iter = sdb_store_expr_typed(cmp_name_data[_i].type, obj);
+               tmp = sdb_store_any_matcher(iter, m);
+               ck_assert(iter && m);
+               sdb_object_deref(SDB_OBJ(iter));
                sdb_object_deref(SDB_OBJ(m));
-
-               /* now match the inverted set of objects */
-               status = sdb_store_matcher_matches(n, obj);
-               fail_unless(status == !golden_data[i].expected,
-                               "sdb_store_matcher_matches(%s, <host a>) = %d; expected: %d",
-                               sdb_store_matcher_tostring(n, buf, sizeof(buf)),
-                               status, !golden_data[i].expected);
-
-               sdb_object_deref(SDB_OBJ(n));
+               m = tmp;
        }
-
        sdb_object_deref(SDB_OBJ(obj));
+       sdb_object_deref(SDB_OBJ(value));
+       fail_unless(m != NULL,
+                       "sdb_store_%s_matcher(%s, %s) = NULL; "
+                       "expected: <matcher>",
+                       cmp_name_data[_i].re ? "regex" : "eq",
+                       SDB_STORE_TYPE_TO_NAME(cmp_name_data[_i].type),
+                       cmp_name_data[_i].name);
+
+       status = sdb_store_matcher_matches(m, host, /* filter */ NULL);
+       fail_unless(status == cmp_name_data[_i].expected,
+                       "sdb_store_matcher_matches(%s->%s, <host a>, NULL) = %d; "
+                       "expected: %d", SDB_STORE_TYPE_TO_NAME(cmp_name_data[_i].type),
+                       cmp_name_data[_i].name, status, cmp_name_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, host, /* filter */ NULL);
+       fail_unless(status == !cmp_name_data[_i].expected,
+                       "sdb_store_matcher_matches(%s->%s, <host a>, NULL) = %d; "
+                       "expected: %d", SDB_STORE_TYPE_TO_NAME(cmp_name_data[_i].type),
+                       cmp_name_data[_i].name, status, !cmp_name_data[_i].expected);
+
+       sdb_object_deref(SDB_OBJ(n));
+       sdb_object_deref(SDB_OBJ(host));
 }
 END_TEST
 
-START_TEST(test_store_match_attr)
+struct {
+       const char *attr;
+       const sdb_data_t value;
+       int expected_lt, expected_le, expected_eq, expected_ge, expected_gt;
+} cmp_attr_data[] = {
+       { "k1", { SDB_TYPE_STRING,  { .string  = "v1" } },  0, 1, 1, 1, 0 },
+       { "k1", { SDB_TYPE_STRING,  { .string  = "v2" } },  1, 1, 0, 0, 0 },
+       { "k1", { SDB_TYPE_STRING,  { .string  = "v0" } },  0, 0, 0, 1, 1 },
+       { "k1", { SDB_TYPE_STRING,  { .string  = "0" } },   0, 0, 0, 1, 1 },
+       { "k2", { SDB_TYPE_INTEGER, { .integer = 123 } },   0, 1, 1, 1, 0 },
+       { "k2", { SDB_TYPE_INTEGER, { .integer = 124 } },   1, 1, 0, 0, 0 },
+       { "k2", { SDB_TYPE_INTEGER, { .integer = 122 } },   0, 0, 0, 1, 1 },
+       /* key does not exist */
+       { "k3", { SDB_TYPE_STRING,  { .string  = "v1" } },  0, 0, 0, 0, 0 },
+       { "k3", { SDB_TYPE_STRING,  { .string  = "123" } }, 0, 0, 0, 0, 0 },
+       { "k3", { SDB_TYPE_INTEGER, { .integer = 123 } },   0, 0, 0, 0, 0 },
+       /* type mismatch */
+       { "k1", { SDB_TYPE_INTEGER, { .integer = 0 } },     0, 0, 0, 1, 1 },
+       { "k2", { SDB_TYPE_STRING,  { .string  = "123" } }, 0, 1, 1, 1, 0 },
+};
+
+START_TEST(test_cmp_attr)
 {
-       sdb_store_obj_t *obj;
+       sdb_store_obj_t *host;
+       sdb_store_expr_t *attr;
+       sdb_store_expr_t *value;
+       char value_str[1024];
+       int status;
+       size_t j;
 
        struct {
-               const char *attr_name;
-               const char *attr_value;
-               _Bool re;
-
+               sdb_store_matcher_t *(*matcher)(sdb_store_expr_t *,
+                               sdb_store_expr_t *);
                int expected;
-       } golden_data[] = {
-               { "k1", NULL,   0, 1 },
-               { "k",  NULL,   1, 0 },
-               { "1",  NULL,   1, 0 },
-               { "k3", NULL,   0, 0 },
-               { "k3", 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 },
+       } tests[] = {
+               { sdb_store_lt_matcher, cmp_attr_data[_i].expected_lt },
+               { sdb_store_le_matcher, cmp_attr_data[_i].expected_le },
+               { sdb_store_eq_matcher, cmp_attr_data[_i].expected_eq },
+               { sdb_store_ge_matcher, cmp_attr_data[_i].expected_ge },
+               { sdb_store_gt_matcher, cmp_attr_data[_i].expected_gt },
        };
 
-       size_t i;
+       const char *op_str[] = { "<", "<=", "=", ">=", ">" };
+       assert(SDB_STATIC_ARRAY_LEN(tests) == SDB_STATIC_ARRAY_LEN(op_str));
 
-       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>");
 
-       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");
+       sdb_data_format(&cmp_attr_data[_i].value,
+                       value_str, sizeof(value_str), SDB_UNQUOTED);
 
-       for (i = 0; i < SDB_STATIC_ARRAY_LEN(golden_data); ++i) {
-               sdb_store_matcher_t *m, *n;
-               char buf[1024];
-               int status;
+       attr = sdb_store_expr_attrvalue(cmp_attr_data[_i].attr);
+       fail_unless(attr != NULL,
+                       "sdb_store_expr_attrvalue(%s) = NULL; expected: <expr>",
+                       cmp_attr_data[_i].attr);
 
-               m = sdb_store_attr_matcher(golden_data[i].attr_name,
-                               golden_data[i].attr_value, golden_data[i].re);
-               fail_unless(m != NULL,
-                               "sdb_store_attr_matcher() = NULL; expected: <matcher>");
+       value = sdb_store_expr_constvalue(&cmp_attr_data[_i].value);
+       fail_unless(value != NULL,
+                       "sdb_store_expr_constvalue(%s) = NULL; expected: <expr>",
+                       value_str);
 
-               status = sdb_store_matcher_matches(m, obj);
-               fail_unless(status == golden_data[i].expected,
-                               "sdb_store_matcher_matches({%s, <host a>) = %d; expected: %d",
-                               sdb_store_matcher_tostring(m, buf, sizeof(buf)),
-                               status, golden_data[i].expected);
+       for (j = 0; j < SDB_STATIC_ARRAY_LEN(tests); ++j) {
+               sdb_store_matcher_t *m;
 
-               n = sdb_store_inv_matcher(m);
-               fail_unless(n != NULL,
-                               "sdb_store_inv_matcher() = NULL; expected: <matcher>");
-               sdb_object_deref(SDB_OBJ(m));
+               m = tests[j].matcher(attr, value);
+               fail_unless(m != NULL,
+                               "sdb_store_<cond>_matcher() = NULL; expected: <matcher>");
 
-               /* now match the inverted set of objects */
-               status = sdb_store_matcher_matches(n, obj);
-               fail_unless(status == !golden_data[i].expected,
-                               "sdb_store_matcher_matches({%s, <host a>) = %d; expected: %d",
-                               sdb_store_matcher_tostring(n, buf, sizeof(buf)),
-                               status, !golden_data[i].expected);
+               status = sdb_store_matcher_matches(m, host, /* filter */ NULL);
+               fail_unless(status == tests[j].expected,
+                               "sdb_store_matcher_matches(<attr[%s] %s %s>, "
+                               "<host>, NULL) = %d; expected: %d",
+                               cmp_attr_data[_i].attr, op_str[j], value_str,
+                               status, tests[j].expected);
 
-               sdb_object_deref(SDB_OBJ(n));
+               sdb_object_deref(SDB_OBJ(m));
        }
 
-       sdb_object_deref(SDB_OBJ(obj));
+       sdb_object_deref(SDB_OBJ(attr));
+       sdb_object_deref(SDB_OBJ(value));
+       sdb_object_deref(SDB_OBJ(host));
 }
 END_TEST
 
-START_TEST(test_store_cond)
+struct {
+       const char *host;
+       int field;
+       const sdb_data_t value;
+       int expected_lt, expected_le, expected_eq, expected_ge, expected_gt;
+} cmp_obj_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 },
+};
+
+START_TEST(test_cmp_obj)
 {
-       sdb_store_obj_t *obj;
+       sdb_store_obj_t *host;
+       sdb_store_expr_t *field;
+       sdb_store_expr_t *value;
+       char value_str[1024];
+       int status;
+       size_t j;
 
        struct {
-               const char *attr;
-               const sdb_data_t value;
-               int expected_lt, expected_le, expected_eq, expected_ge, expected_gt;
-       } golden_data[] = {
-               { "k1", { SDB_TYPE_STRING,  { .string  = "v1" } },  0, 1, 1, 1, 0 },
-               { "k1", { SDB_TYPE_STRING,  { .string  = "v2" } },  1, 1, 0, 0, 0 },
-               { "k1", { SDB_TYPE_STRING,  { .string  = "v0" } },  0, 0, 0, 1, 1 },
-               { "k2", { SDB_TYPE_INTEGER, { .integer = 123 } },   0, 1, 1, 1, 0 },
-               { "k2", { SDB_TYPE_INTEGER, { .integer = 124 } },   1, 1, 0, 0, 0 },
-               { "k2", { SDB_TYPE_INTEGER, { .integer = 122 } },   0, 0, 0, 1, 1 },
-               /* key does not exist */
-               { "k3", { SDB_TYPE_STRING,  { .string  = "v1" } },  0, 0, 0, 0, 0 },
-               { "k3", { SDB_TYPE_STRING,  { .string  = "123" } }, 0, 0, 0, 0, 0 },
-               { "k3", { SDB_TYPE_INTEGER, { .integer = 123 } },   0, 0, 0, 0, 0 },
-               /* type mismatch */
-               { "k1", { SDB_TYPE_INTEGER, { .integer = 0 } },     0, 0, 0, 0, 0 },
-               { "k2", { SDB_TYPE_STRING,  { .string  = "123" } }, 0, 0, 0, 0, 0 },
+               sdb_store_matcher_t *(*matcher)(sdb_store_expr_t *,
+                               sdb_store_expr_t *);
+               int expected;
+       } tests[] = {
+               { sdb_store_lt_matcher, cmp_obj_data[_i].expected_lt },
+               { sdb_store_le_matcher, cmp_obj_data[_i].expected_le },
+               { sdb_store_eq_matcher, cmp_obj_data[_i].expected_eq },
+               { sdb_store_ge_matcher, cmp_obj_data[_i].expected_ge },
+               { sdb_store_gt_matcher, cmp_obj_data[_i].expected_gt },
        };
+       char *op_str[] = { "<", "<=", "=", ">=", ">" };
 
-       int status;
-       size_t i;
+       assert(SDB_STATIC_ARRAY_LEN(tests) == SDB_STATIC_ARRAY_LEN(op_str));
 
-       obj = sdb_store_get_host("a");
-       fail_unless(obj != NULL,
-                       "sdb_store_get_host(a) = NULL; expected: <host>");
+       host = sdb_store_get_host(cmp_obj_data[_i].host);
+       fail_unless(host != NULL,
+                       "sdb_store_get_host(%s) = NULL; expected: <host>",
+                       cmp_obj_data[_i].host);
 
-       for (i = 0; i < SDB_STATIC_ARRAY_LEN(golden_data); ++i) {
-               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 },
-               };
-
-               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);
-               fail_unless(c != NULL,
-                               "sdb_store_attr_cond(%s, %s) = NULL; expected: <cond>",
-                               golden_data[i].attr, 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_<cond>_matcher() = NULL; expected: <matcher>");
-
-                       status = sdb_store_matcher_matches(m, obj);
-                       fail_unless(status == *tests[j].expected,
-                                       "sdb_store_matcher_matches(%s) = %d; expected: %d",
-                                       sdb_store_matcher_tostring(m, m_str, sizeof(m_str)),
-                                       status, *tests[j].expected);
-
-                       sdb_object_deref(SDB_OBJ(m));
-               }
+       sdb_data_format(&cmp_obj_data[_i].value,
+                       value_str, sizeof(value_str), SDB_UNQUOTED);
+
+       field = sdb_store_expr_fieldvalue(cmp_obj_data[_i].field);
+       fail_unless(field != NULL,
+                       "sdb_store_expr_fieldvalue(%d) = NULL; "
+                       "expected: <expr>", cmp_obj_data[_i].field);
+
+       value = sdb_store_expr_constvalue(&cmp_obj_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) {
+               char m_str[1024];
+               sdb_store_matcher_t *m;
 
-               sdb_object_deref(SDB_OBJ(c));
+               snprintf(m_str, sizeof(m_str), "%s %s %s",
+                               SDB_FIELD_TO_NAME(cmp_obj_data[_i].field),
+                               op_str[j], value_str);
+
+               m = tests[j].matcher(field, value);
+               fail_unless(m != NULL,
+                               "sdb_store_<cond>_matcher() = NULL; expected: <matcher>");
+
+               status = sdb_store_matcher_matches(m, host, /* filter */ NULL);
+               fail_unless(status == tests[j].expected,
+                               "sdb_store_matcher_matches(<%s>, <host '%s'>, NULL) = %d; "
+                               "expected: %d", m_str, cmp_obj_data[_i].host, status,
+                               tests[j].expected);
+
+               sdb_object_deref(SDB_OBJ(m));
        }
 
-       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
 
@@ -329,8 +424,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 *never = sdb_store_isnull_matcher(e);
+       sdb_store_matcher_t *always = sdb_store_inv_matcher(never);
 
        struct {
                const char *op;
@@ -353,10 +451,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");
 
@@ -377,9 +475,9 @@ START_TEST(test_store_match_op)
 #define TO_NAME(v) (((v) == always) ? "always" \
                : ((v) == never) ? "never" : "<unknown>")
 
-               status = sdb_store_matcher_matches(m, obj);
+               status = sdb_store_matcher_matches(m, obj, /* filter */ NULL);
                fail_unless(status == golden_data[i].expected,
-                               "%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);
 
@@ -390,226 +488,182 @@ 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 srvname  = { SDB_TYPE_STRING, { .string = "srvname" } };
-       sdb_data_t attrname = { SDB_TYPE_STRING, { .string = "attrname" } };
-
-       sdb_store_matcher_t *check;
-
-       size_t i;
-
-       struct {
-               const char *obj_type;
-               const char *attr;
-               const char *op;
-               const sdb_data_t value;
-               int expected;
-       } golden_data[] = {
-               { "host",      "name", "=",  hostname, MATCHER_NAME },
-               { "host",      "name", "!=", hostname, MATCHER_NOT },
-               { "host",      "name", "=~", hostname, MATCHER_NAME },
-               { "host",      "name", "!~", hostname, MATCHER_NOT },
-               { "host",      "attr", "=",  hostname, -1 },
-               { "host",      "attr", "!=", hostname, -1 },
-               { "host",      "name", "&^", hostname, -1 },
-               { "host",      "name", "<",  hostname, -1 },
-               { "host",      "name", "<=", hostname, -1 },
-               { "host",      "name", ">=", hostname, -1 },
-               { "host",      "name", ">",  hostname, -1 },
-               { "service",   "name", "=",  srvname,  MATCHER_NAME },
-               { "service",   "name", "!=", srvname,  MATCHER_NOT },
-               { "service",   "name", "=~", srvname,  MATCHER_NAME },
-               { "service",   "name", "!~", srvname,  MATCHER_NOT },
-               { "service",   "attr", "=",  srvname,  -1 },
-               { "service",   "attr", "!=", srvname,  -1 },
-               { "service",   "name", "&^", srvname,  -1 },
-               { "service",   "name", "<",  srvname,  -1 },
-               { "service",   "name", "<=", srvname,  -1 },
-               { "service",   "name", ">=", srvname,  -1 },
-               { "service",   "name", ">",  srvname,  -1 },
-               { "attribute", "name", "=",  attrname, MATCHER_NAME },
-               { "attribute", "name", "!=", attrname, MATCHER_NOT },
-               { "attribute", "name", "=~", attrname, MATCHER_NAME },
-               { "attribute", "name", "!~", attrname, MATCHER_NOT },
-               { "attribute", "name", "<",  attrname, -1 },
-               { "attribute", "name", "<=", attrname, -1 },
-               { "attribute", "name", ">=", attrname, -1 },
-               { "attribute", "name", ">",  attrname, -1 },
-               { "attribute", "attr", "=",  attrname, MATCHER_ATTR },
-               { "attribute", "attr", "!=", attrname, MATCHER_NOT },
-               { "attribute", "attr", "=~", attrname, MATCHER_ATTR },
-               { "attribute", "attr", "!~", attrname, MATCHER_NOT },
-               { "attribute", "attr", "&^", attrname, -1 },
-               { "attribute", "attr", "<",  attrname, MATCHER_LT },
-               { "attribute", "attr", "<=", attrname, MATCHER_LE },
-/*             { "attribute", "attr", "=",  attrname, MATCHER_EQ }, */
-               { "attribute", "attr", ">=", attrname, MATCHER_GE },
-               { "attribute", "attr", ">",  attrname, MATCHER_GT },
-               { "foo",       "name", "=",  attrname, -1 },
-               { "foo",       "attr", "=",  attrname, -1 },
-       };
-
-       for (i = 0; i < SDB_STATIC_ARRAY_LEN(golden_data); ++i) {
-               char buf[1024];
-
-               check = sdb_store_matcher_parse_cmp(golden_data[i].obj_type,
-                               golden_data[i].attr, golden_data[i].op,
-                               &golden_data[i].value);
-
-               if (sdb_data_format(&golden_data[i].value,
-                                       buf, sizeof(buf), SDB_UNQUOTED) < 0)
-                       snprintf(buf, sizeof(buf), "ERR");
-
-               if (golden_data[i].expected == -1) {
-                       fail_unless(check == NULL,
-                                       "sdb_store_matcher_parse_cmp(%s, %s, %s, %s) = %p; "
-                                       "expected: NULL", golden_data[i].obj_type,
-                                       golden_data[i].attr, golden_data[i].op, buf, check);
-                       continue;
-               }
-
-               fail_unless(check != NULL,
-                               "sdb_store_matcher_parse_cmp(%s, %s, %s, %s) = %p; "
-                               "expected: NULL", golden_data[i].obj_type,
-                               golden_data[i].attr, golden_data[i].op, buf, check);
-               fail_unless(M(check)->type == golden_data[i].expected,
-                               "sdb_store_matcher_parse_cmp(%s, %s, %s, %s) returned matcher "
-                               "of type %d; expected: %d", golden_data[i].obj_type,
-                               golden_data[i].attr, golden_data[i].op, buf,
-                               M(check)->type, golden_data[i].expected);
-
-               sdb_object_deref(SDB_OBJ(check));
-       }
-}
-END_TEST
-
 static int
-lookup_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_lookup callback received NULL obj; expected: "
+                       "sdb_store_scan callback received NULL obj; expected: "
                        "<store base obj>");
        fail_unless(i != NULL,
-                       "sdb_store_lookup callback received NULL user_data; "
+                       "sdb_store_scan callback received NULL user_data; "
                        "expected: <pointer to data>");
 
        ++(*i);
        return 0;
-} /* lookup_cb */
-
-START_TEST(test_lookup)
+} /* scan_cb */
+
+struct {
+       const char *query;
+       const char *filter;
+       int expected;
+} scan_data[] = {
+       /* TODO: check the name of the expected hosts */
+       { "name = 'a'", NULL,                        1 },
+       { "name = 'a'", "name = 'x'",                0 }, /* filter never matches */
+       { "name = 'a'",
+               "NOT attribute['x'] = ''",               1 }, /* filter always matches */
+       { "name =~ 'a|b'", NULL,                     2 },
+       { "name =~ 'host'", NULL,                    0 },
+       { "name =~ '.'", NULL,                       3 },
+       { "ANY backend = 'backend'", NULL,           0 },
+       { "ALL backend = ''", NULL,                  3 }, /* backend is empty */
+       { "backend = ['backend']", NULL,             0 },
+       { "backend != ['backend']", NULL,            3 },
+       { "backend < ['backend']", NULL,             3 },
+       { "backend <= ['backend']", NULL,            3 },
+       { "backend >= ['backend']", NULL,            0 },
+       { "backend > ['backend']", NULL,             0 },
+       { "ANY metric.name = 'm1'", NULL,            2 },
+       { "ANY metric.name = 'm1'", "name = 'x'",    0 }, /* filter never matches */
+       { "ANY metric.name = 'm1'",
+               "NOT attribute['x'] = ''",               2 }, /* filter always matches */
+       { "ANY metric.name =~ 'm'", NULL,            2 },
+       { "ALL metric.name =~ 'm'", NULL,            3 },
+       { "ANY metric.name =~ 'm'", "name !~ '1'",   1 },
+       { "ANY metric.name =~ 'm'", "name !~ 'm'",   0 },
+       { "ALL metric.name =~ '1'", NULL,            2 },
+       { "ALL metric.name =~ '2'", NULL,            1 },
+       { "ANY metric.name !~ 'm'", NULL,            0 },
+       { "ALL metric.name !~ 'm'", NULL,            1 },
+       { "ANY metric.name =~ 'x'", NULL,            0 },
+       { "ANY service.name = 's1'", NULL,           2 },
+       { "ANY service.name = 's1'", "name = 'x'",   0 }, /* filter never matches */
+       { "ANY service.name = 's1'",
+               "NOT attribute['x'] = ''",               2 }, /* filter always matches */
+       { "ANY service.name =~ 's'", NULL,           2 },
+       { "ANY service.name =~ 's'", "name !~ 's'",  0 },
+       { "ANY service.name =~ 's'", "name !~ '1'",  2 },
+       { "ANY service.name !~ 's'", NULL,           0 },
+       { "ANY attribute.name = 'k1'", NULL,         2 },
+       { "ANY attribute.name = 'k1'", "name = 'x'", 0 }, /* filter never matches */
+       { "ANY attribute.name = 'k1'",
+               "NOT attribute['x'] = ''",         2 }, /* filter always matches */
+       { "ANY attribute.name =~ 'k'", NULL,   2 },
+       { "ANY attribute.name =~ 'k'",
+               "name !~ '1'",                     1 },
+       { "ANY attribute.name =~ 'k'",
+               "name !~ 'k'",                     0 },
+       { "ANY attribute.name =~ '1'", NULL,   2 },
+       { "ANY attribute.name =~ '2'", NULL,   1 },
+       { "ANY attribute.name = 'x'", NULL,    0 },
+       { "ANY attribute.name =~ 'x'", NULL,   0 },
+       { "ALL attribute.name = 'k1'", NULL,   2 },
+       { "ANY attribute.value = 'v1'", NULL,  1 },
+       { "ANY attribute.value =~ 'v'", NULL,  2 },
+       { "ANY attribute.value = 123", NULL,   1 },
+       { "host.name = 'a'", NULL,             1 },
+       { "host.attribute['k1'] =~ 'v1'",
+               NULL,                              1 },
+       { "host.attribute['x1'] IS NULL",
+               NULL,                              3 },
+       { "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,      0 },
+       { "attribute['k1'] = 'v2'", NULL,      1 },
+       { "attribute['k1'] =~ 'v2'", NULL,     1 },
+       { "attribute['x1'] =~ 'v'", NULL,      0 },
+       { "attribute['x1'] =~ 'NULL'", NULL,   0 },
+       { "attribute['x1'] !~ 'v'", NULL,      0 },
+       { "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.name != 'x' "
+         "AND attribute['k1'] !~ 'x'", NULL,  2 },
+};
+
+START_TEST(test_scan)
 {
-#define PTR_RE "0x[0-9a-f]+"
-       struct {
-               const char *query;
-               int expected;
-               const char *tostring_re;
-       } golden_data[] = {
-               { "host.name = 'a'",       1,
-                       "OBJ\\[host\\]\\{ NAME\\{ 'a', \\(nil\\) \\} \\}" },
-               { "host.name =~ 'a|b'",    2,
-                       "OBJ\\[host\\]\\{ NAME\\{ NULL, "PTR_RE" \\} \\}" },
-               { "host.name =~ 'host'",   0,
-                       "OBJ\\[host\\]\\{ NAME\\{ NULL, "PTR_RE" \\} \\}" },
-               { "host.name =~ '.'",      3,
-                       "OBJ\\[host\\]\\{ NAME\\{ NULL, "PTR_RE" \\} \\}" },
-               { "service.name = 's1'",   2,
-                       "OBJ\\[service\\]\\{ NAME\\{ 's1', \\(nil\\) } \\}" },
-               { "service.name =~ 's'",   2,
-                       "OBJ\\[service\\]\\{ NAME\\{ NULL, "PTR_RE" } \\}" },
-               { "service.name !~ 's'",   1,
-                       "\\(NOT, OBJ\\[service\\]\\{ NAME\\{ NULL, "PTR_RE" } \\}\\)" },
-               { "attribute.name = 'k1'", 1,
-                       "OBJ\\[attribute\\]\\{ NAME\\{ 'k1', \\(nil\\) \\} " },
-               { "attribute.name = 'x'",  0,
-                       "OBJ\\[attribute\\]\\{ NAME\\{ 'x', \\(nil\\) \\}" },
-               { "attribute.k1 = 'v1'",   1,
-                       "ATTR\\[k1\\]\\{ VALUE\\{ 'v1', \\(nil\\) \\} \\}" },
-               { "attribute.k2 < 123",    0,
-                       "ATTR\\[k2\\]\\{ < 123 \\}" },
-               { "attribute.k2 <= 123",   1,
-                       "ATTR\\[k2\\]\\{ <= 123 \\}" },
-               { "attribute.k2 >= 123",   1,
-                       "ATTR\\[k2\\]\\{ >= 123 \\}" },
-               { "attribute.k2 > 123",    0,
-                       "ATTR\\[k2\\]\\{ > 123 \\}" },
-               { "attribute.k2 = 123",    1,
-                       "ATTR\\[k2\\]\\{ = 123 \\}" },
-               { "attribute.k2 != 123",   2,
-                       "\\(NOT, ATTR\\[k2\\]\\{ = 123 \\}\\)" },
-               { "attribute.k1 != 'v1'",  2,
-                       "\\(NOT, ATTR\\[k1\\]\\{ VALUE\\{ 'v1', \\(nil\\) \\} \\}\\)" },
-               { "attribute.k1 != 'v2'",  3,
-                       "\\(NOT, ATTR\\[k1\\]\\{ VALUE\\{ 'v2', \\(nil\\) \\} \\}\\)" },
-               { "attribute.name != 'x' "
-                 "AND attribute.y !~ 'x'", 3,
-                       "\\(AND, "
-                               "\\(NOT, OBJ\\[attribute\\]\\{ NAME\\{ 'x', \\(nil\\) \\} \\}\\), "
-                               "\\(NOT, ATTR\\[y\\]\\{ VALUE\\{ NULL, "PTR_RE" \\} \\}\\)\\)" },
-       };
-
+       sdb_strbuf_t *errbuf = sdb_strbuf_create(64);
+       sdb_store_matcher_t *m, *filter = NULL;
+       sdb_ast_node_t *ast;
        int check, n;
-       size_t i;
 
        n = 0;
-       check = sdb_store_lookup(NULL, lookup_cb, &n);
+       check = sdb_store_scan(SDB_HOST, /* 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);
-
-       for (i = 0; i < SDB_STATIC_ARRAY_LEN(golden_data); ++i) {
-               sdb_store_matcher_t *m;
-               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: <matcher>",
-                               golden_data[i].query);
-               fail_unless(sdb_regmatches(golden_data[i].tostring_re,
-                                       sdb_store_matcher_tostring(m, buf, sizeof(buf))) == 0,
-                               "sdb_fe_parse_matcher(%s, -1) = %s; expected: %s",
-                               golden_data[i].query,
-                               sdb_store_matcher_tostring(m, buf, sizeof(buf)),
-                               golden_data[i].tostring_re);
-
-               n = 0;
-               sdb_store_lookup(m, lookup_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_object_deref(SDB_OBJ(m));
+                       "sdb_store_scan called callback %d times; expected: 3", (int)n);
+
+       ast = sdb_parser_parse_conditional(scan_data[_i].query, -1, errbuf);
+       m = sdb_store_query_prepare_matcher(ast);
+       sdb_object_deref(SDB_OBJ(ast));
+       fail_unless(m != NULL,
+                       "sdb_parser_parse_conditional(%s, -1) = NULL; expected: <ast> "
+                       "(parser error: %s)", scan_data[_i].query,
+                       sdb_strbuf_string(errbuf));
+
+       if (scan_data[_i].filter) {
+               ast = sdb_parser_parse_conditional(scan_data[_i].filter, -1, errbuf);
+               filter = sdb_store_query_prepare_matcher(ast);
+               sdb_object_deref(SDB_OBJ(ast));
+               fail_unless(filter != NULL,
+                               "sdb_parser_parse_conditional(%s, -1) = NULL; "
+                               "expected: <ast> (parser error: %s)",
+                               scan_data[_i].filter, sdb_strbuf_string(errbuf));
        }
+
+       n = 0;
+       sdb_store_scan(SDB_HOST, m, filter, scan_cb, &n);
+       fail_unless(n == scan_data[_i].expected,
+                       "sdb_store_scan(HOST, matcher{%s}, filter{%s}) "
+                       "found %d hosts; expected: %d", scan_data[_i].query,
+                       scan_data[_i].filter, n, scan_data[_i].expected);
+
+       sdb_object_deref(SDB_OBJ(filter));
+       sdb_object_deref(SDB_OBJ(m));
+       sdb_strbuf_destroy(errbuf);
 }
 END_TEST
 
-Suite *
-core_store_lookup_suite(void)
+TEST_MAIN("core::store_lookup")
 {
-       Suite *s = suite_create("core::store_lookup");
-       TCase *tc;
-
-       tc = tcase_create("core");
+       TCase *tc = tcase_create("core");
        tcase_add_checked_fixture(tc, populate, sdb_store_clear);
-       tcase_add_test(tc, test_store_match_name);
-       tcase_add_test(tc, test_store_match_attr);
-       tcase_add_test(tc, test_store_cond);
+       TC_ADD_LOOP_TEST(tc, cmp_name);
+       TC_ADD_LOOP_TEST(tc, cmp_attr);
+       TC_ADD_LOOP_TEST(tc, cmp_obj);
+       TC_ADD_LOOP_TEST(tc, scan);
        tcase_add_test(tc, test_store_match_op);
-       tcase_add_test(tc, test_parse_cmp);
-       tcase_add_test(tc, test_lookup);
-       suite_add_tcase(s, tc);
-
-       return s;
-} /* core_store_lookup_suite */
+       ADD_TCASE(tc);
+}
+TEST_MAIN_END
 
 /* vim: set tw=78 sw=4 ts=4 noexpandtab : */