X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fcore%2Fstore_lookup.c;h=e5dad19a960b2c18bebd8172452a58ac41bcb8fd;hb=369fdff9e2ddaa96acb1bf3498d027011796f2e8;hp=513b6a64a7a824c5263eec708945c14a3812cfe6;hpb=99d12b86d046b983801fd9381d5b9cea0200a64c;p=sysdb.git

diff --git a/src/core/store_lookup.c b/src/core/store_lookup.c
index 513b6a6..e5dad19 100644
--- a/src/core/store_lookup.c
+++ b/src/core/store_lookup.c
@@ -50,33 +50,86 @@
 #include <limits.h>
 
 /*
- * private data types
+ * matcher implementations
  */
 
-typedef struct {
-	sdb_store_matcher_t *m;
-	sdb_store_matcher_t *filter;
-	sdb_store_lookup_cb  cb;
-	void *user_data;
-} scan_iter_data_t;
-
 /*
- * private helper functions
+ * 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_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);
 
-	if (sdb_store_matcher_matches(d->m, obj, d->filter))
-		return d->cb(obj, d->user_data);
+	if (status == INT_MAX)
+		return 0;
+	else if (op == MATCHER_LT)
+		return status < 0;
+	else if (op == MATCHER_LE)
+		return status <= 0;
+	else if (op == MATCHER_EQ)
+		return status == 0;
+	else if (op == MATCHER_NE)
+		return status != 0;
+	else if (op == MATCHER_GE)
+		return status >= 0;
+	else if (op == MATCHER_GT)
+		return status > 0;
 	return 0;
-} /* scan_iter */
+} /* match_cmp_value */
 
-/*
- * matcher implementations
- */
+static int
+match_regex_value(int op, sdb_data_t *v, sdb_data_t *re)
+{
+	char value[sdb_data_strlen(v) + 1];
+	int status = 0;
+
+	assert((op == MATCHER_REGEX)
+			|| (op == MATCHER_NREGEX));
+
+	if (sdb_data_isnull(v) || sdb_data_isnull(re))
+		return 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;
+
+	if (sdb_data_format(v, value, sizeof(value), SDB_UNQUOTED) < 0)
+		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_value(int op, sdb_data_t *v1, sdb_data_t *v2, _Bool strcmp_fallback)
+{
+	if ((op == MATCHER_REGEX) || (op == MATCHER_NREGEX))
+		return match_regex_value(op, v1, v2);
+	return match_cmp_value(op, v1, v2, strcmp_fallback);
+} /* match_value */
 
 static int
 match_logical(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
@@ -108,6 +161,66 @@ 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 arrays: ANY/ALL <array> <cmp> <value> */
+static int
+match_iter_array(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
+		sdb_store_matcher_t *filter)
+{
+	sdb_store_expr_t *e1, *e2;
+	sdb_data_t v1 = SDB_DATA_INIT;
+	sdb_data_t v2 = SDB_DATA_INIT;
+
+	int status;
+
+	if ((ITER_M(m)->m->type < MATCHER_LT)
+			|| (MATCHER_NREGEX < ITER_M(m)->m->type))
+		return 0;
+
+	e1 = CMP_M(ITER_M(m)->m)->left;
+	e2 = CMP_M(ITER_M(m)->m)->right;
+
+	if (sdb_store_expr_eval(e1, obj, &v1, filter))
+		return 0;
+	if (sdb_store_expr_eval(e2, obj, &v2, filter)) {
+		sdb_data_free_datum(&v1);
+		return 0;
+	}
+
+	if ((! (v1.type & SDB_TYPE_ARRAY)) || (v2.type & SDB_TYPE_ARRAY))
+		status = 0;
+	else if (sdb_data_isnull(&v1) || (sdb_data_isnull(&v2)))
+		status = 0;
+	else {
+		size_t i;
+		int all = (int)(m->type == MATCHER_ALL);
+
+		status = all;
+		for (i = 0; i < v1.data.array.length; ++i) {
+			sdb_data_t v = SDB_DATA_INIT;
+			if (sdb_data_array_get(&v1, i, &v)) {
+				status = 0;
+				break;
+			}
+
+			if (match_value(ITER_M(m)->m->type, &v, &v2,
+						(e1->data_type) < 0 || (e2->data_type < 0))) {
+				if (! all) {
+					status = 1;
+					break;
+				}
+			}
+			else if (all) {
+				status = 0;
+				break;
+			}
+		}
+	}
+
+	sdb_data_free_datum(&v1);
+	sdb_data_free_datum(&v2);
+	return status;
+} /* match_iter_array */
+
 static int
 match_iter(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
 		sdb_store_matcher_t *filter)
@@ -118,16 +231,23 @@ match_iter(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
 
 	assert((m->type == MATCHER_ANY) || (m->type == MATCHER_ALL));
 
-	/* TODO: support all object types */
-	if (obj->type != SDB_HOST)
-		return 0;
-
-	if (ITER_M(m)->type == SDB_SERVICE)
-		iter = sdb_avltree_get_iter(HOST(obj)->services);
-	else if (ITER_M(m)->type == SDB_METRIC)
-		iter = sdb_avltree_get_iter(HOST(obj)->metrics);
-	else if (ITER_M(m)->type == SDB_ATTRIBUTE)
-		iter = sdb_avltree_get_iter(HOST(obj)->attributes);
+	if (ITER_M(m)->type == SDB_FIELD_BACKEND)
+		return match_iter_array(m, obj, filter);
+
+	if (obj->type == SDB_HOST) {
+		if (ITER_M(m)->type == SDB_SERVICE)
+			iter = sdb_avltree_get_iter(HOST(obj)->services);
+		else if (ITER_M(m)->type == SDB_METRIC)
+			iter = sdb_avltree_get_iter(HOST(obj)->metrics);
+		else if (ITER_M(m)->type == SDB_ATTRIBUTE)
+			iter = sdb_avltree_get_iter(HOST(obj)->attributes);
+	} else if (obj->type == SDB_SERVICE) {
+		if (ITER_M(m)->type == SDB_ATTRIBUTE)
+			iter = sdb_avltree_get_iter(SVC(obj)->attributes);
+	} else if (obj->type == SDB_METRIC) {
+		if (ITER_M(m)->type == SDB_ATTRIBUTE)
+			iter = sdb_avltree_get_iter(METRIC(obj)->attributes);
+	}
 
 	status = all;
 	while (sdb_avltree_iter_has_next(iter)) {
@@ -149,102 +269,36 @@ match_iter(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
 	return status;
 } /* match_iter */
 
-/*
- * 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)
+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)
+			|| (m->type == MATCHER_LE)
+			|| (m->type == MATCHER_EQ)
+			|| (m->type == MATCHER_NE)
+			|| (m->type == MATCHER_GE)
+			|| (m->type == MATCHER_GT));
+
 	if (sdb_store_expr_eval(e1, obj, &v1, filter))
-		return INT_MAX;
+		return 0;
 	if (sdb_store_expr_eval(e2, obj, &v2, filter)) {
 		sdb_data_free_datum(&v1);
-		return INT_MAX;
+		return 0;
 	}
 
-	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 ((e1->data_type >= 0) && (e2->data_type >= 0))
-		status = INT_MAX;
-	else
-		status = sdb_data_strcmp(&v1, &v2);
+	status = match_cmp_value(m->type, &v1, &v2,
+			(e1->data_type) < 0 || (e2->data_type < 0));
 
 	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 */
-
-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 */
-
-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 */
-
-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 */
+} /* match_cmp */
 
 static int
 match_in(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
@@ -271,59 +325,26 @@ 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));
 
-	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))
+		return 0;
+	else if (! CMP_M(m)->right->type)
+		regex = CMP_M(m)->right->data;
+	else if (sdb_store_expr_eval(CMP_M(m)->right, obj, &regex, filter)) {
+		sdb_data_free_datum(&v);
+		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;
+	if (CMP_M(m)->right->type)
+		sdb_data_free_datum(&regex);
 	return status;
 } /* match_regex */
 
