X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fcore%2Fstore_lookup.c;h=e2ae0669f3cdc64300d5a8d49ecc3b032deea49a;hb=643b6cdd66f789baac6a4f13d1466f7688e22670;hp=6730e11f59eedc18b51837f35f8b0c19bc77b4ba;hpb=d64762ef1ee24d605bcd32495daeef29d3dc3b3c;p=sysdb.git

diff --git a/src/core/store_lookup.c b/src/core/store_lookup.c
index 6730e11..e2ae066 100644
--- a/src/core/store_lookup.c
+++ b/src/core/store_lookup.c
@@ -74,31 +74,6 @@ scan_iter(sdb_store_obj_t *obj, void *user_data)
 	return 0;
 } /* scan_iter */
 
-static sdb_attribute_t *
-attr_get(sdb_host_t *host, const char *name, sdb_store_matcher_t *filter)
-{
-	sdb_avltree_iter_t *iter = NULL;
-	sdb_attribute_t *attr = NULL;
-
-	iter = sdb_avltree_get_iter(host->attributes);
-	while (sdb_avltree_iter_has_next(iter)) {
-		sdb_attribute_t *a = ATTR(sdb_avltree_iter_get_next(iter));
-
-		if (strcasecmp(name, SDB_OBJ(a)->name))
-			continue;
-
-		assert(STORE_OBJ(a)->type == SDB_ATTRIBUTE);
-		attr = a;
-		break;
-	}
-	sdb_avltree_iter_destroy(iter);
-
-	if (filter && (! sdb_store_matcher_matches(filter, STORE_OBJ(attr),
-					NULL)))
-		return NULL;
-	return attr;
-} /* attr_get */
-
 /*
  * matcher implementations
  */
@@ -190,29 +165,6 @@ match_name(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
 	return status;
 } /* match_name */
 
-static int
-match_attr(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
-		sdb_store_matcher_t *filter)
-{
-	sdb_attribute_t *attr;
-
-	assert(m->type == MATCHER_ATTR);
-	assert(ATTR_M(m)->name);
-
-	if (obj->type != SDB_HOST)
-		return 0;
-
-	attr = attr_get(HOST(obj), ATTR_M(m)->name, filter);
-	if (attr) {
-		char buf[sdb_data_strlen(&attr->value) + 1];
-		if (sdb_data_format(&attr->value, buf, sizeof(buf), SDB_UNQUOTED) <= 0)
-			return 0;
-		if (match_string(&ATTR_M(m)->value, buf))
-			return 1;
-	}
-	return 0;
-} /* match_attr */
-
 static int
 match_child(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
 		sdb_store_matcher_t *filter)
@@ -250,56 +202,6 @@ match_child(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
 	return status;
 } /* match_child */
 
-static int
-match_lt(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
-		sdb_store_matcher_t *filter)
-{
-	int status;
-	assert(m->type == MATCHER_LT);
-	status = COND_M(m)->cond->cmp(obj, COND_M(m)->cond, filter);
-	return (status != INT_MAX) && (status < 0);
-} /* match_lt */
-
-static int
-match_le(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
-		sdb_store_matcher_t *filter)
-{
-	int status;
-	assert(m->type == MATCHER_LE);
-	status = COND_M(m)->cond->cmp(obj, COND_M(m)->cond, filter);
-	return (status != INT_MAX) && (status <= 0);
-} /* match_le */
-
-static int
-match_eq(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
-		sdb_store_matcher_t *filter)
-{
-	int status;
-	assert(m->type == MATCHER_EQ);
-	status = COND_M(m)->cond->cmp(obj, COND_M(m)->cond, filter);
-	return (status != INT_MAX) && (! status);
-} /* match_eq */
-
-static int
-match_ge(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
-		sdb_store_matcher_t *filter)
-{
-	int status;
-	assert(m->type == MATCHER_GE);
-	status = COND_M(m)->cond->cmp(obj, COND_M(m)->cond, filter);
-	return (status != INT_MAX) && (status >= 0);
-} /* match_ge */
-
-static int
-match_gt(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
-		sdb_store_matcher_t *filter)
-{
-	int status;
-	assert(m->type == MATCHER_GT);
-	status = COND_M(m)->cond->cmp(obj, COND_M(m)->cond, filter);
-	return (status != INT_MAX) && (status > 0);
-} /* match_gt */
-
 /*
  * cmp_expr:
  * Compare the values of two expressions when evaluating them using the
@@ -336,64 +238,64 @@ cmp_expr(sdb_store_expr_t *e1, sdb_store_expr_t *e2,
 } /* cmp_expr */
 
 static int
