X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=src%2Fcore%2Fstore_lookup.c;h=b43b1ef6785930cf1550fdec7b917aa22e081eff;hp=5aa69152f237576cb4d2995e15c9a3c771b5b976;hb=dbba6b8562bd2a13e77c5381b2fc85931dcaab5d;hpb=64fcd0d638fdfd2ab5845cb7a9d368b8a76b39e9

diff --git a/src/core/store_lookup.c b/src/core/store_lookup.c
index 5aa6915..b43b1ef 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>
 
@@ -142,7 +143,7 @@ match_regex_value(int op, sdb_data_t *v, sdb_data_t *re)
 	else if (re->type != SDB_TYPE_REGEX)
 		return 0;
 
-	if (sdb_data_format(v, value, sizeof(value), SDB_UNQUOTED) < 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;
@@ -152,14 +153,6 @@ match_regex_value(int op, sdb_data_t *v, sdb_data_t *re)
 	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,
 		sdb_store_matcher_t *filter)
@@ -181,107 +174,43 @@ match_logical(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
 } /* match_logical */
 
 static int
-match_unary(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
+match_uop(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, 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;
-
-	assert(CMP_M(m)->left && CMP_M(m)->right);
-
-	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 (expr_eval2(e1, &v1, e2, &v2, obj, filter))
-		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;
-			}
-		}
-	}
-
-	expr_free_datum2(e1, &v1, e2, &v2);
-	return status;
-} /* match_iter_array */
+} /* match_uop */
 
+/* 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;
@@ -291,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 */
 
