X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fcore%2Fstore_lookup.c;h=476e0e717d9fb5c788651722d5e2a4948dcd696e;hb=52e68c096ba26c0620f78718054b20dc6c0d5306;hp=90ca2fed6060b36e15b8d4e04ea6fbdc341c0b07;hpb=033aa984a8b4be78ced113a3715422841a48d9a8;p=sysdb.git

diff --git a/src/core/store_lookup.c b/src/core/store_lookup.c
index 90ca2fe..476e0e7 100644
--- a/src/core/store_lookup.c
+++ b/src/core/store_lookup.c
@@ -55,40 +55,47 @@
 
 typedef struct {
 	sdb_store_matcher_t *m;
+	sdb_store_matcher_t *filter;
 	sdb_store_lookup_cb  cb;
 	void *user_data;
-} lookup_iter_data_t;
+} scan_iter_data_t;
 
 /*
  * private helper functions
  */
 
 static int
-lookup_iter(sdb_store_obj_t *obj, void *user_data)
+scan_iter(sdb_store_obj_t *obj, void *user_data)
 {
-	lookup_iter_data_t *d = user_data;
+	scan_iter_data_t *d = user_data;
 
-	if (sdb_store_matcher_matches(d->m, obj))
+	if (sdb_store_matcher_matches(d->m, obj, d->filter))
 		return d->cb(obj, d->user_data);
 	return 0;
-} /* lookup_iter */
+} /* scan_iter */
 
-static sdb_store_obj_t *
-attr_get(sdb_host_t *host, const char *name)
+static sdb_attribute_t *
+attr_get(sdb_host_t *host, const char *name, sdb_store_matcher_t *filter)
 {
-	sdb_llist_iter_t *iter = NULL;
-	sdb_store_obj_t *attr = NULL;
+	sdb_avltree_iter_t *iter = NULL;
+	sdb_attribute_t *attr = NULL;
 
-	iter = sdb_llist_get_iter(host->attributes);
-	while (sdb_llist_iter_has_next(iter)) {
-		sdb_attribute_t *a = ATTR(sdb_llist_iter_get_next(iter));
+	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;
-		attr = STORE_OBJ(a);
+
+		assert(STORE_OBJ(a)->type == SDB_ATTRIBUTE);
+		attr = a;
 		break;
 	}
-	sdb_llist_iter_destroy(iter);
+	sdb_avltree_iter_destroy(iter);
+
+	if (filter && (! sdb_store_matcher_matches(filter, STORE_OBJ(attr),
+					NULL)))
+		return NULL;
 	return attr;
 } /* attr_get */
 
@@ -97,16 +104,28 @@ attr_get(sdb_host_t *host, const char *name)
  */
 
 static int
-attr_cmp(sdb_store_obj_t *obj, sdb_store_cond_t *cond)
+attr_cmp(sdb_store_obj_t *obj, sdb_store_cond_t *cond,
+		sdb_store_matcher_t *filter)
 {
 	sdb_attribute_t *attr;
+	sdb_data_t value = SDB_DATA_INIT;
+	int status;
 
-	attr = ATTR(attr_get(HOST(obj), ATTR_C(cond)->name));
-	if (! attr)
+	if (obj->type != SDB_HOST)
 		return INT_MAX;
-	if (attr->value.type != ATTR_C(cond)->value.type)
+
+	if (sdb_store_expr_eval(ATTR_C(cond)->expr, &value))
 		return INT_MAX;
-	return sdb_data_cmp(&attr->value, &ATTR_C(cond)->value);
+
+	attr = attr_get(HOST(obj), ATTR_C(cond)->name, filter);
+	if (! attr)
+		status = INT_MAX;
+	else if (attr->value.type != value.type)
+		status = INT_MAX;
+	else
+		status = sdb_data_cmp(&attr->value, &value);
+	sdb_data_free_datum(&value);
+	return status;
 } /* attr_cmp */
 
 /*
@@ -131,72 +150,85 @@ match_string(string_matcher_t *m, const char *name)
 } /* match_string */
 
 static int