-match_cmp_lt(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
+match_lt(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
 		sdb_store_matcher_t *filter)
 {
 	int status;
-	assert(m->type == MATCHER_CMP_LT);
+	assert(m->type == MATCHER_LT);
 	status = cmp_expr(CMP_M(m)->left, CMP_M(m)->right, obj, filter);
 	return (status != INT_MAX) && (status < 0);
-} /* match_cmp_lt */
+} /* match_lt */
 
 static int
-match_cmp_le(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
+match_le(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
 		sdb_store_matcher_t *filter)
 {
 	int status;
-	assert(m->type == MATCHER_CMP_LE);
+	assert(m->type == MATCHER_LE);
 	status = cmp_expr(CMP_M(m)->left, CMP_M(m)->right, obj, filter);
 	return (status != INT_MAX) && (status <= 0);
-} /* match_cmp_le */
+} /* match_le */
 
 static int
-match_cmp_eq(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
+match_eq(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
 		sdb_store_matcher_t *filter)
 {
 	int status;
-	assert(m->type == MATCHER_CMP_EQ);
+	assert(m->type == MATCHER_EQ);
 	status = cmp_expr(CMP_M(m)->left, CMP_M(m)->right, obj, filter);
 	return (status != INT_MAX) && (! status);
-} /* match_cmp_eq */
+} /* match_eq */
 
 static int
-match_cmp_ne(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
+match_ne(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
 		sdb_store_matcher_t *filter)
 {
 	int status;
-	assert(m->type == MATCHER_CMP_NE);
+	assert(m->type == MATCHER_NE);
 	status = cmp_expr(CMP_M(m)->left, CMP_M(m)->right, obj, filter);
 	return (status != INT_MAX) && status;
-} /* match_cmp_ne */
+} /* match_ne */
 
 static int
-match_cmp_ge(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
+match_ge(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
 		sdb_store_matcher_t *filter)
 {
 	int status;
-	assert(m->type == MATCHER_CMP_GE);
+	assert(m->type == MATCHER_GE);
 	status = cmp_expr(CMP_M(m)->left, CMP_M(m)->right, obj, filter);
 	return (status != INT_MAX) && (status >= 0);
-} /* match_cmp_ge */
+} /* match_ge */
 
 static int