@@ -329,7 +258,7 @@ 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) || (m->type == MATCHER_NIN));
+	assert(m->type == MATCHER_IN);
 	assert(CMP_M(m)->left && CMP_M(m)->right);
 
 	if (expr_eval2(CMP_M(m)->left, &value,
@@ -340,8 +269,6 @@ match_in(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
 		status = sdb_data_inarray(&value, &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 */
 
@@ -366,34 +293,39 @@ match_regex(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
 } /* match_regex */
 
 static int
-match_isnull(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
+match_unary(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
 		sdb_store_matcher_t *filter)
 {
 	sdb_data_t v = SDB_DATA_INIT;
 	int status;
 
-	assert((m->type == MATCHER_ISNULL) || (m->type == MATCHER_ISNNULL));
+	assert((m->type == MATCHER_ISNULL)
+			|| (m->type == MATCHER_ISTRUE)
+			|| (m->type == MATCHER_ISFALSE));
 
-	if (ISNULL_M(m)->expr->type) {
+	if (UNARY_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))
+		if (sdb_store_expr_eval(UNARY_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;
+		v = UNARY_M(m)->expr->data;
+
+	if (m->type == MATCHER_ISNULL)
+		status = sdb_data_isnull(&v) ? 1 : 0;
+	else { /* ISTRUE or ISFALSE */
+		if ((v.type == SDB_TYPE_BOOLEAN)
+				&& (v.data.boolean == (m->type == MATCHER_ISTRUE)))
+			status = 1;
+		else
+			status = 0;
+	}
 
-	if (ISNULL_M(m)->expr->type)
+	if (UNARY_M(m)->expr->type)
 		sdb_data_free_datum(&v);
-	if (m->type == MATCHER_ISNNULL)
-		return !status;
 	return status;
-} /* match_isnull */
+} /* match_unary */
 
 typedef int (*matcher_cb)(sdb_store_matcher_t *, sdb_store_obj_t *,
 		sdb_store_matcher_t *);
@@ -404,15 +336,15 @@ static matcher_cb
 matchers[] = {
 	match_logical,
 	match_logical,
-	match_unary,
+	match_uop,
 	match_iter,
 	match_iter,
 	match_in,
-	match_in,
 
 	/* unary operators */
-	match_isnull,
-	match_isnull,
+	match_unary,
+	match_unary,
+	match_unary,
 
 	/* ary operators */
 	match_cmp,
@@ -423,6 +355,8 @@ matchers[] = {
 	match_cmp,
 	match_regex,
 	match_regex,
+
+	NULL, /* QUERY */
 };
 
 /*
@@ -459,19 +393,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 */
 
@@ -520,23 +456,25 @@ uop_matcher_destroy(sdb_object_t *obj)
 } /* uop_matcher_destroy */
 
 static int
-isnull_matcher_init(sdb_object_t *obj, va_list ap)
+unary_matcher_init(sdb_object_t *obj, va_list ap)
 {
 	M(obj)->type = va_arg(ap, int);
-	if ((M(obj)->type != MATCHER_ISNULL) && (M(obj)->type != MATCHER_ISNNULL))
+	if ((M(obj)->type != MATCHER_ISNULL)
+			&& (M(obj)->type != MATCHER_ISTRUE)
+			&& (M(obj)->type != MATCHER_ISFALSE))
 		return -1;
 
-	ISNULL_M(obj)->expr = va_arg(ap, sdb_store_expr_t *);
-	sdb_object_ref(SDB_OBJ(ISNULL_M(obj)->expr));
+	UNARY_M(obj)->expr = va_arg(ap, sdb_store_expr_t *);
+	sdb_object_ref(SDB_OBJ(UNARY_M(obj)->expr));
 	return 0;
-} /* isnull_matcher_init */
+} /* unary_matcher_init */
 
 static void
-isnull_matcher_destroy(sdb_object_t *obj)
+unary_matcher_destroy(sdb_object_t *obj)
 {
-	sdb_object_deref(SDB_OBJ(ISNULL_M(obj)->expr));
-	ISNULL_M(obj)->expr = NULL;
-} /* isnull_matcher_destroy */
+	sdb_object_deref(SDB_OBJ(UNARY_M(obj)->expr));
+	UNARY_M(obj)->expr = NULL;
+} /* unary_matcher_destroy */
 
 static sdb_type_t op_type = {
 	/* size = */ sizeof(op_matcher_t),
@@ -562,10 +500,10 @@ static sdb_type_t cmp_type = {
 	/* destroy = */ cmp_matcher_destroy,
 };
 
-static sdb_type_t isnull_type = {
-	/* size = */ sizeof(isnull_matcher_t),
-	/* init = */ isnull_matcher_init,
-	/* destroy = */ isnull_matcher_destroy,
+static sdb_type_t unary_type = {
+	/* size = */ sizeof(unary_matcher_t),
+	/* init = */ unary_matcher_init,
+	/* destroy = */ unary_matcher_destroy,
 };
 
 /*
@@ -573,23 +511,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 *
@@ -641,13 +599,6 @@ 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)
 {
@@ -680,82 +631,23 @@ sdb_store_nregex_matcher(sdb_store_expr_t *left, sdb_store_expr_t *right)
 sdb_store_matcher_t *
 sdb_store_isnull_matcher(sdb_store_expr_t *expr)
 {
-	return M(sdb_object_create("isnull-matcher", isnull_type,
+	return M(sdb_object_create("isnull-matcher", unary_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 */
+sdb_store_istrue_matcher(sdb_store_expr_t *expr)
+{
+	return M(sdb_object_create("istrue-matcher", unary_type,
+				MATCHER_ISTRUE, expr));
+} /* sdb_store_istrue_matcher */
 
-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 */
+sdb_store_matcher_t *
+sdb_store_isfalse_matcher(sdb_store_expr_t *expr)
+{
+	return M(sdb_object_create("isfalse-matcher", unary_type,
+				MATCHER_ISFALSE, expr));
+} /* sdb_store_isfalse_matcher */
 
 sdb_store_matcher_t *
 sdb_store_dis_matcher(sdb_store_matcher_t *left, sdb_store_matcher_t *right)
@@ -791,6 +683,8 @@ sdb_store_matcher_matches(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
 	if ((m->type < 0) || ((size_t)m->type >= SDB_STATIC_ARRAY_LEN(matchers)))
 		return 0;
 
+	if (! matchers[m->type])
+		return 0;
 	return matchers[m->type](m, obj, filter);
 } /* sdb_store_matcher_matches */