X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=src%2Fcore%2Fstore_lookup.c;h=18a0235536e3f154128ff576cbc624c9dfa49a5f;hp=dceab19dd7d99feb1e7fb68982d43fe703567e00;hb=da52b4da948c741d20c7a3995ce5d133af377def;hpb=596bcf4487836a640a03ccbad28763694181cab4

diff --git a/src/core/store_lookup.c b/src/core/store_lookup.c
index dceab19..18a0235 100644
--- a/src/core/store_lookup.c
+++ b/src/core/store_lookup.c
@@ -38,6 +38,7 @@
 #include "sysdb.h"
 #include "core/store-private.h"
 #include "core/object.h"
+#include "utils/error.h"
 
 #include <assert.h>
 
@@ -49,414 +50,313 @@
 
 #include <limits.h>
 
-/*
- * private data types
- */
-
-typedef struct {
-	sdb_store_matcher_t *m;
-	sdb_store_lookup_cb  cb;
-	void *user_data;
-} lookup_iter_data_t;
-
-/*
- * private helper functions
- */
-
 static int
-lookup_iter(sdb_store_base_t *obj, void *user_data)
+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)
 {
-	lookup_iter_data_t *d = user_data;
-
-	if (sdb_store_matcher_matches(d->m, obj))
-		return d->cb(obj, d->user_data);
+	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;
-} /* lookup_iter */
+} /* expr_eval2 */
 
-static sdb_store_base_t *
-attr_get(sdb_store_base_t *host, const char *name)
+static void
+expr_free_datum2(sdb_store_expr_t *e1, sdb_data_t *v1,
+		sdb_store_expr_t *e2, sdb_data_t *v2)
 {
-	sdb_llist_iter_t *iter = NULL;
-	sdb_store_base_t *attr = NULL;
-
-	assert(host->type == SDB_HOST);
-
-	iter = sdb_llist_get_iter(SDB_STORE_OBJ(host)->attributes);
-	while (sdb_llist_iter_has_next(iter)) {
-		sdb_attribute_t *a = SDB_ATTR(sdb_llist_iter_get_next(iter));
-
-		if (strcasecmp(name, SDB_OBJ(a)->name))
-			continue;
-		attr = STORE_BASE(a);
-		break;
-	}
-	sdb_llist_iter_destroy(iter);
-	return attr;
-} /* attr_get */
+	if (e1->type)
+		sdb_data_free_datum(v1);
+	if (e2->type)
+		sdb_data_free_datum(v2);
+} /* expr_free_datum2 */
 
 /*
- * conditional implementations
+ * 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
-attr_cmp(sdb_store_base_t *obj, sdb_store_cond_t *cond)
+match_cmp_value(int op, sdb_data_t *v1, sdb_data_t *v2, bool strcmp_fallback)
 {
-	sdb_attribute_t *attr;
+	int status;
 
-	attr = SDB_ATTR(attr_get(obj, ATTR_C(cond)->name));
-	if (! attr)
-		return INT_MAX;
-	if (attr->value.type != ATTR_C(cond)->value.type)
-		return INT_MAX;
-	return sdb_data_cmp(&attr->value, &ATTR_C(cond)->value);
-} /* attr_cmp */
+	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_base_t *obj)
+match_logical(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
+		sdb_store_matcher_t *filter)
 {
 	int status;
 
 	assert((m->type == MATCHER_AND) || (m->type == MATCHER_OR));
 	assert(OP_M(m)->left && OP_M(m)->right);
 
-	status = sdb_store_matcher_matches(OP_M(m)->left, obj);
+	status = sdb_store_matcher_matches(OP_M(m)->left, obj, filter);
+
 	/* lazy evaluation */
 	if ((! status) && (m->type == MATCHER_AND))
 		return status;
 	else if (status && (m->type == MATCHER_OR))
 		return status;
 
-	return sdb_store_matcher_matches(OP_M(m)->right, obj);
+	return sdb_store_matcher_matches(OP_M(m)->right, obj, filter);
 } /* match_logical */
 
 static int
