X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fcore%2Fstore_lookup.c;h=11d85fea0a5ead05b42f6fffd089b6b135b0bcb9;hb=82605756814adadc0fcad9ee55e472c1730bf9ba;hp=e2ae0669f3cdc64300d5a8d49ecc3b032deea49a;hpb=643b6cdd66f789baac6a4f13d1466f7688e22670;p=sysdb.git

diff --git a/src/core/store_lookup.c b/src/core/store_lookup.c
index e2ae066..11d85fe 100644
--- a/src/core/store_lookup.c
+++ b/src/core/store_lookup.c
@@ -78,23 +78,6 @@ scan_iter(sdb_store_obj_t *obj, void *user_data)
  * matcher implementations
  */
 
-static int
-match_string(string_matcher_t *m, const char *name)
-{
-	if ((! m->name) && (! m->name_re))
-		return 1;
-
-	if (! name)
-		name = "";
-
-	if (m->name && strcasecmp(m->name, name))
-		return 0;
-	if (m->name_re && regexec(m->name_re, name,
-					/* matches */ 0, NULL, /* flags = */ 0))
-		return 0;
-	return 1;
-} /* match_string */
-
 static int
 match_logical(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
 		sdb_store_matcher_t *filter)
@@ -126,81 +109,45 @@ match_unary(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
 } /* match_unary */
 
 static int
-match_name(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_NAME);
-
-	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)
-		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;
-			break;
-		}
-	}
-	sdb_avltree_iter_destroy(iter);
-	return status;
-} /* match_name */
-
-static int
-match_child(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;
+	int status;
+	int all = 0;
 
-	assert((m->type == MATCHER_SERVICE)
-			|| (m->type == MATCHER_METRIC)
-			|| (m->type == MATCHER_ATTRIBUTE));
+	assert(m->type == MATCHER_ANY);
 
 	/* TODO: support all object types */
 	if (obj->type != SDB_HOST)
 		return 0;
 
-	if (m->type == MATCHER_SERVICE)
+	if (ITER_M(m)->type == SDB_SERVICE)
 		iter = sdb_avltree_get_iter(HOST(obj)->services);
-	else if (m->type == MATCHER_METRIC)
+	else if (ITER_M(m)->type == SDB_METRIC)
 		iter = sdb_avltree_get_iter(HOST(obj)->metrics);
-	else if (m->type == SDB_ATTRIBUTE)
+	else if (ITER_M(m)->type == SDB_ATTRIBUTE)
 		iter = sdb_avltree_get_iter(HOST(obj)->attributes);
 
+	status = all;
 	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)))
+		sdb_store_obj_t *child = STORE_OBJ(sdb_avltree_iter_get_next(iter));
+		if (filter && (! sdb_store_matcher_matches(filter, child, NULL)))
 			continue;
 
-		if (sdb_store_matcher_matches(CHILD_M(m)->m, obj, filter)) {
-			status = 1;
+		if (sdb_store_matcher_matches(ITER_M(m)->m, child, filter)) {
+			if (! all) {
+				status = 1;
+				break;
+			}
+		} else if (all) {
+			status = 0;
 			break;
 		}
 	}
 	sdb_avltree_iter_destroy(iter);
 	return status;
-} /* match_child */
+} /* match_iter */
 
 /*
  * cmp_expr:
@@ -229,6 +176,8 @@ cmp_expr(sdb_store_expr_t *e1, sdb_store_expr_t *e2,
 		status = INT_MAX;
 	else if (v1.type == v2.type)
 		status = sdb_data_cmp(&v1, &v2);
+	else if ((e1->data_type >= 0) && (e2->data_type >= 0))
+		status = INT_MAX;
 	else
 		status = sdb_data_strcmp(&v1, &v2);
 
@@ -411,10 +360,7 @@ matchers[] = {
 	match_logical,
 	match_logical,
 	match_unary,
-	match_name,
-	match_child,
-	match_child,
-	match_child,
+	match_iter,
 	match_lt,
 	match_le,
 	match_eq,
@@ -432,55 +378,6 @@ matchers[] = {
  * 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 +405,24 @@ 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)->type = va_arg(ap, int);
+	ITER_M(obj)->m = va_arg(ap, sdb_store_matcher_t *);
 
-	if (! CHILD_M(obj)->m)
+	if (! ITER_M(obj)->m)
 		return -1;
 
-	sdb_object_ref(SDB_OBJ(CHILD_M(obj)->m));
+	sdb_object_ref(SDB_OBJ(ITER_M(obj)->m));
 	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)->m));
+} /* iter_matcher_destroy */
 
 static int
 cmp_matcher_init(sdb_object_t *obj, va_list ap)
@@ -589,12 +487,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 +499,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 +522,14 @@ 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(int type, 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 ((type != SDB_SERVICE) && (type != SDB_METRIC)
+			&& (type != SDB_ATTRIBUTE))
 		return NULL;
-
-	NAME_M(m)->obj_type = type;
-	return m;
-} /* sdb_store_name_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 */
+	return M(sdb_object_create("any-matcher", iter_type,
+				MATCHER_ANY, type, m));
+} /* sdb_store_iter_matcher */
 
 sdb_store_matcher_t *
 sdb_store_lt_matcher(sdb_store_expr_t *left, sdb_store_expr_t *right)
@@ -774,6 +645,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 +668,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 */
 
@@ -802,73 +689,6 @@ sdb_store_parse_field_name(const char *name)
 	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)
 {