@@ -362,17 +383,21 @@ matchers[] = {
 	match_unary,
 	match_iter,
 	match_iter,
-	match_lt,
-	match_le,
-	match_eq,
-	match_ne,
-	match_ge,
-	match_gt,
 	match_in,
-	match_regex,
-	match_regex,
+
+	/* unary operators */
 	match_isnull,
 	match_isnull,
+
+	/* ary operators */
+	match_cmp,
+	match_cmp,
+	match_cmp,
+	match_cmp,
+	match_cmp,
+	match_cmp,
+	match_regex,
+	match_regex,
 };
 
 /*
@@ -526,7 +551,7 @@ sdb_store_matcher_t *
 sdb_store_any_matcher(int type, sdb_store_matcher_t *m)
 {
 	if ((type != SDB_SERVICE) && (type != SDB_METRIC)
-			&& (type != SDB_ATTRIBUTE))
+			&& (type != SDB_ATTRIBUTE) && (type != SDB_FIELD_BACKEND))
 		return NULL;
 	return M(sdb_object_create("any-matcher", iter_type,
 				MATCHER_ANY, type, m));
@@ -536,7 +561,7 @@ sdb_store_matcher_t *
 sdb_store_all_matcher(int type, sdb_store_matcher_t *m)
 {
 	if ((type != SDB_SERVICE) && (type != SDB_METRIC)
-			&& (type != SDB_ATTRIBUTE))
+			&& (type != SDB_ATTRIBUTE) && (type != SDB_FIELD_BACKEND))
 		return NULL;
 	return M(sdb_object_create("all-matcher", iter_type,
 				MATCHER_ALL, type, m));
@@ -737,16 +762,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 : */