-match_unary(sdb_store_matcher_t *m, sdb_store_base_t *obj)
+match_unary(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
+		sdb_store_matcher_t *filter)
 {
 	assert(m->type == MATCHER_NOT);
 	assert(UOP_M(m)->op);
 
-	return !sdb_store_matcher_matches(UOP_M(m)->op, 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_base_t *obj)
+match_iter(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
+		sdb_store_matcher_t *filter)
 {
-	sdb_llist_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);
 
-	switch (NAME_M(m)->obj_type) {
-		case SDB_HOST:
-			return match_string(&NAME_M(m)->name, obj->super.name);
-			break;
-		case SDB_SERVICE:
-			iter = sdb_llist_get_iter(SDB_STORE_OBJ(obj)->children);
-			break;
-		case SDB_ATTRIBUTE:
-			iter = sdb_llist_get_iter(SDB_STORE_OBJ(obj)->attributes);
-			break;
-	}
+	iter = sdb_store_expr_iter(ITER_M(m)->iter, obj, filter);
+	if (! iter)
+		return 0;
 
-	while (sdb_llist_iter_has_next(iter)) {
-		sdb_store_base_t *child = STORE_BASE(sdb_llist_iter_get_next(iter));
-		if (match_string(&NAME_M(m)->name, child->super.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_llist_iter_destroy(iter);
+	sdb_store_expr_iter_destroy(iter);
 	return status;
-} /* match_name */
+} /* match_iter */
 
 static int
-match_attr(sdb_store_matcher_t *m, sdb_store_base_t *obj)
-{
-	sdb_attribute_t *attr;
-
-	assert(m->type == MATCHER_ATTR);
-	assert(ATTR_M(m)->name);
-
-	attr = SDB_ATTR(attr_get(obj, ATTR_M(m)->name));
-	if (attr) {
-		char buf[sdb_data_strlen(&attr->value) + 1];
-		if (sdb_data_format(&attr->value, buf, sizeof(buf), SDB_UNQUOTED) <= 0)
-			return 0;
-		if (match_string(&ATTR_M(m)->value, buf))
-			return 1;
-	}
-	return 0;
-} /* match_attr */
-
-static int
-match_lt(sdb_store_matcher_t *m, sdb_store_base_t *obj)
+match_cmp(sdb_store_matcher_t *m, 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;
-	assert(m->type == MATCHER_LT);
-	status = COND_M(m)->cond->cmp(obj, COND_M(m)->cond);
-	return (status != INT_MAX) && (status < 0);
-} /* match_lt */
 
-static int
-match_le(sdb_store_matcher_t *m, sdb_store_base_t *obj)
-{
-	int status;
-	assert(m->type == MATCHER_LE);
-	status = COND_M(m)->cond->cmp(obj, COND_M(m)->cond);
-	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_base_t *obj)
-{
-	int status;
-	assert(m->type == MATCHER_EQ);
-	status = COND_M(m)->cond->cmp(obj, COND_M(m)->cond);
-	return (status != INT_MAX) && (! status);
-} /* match_eq */
-
-static int
-match_ge(sdb_store_matcher_t *m, sdb_store_base_t *obj)
-{
-	int status;
-	assert(m->type == MATCHER_GE);
-	status = COND_M(m)->cond->cmp(obj, COND_M(m)->cond);
-	return (status != INT_MAX) && (status >= 0);
-} /* match_ge */
-
-static int
-match_gt(sdb_store_matcher_t *m, sdb_store_base_t *obj)
-{
-	int status;
-	assert(m->type == MATCHER_GT);
-	status = COND_M(m)->cond->cmp(obj, COND_M(m)->cond);
-	return (status != INT_MAX) && (status > 0);
-} /* match_gt */
-
-typedef int (*matcher_cb)(sdb_store_matcher_t *, sdb_store_base_t *);
+	if (expr_eval2(e1, &v1, e2, &v2, obj, filter))
+		return 0;
 
-/* this array needs to be indexable by the matcher types;
- * -> update the enum in store-private.h when updating this */
-static matcher_cb matchers[] = {
-	match_logical,
-	match_logical,
-	match_unary,
-	match_name,
-	match_attr,
-	match_lt,
-	match_le,
-	match_eq,
-	match_ge,
-	match_gt,
-};
+	status = match_cmp_value(m->type, &v1, &v2,
+			(e1->data_type) < 0 || (e2->data_type < 0));
 
-/*
- * private conditional types
- */
+	expr_free_datum2(e1, &v1, e2, &v2);
+	return status;
+} /* match_cmp */
 
 static int
-attr_cond_init(sdb_object_t *obj, va_list ap)
+match_in(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
+		sdb_store_matcher_t *filter)
 {
-	const char *name = va_arg(ap, const char *);
-	const sdb_data_t *value = va_arg(ap, const sdb_data_t *);
+	sdb_data_t value = SDB_DATA_INIT, array = SDB_DATA_INIT;
+	int status = 1;
 
-	if (! name)
-		return -1;
+	assert((m->type == MATCHER_IN) || (m->type == MATCHER_NIN));
+	assert(CMP_M(m)->left && CMP_M(m)->right);
 
-	SDB_STORE_COND(obj)->cmp = attr_cmp;
-
-	ATTR_C(obj)->name = strdup(name);
-	if (! ATTR_C(obj)->name)
-		return -1;
-	if (sdb_data_copy(&ATTR_C(obj)->value, value))
-		return -1;
-	return 0;
-} /* attr_cond_init */
-
-static void
-attr_cond_destroy(sdb_object_t *obj)
-{
-	if (ATTR_C(obj)->name)
-		free(ATTR_C(obj)->name);
-	sdb_data_free_datum(&ATTR_C(obj)->value);
-} /* attr_cond_destroy */
+	if (expr_eval2(CMP_M(m)->left, &value,
+				CMP_M(m)->right, &array, obj, filter))
+		status = 0;
 
-static sdb_type_t attr_cond_type = {
-	/* size = */ sizeof(attr_cond_t),
-	/* init = */ attr_cond_init,
-	/* destroy = */ attr_cond_destroy,
-};
+	if (status)
+		status = sdb_data_inarray(&value, &array);
 
-/*
- * private matcher types
- */
+	expr_free_datum2(CMP_M(m)->left, &value, CMP_M(m)->right, &array);
+	if (m->type == MATCHER_NIN)
+		return !status;
+	return status;
+} /* match_in */
 
