X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fcore%2Fstore_lookup.c;h=21e0ba4ef4dd13d30d1fcfe7d9bf6c9a0465fafa;hb=10a65c7e584820b403567bc849581bb0c3176ff5;hp=124c4514c59170a82e2fb575ccc35583bc8d18e1;hpb=90ada5c7c86cf280b2a4468e285671e9314e0d29;p=sysdb.git

diff --git a/src/core/store_lookup.c b/src/core/store_lookup.c
index 124c451..21e0ba4 100644
--- a/src/core/store_lookup.c
+++ b/src/core/store_lookup.c
@@ -114,14 +114,14 @@ attr_cmp(sdb_store_obj_t *obj, sdb_store_cond_t *cond,
 	if (obj->type != SDB_HOST)
 		return INT_MAX;
 
-	if (sdb_store_expr_eval(ATTR_C(cond)->expr, &value))
+	if (sdb_store_expr_eval(ATTR_C(cond)->expr, obj, &value, filter))
 		return INT_MAX;
 
 	attr = attr_get(HOST(obj), ATTR_C(cond)->name, filter);
 	if (! attr)
 		status = INT_MAX;
 	else if (attr->value.type != value.type)
-		status = INT_MAX;
+		status = sdb_data_strcmp(&attr->value, &value);
 	else
 		status = sdb_data_cmp(&attr->value, &value);
 	sdb_data_free_datum(&value);
@@ -130,44 +130,23 @@ attr_cmp(sdb_store_obj_t *obj, sdb_store_cond_t *cond,
 
 static int
 obj_cmp(sdb_store_obj_t *obj, sdb_store_cond_t *cond,
-		sdb_store_matcher_t __attribute__((unused)) *filter)
+		sdb_store_matcher_t *filter)
 {
 	sdb_data_t obj_value = SDB_DATA_INIT;
 	sdb_data_t value = SDB_DATA_INIT;
 	int status;
 
-	switch (OBJ_C(cond)->field) {
-		case SDB_FIELD_LAST_UPDATE:
-			obj_value.type = SDB_TYPE_DATETIME;
-			obj_value.data.datetime = obj->last_update;
-			break;
-		case SDB_FIELD_AGE:
-			obj_value.type = SDB_TYPE_DATETIME;
-			obj_value.data.datetime = sdb_gettime() - obj->last_update;
-			break;
-		case SDB_FIELD_INTERVAL:
-			obj_value.type = SDB_TYPE_DATETIME;
-			obj_value.data.datetime = obj->interval;
-			break;
-		case SDB_FIELD_BACKEND:
-			obj_value.type = SDB_TYPE_STRING;
-			obj_value.data.string = NULL; /* handled separately */
-			break;
-		default:
-			return INT_MAX;
-	}
-
-	if (sdb_store_expr_eval(OBJ_C(cond)->expr, &value))
+	if (sdb_store_expr_eval(OBJ_C(cond)->expr, obj, &value, filter))
 		return INT_MAX;
 
-	if (obj_value.type != value.type) {
-		sdb_data_free_datum(&value);
-		return INT_MAX;
-	}
-	else if (OBJ_C(cond)->field == SDB_FIELD_BACKEND) {
+	if (OBJ_C(cond)->field == SDB_FIELD_BACKEND) {
 		/* this implementation is not actually a conditional but rather checks
 		 * for equality (or rather, existence) only */
 		size_t i;
+
+		if (value.type != SDB_TYPE_STRING)
+			return INT_MAX;
+
 		status = INT_MAX;
 		for (i = 0; i < obj->backends_num; ++i) {
 			if (! strcasecmp(obj->backends[i], value.data.string)) {
@@ -175,10 +154,20 @@ obj_cmp(sdb_store_obj_t *obj, sdb_store_cond_t *cond,
 				break;
 			}
 		}
+		sdb_data_free_datum(&value);
+		return status;
 	}
-	else {
-		status = sdb_data_cmp(&obj_value, &value);
+
+	if (sdb_store_get_field(obj, OBJ_C(cond)->field, &obj_value))
+		return INT_MAX;
+	if (obj_value.type != value.type) {
+		sdb_data_free_datum(&obj_value);
+		sdb_data_free_datum(&value);
+		return INT_MAX;
 	}
+
+	status = sdb_data_cmp(&obj_value, &value);
+	sdb_data_free_datum(&obj_value);
 	sdb_data_free_datum(&value);
 	return status;
 } /* obj_cmp */
@@ -252,6 +241,9 @@ match_name(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
 		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;
@@ -294,6 +286,43 @@ match_attr(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
 	return 0;
 } /* match_attr */
 
+static int
+match_child(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 */
+
 static int
 match_lt(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
 		sdb_store_matcher_t *filter)
@@ -344,14 +373,178 @@ match_gt(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
 	return (status != INT_MAX) && (status > 0);
 } /* match_gt */
 
+/*
+ * 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.
+ */
+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_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 (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_cmp_lt(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
+		sdb_store_matcher_t *filter)
+{
+	int status;
+	assert(m->type == MATCHER_CMP_LT);
+	status = cmp_expr(CMP_M(m)->left, CMP_M(m)->right, obj, filter);
+	return (status != INT_MAX) && (status < 0);
+} /* match_cmp_lt */
+
+static int
+match_cmp_le(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
+		sdb_store_matcher_t *filter)
+{
+	int status;
+	assert(m->type == MATCHER_CMP_LE);
+	status = cmp_expr(CMP_M(m)->left, CMP_M(m)->right, obj, filter);
+	return (status != INT_MAX) && (status <= 0);
+} /* match_cmp_le */
+
+static int
+match_cmp_eq(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
+		sdb_store_matcher_t *filter)
+{
+	int status;
+	assert(m->type == MATCHER_CMP_EQ);
+	status = cmp_expr(CMP_M(m)->left, CMP_M(m)->right, obj, filter);
+	return (status != INT_MAX) && (! status);
+} /* match_cmp_eq */
+
+static int
+match_cmp_ne(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
+		sdb_store_matcher_t *filter)
+{
+	int status;
+	assert(m->type == MATCHER_CMP_NE);
+	status = cmp_expr(CMP_M(m)->left, CMP_M(m)->right, obj, filter);
+	return (status != INT_MAX) && status;
+} /* match_cmp_ne */
+
+static int
+match_cmp_ge(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
+		sdb_store_matcher_t *filter)
+{
+	int status;
+	assert(m->type == MATCHER_CMP_GE);
+	status = cmp_expr(CMP_M(m)->left, CMP_M(m)->right, obj, filter);
+	return (status != INT_MAX) && (status >= 0);
+} /* match_cmp_ge */
+
+static int
+match_cmp_gt(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
+		sdb_store_matcher_t *filter)
+{
+	int status;
+	assert(m->type == MATCHER_CMP_GT);
+	status = cmp_expr(CMP_M(m)->left, CMP_M(m)->right, obj, filter);
+	return (status != INT_MAX) && (status > 0);
+} /* match_cmp_gt */
+
+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;
+	int status = 0;
+
+	regex_t regex;
+	_Bool free_regex = 0;
+
+	assert((m->type == MATCHER_REGEX)
+			|| (m->type == MATCHER_NREGEX));
+
+	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 (sdb_store_expr_eval(CMP_M(m)->left, obj, &v, filter))
+		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;
+	}
+
+	if (free_regex)
+		regfree(&regex);
+	sdb_data_free_datum(&v);
+	if (m->type == MATCHER_NREGEX)
+		return !status;
+	return status;
+} /* match_regex */
+
 static int
 match_isnull(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
 		sdb_store_matcher_t *filter)
 {
-	assert(m->type == MATCHER_ISNULL);
-	if (obj->type != SDB_HOST)
-		return 0;
-	return attr_get(HOST(obj), ISNULL_M(m)->attr_name, filter) == NULL;
+	sdb_data_t v = SDB_DATA_INIT;
+	int status;
+
+	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))
+		status = 1;
+	else
+		status = 0;
+
+	sdb_data_free_datum(&v);
+	if (m->type == MATCHER_ISNNULL)
+		return !status;
+	return status;
 } /* match_isnull */
 
 typedef int (*matcher_cb)(sdb_store_matcher_t *, sdb_store_obj_t *,
@@ -366,11 +559,23 @@ matchers[] = {
 	match_unary,
 	match_name,
 	match_attr,
+	match_child,
+	match_child,
+	match_child,
 	match_lt,
 	match_le,
 	match_eq,
 	match_ge,
 	match_gt,
+	match_cmp_lt,
+	match_cmp_le,
+	match_cmp_eq,
+	match_cmp_ne,
+	match_cmp_ge,
+	match_cmp_gt,
+	match_regex,
+	match_regex,
+	match_isnull,
 	match_isnull,
 };
 
@@ -596,7 +801,7 @@ cond_tostring(sdb_store_matcher_t *m, char *buf, size_t buflen)
 		return buf;
 	}
 
-	if (sdb_store_expr_eval(expr, &value))
+	if (sdb_store_expr_eval(expr, /* obj */ NULL, &value, /* filter */ NULL))
 		snprintf(value_str, sizeof(value_str), "ERR");
 	else if (sdb_data_format(&value, value_str, sizeof(value_str),
 				SDB_SINGLE_QUOTED) < 0)
@@ -652,6 +857,71 @@ op_tostring(sdb_store_matcher_t *m, char *buf, size_t buflen)
 	return buf;
 } /* op_tostring */
 
+static int
+child_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 *);
+
+	if (! CHILD_M(obj)->m)
+		return -1;
+
+	sdb_object_ref(SDB_OBJ(CHILD_M(obj)->m));
+	return 0;
+} /* child_matcher_init */
+
+static void
+child_matcher_destroy(sdb_object_t *obj)
+{
+	sdb_object_deref(SDB_OBJ(CHILD_M(obj)->m));
+} /* child_matcher_destroy */
+
+static char *
+child_tostring(sdb_store_matcher_t *m, char *buf, size_t buflen)
+{
+	snprintf(buf, buflen, "%s:", MATCHER_SYM(m->type));
+	buf[buflen - 1] = '\0';
+	sdb_store_matcher_tostring(CHILD_M(m)->m,
+			buf + strlen(buf), buflen - strlen(buf));
+	return buf;
+} /* child_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)->left) || (! 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 char *
+cmp_tostring(sdb_store_matcher_t *m, char *buf, size_t buflen)
+{
+	if (! m) {
+		/* this should not happen */
+		snprintf(buf, buflen, "()");
+		return buf;
+	}
+
+	/* TODO */
+	snprintf(buf, buflen, "CMP_MATCHER(%d)", m->type);
+	return buf;
+} /* cmp_tostring */
+
 static int
 uop_matcher_init(sdb_object_t *obj, va_list ap)
 {
@@ -694,33 +964,30 @@ uop_tostring(sdb_store_matcher_t *m, char *buf, size_t buflen)
 static int
 isnull_matcher_init(sdb_object_t *obj, va_list ap)
 {
-	const char *name;
-
 	M(obj)->type = va_arg(ap, int);
-	if (M(obj)->type != MATCHER_ISNULL)
+	if ((M(obj)->type != MATCHER_ISNULL) && (M(obj)->type != MATCHER_ISNNULL))
 		return -1;
 
-	name = va_arg(ap, const char *);
-	if (! name)
-		return -1;
-	ISNULL_M(obj)->attr_name = strdup(name);
-	if (! ISNULL_M(obj)->attr_name)
-		return -1;
+	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 void
 isnull_matcher_destroy(sdb_object_t *obj)
 {
-	if (ISNULL_M(obj)->attr_name)
-		free(ISNULL_M(obj)->attr_name);
-	ISNULL_M(obj)->attr_name = NULL;
+	sdb_object_deref(SDB_OBJ(ISNULL_M(obj)->expr));
+	ISNULL_M(obj)->expr = NULL;
 } /* isnull_matcher_destroy */
 
 static char *
 isnull_tostring(sdb_store_matcher_t *m, char *buf, size_t buflen)
 {
-	snprintf(buf, buflen, "(IS NULL, ATTR[%s])", ISNULL_M(m)->attr_name);
+	/* XXX */
+	if (m->type == MATCHER_ISNULL)
+		strncpy(buf, "(IS NULL)", buflen);
+	else
+		strncpy(buf, "(IS NOT NULL)", buflen);
 	return buf;
 } /* isnull_tostring */
 
@@ -754,6 +1021,18 @@ 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 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,
@@ -771,11 +1050,23 @@ matchers_tostring[] = {
 	uop_tostring,
 	name_tostring,
 	attr_tostring,
+	child_tostring,
+	child_tostring,
+	child_tostring,
 	cond_tostring,
 	cond_tostring,
 	cond_tostring,
 	cond_tostring,
 	cond_tostring,
+	cmp_tostring,
+	cmp_tostring,
+	cmp_tostring,
+	cmp_tostring,
+	cmp_tostring,
+	cmp_tostring,
+	cmp_tostring,
+	cmp_tostring,
+	isnull_tostring,
 	isnull_tostring,
 };
 
@@ -831,6 +1122,20 @@ sdb_store_attr_matcher(const char *name, const char *value, _Bool re)
 	return m;
 } /* sdb_store_attr_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
+		return NULL;
+	return M(sdb_object_create("any-matcher", child_type, type, m));
+} /* sdb_store_child_matcher */
+
 sdb_store_matcher_t *
 sdb_store_lt_matcher(sdb_store_cond_t *cond)
 {
@@ -866,13 +1171,146 @@ sdb_store_gt_matcher(sdb_store_cond_t *cond)
 				MATCHER_GT, cond));
 } /* sdb_store_gt_matcher */
 