-match_cmp_gt(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
+match_gt(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
 		sdb_store_matcher_t *filter)
 {
 	int status;
-	assert(m->type == MATCHER_CMP_GT);
+	assert(m->type == MATCHER_GT);
 	status = cmp_expr(CMP_M(m)->left, CMP_M(m)->right, obj, filter);
 	return (status != INT_MAX) && (status > 0);
-} /* match_cmp_gt */
+} /* match_gt */
 
 static int
 match_in(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
@@ -510,21 +412,15 @@ matchers[] = {
 	match_logical,
 	match_unary,
 	match_name,
-	match_attr,
 	match_child,
 	match_child,
 	match_child,
 	match_lt,
 	match_le,
 	match_eq,
+	match_ne,
 	match_ge,
 	match_gt,
-	match_cmp_lt,
-	match_cmp_le,
-	match_cmp_eq,
-	match_cmp_ne,
-	match_cmp_ge,
-	match_cmp_gt,
 	match_in,
 	match_regex,
 	match_regex,
@@ -585,53 +481,6 @@ name_matcher_destroy(sdb_object_t *obj)
 	string_matcher_destroy(&m->name);
 } /* name_matcher_destroy */
 
-static int
-attr_matcher_init(sdb_object_t *obj, va_list ap)
-{
-	attr_matcher_t *attr = ATTR_M(obj);
-	const char *name = va_arg(ap, const char *);
-
-	M(obj)->type = MATCHER_ATTR;
-	if (name) {
-		attr->name = strdup(name);
-		if (! attr->name)
-			return -1;
-	}
-	return string_matcher_init(&attr->value, ap);
-} /* attr_matcher_init */
-
-static void
-attr_matcher_destroy(sdb_object_t *obj)
-{
-	attr_matcher_t *attr = ATTR_M(obj);
-	if (attr->name)
-		free(attr->name);
-	attr->name = NULL;
-	string_matcher_destroy(&attr->value);
-} /* attr_matcher_destroy */
-
-static int
-cond_matcher_init(sdb_object_t *obj, va_list ap)
-{
-	int type = va_arg(ap, int);
-	sdb_store_cond_t *cond = va_arg(ap, sdb_store_cond_t *);
-
-	if (! cond)
-		return -1;
-
-	sdb_object_ref(SDB_OBJ(cond));
-
-	M(obj)->type = type;
-	COND_M(obj)->cond = cond;
-	return 0;
-} /* cond_matcher_init */
-
-static void
-cond_matcher_destroy(sdb_object_t *obj)
-{
-	sdb_object_deref(SDB_OBJ(COND_M(obj)->cond));
-} /* cond_matcher_destroy */
-
 static int
 op_matcher_init(sdb_object_t *obj, va_list ap)
 {
@@ -746,18 +595,6 @@ static sdb_type_t name_type = {
 	/* destroy = */ name_matcher_destroy,
 };
 
-static sdb_type_t attr_type = {
-	/* size = */ sizeof(attr_matcher_t),
-	/* init = */ attr_matcher_init,
-	/* destroy = */ attr_matcher_destroy,
-};
-
-static sdb_type_t cond_type = {
-	/* size = */ sizeof(cond_matcher_t),
-	/* init = */ cond_matcher_init,
-	/* destroy = */ cond_matcher_destroy,
-};
-
 static sdb_type_t op_type = {
 	/* size = */ sizeof(op_matcher_t),
 	/* init = */ op_matcher_init,
@@ -809,23 +646,6 @@ sdb_store_name_matcher(int type, const char *name, _Bool re)
 	return m;
 } /* sdb_store_name_matcher */
 
-sdb_store_matcher_t *
-sdb_store_attr_matcher(const char *name, const char *value, _Bool re)
-{
-	sdb_store_matcher_t *m;
-
-	if (! name)
-		return NULL;
-
-	if (re)
-		m = M(sdb_object_create("attr-matcher", attr_type,
-					name, NULL, value));
-	else
-		m = M(sdb_object_create("attr-matcher", attr_type,
-					name, value, NULL));
-	return m;
-} /* sdb_store_attr_matcher */
-
 sdb_store_matcher_t *
 sdb_store_child_matcher(int type, sdb_store_matcher_t *m)
 {
@@ -841,86 +661,46 @@ sdb_store_child_matcher(int type, sdb_store_matcher_t *m)
 } /* sdb_store_child_matcher */
 
 sdb_store_matcher_t *
-sdb_store_lt_matcher(sdb_store_cond_t *cond)
-{
-	return M(sdb_object_create("lt-matcher", cond_type,
-				MATCHER_LT, cond));
-} /* sdb_store_lt_matcher */
-
-sdb_store_matcher_t *
-sdb_store_le_matcher(sdb_store_cond_t *cond)
-{
-	return M(sdb_object_create("le-matcher", cond_type,
-				MATCHER_LE, cond));
-} /* sdb_store_le_matcher */
-
-sdb_store_matcher_t *
-sdb_store_eq_matcher(sdb_store_cond_t *cond)
-{
-	return M(sdb_object_create("eq-matcher", cond_type,
-				MATCHER_EQ, cond));
-} /* sdb_store_eq_matcher */
-
-sdb_store_matcher_t *
-sdb_store_ge_matcher(sdb_store_cond_t *cond)
-{
-	return M(sdb_object_create("ge-matcher", cond_type,
-				MATCHER_GE, cond));
-} /* sdb_store_ge_matcher */
-
-sdb_store_matcher_t *
-sdb_store_gt_matcher(sdb_store_cond_t *cond)
-{
-	return M(sdb_object_create("gt-matcher", cond_type,
-				MATCHER_GT, cond));
-} /* sdb_store_gt_matcher */
-
-/*
- * TODO: Rename sdb_store_cmp_* to sdb_store_* once the old code is unused and
- * has been removed.
- */
-
-sdb_store_matcher_t *
-sdb_store_cmp_lt(sdb_store_expr_t *left, sdb_store_expr_t *right)
+sdb_store_lt_matcher(sdb_store_expr_t *left, sdb_store_expr_t *right)
 {
 	return M(sdb_object_create("lt-matcher", cmp_type,
-				MATCHER_CMP_LT, left, right));
-} /* sdb_store_cmp_lt */
+				MATCHER_LT, left, right));
+} /* sdb_store_lt_matcher */
 
 sdb_store_matcher_t *
