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

diff --git a/src/core/store_lookup.c b/src/core/store_lookup.c
index 94f95cc..18a0235 100644
--- a/src/core/store_lookup.c
+++ b/src/core/store_lookup.c
@@ -153,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)
@@ -191,104 +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;
-
-	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 */
-
+/* 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;
-	int type, status;
+	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)->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 (type == SDB_SERVICE)
-			iter = sdb_avltree_get_iter(HOST(obj)->services);
-		else if (type == SDB_METRIC)
-			iter = sdb_avltree_get_iter(HOST(obj)->metrics);
-		else if (type == SDB_ATTRIBUTE)
-			iter = sdb_avltree_get_iter(HOST(obj)->attributes);
-	} else if (obj->type == SDB_SERVICE) {
-		if (type == SDB_ATTRIBUTE)
-			iter = sdb_avltree_get_iter(SVC(obj)->attributes);
-	} else if (obj->type == SDB_METRIC) {
-		if (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;
@@ -298,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 */
 
@@ -589,6 +511,14 @@ sdb_store_any_matcher(sdb_store_expr_t *iter, sdb_store_matcher_t *m)
 				"(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, iter, m));
 } /* sdb_store_any_matcher */
@@ -601,6 +531,14 @@ sdb_store_all_matcher(sdb_store_expr_t *iter, sdb_store_matcher_t *m)
 				"(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, iter, m));
 } /* sdb_store_all_matcher */
@@ -767,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 */