-/* 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)
+match_regex(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
+		sdb_store_matcher_t *filter)
 {
-	if (m->name)
-		free(m->name);
-	if (m->name_re) {
-		regfree(m->name_re);
-		free(m->name_re);
-	}
-} /* string_matcher_destroy */
+	sdb_data_t regex = SDB_DATA_INIT, v = SDB_DATA_INIT;
+	int status = 0;
 
-static char *
-string_tostring(string_matcher_t *m, char *buf, size_t buflen)
-{
-	snprintf(buf, buflen, "{ %s%s%s, %p }",
-			m->name ? "'" : "", m->name ? m->name : "NULL", m->name ? "'" : "",
-			m->name_re);
-	return buf;
-} /* string_tostring */
+	assert((m->type == MATCHER_REGEX)
+			|| (m->type == MATCHER_NREGEX));
+	assert(CMP_M(m)->left && CMP_M(m)->right);
 
-/* 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 */
+	if (expr_eval2(CMP_M(m)->left, &v, CMP_M(m)->right, &regex, obj, filter))
+		return 0;
 
-static void
-name_matcher_destroy(sdb_object_t *obj)
-{
-	name_matcher_t *m = NAME_M(obj);
-	string_matcher_destroy(&m->name);
-} /* name_matcher_destroy */
+	status = match_regex_value(m->type, &v, &regex);
 
-static char *
-name_tostring(sdb_store_matcher_t *m, char *buf, size_t buflen)
-{
-	char name[buflen + 1];
-	assert(m->type == MATCHER_NAME);
-	snprintf(buf, buflen, "OBJ[%s]{ NAME%s }",
-			SDB_STORE_TYPE_TO_NAME(NAME_M(m)->obj_type),
-			string_tostring(&NAME_M(m)->name, name, sizeof(name)));
-	return buf;
-} /* name_tostring */
+	expr_free_datum2(CMP_M(m)->left, &v, CMP_M(m)->right, &regex);
+	return status;
+} /* match_regex */
 
 static int