-sdb_store_cmp_le(sdb_store_expr_t *left, sdb_store_expr_t *right)
+sdb_store_le_matcher(sdb_store_expr_t *left, sdb_store_expr_t *right)
 {
 	return M(sdb_object_create("le-matcher", cmp_type,
-				MATCHER_CMP_LE, left, right));
-} /* sdb_store_cmp_le */
+				MATCHER_LE, left, right));
+} /* sdb_store_le_matcher */
 
 sdb_store_matcher_t *
-sdb_store_cmp_eq(sdb_store_expr_t *left, sdb_store_expr_t *right)
+sdb_store_eq_matcher(sdb_store_expr_t *left, sdb_store_expr_t *right)
 {
 	return M(sdb_object_create("eq-matcher", cmp_type,
-				MATCHER_CMP_EQ, left, right));
-} /* sdb_store_cmp_eq */
+				MATCHER_EQ, left, right));
+} /* sdb_store_eq_matcher */
 
 sdb_store_matcher_t *
-sdb_store_cmp_ne(sdb_store_expr_t *left, sdb_store_expr_t *right)
+sdb_store_ne_matcher(sdb_store_expr_t *left, sdb_store_expr_t *right)
 {
 	return M(sdb_object_create("ne-matcher", cmp_type,
-				MATCHER_CMP_NE, left, right));
-} /* sdb_store_cmp_ne */
+				MATCHER_NE, left, right));
+} /* sdb_store_ne_matcher */
 
 sdb_store_matcher_t *
-sdb_store_cmp_ge(sdb_store_expr_t *left, sdb_store_expr_t *right)
+sdb_store_ge_matcher(sdb_store_expr_t *left, sdb_store_expr_t *right)
 {
 	return M(sdb_object_create("ge-matcher", cmp_type,
-				MATCHER_CMP_GE, left, right));
-} /* sdb_store_cmp_ge */
+				MATCHER_GE, left, right));
+} /* sdb_store_ge_matcher */
 
 sdb_store_matcher_t *
-sdb_store_cmp_gt(sdb_store_expr_t *left, sdb_store_expr_t *right)
+sdb_store_gt_matcher(sdb_store_expr_t *left, sdb_store_expr_t *right)
 {
 	return M(sdb_object_create("gt-matcher", cmp_type,
-				MATCHER_CMP_GT, left, right));
-} /* sdb_store_cmp_gt */
+				MATCHER_GT, left, right));
+} /* sdb_store_gt_matcher */
 
 sdb_store_matcher_t *
 sdb_store_in_matcher(sdb_store_expr_t *left, sdb_store_expr_t *right)
@@ -976,17 +756,17 @@ sdb_store_matcher_op_cb
 sdb_store_parse_matcher_op(const char *op)
 {
 	if (! strcasecmp(op, "<"))
-		return sdb_store_cmp_lt;
+		return sdb_store_lt_matcher;
 	else if (! strcasecmp(op, "<="))
-		return sdb_store_cmp_le;
+		return sdb_store_le_matcher;
 	else if (! strcasecmp(op, "="))
-		return sdb_store_cmp_eq;
+		return sdb_store_eq_matcher;
 	else if (! strcasecmp(op, "!="))
-		return sdb_store_cmp_ne;
+		return sdb_store_ne_matcher;
 	else if (! strcasecmp(op, ">="))
-		return sdb_store_cmp_ge;
+		return sdb_store_ge_matcher;
 	else if (! strcasecmp(op, ">"))
-		return sdb_store_cmp_gt;
+		return sdb_store_gt_matcher;
 	else if (! strcasecmp(op, "=~"))
 		return sdb_store_regex_matcher;
 	else if (! strcasecmp(op, "!~"))