Code

store: Added field type VALUE for attribute values.
[sysdb.git] / src / core / store_lookup.c
index e2ae0669f3cdc64300d5a8d49ecc3b032deea49a..18a0235536e3f154128ff576cbc624c9dfa49a5f 100644 (file)
@@ -38,6 +38,7 @@
 #include "sysdb.h"
 #include "core/store-private.h"
 #include "core/object.h"
+#include "utils/error.h"
 
 #include <assert.h>
 
 
 #include <limits.h>
 
-/*
- * private data types
- */
+static int
+expr_eval2(sdb_store_expr_t *e1, sdb_data_t *v1,
+               sdb_store_expr_t *e2, sdb_data_t *v2,
+               sdb_store_obj_t *obj, sdb_store_matcher_t *filter)
+{
+       if (e1->type) {
+               if (sdb_store_expr_eval(e1, obj, v1, filter))
+                       return -1;
+       }
+       else
+               *v1 = e1->data;
+       if (e2->type) {
+               if (sdb_store_expr_eval(e2, obj, v2, filter)) {
+                       if (e1->type)
+                               sdb_data_free_datum(v1);
+                       return -1;
+               }
+       }
+       else
+               *v2 = e2->data;
+       return 0;
+} /* expr_eval2 */
 
-typedef struct {
-       sdb_store_matcher_t *m;
-       sdb_store_matcher_t *filter;
-       sdb_store_lookup_cb  cb;
-       void *user_data;
-} scan_iter_data_t;
+static void
+expr_free_datum2(sdb_store_expr_t *e1, sdb_data_t *v1,
+               sdb_store_expr_t *e2, sdb_data_t *v2)
+{
+       if (e1->type)
+               sdb_data_free_datum(v1);
+       if (e2->type)
+               sdb_data_free_datum(v2);
+} /* expr_free_datum2 */
 
 /*
- * private helper functions
+ * matcher implementations
  */
 
+/*
+ * cmp_expr:
+ * Compare two values using the specified matcher operator. If strcmp_fallback
+ * is enabled, compare the string values in case of a type mismatch.
+ */
 static int
-scan_iter(sdb_store_obj_t *obj, void *user_data)
+match_cmp_value(int op, sdb_data_t *v1, sdb_data_t *v2, bool strcmp_fallback)
 {
-       scan_iter_data_t *d = user_data;
+       int status;
 
-       if (sdb_store_matcher_matches(d->m, obj, d->filter))
-               return d->cb(obj, d->user_data);
-       return 0;
-} /* scan_iter */
+       if (sdb_data_isnull(v1) || (sdb_data_isnull(v2)))
+               status = INT_MAX;
+       else if (v1->type == v2->type)
+               status = sdb_data_cmp(v1, v2);
+       else if (! strcmp_fallback)
+               status = INT_MAX;
+       else
+               status = sdb_data_strcmp(v1, v2);
 
-/*
- * matcher implementations
- */
+       if (status == INT_MAX)
+               return 0;
+       switch (op) {
+               case MATCHER_LT: return status < 0;
+               case MATCHER_LE: return status <= 0;
+               case MATCHER_EQ: return status == 0;
+               case MATCHER_NE: return status != 0;
+               case MATCHER_GE: return status >= 0;
+               case MATCHER_GT: return status > 0;
+       }
+       return 0;
+} /* match_cmp_value */
 
 static int