-attr_matcher_init(sdb_object_t *obj, va_list ap)
+match_isnull(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
+		sdb_store_matcher_t *filter)
 {
-	attr_matcher_t *attr = ATTR_M(obj);
-	const char *name = va_arg(ap, const char *);
-
-	M(obj)->type = MATCHER_ATTR;
-	if (name) {
-		attr->name = strdup(name);
-		if (! attr->name)
-			return -1;
-	}
-	return string_matcher_init(&attr->value, ap);
-} /* attr_matcher_init */
-
-static void
-attr_matcher_destroy(sdb_object_t *obj)
-{
-	attr_matcher_t *attr = ATTR_M(obj);
-	if (attr->name)
-		free(attr->name);
-	attr->name = NULL;
-	string_matcher_destroy(&attr->value);
-} /* attr_matcher_destroy */
+	sdb_data_t v = SDB_DATA_INIT;
+	int status;
 
-static char *
-attr_tostring(sdb_store_matcher_t *m, char *buf, size_t buflen)
-{
-	char value[buflen + 1];
+	assert((m->type == MATCHER_ISNULL) || (m->type == MATCHER_ISNNULL));
 
-	if (! m) {
-		snprintf(buf, buflen, "ATTR{}");
-		return buf;
+	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;
 
-	assert(m->type == MATCHER_ATTR);
-	snprintf(buf, buflen, "ATTR[%s]{ VALUE%s }", ATTR_M(m)->name,
-			string_tostring(&ATTR_M(m)->value, value, sizeof(value)));
-	return buf;
-} /* attr_tostring */
-
-static int
-cond_matcher_init(sdb_object_t *obj, va_list ap)
-{
-	int type = va_arg(ap, int);
-	sdb_store_cond_t *cond = va_arg(ap, sdb_store_cond_t *);
-
-	if (! cond)
-		return -1;
+	if (sdb_data_isnull(&v))
+		status = 1;
+	else
+		status = 0;
 
-	sdb_object_ref(SDB_OBJ(cond));
+	if (ISNULL_M(m)->expr->type)
+		sdb_data_free_datum(&v);
+	if (m->type == MATCHER_ISNNULL)
+		return !status;
+	return status;
+} /* match_isnull */
 
-	M(obj)->type = type;
-	COND_M(obj)->cond = cond;
-	return 0;
-} /* cond_matcher_init */
+typedef int (*matcher_cb)(sdb_store_matcher_t *, sdb_store_obj_t *,
+		sdb_store_matcher_t *);
 
-static void
-cond_matcher_destroy(sdb_object_t *obj)
-{
-	sdb_object_deref(SDB_OBJ(COND_M(obj)->cond));
-} /* cond_matcher_destroy */
+/* this array needs to be indexable by the matcher types;
+ * -> update the enum in store-private.h when updating this */
+static matcher_cb
+matchers[] = {
+	match_logical,
+	match_logical,
+	match_unary,
+	match_iter,
+	match_iter,
+	match_in,
+	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,
+};
 
-static char *
-cond_tostring(sdb_store_matcher_t *m, char *buf, size_t buflen)
-{
-	if (COND_M(m)->cond->cmp == attr_cmp) {
-		char value[buflen];
-		if (sdb_data_format(&ATTR_C(COND_M(m)->cond)->value,
-					value, sizeof(value), SDB_SINGLE_QUOTED) < 0)
-			snprintf(value, sizeof(value), "ERR");
-		snprintf(buf, buflen, "ATTR[%s]{ %s %s }",
-				ATTR_C(COND_M(m)->cond)->name, MATCHER_SYM(m->type), value);
-	}
-	return buf;
-} /* cond_tostring */
+/*
+ * private matcher types
+ */
 
 static int
 op_matcher_init(sdb_object_t *obj, va_list ap)
@@ -484,24 +384,49 @@ op_matcher_destroy(sdb_object_t *obj)
 		sdb_object_deref(SDB_OBJ(OP_M(obj)->right));
 } /* op_matcher_destroy */
 