+/*
+ * TODO: Rename sdb_store_cmp_* to sdb_store_* once the old code is unused and
+ * has been removed.
+ */
+
+sdb_store_matcher_t *
+sdb_store_cmp_lt(sdb_store_expr_t *left, sdb_store_expr_t *right)
+{
+	return M(sdb_object_create("lt-matcher", cmp_type,
+				MATCHER_CMP_LT, left, right));
+} /* sdb_store_cmp_lt */
+
+sdb_store_matcher_t *
+sdb_store_cmp_le(sdb_store_expr_t *left, sdb_store_expr_t *right)
+{
+	return M(sdb_object_create("le-matcher", cmp_type,
+				MATCHER_CMP_LE, left, right));
+} /* sdb_store_cmp_le */
+
+sdb_store_matcher_t *
+sdb_store_cmp_eq(sdb_store_expr_t *left, sdb_store_expr_t *right)
+{
+	return M(sdb_object_create("eq-matcher", cmp_type,
+				MATCHER_CMP_EQ, left, right));
+} /* sdb_store_cmp_eq */
+
+sdb_store_matcher_t *
+sdb_store_cmp_ne(sdb_store_expr_t *left, sdb_store_expr_t *right)
+{
+	return M(sdb_object_create("ne-matcher", cmp_type,
+				MATCHER_CMP_NE, left, right));
+} /* sdb_store_cmp_ne */
+
+sdb_store_matcher_t *
+sdb_store_cmp_ge(sdb_store_expr_t *left, sdb_store_expr_t *right)
+{
+	return M(sdb_object_create("ge-matcher", cmp_type,
+				MATCHER_CMP_GE, left, right));
+} /* sdb_store_cmp_ge */
+
+sdb_store_matcher_t *
+sdb_store_cmp_gt(sdb_store_expr_t *left, sdb_store_expr_t *right)
+{
+	return M(sdb_object_create("gt-matcher", cmp_type,
+				MATCHER_CMP_GT, left, right));
+} /* sdb_store_cmp_gt */
+
+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);
+		}
+	}
+	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;
+	m->type = MATCHER_NREGEX;
+	return m;
+} /* sdb_store_nregex_matcher */
+
 sdb_store_matcher_t *