-match_logical(sdb_store_matcher_t *m, sdb_store_obj_t *obj)
+match_logical(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
+		sdb_store_matcher_t *filter)
 {
 	int status;
 
 	assert((m->type == MATCHER_AND) || (m->type == MATCHER_OR));
 	assert(OP_M(m)->left && OP_M(m)->right);
 
-	status = sdb_store_matcher_matches(OP_M(m)->left, obj);
+	status = sdb_store_matcher_matches(OP_M(m)->left, obj, filter);
+
 	/* lazy evaluation */
 	if ((! status) && (m->type == MATCHER_AND))
 		return status;
 	else if (status && (m->type == MATCHER_OR))
 		return status;
 
-	return sdb_store_matcher_matches(OP_M(m)->right, obj);
+	return sdb_store_matcher_matches(OP_M(m)->right, obj, filter);
 } /* match_logical */
 
 static int
-match_unary(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)
 {
 	assert(m->type == MATCHER_NOT);
 	assert(UOP_M(m)->op);
 
-	return !sdb_store_matcher_matches(UOP_M(m)->op, obj);
+	return !sdb_store_matcher_matches(UOP_M(m)->op, obj, filter);
 } /* match_unary */
 
 static int
-match_name(sdb_store_matcher_t *m, sdb_store_obj_t *obj)
+match_name(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
+		sdb_store_matcher_t *filter)
 {
-	sdb_llist_iter_t *iter = NULL;
+	sdb_avltree_iter_t *iter = NULL;
 	int status = 0;
 
 	assert(m->type == MATCHER_NAME);
 
+	if (obj->type == NAME_M(m)->obj_type)
+		return match_string(&NAME_M(m)->name, SDB_OBJ(obj)->name);
+	else if (obj->type != SDB_HOST)
+		return 0;
+
 	switch (NAME_M(m)->obj_type) {
-		case SDB_HOST:
-			return match_string(&NAME_M(m)->name, obj->super.name);
-			break;
 		case SDB_SERVICE:
-			iter = sdb_llist_get_iter(HOST(obj)->services);
+			iter = sdb_avltree_get_iter(HOST(obj)->services);
 			break;
 		case SDB_ATTRIBUTE:
-			iter = sdb_llist_get_iter(HOST(obj)->attributes);
+			iter = sdb_avltree_get_iter(HOST(obj)->attributes);
 			break;
 	}
 
-	while (sdb_llist_iter_has_next(iter)) {
-		sdb_store_obj_t *child = STORE_OBJ(sdb_llist_iter_get_next(iter));
-		if (match_string(&NAME_M(m)->name, child->super.name)) {
+	while (sdb_avltree_iter_has_next(iter)) {
+		sdb_object_t *child = sdb_avltree_iter_get_next(iter);
+		if (filter && (! sdb_store_matcher_matches(filter, STORE_OBJ(child),
+						NULL)))
+			continue;
+		if (match_string(&NAME_M(m)->name, child->name)) {
 			status = 1;
 			break;
 		}
 	}
-	sdb_llist_iter_destroy(iter);
+	sdb_avltree_iter_destroy(iter);
 	return status;
 } /* match_name */
 
 static int
-match_attr(sdb_store_matcher_t *m, sdb_store_obj_t *obj)
+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);
 
-	attr = ATTR(attr_get(HOST(obj), 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)
@@ -208,55 +240,72 @@ match_attr(sdb_store_matcher_t *m, sdb_store_obj_t *obj)
 } /* match_attr */
 
 static int
-match_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_LT);
-	status = COND_M(m)->cond->cmp(obj, COND_M(m)->cond);
+	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)
+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);
+	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)
+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);
+	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)
+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);
+	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)
+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);
+	status = COND_M(m)->cond->cmp(obj, COND_M(m)->cond, filter);
 	return (status != INT_MAX) && (status > 0);
 } /* match_gt */
 
-typedef int (*matcher_cb)(sdb_store_matcher_t *, sdb_store_obj_t *);
+static int
+match_isnull(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
+		sdb_store_matcher_t *filter)
+{
+	assert(m->type == MATCHER_ISNULL);
+	if (obj->type != SDB_HOST)
+		return 0;
+	return attr_get(HOST(obj), ISNULL_M(m)->attr_name, filter) == NULL;
+} /* match_isnull */
+
+typedef int (*matcher_cb)(sdb_store_matcher_t *, sdb_store_obj_t *,
+		sdb_store_matcher_t *);
 
 /* this array needs to be indexable by the matcher types;
  * -> update the enum in store-private.h when updating this */