-static char *
-op_tostring(sdb_store_matcher_t *m, char *buf, size_t buflen)
+static int
+iter_matcher_init(sdb_object_t *obj, va_list ap)
 {
-	char left[buflen + 1], right[buflen + 1];
+	M(obj)->type = va_arg(ap, int);
+	ITER_M(obj)->iter = va_arg(ap, sdb_store_expr_t *);
+	ITER_M(obj)->m = va_arg(ap, sdb_store_matcher_t *);
 
-	if (! m) {
-		/* this should not happen */
-		snprintf(buf, buflen, "()");
-		return buf;
-	}
+	sdb_object_ref(SDB_OBJ(ITER_M(obj)->iter));
+	sdb_object_ref(SDB_OBJ(ITER_M(obj)->m));
+
+	if ((! ITER_M(obj)->iter) || (! ITER_M(obj)->m))
+		return -1;
+	return 0;
+} /* iter_matcher_init */
+
+static void
+iter_matcher_destroy(sdb_object_t *obj)
+{
+	sdb_object_deref(SDB_OBJ(ITER_M(obj)->iter));
+	sdb_object_deref(SDB_OBJ(ITER_M(obj)->m));
+} /* iter_matcher_destroy */
 
-	assert((m->type == MATCHER_OR) || (m->type == MATCHER_AND));
-	snprintf(buf, buflen, "(%s, %s, %s)",
-			m->type == MATCHER_OR ? "OR" : "AND",
-			sdb_store_matcher_tostring(OP_M(m)->left, left, sizeof(left)),
-			sdb_store_matcher_tostring(OP_M(m)->right, right, sizeof(right)));
-	return buf;
-} /* op_tostring */
+static int
+cmp_matcher_init(sdb_object_t *obj, va_list ap)
+{
+	M(obj)->type = va_arg(ap, int);
+
+	CMP_M(obj)->left = va_arg(ap, sdb_store_expr_t *);
+	sdb_object_ref(SDB_OBJ(CMP_M(obj)->left));
+	CMP_M(obj)->right = va_arg(ap, sdb_store_expr_t *);
+	sdb_object_ref(SDB_OBJ(CMP_M(obj)->right));
+
+	if (! CMP_M(obj)->right)
+		return -1;
+	return 0;
+} /* cmp_matcher_init */
+
+static void
+cmp_matcher_destroy(sdb_object_t *obj)
+{
+	sdb_object_deref(SDB_OBJ(CMP_M(obj)->left));
+	sdb_object_deref(SDB_OBJ(CMP_M(obj)->right));
+} /* cmp_matcher_destroy */
 
 static int
 uop_matcher_init(sdb_object_t *obj, va_list ap)
@@ -525,40 +450,24 @@ uop_matcher_destroy(sdb_object_t *obj)
 		sdb_object_deref(SDB_OBJ(UOP_M(obj)->op));
 } /* uop_matcher_destroy */
 
-static char *
-uop_tostring(sdb_store_matcher_t *m, char *buf, size_t buflen)
+static int
+isnull_matcher_init(sdb_object_t *obj, va_list ap)
 {
-	char op[buflen + 1];
-
-	if (! m) {
-		/* this should not happen */
-		snprintf(buf, buflen, "()");
-		return buf;
-	}
-
-	assert(m->type == MATCHER_NOT);
-	snprintf(buf, buflen, "(NOT, %s)",
-			sdb_store_matcher_tostring(UOP_M(m)->op, op, sizeof(op)));
-	return buf;
-} /* uop_tostring */
-
-static sdb_type_t name_type = {
-	/* size = */ sizeof(name_matcher_t),
-	/* init = */ name_matcher_init,
-	/* destroy = */ name_matcher_destroy,
-};
+	M(obj)->type = va_arg(ap, int);
+	if ((M(obj)->type != MATCHER_ISNULL) && (M(obj)->type != MATCHER_ISNNULL))
+		return -1;
 
