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

diff --git a/src/core/store_lookup.c b/src/core/store_lookup.c
index e2ec1b1..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,6 +50,39 @@
 
 #include <limits.h>
 
+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 */
+
+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 */
+
 /*
  * matcher implementations
  */
@@ -59,7 +93,7 @@
  * is enabled, compare the string values in case of a type mismatch.
  */
 static int
-cmp_value(int op, sdb_data_t *v1, sdb_data_t *v2, _Bool strcmp_fallback)
+match_cmp_value(int op, sdb_data_t *v1, sdb_data_t *v2, bool strcmp_fallback)
 {
 	int status;
 
@@ -74,20 +108,50 @@ cmp_value(int op, sdb_data_t *v1, sdb_data_t *v2, _Bool strcmp_fallback)
 
 	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;
+	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;
-} /* cmp_value */
+} /* match_cmp_value */
+
+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))
+		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,
@@ -119,101 +183,34 @@ 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;
-
-	/* TODO: fully support arbitrary operators (?) */
-	if ((ITER_M(m)->m->type < MATCHER_LT) || (MATCHER_GT < 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 (cmp_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 */
-
+/* iterate: ANY/ALL <iter> <cmp> <value> */
 static int
 match_iter(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
 		sdb_store_matcher_t *filter)
 {
-	sdb_avltree_iter_t *iter = NULL;
+	sdb_store_expr_iter_t *iter = NULL;
 	int status;
 	int all = (int)(m->type == MATCHER_ALL);
 
 	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 (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);
-	}
+	iter = sdb_store_expr_iter(ITER_M(m)->iter, obj, filter);
+	if (! iter)
+		return 0;
 
 	status = all;
-	while (sdb_avltree_iter_has_next(iter)) {
-		sdb_store_obj_t *child = STORE_OBJ(sdb_avltree_iter_get_next(iter));
-		if (filter && (! sdb_store_matcher_matches(filter, child, NULL)))
-			continue;
+	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 (sdb_store_matcher_matches(ITER_M(m)->m, child, filter)) {
+		if (matches) {
 			if (! all) {
 				status = 1;
 				break;
@@ -223,7 +220,7 @@ match_iter(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
 			break;
 		}
 	}
-	sdb_avltree_iter_destroy(iter);
+	sdb_store_expr_iter_destroy(iter);
 	return status;
 } /* match_iter */
 
@@ -242,19 +239,15 @@ match_cmp(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
 			|| (m->type == MATCHER_NE)
 			|| (m->type == MATCHER_GE)
 			|| (m->type == MATCHER_GT));
+	assert(e1 && e2);
 
-	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);
+	if (expr_eval2(e1, &v1, e2, &v2, obj, filter))
 		return 0;
-	}
 
-	status = cmp_value(m->type, &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);
+	expr_free_datum2(e1, &v1, e2, &v2);
 	return status;
 } /* match_cmp */
 
@@ -265,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 */
 
@@ -283,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 */
 
@@ -348,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;
@@ -374,17 +336,22 @@ matchers[] = {
 	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_in,
 	match_regex,
 	match_regex,
-	match_isnull,
-	match_isnull,
 };
 
 /*
@@ -421,19 +388,21 @@ static int
 iter_matcher_init(sdb_object_t *obj, va_list ap)
 {
 	M(obj)->type = va_arg(ap, int);
-	ITER_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 (! ITER_M(obj)->m)
-		return -1;
-
+	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 */
 
@@ -447,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 */
@@ -535,23 +504,43 @@ static sdb_type_t isnull_type = {
  */
 
 sdb_store_matcher_t *
-sdb_store_any_matcher(int type, sdb_store_matcher_t *m)
+sdb_store_any_matcher(sdb_store_expr_t *iter, sdb_store_matcher_t *m)
 {
-	if ((type != SDB_SERVICE) && (type != SDB_METRIC)
-			&& (type != SDB_ATTRIBUTE) && (type != SDB_FIELD_BACKEND))
+	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;
+	}
+	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, type, m));
+				MATCHER_ANY, iter, m));
 } /* sdb_store_any_matcher */
 
 sdb_store_matcher_t *
-sdb_store_all_matcher(int type, sdb_store_matcher_t *m)
+sdb_store_all_matcher(sdb_store_expr_t *iter, sdb_store_matcher_t *m)
 {
-	if ((type != SDB_SERVICE) && (type != SDB_METRIC)
-			&& (type != SDB_ATTRIBUTE) && (type != SDB_FIELD_BACKEND))
+	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("all-matcher", iter_type,
-				MATCHER_ALL, type, m));
+				MATCHER_ALL, iter, m));
 } /* sdb_store_all_matcher */
 
 sdb_store_matcher_t *
@@ -603,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)
 {
@@ -709,6 +705,8 @@ 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 */