-static matcher_cb matchers[] = {
+static matcher_cb
+matchers[] = {
 	match_logical,
 	match_logical,
 	match_unary,
@@ -267,6 +316,7 @@ static matcher_cb matchers[] = {
 	match_eq,
 	match_ge,
 	match_gt,
+	match_isnull,
 };
 
 /*
@@ -277,7 +327,7 @@ static int
 attr_cond_init(sdb_object_t *obj, va_list ap)
 {
 	const char *name = va_arg(ap, const char *);
-	const sdb_data_t *value = va_arg(ap, const sdb_data_t *);
+	sdb_store_expr_t *expr = va_arg(ap, sdb_store_expr_t *);
 
 	if (! name)
 		return -1;
@@ -287,8 +337,8 @@ attr_cond_init(sdb_object_t *obj, va_list ap)
 	ATTR_C(obj)->name = strdup(name);
 	if (! ATTR_C(obj)->name)
 		return -1;
-	if (sdb_data_copy(&ATTR_C(obj)->value, value))
-		return -1;
+	ATTR_C(obj)->expr = expr;
+	sdb_object_ref(SDB_OBJ(expr));
 	return 0;
 } /* attr_cond_init */
 
@@ -297,7 +347,7 @@ attr_cond_destroy(sdb_object_t *obj)
 {
 	if (ATTR_C(obj)->name)
 		free(ATTR_C(obj)->name);
-	sdb_data_free_datum(&ATTR_C(obj)->value);
+	sdb_object_deref(SDB_OBJ(ATTR_C(obj)->expr));
 } /* attr_cond_destroy */
 
 static sdb_type_t attr_cond_type = {
@@ -446,13 +496,20 @@ static char *
 cond_tostring(sdb_store_matcher_t *m, char *buf, size_t buflen)
 {
 	if (COND_M(m)->cond->cmp == attr_cmp) {
-		char value[buflen];
-		if (sdb_data_format(&ATTR_C(COND_M(m)->cond)->value,
-					value, sizeof(value), SDB_SINGLE_QUOTED) < 0)
-			snprintf(value, sizeof(value), "ERR");
+		sdb_data_t value = SDB_DATA_INIT;
+		char value_str[buflen];
+		if (sdb_store_expr_eval(ATTR_C(COND_M(m)->cond)->expr, &value))
+			snprintf(value_str, sizeof(value_str), "ERR");
+		else if (sdb_data_format(&value, value_str, sizeof(value_str),
+					SDB_SINGLE_QUOTED) < 0)
+			snprintf(value_str, sizeof(value_str), "ERR");
 		snprintf(buf, buflen, "ATTR[%s]{ %s %s }",
-				ATTR_C(COND_M(m)->cond)->name, MATCHER_SYM(m->type), value);
+				ATTR_C(COND_M(m)->cond)->name, MATCHER_SYM(m->type),
+				value_str);
+		sdb_data_free_datum(&value);
 	}
+	else
+		snprintf(buf, buflen, "<unknown>");
 	return buf;
 } /* cond_tostring */
 
@@ -540,6 +597,39 @@ uop_tostring(sdb_store_matcher_t *m, char *buf, size_t buflen)
 	return buf;
 } /* uop_tostring */
 
+static int
+isnull_matcher_init(sdb_object_t *obj, va_list ap)
+{
+	const char *name;
+
+	M(obj)->type = va_arg(ap, int);
+	if (M(obj)->type != MATCHER_ISNULL)
+		return -1;
+
+	name = va_arg(ap, const char *);
+	if (! name)
+		return -1;
+	ISNULL_M(obj)->attr_name = strdup(name);
+	if (! ISNULL_M(obj)->attr_name)
+		return -1;
+	return 0;
+} /* isnull_matcher_init */
+
+static void
+isnull_matcher_destroy(sdb_object_t *obj)
+{
+	if (ISNULL_M(obj)->attr_name)
+		free(ISNULL_M(obj)->attr_name);
+	ISNULL_M(obj)->attr_name = NULL;
+} /* isnull_matcher_destroy */
+
+static char *
+isnull_tostring(sdb_store_matcher_t *m, char *buf, size_t buflen)
+{
+	snprintf(buf, buflen, "(IS NULL, ATTR[%s])", ISNULL_M(m)->attr_name);
+	return buf;
+} /* isnull_tostring */
+
 static sdb_type_t name_type = {
 	/* size = */ sizeof(name_matcher_t),
 	/* init = */ name_matcher_init,
@@ -570,11 +660,18 @@ static sdb_type_t uop_type = {
 	/* destroy = */ uop_matcher_destroy,
 };
 
+static sdb_type_t isnull_type = {
+	/* size = */ sizeof(isnull_matcher_t),
+	/* init = */ isnull_matcher_init,
+	/* destroy = */ isnull_matcher_destroy,
+};
+
 typedef char *(*matcher_tostring_cb)(sdb_store_matcher_t *, char *, size_t);
 
 /* this array needs to be indexable by the matcher types;
  * -> update the enum in store-private.h when updating this */
-static matcher_tostring_cb matchers_tostring[] = {
+static matcher_tostring_cb
+matchers_tostring[] = {
 	op_tostring,
 	op_tostring,
 	uop_tostring,
@@ -585,6 +682,7 @@ static matcher_tostring_cb matchers_tostring[] = {
 	cond_tostring,
 	cond_tostring,
 	cond_tostring,
+	isnull_tostring,
 };
 
 /*
@@ -592,10 +690,10 @@ static matcher_tostring_cb matchers_tostring[] = {
  */
 
 sdb_store_cond_t *
-sdb_store_attr_cond(const char *name, const sdb_data_t *value)
+sdb_store_attr_cond(const char *name, sdb_store_expr_t *expr)
 {
 	return SDB_STORE_COND(sdb_object_create("attr-cond", attr_cond_type,
-				name, value));
+				name, expr));
 } /* sdb_store_attr_cond */
 
 sdb_store_matcher_t *
@@ -604,11 +702,9 @@ sdb_store_name_matcher(int type, const char *name, _Bool re)
 	sdb_store_matcher_t *m;
 
 	if (re)
-		m = M(sdb_object_create("name-matcher", name_type,
-					NULL, name));
+		m = M(sdb_object_create("name-matcher", name_type, NULL, name));
 	else
-		m = M(sdb_object_create("name-matcher", name_type,
-					name, NULL));
+		m = M(sdb_object_create("name-matcher", name_type, name, NULL));
 
 	if (! m)
 		return NULL;
@@ -620,14 +716,18 @@ sdb_store_name_matcher(int type, const char *name, _Bool re)
 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)
-		return M(sdb_object_create("attr-matcher", attr_type,
+		m = M(sdb_object_create("attr-matcher", attr_type,
 					name, NULL, value));
-	return M(sdb_object_create("attr-matcher", attr_type,
-				name, value, NULL));
+	else
+		m = M(sdb_object_create("attr-matcher", attr_type,
+					name, value, NULL));
+	return m;
 } /* sdb_store_attr_matcher */
 
 sdb_store_matcher_t *
@@ -665,20 +765,33 @@ sdb_store_gt_matcher(sdb_store_cond_t *cond)
 				MATCHER_GT, cond));
 } /* sdb_store_gt_matcher */
 