-static sdb_type_t attr_type = {
-	/* size = */ sizeof(attr_matcher_t),
-	/* init = */ attr_matcher_init,
-	/* destroy = */ attr_matcher_destroy,
-};
+	ISNULL_M(obj)->expr = va_arg(ap, sdb_store_expr_t *);
+	sdb_object_ref(SDB_OBJ(ISNULL_M(obj)->expr));
+	return 0;
+} /* isnull_matcher_init */
 
-static sdb_type_t cond_type = {
-	/* size = */ sizeof(cond_matcher_t),
-	/* init = */ cond_matcher_init,
-	/* destroy = */ cond_matcher_destroy,
-};
+static void
+isnull_matcher_destroy(sdb_object_t *obj)
+{
+	sdb_object_deref(SDB_OBJ(ISNULL_M(obj)->expr));
+	ISNULL_M(obj)->expr = NULL;
+} /* isnull_matcher_destroy */
 
 static sdb_type_t op_type = {
 	/* size = */ sizeof(op_matcher_t),
@@ -572,154 +481,234 @@ static sdb_type_t uop_type = {
 	/* destroy = */ uop_matcher_destroy,
 };
 
-typedef char *(*matcher_tostring_cb)(sdb_store_matcher_t *, char *, size_t);
+static sdb_type_t iter_type = {
+	/* size = */ sizeof(iter_matcher_t),
+	/* init = */ iter_matcher_init,
+	/* destroy = */ iter_matcher_destroy,
+};
 
-/* this array needs to be indexable by the matcher types;
- * -> update the enum in store-private.h when updating this */
-static matcher_tostring_cb matchers_tostring[] = {
-	op_tostring,
-	op_tostring,
-	uop_tostring,
-	name_tostring,
-	attr_tostring,
-	cond_tostring,
-	cond_tostring,
-	cond_tostring,
-	cond_tostring,
-	cond_tostring,
+static sdb_type_t cmp_type = {
+	/* size = */ sizeof(cmp_matcher_t),
+	/* init = */ cmp_matcher_init,
+	/* destroy = */ cmp_matcher_destroy,
+};
+
+static sdb_type_t isnull_type = {
+	/* size = */ sizeof(isnull_matcher_t),
+	/* init = */ isnull_matcher_init,
+	/* destroy = */ isnull_matcher_destroy,
 };
 
 /*
  * public API
  */
 
-sdb_store_cond_t *
-sdb_store_attr_cond(const char *name, const sdb_data_t *value)
-{
-	return SDB_STORE_COND(sdb_object_create("attr-cond", attr_cond_type,
-				name, value));
-} /* sdb_store_attr_cond */
-
 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_attr_matcher(const char *name, const char *value, _Bool re)
+sdb_store_all_matcher(sdb_store_expr_t *iter, sdb_store_matcher_t *m)
 {
-	if (! name)
+	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 (re)
-		return M(sdb_object_create("attr-matcher", attr_type,
-					name, NULL, value));
-	return M(sdb_object_create("attr-matcher", attr_type,
-				name, value, NULL));
-} /* sdb_store_attr_matcher */
+	}
+	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("all-matcher", iter_type,
+				MATCHER_ALL, iter, m));
+} /* sdb_store_all_matcher */
 
 sdb_store_matcher_t *
-sdb_store_lt_matcher(sdb_store_cond_t *cond)
+sdb_store_lt_matcher(sdb_store_expr_t *left, sdb_store_expr_t *right)
 {
-	return M(sdb_object_create("lt-matcher", cond_type,
-				MATCHER_LT, cond));
+	return M(sdb_object_create("lt-matcher", cmp_type,
+				MATCHER_LT, left, right));
 } /* sdb_store_lt_matcher */
 
 sdb_store_matcher_t *
-sdb_store_le_matcher(sdb_store_cond_t *cond)
+sdb_store_le_matcher(sdb_store_expr_t *left, sdb_store_expr_t *right)
 {
-	return M(sdb_object_create("le-matcher", cond_type,
-				MATCHER_LE, cond));
+	return M(sdb_object_create("le-matcher", cmp_type,
+				MATCHER_LE, left, right));
 } /* sdb_store_le_matcher */
 
 sdb_store_matcher_t *
