X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fcore%2Fstore_lookup.c;h=94f95cc5188f4c03d146bd1b7157adab3f62f76f;hb=b072d9b2786422fcb8f068dd5076bd108a6228e9;hp=e1e03961fc5e3e7760865c0d6e1e7805a7215c4f;hpb=0ec2844f4123c01908a1369266600d200356f043;p=sysdb.git

diff --git a/src/core/store_lookup.c b/src/core/store_lookup.c
index e1e0396..94f95cc 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>
 
@@ -92,7 +93,7 @@ expr_free_datum2(sdb_store_expr_t *e1, sdb_data_t *v1,
  * is enabled, compare the string values in case of a type mismatch.
  */
 static int
-match_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;
 
@@ -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;
@@ -153,7 +154,7 @@ match_regex_value(int op, sdb_data_t *v, sdb_data_t *re)
 } /* match_regex_value */
 
 static int
-match_value(int op, sdb_data_t *v1, sdb_data_t *v2, _Bool strcmp_fallback)
+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);
@@ -201,6 +202,8 @@ match_iter_array(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
 
 	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;
@@ -250,26 +253,32 @@ 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;
+	int type, status;
 	int all = (int)(m->type == MATCHER_ALL);
 
 	assert((m->type == MATCHER_ANY) || (m->type == MATCHER_ALL));
 
-	if (ITER_M(m)->type == SDB_FIELD_BACKEND)
+	if (ITER_M(m)->iter->type == FIELD_VALUE) {
+		if (ITER_M(m)->iter->data.data.integer != SDB_FIELD_BACKEND)
+			return 0;
 		return match_iter_array(m, obj, filter);
+	}
+
+	assert(ITER_M(m)->iter->type == TYPED_EXPR);
 
+	type = (int)ITER_M(m)->iter->data.data.integer;
 	if (obj->type == SDB_HOST) {
-		if (ITER_M(m)->type == SDB_SERVICE)
+		if (type == SDB_SERVICE)
 			iter = sdb_avltree_get_iter(HOST(obj)->services);
-		else if (ITER_M(m)->type == SDB_METRIC)
+		else if (type == SDB_METRIC)
 			iter = sdb_avltree_get_iter(HOST(obj)->metrics);
-		else if (ITER_M(m)->type == SDB_ATTRIBUTE)
+		else if (type == SDB_ATTRIBUTE)
 			iter = sdb_avltree_get_iter(HOST(obj)->attributes);
 	} else if (obj->type == SDB_SERVICE) {
-		if (ITER_M(m)->type == SDB_ATTRIBUTE)
+		if (type == SDB_ATTRIBUTE)
 			iter = sdb_avltree_get_iter(SVC(obj)->attributes);
 	} else if (obj->type == SDB_METRIC) {
-		if (ITER_M(m)->type == SDB_ATTRIBUTE)
+		if (type == SDB_ATTRIBUTE)
 			iter = sdb_avltree_get_iter(METRIC(obj)->attributes);
 	}
 
@@ -308,6 +317,7 @@ 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 (expr_eval2(e1, &v1, e2, &v2, obj, filter))
 		return 0;
@@ -326,7 +336,8 @@ 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 (expr_eval2(CMP_M(m)->left, &value,
 				CMP_M(m)->right, &array, obj, filter))
@@ -336,6 +347,8 @@ 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 */
 
@@ -348,6 +361,7 @@ match_regex(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
 
 	assert((m->type == MATCHER_REGEX)
 			|| (m->type == MATCHER_NREGEX));
+	assert(CMP_M(m)->left && CMP_M(m)->right);
 
 	if (expr_eval2(CMP_M(m)->left, &v, CMP_M(m)->right, &regex, obj, filter))
 		return 0;
@@ -401,6 +415,7 @@ matchers[] = {
 	match_iter,
 	match_iter,
 	match_in,
+	match_in,
 
 	/* unary operators */
 	match_isnull,
@@ -451,19 +466,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 */
 
@@ -477,7 +494,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 */
@@ -565,23 +582,27 @@ 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;
+	}
 	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;
+	}
 	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 *
@@ -633,6 +654,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)
 {