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

diff --git a/src/core/store_lookup.c b/src/core/store_lookup.c
index 18a0235..06151a8 100644
--- a/src/core/store_lookup.c
+++ b/src/core/store_lookup.c
@@ -174,14 +174,14 @@ 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 */
+} /* match_uop */
 
 /* iterate: ANY/ALL <iter> <cmp> <value> */
 static int
@@ -196,8 +196,10 @@ match_iter(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
 	assert((! CMP_M(ITER_M(m)->m)->left) && CMP_M(ITER_M(m)->m)->right);
 
 	iter = sdb_store_expr_iter(ITER_M(m)->iter, obj, filter);
-	if (! iter)
+	if (! iter) {
+		sdb_log(SDB_LOG_WARNING, "store: Invalid iterator");
 		return 0;
+	}
 
 	status = all;
 	while (sdb_store_expr_iter_has_next(iter)) {
@@ -258,7 +260,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,
@@ -269,8 +271,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 */
 
@@ -295,34 +295,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 *);
@@ -333,15 +338,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,
@@ -352,6 +357,8 @@ matchers[] = {
 	match_cmp,
 	match_regex,
 	match_regex,
+
+	NULL, /* QUERY */
 };
 
 /*
@@ -451,23 +458,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),
@@ -493,10 +502,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,
 };
 
 /*
@@ -592,13 +601,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)
 {
@@ -631,84 +633,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;
-	else if (! strcasecmp(name, "value"))
-		return SDB_FIELD_VALUE;
-	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)
@@ -744,6 +685,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 */