-sdb_store_eq_matcher(sdb_store_cond_t *cond)
+sdb_store_eq_matcher(sdb_store_expr_t *left, sdb_store_expr_t *right)
 {
-	return M(sdb_object_create("eq-matcher", cond_type,
-				MATCHER_EQ, cond));
+	return M(sdb_object_create("eq-matcher", cmp_type,
+				MATCHER_EQ, left, right));
 } /* sdb_store_eq_matcher */
 
 sdb_store_matcher_t *
-sdb_store_ge_matcher(sdb_store_cond_t *cond)
+sdb_store_ne_matcher(sdb_store_expr_t *left, sdb_store_expr_t *right)
+{
+	return M(sdb_object_create("ne-matcher", cmp_type,
+				MATCHER_NE, left, right));
+} /* sdb_store_ne_matcher */
+
+sdb_store_matcher_t *
+sdb_store_ge_matcher(sdb_store_expr_t *left, sdb_store_expr_t *right)
 {
-	return M(sdb_object_create("ge-matcher", cond_type,
-				MATCHER_GE, cond));
+	return M(sdb_object_create("ge-matcher", cmp_type,
+				MATCHER_GE, left, right));
 } /* sdb_store_ge_matcher */
 
 sdb_store_matcher_t *
-sdb_store_gt_matcher(sdb_store_cond_t *cond)
+sdb_store_gt_matcher(sdb_store_expr_t *left, sdb_store_expr_t *right)
 {
-	return M(sdb_object_create("gt-matcher", cond_type,
-				MATCHER_GT, cond));
+	return M(sdb_object_create("gt-matcher", cmp_type,
+				MATCHER_GT, left, right));
 } /* sdb_store_gt_matcher */
 
 sdb_store_matcher_t *
-sdb_store_matcher_parse_cmp(const char *obj_type, const char *attr,
-		const char *op, const char *value)
+sdb_store_in_matcher(sdb_store_expr_t *left, sdb_store_expr_t *right)
 {
-	int type = -1;
-	_Bool inv = 0;
-	_Bool re = 0;
+	return M(sdb_object_create("in-matcher", cmp_type,
+				MATCHER_IN, left, right));
+} /* sdb_store_in_matcher */
 
-	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, "attribute"))
-		type = SDB_ATTRIBUTE;
-	else
-		return NULL;
+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 */
 
-	/* TODO: support other operators */
-	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;
+sdb_store_matcher_t *
+sdb_store_regex_matcher(sdb_store_expr_t *left, sdb_store_expr_t *right)
+{
+	if (! right->type) {
+		if ((right->data.type != SDB_TYPE_STRING)
+				&& (right->data.type != SDB_TYPE_REGEX))
+			return NULL;
+
+		if (right->data.type == SDB_TYPE_STRING) {
+			char *raw = right->data.data.string;
+			if (sdb_data_parse(raw, SDB_TYPE_REGEX, &right->data))
+				return NULL;
+			free(raw);
+		}
 	}
-	else
-		return NULL;
-
-	if (! strcasecmp(attr, "name"))
-		m = sdb_store_name_matcher(type, value, re);
-	else if (type == SDB_ATTRIBUTE)
-		m = sdb_store_attr_matcher(attr, value, re);
+	return M(sdb_object_create("regex-matcher", cmp_type,
+				MATCHER_REGEX, left, right));
+} /* sdb_store_regex_matcher */
 