-match_string(string_matcher_t *m, const char *name)
+match_regex_value(int op, sdb_data_t *v, sdb_data_t *re)
 {
-       if ((! m->name) && (! m->name_re))
-               return 1;
+       char value[sdb_data_strlen(v) + 1];
+       int status = 0;
 
-       if (! name)
-               name = "";
+       assert((op == MATCHER_REGEX)
+                       || (op == MATCHER_NREGEX));
 
-       if (m->name && strcasecmp(m->name, name))
+       if (sdb_data_isnull(v) || sdb_data_isnull(re))
                return 0;
-       if (m->name_re && regexec(m->name_re, name,
-                                       /* matches */ 0, NULL, /* flags = */ 0))
+
+       if (re->type == SDB_TYPE_STRING) {
+               sdb_data_t tmp = SDB_DATA_INIT;
+
+               if (sdb_data_parse(re->data.string, SDB_TYPE_REGEX, &tmp))
+                       return 0;
+
+               sdb_data_free_datum(re);
+               *re = tmp;
+       }
+       else if (re->type != SDB_TYPE_REGEX)
                return 0;
-       return 1;
-} /* match_string */
+
+       if (! sdb_data_format(v, value, sizeof(value), SDB_UNQUOTED))
+               status = 0;
+       else if (! regexec(&re->data.re.regex, value, 0, NULL, 0))
+               status = 1;
+
+       if (op == MATCHER_NREGEX)
+               return !status;
+       return status;
+} /* match_regex_value */
 
 static int
 match_logical(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
@@ -125,177 +183,73 @@ match_unary(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
        return !sdb_store_matcher_matches(UOP_M(m)->op, obj, filter);
 } /* match_unary */
 
+/* iterate: ANY/ALL <iter> <cmp> <value> */
 static int
-match_name(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
+match_iter(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
                sdb_store_matcher_t *filter)
 {
-       sdb_avltree_iter_t *iter = NULL;
-       int status = 0;
+       sdb_store_expr_iter_t *iter = NULL;
+       int status;
+       int all = (int)(m->type == MATCHER_ALL);
 
-       assert(m->type == MATCHER_NAME);
+       assert((m->type == MATCHER_ANY) || (m->type == MATCHER_ALL));
+       assert((! CMP_M(ITER_M(m)->m)->left) && CMP_M(ITER_M(m)->m)->right);
 
-       if (obj->type == NAME_M(m)->obj_type)
-               return match_string(&NAME_M(m)->name, SDB_OBJ(obj)->name);
-       else if (obj->type != SDB_HOST)
+       iter = sdb_store_expr_iter(ITER_M(m)->iter, obj, filter);
+       if (! iter)
                return 0;
 
-       switch (NAME_M(m)->obj_type) {
-               case SDB_SERVICE:
-                       iter = sdb_avltree_get_iter(HOST(obj)->services);
-                       break;
-               case SDB_METRIC:
-                       iter = sdb_avltree_get_iter(HOST(obj)->metrics);
-                       break;
-               case SDB_ATTRIBUTE:
-                       iter = sdb_avltree_get_iter(HOST(obj)->attributes);
-                       break;
-       }
-
-       while (sdb_avltree_iter_has_next(iter)) {
-               sdb_object_t *child = sdb_avltree_iter_get_next(iter);
-               if (filter && (! sdb_store_matcher_matches(filter, STORE_OBJ(child),
-                                               NULL)))
-                       continue;
-               if (match_string(&NAME_M(m)->name, child->name)) {
-                       status = 1;
+       status = all;
+       while (sdb_store_expr_iter_has_next(iter)) {
+               sdb_data_t v = sdb_store_expr_iter_get_next(iter);
+               sdb_store_expr_t expr = CONST_EXPR(v);
+               bool matches;
+
+               CMP_M(ITER_M(m)->m)->left = &expr;
+               matches = sdb_store_matcher_matches(ITER_M(m)->m, obj, filter);
+               CMP_M(ITER_M(m)->m)->left = NULL;
+               sdb_data_free_datum(&v);
+
+               if (matches) {
+                       if (! all) {
+                               status = 1;
+                               break;
+                       }
+               } else if (all) {
+                       status = 0;
                        break;
                }
        }
-       sdb_avltree_iter_destroy(iter);
+       sdb_store_expr_iter_destroy(iter);
        return status;
-} /* match_name */
+} /* match_iter */
 
 static int
-match_child(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
+match_cmp(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
                sdb_store_matcher_t *filter)
 {
-       sdb_avltree_iter_t *iter = NULL;
-       int status = 0;
-
-       assert((m->type == MATCHER_SERVICE)
-                       || (m->type == MATCHER_METRIC)
-                       || (m->type == MATCHER_ATTRIBUTE));
-
-       /* TODO: support all object types */
-       if (obj->type != SDB_HOST)
-               return 0;
-
-       if (m->type == MATCHER_SERVICE)
-               iter = sdb_avltree_get_iter(HOST(obj)->services);
-       else if (m->type == MATCHER_METRIC)
-               iter = sdb_avltree_get_iter(HOST(obj)->metrics);
-       else if (m->type == SDB_ATTRIBUTE)
-               iter = sdb_avltree_get_iter(HOST(obj)->attributes);
-
-       while (sdb_avltree_iter_has_next(iter)) {
-               sdb_object_t *child = sdb_avltree_iter_get_next(iter);
-               if (filter && (! sdb_store_matcher_matches(filter,
-                                               STORE_OBJ(child), NULL)))
-                       continue;
-
-               if (sdb_store_matcher_matches(CHILD_M(m)->m, obj, filter)) {
-                       status = 1;
-                       break;
-               }
-       }
-       sdb_avltree_iter_destroy(iter);
-       return status;
-} /* match_child */
-
-/*
- * cmp_expr:
- * Compare the values of two expressions when evaluating them using the
- * specified stored object and filter. Returns a value less than, equal to, or
- * greater than zero if the value of the first expression compares less than,
- * equal to, or greater than the value of the second expression. Returns
- * INT_MAX if any of the expressions could not be evaluated or if any of them
- * evaluated to NULL.
- */
-static int
-cmp_expr(sdb_store_expr_t *e1, sdb_store_expr_t *e2,
-               sdb_store_obj_t *obj, sdb_store_matcher_t *filter)
-{
+       sdb_store_expr_t *e1 = CMP_M(m)->left;
+       sdb_store_expr_t *e2 = CMP_M(m)->right;
        sdb_data_t v1 = SDB_DATA_INIT, v2 = SDB_DATA_INIT;
        int status;
 
-       if (sdb_store_expr_eval(e1, obj, &v1, filter))
-               return INT_MAX;
-       if (sdb_store_expr_eval(e2, obj, &v2, filter)) {
-               sdb_data_free_datum(&v1);
-               return INT_MAX;
-       }
-
-       if (sdb_data_isnull(&v1) || (sdb_data_isnull(&v2)))
-               status = INT_MAX;
-       else if (v1.type == v2.type)
-               status = sdb_data_cmp(&v1, &v2);
-       else
-               status = sdb_data_strcmp(&v1, &v2);
-
-       sdb_data_free_datum(&v1);
-       sdb_data_free_datum(&v2);
-       return status;
-} /* cmp_expr */
-
-static int
-match_lt(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
-               sdb_store_matcher_t *filter)
-{
-       int status;
-       assert(m->type == MATCHER_LT);
-       status = cmp_expr(CMP_M(m)->left, CMP_M(m)->right, obj, filter);
-       return (status != INT_MAX) && (status < 0);
-} /* match_lt */
-
-static int
-match_le(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
-               sdb_store_matcher_t *filter)
-{
-       int status;
-       assert(m->type == MATCHER_LE);
-       status = cmp_expr(CMP_M(m)->left, CMP_M(m)->right, obj, filter);
-       return (status != INT_MAX) && (status <= 0);
-} /* match_le */
+       assert((m->type == MATCHER_LT)
+                       || (m->type == MATCHER_LE)
+                       || (m->type == MATCHER_EQ)
+                       || (m->type == MATCHER_NE)
+                       || (m->type == MATCHER_GE)
+                       || (m->type == MATCHER_GT));
+       assert(e1 && e2);
 
-static int
-match_eq(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
-               sdb_store_matcher_t *filter)
-{
-       int status;
-       assert(m->type == MATCHER_EQ);
-       status = cmp_expr(CMP_M(m)->left, CMP_M(m)->right, obj, filter);
-       return (status != INT_MAX) && (! status);
-} /* match_eq */
-
-static int
-match_ne(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
-               sdb_store_matcher_t *filter)
-{
-       int status;
-       assert(m->type == MATCHER_NE);
-       status = cmp_expr(CMP_M(m)->left, CMP_M(m)->right, obj, filter);
-       return (status != INT_MAX) && status;
-} /* match_ne */
+       if (expr_eval2(e1, &v1, e2, &v2, obj, filter))
+               return 0;
 
-static int
-match_ge(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
-               sdb_store_matcher_t *filter)
-{
-       int status;
-       assert(m->type == MATCHER_GE);
-       status = cmp_expr(CMP_M(m)->left, CMP_M(m)->right, obj, filter);
-       return (status != INT_MAX) && (status >= 0);
-} /* match_ge */
+       status = match_cmp_value(m->type, &v1, &v2,
+                       (e1->data_type) < 0 || (e2->data_type < 0));
 
-static int
-match_gt(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
-               sdb_store_matcher_t *filter)
-{
-       int status;
-       assert(m->type == MATCHER_GT);
-       status = cmp_expr(CMP_M(m)->left, CMP_M(m)->right, obj, filter);
-       return (status != INT_MAX) && (status > 0);
-} /* match_gt */
+       expr_free_datum2(e1, &v1, e2, &v2);
+       return status;
+} /* match_cmp */
 
 static int
 match_in(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
@@ -304,17 +258,19 @@ match_in(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
        sdb_data_t value = SDB_DATA_INIT, array = SDB_DATA_INIT;
        int status = 1;
 
-       assert(m->type == MATCHER_IN);
+       assert((m->type == MATCHER_IN) || (m->type == MATCHER_NIN));
+       assert(CMP_M(m)->left && CMP_M(m)->right);
 
-       if ((sdb_store_expr_eval(CMP_M(m)->left, obj, &value, filter))
-                       || (sdb_store_expr_eval(CMP_M(m)->right, obj, &array, filter)))
+       if (expr_eval2(CMP_M(m)->left, &value,
+                               CMP_M(m)->right, &array, obj, filter))
                status = 0;
 
        if (status)
                status = sdb_data_inarray(&value, &array);
 
-       sdb_data_free_datum(&value);
-       sdb_data_free_datum(&array);
+       expr_free_datum2(CMP_M(m)->left, &value, CMP_M(m)->right, &array);
+       if (m->type == MATCHER_NIN)
+               return !status;
        return status;
 } /* match_in */
 
@@ -322,59 +278,19 @@ static int
 match_regex(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
                sdb_store_matcher_t *filter)
 {
-       sdb_data_t v = SDB_DATA_INIT;
+       sdb_data_t regex = SDB_DATA_INIT, v = SDB_DATA_INIT;
        int status = 0;
 
-       regex_t regex;
-       _Bool free_regex = 0;
-
        assert((m->type == MATCHER_REGEX)
                        || (m->type == MATCHER_NREGEX));
+       assert(CMP_M(m)->left && CMP_M(m)->right);
 
-       if (! CMP_M(m)->right->type) {
-               assert(CMP_M(m)->right->data.type == SDB_TYPE_REGEX);
-               regex = CMP_M(m)->right->data.data.re.regex;
-       }
-       else {
-               sdb_data_t tmp = SDB_DATA_INIT;
-               char *raw;
-
-               if (sdb_store_expr_eval(CMP_M(m)->right, obj, &tmp, filter))
-                       return 0;
-
-               if (tmp.type != SDB_TYPE_STRING) {
-                       sdb_data_free_datum(&tmp);
-                       return 0;
-               }
-
-               raw = tmp.data.string;
-               if (sdb_data_parse(raw, SDB_TYPE_REGEX, &tmp)) {
-                       free(raw);
-                       return 0;
-               }
-
-               regex = tmp.data.re.regex;
-               free_regex = 1;
-               free(tmp.data.re.raw);
-               free(raw);
-       }
+       if (expr_eval2(CMP_M(m)->left, &v, CMP_M(m)->right, &regex, obj, filter))
+               return 0;
 
-       if ((sdb_store_expr_eval(CMP_M(m)->left, obj, &v, filter))
-                       || (sdb_data_isnull(&v)))
-               status = 0;
-       else {
-               char value[sdb_data_strlen(&v) + 1];
-               if (sdb_data_format(&v, value, sizeof(value), SDB_UNQUOTED) < 0)
-                       status = 0;
-               else if (! regexec(&regex, value, 0, NULL, 0))
-                       status = 1;
-       }
+       status = match_regex_value(m->type, &v, &regex);
 
-       if (free_regex)
-               regfree(&regex);
-       sdb_data_free_datum(&v);
-       if (m->type == MATCHER_NREGEX)
-               return !status;
+       expr_free_datum2(CMP_M(m)->left, &v, CMP_M(m)->right, &regex);
        return status;
 } /* match_regex */
 
@@ -387,15 +303,22 @@ match_isnull(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
 
        assert((m->type == MATCHER_ISNULL) || (m->type == MATCHER_ISNNULL));
 
-       /* TODO: this might hide real errors;
-        * improve error reporting and propagation */
-       if (sdb_store_expr_eval(ISNULL_M(m)->expr, obj, &v, filter)
-                       || sdb_data_isnull(&v))
+       if (ISNULL_M(m)->expr->type) {
+               /* TODO: this might hide real errors;
+                * improve error reporting and propagation */
+               if (sdb_store_expr_eval(ISNULL_M(m)->expr, obj, &v, filter))
+                       return 1;
+       }
+       else
+               v = ISNULL_M(m)->expr->data;
+
+       if (sdb_data_isnull(&v))
                status = 1;
        else
                status = 0;
 
-       sdb_data_free_datum(&v);
+       if (ISNULL_M(m)->expr->type)
+               sdb_data_free_datum(&v);
        if (m->type == MATCHER_ISNNULL)
                return !status;
        return status;
@@ -411,76 +334,30 @@ matchers[] = {
        match_logical,
        match_logical,
        match_unary,
-       match_name,
-       match_child,
-       match_child,
-       match_child,
-       match_lt,
-       match_le,
-       match_eq,
-       match_ne,
-       match_ge,
-       match_gt,
+       match_iter,
+       match_iter,
        match_in,
-       match_regex,
-       match_regex,
+       match_in,
+
+       /* unary operators */
        match_isnull,
        match_isnull,
+
+       /* ary operators */
+       match_cmp,
+       match_cmp,
+       match_cmp,
+       match_cmp,
+       match_cmp,
+       match_cmp,
+       match_regex,
+       match_regex,
 };
 
 /*
  * private matcher types
  */
 
-/* initializes a string matcher consuming two elements from ap */
-static int
-string_matcher_init(string_matcher_t *m, va_list ap)
-{
-       const char *name = va_arg(ap, const char *);
-       const char *name_re = va_arg(ap, const char *);
-
-       if (name) {
-               m->name = strdup(name);
-               if (! m->name)
-                       return -1;
-       }
-       if (name_re) {
-               m->name_re = malloc(sizeof(*m->name_re));
-               if (! m->name_re)
-                       return -1;
-               if (regcomp(m->name_re, name_re, REG_EXTENDED | REG_ICASE | REG_NOSUB))
-                       return -1;
-       }
-       return 0;
-} /* string_matcher_init */
-
-static void
-string_matcher_destroy(string_matcher_t *m)
-{
-       if (m->name)
-               free(m->name);
-       if (m->name_re) {
-               regfree(m->name_re);
-               free(m->name_re);
-       }
-} /* string_matcher_destroy */
-
-/* initializes a name matcher */
-static int
-name_matcher_init(sdb_object_t *obj, va_list ap)
-{
-       name_matcher_t *m = NAME_M(obj);
-       M(obj)->type = MATCHER_NAME;
-       return string_matcher_init(&m->name, ap);
-} /* name_matcher_init */
-
-static void
-name_matcher_destroy(sdb_object_t *obj)
-{
-       name_matcher_t *m = NAME_M(obj);
-       string_matcher_destroy(&m->name);
-} /* name_matcher_destroy */
-
 static int
 op_matcher_init(sdb_object_t *obj, va_list ap)
 {
@@ -508,23 +385,26 @@ op_matcher_destroy(sdb_object_t *obj)
 } /* op_matcher_destroy */
 
 static int
-child_matcher_init(sdb_object_t *obj, va_list ap)
+iter_matcher_init(sdb_object_t *obj, va_list ap)
 {
        M(obj)->type = va_arg(ap, int);
-       CHILD_M(obj)->m = va_arg(ap, sdb_store_matcher_t *);
+       ITER_M(obj)->iter = va_arg(ap, sdb_store_expr_t *);
+       ITER_M(obj)->m = va_arg(ap, sdb_store_matcher_t *);
 
-       if (! CHILD_M(obj)->m)
-               return -1;
+       sdb_object_ref(SDB_OBJ(ITER_M(obj)->iter));
+       sdb_object_ref(SDB_OBJ(ITER_M(obj)->m));
 
-       sdb_object_ref(SDB_OBJ(CHILD_M(obj)->m));
+       if ((! ITER_M(obj)->iter) || (! ITER_M(obj)->m))
+               return -1;
        return 0;
-} /* child_matcher_init */
+} /* iter_matcher_init */
 
 static void
-child_matcher_destroy(sdb_object_t *obj)
+iter_matcher_destroy(sdb_object_t *obj)
 {
-       sdb_object_deref(SDB_OBJ(CHILD_M(obj)->m));
-} /* child_matcher_destroy */
+       sdb_object_deref(SDB_OBJ(ITER_M(obj)->iter));
+       sdb_object_deref(SDB_OBJ(ITER_M(obj)->m));
+} /* iter_matcher_destroy */
 
 static int
 cmp_matcher_init(sdb_object_t *obj, va_list ap)
@@ -536,7 +416,7 @@ cmp_matcher_init(sdb_object_t *obj, va_list ap)
        CMP_M(obj)->right = va_arg(ap, sdb_store_expr_t *);
        sdb_object_ref(SDB_OBJ(CMP_M(obj)->right));
 
-       if ((! CMP_M(obj)->left) || (! CMP_M(obj)->right))
+       if (! CMP_M(obj)->right)
                return -1;
        return 0;
 } /* cmp_matcher_init */
@@ -589,12 +469,6 @@ isnull_matcher_destroy(sdb_object_t *obj)
        ISNULL_M(obj)->expr = NULL;
 } /* isnull_matcher_destroy */
 
-static sdb_type_t name_type = {
-       /* size = */ sizeof(name_matcher_t),
-       /* init = */ name_matcher_init,
-       /* destroy = */ name_matcher_destroy,
-};
-
 static sdb_type_t op_type = {
        /* size = */ sizeof(op_matcher_t),
        /* init = */ op_matcher_init,
@@ -607,10 +481,10 @@ static sdb_type_t uop_type = {
        /* destroy = */ uop_matcher_destroy,
 };
 
-static sdb_type_t child_type = {
-       /* size = */ sizeof(child_matcher_t),
-       /* init = */ child_matcher_init,
-       /* destroy = */ child_matcher_destroy,
+static sdb_type_t iter_type = {
+       /* size = */ sizeof(iter_matcher_t),
+       /* init = */ iter_matcher_init,
+       /* destroy = */ iter_matcher_destroy,
 };
 
 static sdb_type_t cmp_type = {
@@ -630,35 +504,44 @@ static sdb_type_t isnull_type = {
  */
 
 sdb_store_matcher_t *
-sdb_store_name_matcher(int type, const char *name, _Bool re)
+sdb_store_any_matcher(sdb_store_expr_t *iter, sdb_store_matcher_t *m)
 {
-       sdb_store_matcher_t *m;
-
-       if (re)
-               m = M(sdb_object_create("name-matcher", name_type, NULL, name));
-       else
-               m = M(sdb_object_create("name-matcher", name_type, name, NULL));
-
-       if (! m)
+       if ((m->type < MATCHER_LT) || (MATCHER_NREGEX < m->type)) {
+               sdb_log(SDB_LOG_ERR, "store: Invalid ANY -> %s matcher "
+                               "(invalid operator)", MATCHER_SYM(m->type));
                return NULL;
-
-       NAME_M(m)->obj_type = type;
-       return m;
-} /* sdb_store_name_matcher */
+       }
+       if (CMP_M(m)->left) {
+               sdb_log(SDB_LOG_ERR, "store: Invalid ANY %s %s %s matcher "
+                               "(invalid left operand)",
+                               SDB_TYPE_TO_STRING(CMP_M(m)->left->data_type),
+                               MATCHER_SYM(m->type),
+                               SDB_TYPE_TO_STRING(CMP_M(m)->right->data_type));
+               return NULL;
+       }
+       return M(sdb_object_create("any-matcher", iter_type,
+                               MATCHER_ANY, iter, m));
+} /* sdb_store_any_matcher */
 
 sdb_store_matcher_t *
-sdb_store_child_matcher(int type, sdb_store_matcher_t *m)
-{
-       if (type == SDB_SERVICE)
-               type = MATCHER_SERVICE;
-       else if (type == SDB_METRIC)
-               type = MATCHER_METRIC;
-       else if (type == SDB_ATTRIBUTE)
-               type = MATCHER_ATTRIBUTE;
-       else
+sdb_store_all_matcher(sdb_store_expr_t *iter, sdb_store_matcher_t *m)
+{
+       if ((m->type < MATCHER_LT) || (MATCHER_NREGEX < m->type)) {
+               sdb_log(SDB_LOG_ERR, "store: Invalid ALL -> %s matcher "
+                               "(invalid operator)", MATCHER_SYM(m->type));
+               return NULL;
+       }
+       if (CMP_M(m)->left) {
+               sdb_log(SDB_LOG_ERR, "store: Invalid ALL %s %s %s matcher "
+                               "(invalid left operand)",
+                               SDB_TYPE_TO_STRING(CMP_M(m)->left->data_type),
+                               MATCHER_SYM(m->type),
+                               SDB_TYPE_TO_STRING(CMP_M(m)->right->data_type));
                return NULL;
-       return M(sdb_object_create("any-matcher", child_type, type, m));
-} /* sdb_store_child_matcher */
+       }
+       return M(sdb_object_create("all-matcher", iter_type,
+                               MATCHER_ALL, iter, m));
+} /* sdb_store_all_matcher */
 
 sdb_store_matcher_t *
 sdb_store_lt_matcher(sdb_store_expr_t *left, sdb_store_expr_t *right)
@@ -709,6 +592,13 @@ sdb_store_in_matcher(sdb_store_expr_t *left, sdb_store_expr_t *right)
                                MATCHER_IN, left, right));
 } /* sdb_store_in_matcher */
 
+sdb_store_matcher_t *
+sdb_store_nin_matcher(sdb_store_expr_t *left, sdb_store_expr_t *right)
+{
+       return M(sdb_object_create("not-in-matcher", cmp_type,
+                               MATCHER_NIN, left, right));
+} /* sdb_store_in_matcher */
+
 sdb_store_matcher_t *
 sdb_store_regex_matcher(sdb_store_expr_t *left, sdb_store_expr_t *right)
 {
@@ -774,6 +664,20 @@ sdb_store_parse_matcher_op(const char *op)
        return NULL;
 } /* sdb_store_parse_matcher_op */
 
+int
+sdb_store_parse_object_type(const char *name)
+{
+       if (! strcasecmp(name, "host"))
+               return SDB_HOST;
+       else if (! strcasecmp(name, "service"))
+               return SDB_SERVICE;
+       else if (! strcasecmp(name, "metric"))
+               return SDB_METRIC;
+       else if (! strcasecmp(name, "attribute"))
+               return SDB_ATTRIBUTE;
+       return -1;
+} /* sdb_store_parse_object_type */
+
 int
 sdb_store_parse_object_type_plural(const char *name)
 {
@@ -783,6 +687,8 @@ sdb_store_parse_object_type_plural(const char *name)
                return SDB_SERVICE;
        else if (! strcasecmp(name, "metrics"))
                return SDB_METRIC;
+       else if (! strcasecmp(name, "attributes"))
+               return SDB_ATTRIBUTE;
        return -1;
 } /* sdb_store_parse_object_type_plural */
 
@@ -799,76 +705,11 @@ sdb_store_parse_field_name(const char *name)
                return SDB_FIELD_INTERVAL;
        else if (! strcasecmp(name, "backend"))
                return SDB_FIELD_BACKEND;
+       else if (! strcasecmp(name, "value"))
+               return SDB_FIELD_VALUE;
        return -1;
 } /* sdb_store_parse_field_name */
 