-sdb_store_isnull_matcher(const char *attr_name)
+sdb_store_isnull_matcher(sdb_store_expr_t *expr)
 {
 	return M(sdb_object_create("isnull-matcher", isnull_type,
-				MATCHER_ISNULL, attr_name));
+				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_cmp_lt;
+	else if (! strcasecmp(op, "<="))
+		return sdb_store_cmp_le;
+	else if (! strcasecmp(op, "="))
+		return sdb_store_cmp_eq;
+	else if (! strcasecmp(op, "!="))
+		return sdb_store_cmp_ne;
+	else if (! strcasecmp(op, ">="))
+		return sdb_store_cmp_ge;
+	else if (! strcasecmp(op, ">"))
+		return sdb_store_cmp_gt;
+	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_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;
+	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;
+	return -1;
+} /* sdb_store_parse_field_name */
+
 static sdb_store_matcher_t *
 maybe_inv_matcher(sdb_store_matcher_t *m, _Bool inv)
 {
@@ -922,13 +1360,7 @@ parse_attr_cmp(const char *attr, const char *op, sdb_store_expr_t *expr)
 	if (! attr)
 		return NULL;
 
-	if (! strcasecmp(op, "IS")) {
-		if (! expr)
-			return sdb_store_isnull_matcher(attr);
-		else
-			return NULL;
-	}
-	else if (! expr)
+	if (! expr)
 		return NULL;
 	else if (parse_cond_op(op, &matcher, &inv))
 		return NULL;
@@ -958,6 +1390,8 @@ sdb_store_matcher_parse_cmp(const char *obj_type, const char *attr,
 		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
@@ -985,10 +1419,11 @@ sdb_store_matcher_parse_cmp(const char *obj_type, const char *attr,
 	if (! expr)
 		return NULL;
 
-	if (sdb_store_expr_eval(expr, &value))
-		return NULL;
-	if (value.type != SDB_TYPE_STRING) {
+	if (sdb_store_expr_eval(expr, /* obj */ NULL, &value, /* filter */ NULL)
+			|| (value.type != SDB_TYPE_STRING)) {
 		sdb_data_free_datum(&value);
+		if (type != SDB_ATTRIBUTE)
+			return NULL;
 		return parse_attr_cmp(attr, op, expr);
 	}
 
@@ -1015,20 +1450,12 @@ sdb_store_matcher_parse_field_cmp(const char *name, const char *op,
 	if (! expr)
 		return NULL;
 
-	if (! strcasecmp(name, "last_update"))
-		field = SDB_FIELD_LAST_UPDATE;
-	else if (! strcasecmp(name, "age"))
-		field = SDB_FIELD_AGE;
-	else if (! strcasecmp(name, "interval"))
-		field = SDB_FIELD_INTERVAL;
-	else if (! strcasecmp(name, "backend"))
-		field = SDB_FIELD_BACKEND;
-	else
+	field = sdb_store_parse_field_name(name);
+	if (field < 0)
 		return NULL;
 
 	if (parse_cond_op(op, &matcher, &inv))
 		return NULL;
-
 	cond = sdb_store_obj_cond(field, expr);
 	if (! cond)
 		return NULL;