+sdb_store_matcher_t *
+sdb_store_nregex_matcher(sdb_store_expr_t *left, sdb_store_expr_t *right)
+{
+	sdb_store_matcher_t *m = sdb_store_regex_matcher(left, right);
 	if (! m)
 		return NULL;
-
-	if (inv) {
-		sdb_store_matcher_t *tmp;
-		tmp = sdb_store_inv_matcher(m);
-		/* pass ownership to the inverse matcher */
-		sdb_object_deref(SDB_OBJ(m));
-		m = tmp;
-	}
+	m->type = MATCHER_NREGEX;
 	return m;
-} /* sdb_store_matcher_parse_cmp */
+} /* sdb_store_nregex_matcher */
+
+sdb_store_matcher_t *
+sdb_store_isnull_matcher(sdb_store_expr_t *expr)
+{
+	return M(sdb_object_create("isnull-matcher", isnull_type,
+				MATCHER_ISNULL, expr));
+} /* sdb_store_isnull_matcher */
+
+sdb_store_matcher_t *
+sdb_store_isnnull_matcher(sdb_store_expr_t *expr)
+{
+	return M(sdb_object_create("isnull-matcher", isnull_type,
+				MATCHER_ISNNULL, expr));
+} /* sdb_store_isnnull_matcher */
+
+sdb_store_matcher_op_cb
+sdb_store_parse_matcher_op(const char *op)
+{
+	if (! strcasecmp(op, "<"))
+		return sdb_store_lt_matcher;
+	else if (! strcasecmp(op, "<="))
+		return sdb_store_le_matcher;
+	else if (! strcasecmp(op, "="))
+		return sdb_store_eq_matcher;
+	else if (! strcasecmp(op, "!="))
+		return sdb_store_ne_matcher;
+	else if (! strcasecmp(op, ">="))
+		return sdb_store_ge_matcher;
+	else if (! strcasecmp(op, ">"))
+		return sdb_store_gt_matcher;
+	else if (! strcasecmp(op, "=~"))
+		return sdb_store_regex_matcher;
+	else if (! strcasecmp(op, "!~"))
+		return sdb_store_nregex_matcher;
+	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)
+{
+	if (! strcasecmp(name, "hosts"))
+		return SDB_HOST;
+	else if (! strcasecmp(name, "services"))
+		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 */
+
+int
+sdb_store_parse_field_name(const char *name)
+{
+	if (! strcasecmp(name, "name"))
+		return SDB_FIELD_NAME;
+	else if (! strcasecmp(name, "last_update"))
+		return SDB_FIELD_LAST_UPDATE;
+	else if (! strcasecmp(name, "age"))
+		return SDB_FIELD_AGE;
+	else if (! strcasecmp(name, "interval"))
+		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 */
 
 sdb_store_matcher_t *
 sdb_store_dis_matcher(sdb_store_matcher_t *left, sdb_store_matcher_t *right)
@@ -742,9 +731,10 @@ sdb_store_inv_matcher(sdb_store_matcher_t *m)
 } /* sdb_store_inv_matcher */
 
 int
-sdb_store_matcher_matches(sdb_store_matcher_t *m, sdb_store_base_t *obj)
+sdb_store_matcher_matches(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
+		sdb_store_matcher_t *filter)
 {
-	if (obj->type != SDB_HOST)
+	if (filter && (! sdb_store_matcher_matches(filter, obj, NULL)))
 		return 0;
 
 	/* "NULL" always matches */
@@ -754,31 +744,8 @@ sdb_store_matcher_matches(sdb_store_matcher_t *m, sdb_store_base_t *obj)
 	if ((m->type < 0) || ((size_t)m->type >= SDB_STATIC_ARRAY_LEN(matchers)))
 		return 0;
 
-	return matchers[m->type](m, obj);
+	return matchers[m->type](m, obj, filter);
 } /* sdb_store_matcher_matches */
 
-char *
-sdb_store_matcher_tostring(sdb_store_matcher_t *m, char *buf, size_t buflen)
-{
-	if (! m)
-		return NULL;
-
-	if ((m->type < 0)
-			|| (((size_t)m->type >= SDB_STATIC_ARRAY_LEN(matchers_tostring))))
-		return NULL;
-	return matchers_tostring[m->type](m, buf, buflen);
-} /* sdb_store_matcher_tostring */
-
-int
-sdb_store_lookup(sdb_store_matcher_t *m, sdb_store_lookup_cb cb,
-		void *user_data)
-{
-	lookup_iter_data_t data = { m, cb, user_data };
-
-	if (! cb)
-		return -1;
-	return sdb_store_iterate(lookup_iter, &data);
-} /* sdb_store_lookup */
-
 /* vim: set tw=78 sw=4 ts=4 noexpandtab : */