-static sdb_store_matcher_t *
-maybe_inv_matcher(sdb_store_matcher_t *m, _Bool inv)
-{
-       sdb_store_matcher_t *tmp;
-
-       if ((! m) || (! inv))
-               return m;
-
-       tmp = sdb_store_inv_matcher(m);
-       /* pass ownership to the inverse matcher */
-       sdb_object_deref(SDB_OBJ(m));
-       return tmp;
-} /* maybe_inv_matcher */
-
-sdb_store_matcher_t *
-sdb_store_matcher_parse_cmp(const char *obj_type,
-               const char *op, sdb_store_expr_t *expr)
-{
-       int type = -1;
-       _Bool inv = 0;
-       _Bool re = 0;
-
-       sdb_data_t value = SDB_DATA_INIT;
-       sdb_store_matcher_t *m = NULL;
-
-       if (! strcasecmp(obj_type, "host"))
-               type = SDB_HOST;
-       else if (! strcasecmp(obj_type, "service"))
-               type = SDB_SERVICE;
-       else if (! strcasecmp(obj_type, "metric"))
-               type = SDB_METRIC;
-       else if (! strcasecmp(obj_type, "attribute"))
-               type = SDB_ATTRIBUTE;
-       else
-               return NULL;
-
-       /* XXX: this code sucks! */
-       if (! strcasecmp(op, "=")) {
-               /* nothing to do */
-       }
-       else if (! strcasecmp(op, "!=")) {
-               inv = 1;
-       }
-       else if (! strcasecmp(op, "=~")) {
-               re = 1;
-       }
-       else if (! strcasecmp(op, "!~")) {
-               inv = 1;
-               re = 1;
-       }
-       else
-               return NULL;
-
-       if (! expr)
-               return NULL;
-
-       if (sdb_store_expr_eval(expr, /* obj */ NULL, &value, /* filter */ NULL)
-                       || (value.type != SDB_TYPE_STRING)) {
-               sdb_data_free_datum(&value);
-               return NULL;
-       }
-
-       m = sdb_store_name_matcher(type, value.data.string, re);
-       sdb_data_free_datum(&value);
-       return maybe_inv_matcher(m, inv);
-} /* sdb_store_matcher_parse_cmp */
-
 sdb_store_matcher_t *
 sdb_store_dis_matcher(sdb_store_matcher_t *left, sdb_store_matcher_t *right)
 {
@@ -906,16 +747,5 @@ sdb_store_matcher_matches(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
        return matchers[m->type](m, obj, filter);
 } /* sdb_store_matcher_matches */
 
-int
-sdb_store_scan(sdb_store_matcher_t *m, sdb_store_matcher_t *filter,
-               sdb_store_lookup_cb cb, void *user_data)
-{
-       scan_iter_data_t data = { m, filter, cb, user_data };
-
-       if (! cb)
-               return -1;
-       return sdb_store_iterate(scan_iter, &data);
-} /* sdb_store_scan */
-
 /* vim: set tw=78 sw=4 ts=4 noexpandtab : */