+sdb_store_matcher_t *
+sdb_store_isnull_matcher(const char *attr_name)
+{
+	return M(sdb_object_create("isnull-matcher", isnull_type,
+				MATCHER_ISNULL, attr_name));
+} /* sdb_store_isnull_matcher */
+
 static sdb_store_matcher_t *
-parse_attr_cmp(const char *attr, const char *op, const sdb_data_t *value)
+parse_attr_cmp(const char *attr, const char *op, sdb_store_expr_t *expr)
 {
 	sdb_store_matcher_t *(*matcher)(sdb_store_cond_t *) = NULL;
 	sdb_store_matcher_t *m;
 	sdb_store_cond_t *cond;
 	_Bool inv = 0;
 
-	/* TODO: this will reject any attributes called "name";
-	 * use a different syntax for querying objects by name */
-	if (! strcasecmp(attr, "name"))
+	if (! attr)
 		return NULL;
 
-	if (! strcasecmp(op, "<"))
+	if (! strcasecmp(op, "IS")) {
+		if (! expr)
+			return sdb_store_isnull_matcher(attr);
+		else
+			return NULL;
+	}
+	else if (! expr)
+		return NULL;
+	else if (! strcasecmp(op, "<"))
 		matcher = sdb_store_lt_matcher;
 	else if (! strcasecmp(op, "<="))
 		matcher = sdb_store_le_matcher;
@@ -695,7 +808,7 @@ parse_attr_cmp(const char *attr, const char *op, const sdb_data_t *value)
 	else
 		return NULL;
 
-	cond = sdb_store_attr_cond(attr, value);
+	cond = sdb_store_attr_cond(attr, expr);
 	if (! cond)
 		return NULL;
 
@@ -717,12 +830,13 @@ parse_attr_cmp(const char *attr, const char *op, const sdb_data_t *value)
 
 sdb_store_matcher_t *
 sdb_store_matcher_parse_cmp(const char *obj_type, const char *attr,
-		const char *op, const sdb_data_t *value)
+		const char *op, sdb_store_expr_t *expr)
 {
 	int type = -1;
 	_Bool inv = 0;
 	_Bool re = 0;
 
+	sdb_data_t value = SDB_DATA_INIT;
 	sdb_store_matcher_t *m = NULL;
 
 	if (! strcasecmp(obj_type, "host"))
@@ -749,20 +863,26 @@ sdb_store_matcher_parse_cmp(const char *obj_type, const char *attr,
 		re = 1;
 	}
 	else if (type == SDB_ATTRIBUTE)
-		return parse_attr_cmp(attr, op, value);
+		return parse_attr_cmp(attr, op, expr);
 	else
 		return NULL;
 
-	if (value->type != SDB_TYPE_STRING) {
-		if (type == SDB_ATTRIBUTE)
-			return parse_attr_cmp(attr, op, value);
+	if (! expr)
+		return NULL;
+
+	if (sdb_store_expr_eval(expr, &value))
 		return NULL;
+	if (value.type != SDB_TYPE_STRING) {
+		sdb_data_free_datum(&value);
+		return parse_attr_cmp(attr, op, expr);
 	}
 
-	if (! strcasecmp(attr, "name"))
-		m = sdb_store_name_matcher(type, value->data.string, re);
+	if (! attr)
+		m = sdb_store_name_matcher(type, value.data.string, re);
 	else if (type == SDB_ATTRIBUTE)
-		m = sdb_store_attr_matcher(attr, value->data.string, re);
+		m = sdb_store_attr_matcher(attr, value.data.string, re);
+
+	sdb_data_free_datum(&value);
 
 	if (! m)
 		return NULL;
@@ -798,9 +918,10 @@ sdb_store_inv_matcher(sdb_store_matcher_t *m)
 } /* sdb_store_inv_matcher */
 
 int
-sdb_store_matcher_matches(sdb_store_matcher_t *m, sdb_store_obj_t *obj)
+sdb_store_matcher_matches(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
+		sdb_store_matcher_t *filter)
 {
-	if (obj->type != SDB_HOST)
+	if (filter && (! sdb_store_matcher_matches(filter, obj, NULL)))
 		return 0;
 
 	/* "NULL" always matches */
@@ -810,7 +931,7 @@ 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;
 
-	return matchers[m->type](m, obj);
+	return matchers[m->type](m, obj, filter);
 } /* sdb_store_matcher_matches */
 
 char *
@@ -826,15 +947,15 @@ sdb_store_matcher_tostring(sdb_store_matcher_t *m, char *buf, size_t buflen)
 } /* sdb_store_matcher_tostring */
 
 int
-sdb_store_lookup(sdb_store_matcher_t *m, sdb_store_lookup_cb cb,
-		void *user_data)
+sdb_store_scan(sdb_store_matcher_t *m, sdb_store_matcher_t *filter,
+		sdb_store_lookup_cb cb, void *user_data)
 {
-	lookup_iter_data_t data = { m, cb, user_data };
+	scan_iter_data_t data = { m, filter, cb, user_data };
 
 	if (! cb)
 		return -1;
-	return sdb_store_iterate(lookup_iter, &data);
-} /* sdb_store_lookup */
+	return sdb_store_iterate(scan_iter, &data);
+} /* sdb_store_scan */
 
 /* vim: set tw=78 sw=4 ts=4 noexpandtab : */