X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=src%2Fcore%2Fstore_lookup.c;h=0bb157c76e7a49162e3832f5b9ae0e013372485a;hp=f57cb05cab292fa53d86b56c936d35403fc77351;hb=2ced8af7848867b7589a7c068f5f51c47dc7ea01;hpb=ed569e21915fe71ead292582a8699d25234cf303

diff --git a/src/core/store_lookup.c b/src/core/store_lookup.c
index f57cb05..0bb157c 100644
--- a/src/core/store_lookup.c
+++ b/src/core/store_lookup.c
@@ -57,40 +57,40 @@ typedef struct {
 	sdb_store_matcher_t *m;
 	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_base_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))
 		return d->cb(obj, d->user_data);
 	return 0;
-} /* lookup_iter */
+} /* scan_iter */
 
-static sdb_store_base_t *
-attr_get(sdb_store_base_t *host, const char *name)
+static sdb_attribute_t *
+attr_get(sdb_host_t *host, const char *name)
 {
-	sdb_llist_iter_t *iter = NULL;
-	sdb_store_base_t *attr = NULL;
+	sdb_avltree_iter_t *iter = NULL;
+	sdb_attribute_t *attr = NULL;
 
-	assert(host->type == SDB_HOST);
-
-	iter = sdb_llist_get_iter(SDB_STORE_OBJ(host)->attributes);
-	while (sdb_llist_iter_has_next(iter)) {
-		sdb_attribute_t *a = SDB_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_BASE(a);
+
+		assert(STORE_OBJ(a)->type == SDB_ATTRIBUTE);
+		attr = a;
 		break;
 	}
-	sdb_llist_iter_destroy(iter);
+	sdb_avltree_iter_destroy(iter);
 	return attr;
 } /* attr_get */
 
@@ -99,11 +99,11 @@ attr_get(sdb_store_base_t *host, const char *name)
  */
 
 static int
-attr_cmp(sdb_store_base_t *obj, sdb_store_cond_t *cond)
+attr_cmp(sdb_host_t *host, sdb_store_cond_t *cond)
 {
 	sdb_attribute_t *attr;
 
-	attr = SDB_ATTR(attr_get(obj, ATTR_C(cond)->name));
+	attr = attr_get(host, ATTR_C(cond)->name);
 	if (! attr)
 		return INT_MAX;
 	if (attr->value.type != ATTR_C(cond)->value.type)
@@ -133,72 +133,72 @@ match_string(string_matcher_t *m, const char *name)
 } /* match_string */
 
 static int
-match_logical(sdb_store_matcher_t *m, sdb_store_base_t *obj)
+match_logical(sdb_store_matcher_t *m, sdb_host_t *host)
 {
 	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, STORE_OBJ(host));
 	/* 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, STORE_OBJ(host));
 } /* match_logical */
 
 static int
-match_unary(sdb_store_matcher_t *m, sdb_store_base_t *obj)
+match_unary(sdb_store_matcher_t *m, sdb_host_t *host)
 {
 	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, STORE_OBJ(host));
 } /* match_unary */
 
 static int
-match_name(sdb_store_matcher_t *m, sdb_store_base_t *obj)
+match_name(sdb_store_matcher_t *m, sdb_host_t *host)
 {
-	sdb_llist_iter_t *iter = NULL;
+	sdb_avltree_iter_t *iter = NULL;
 	int status = 0;
 
 	assert(m->type == MATCHER_NAME);
 
 	switch (NAME_M(m)->obj_type) {
 		case SDB_HOST:
-			return match_string(&NAME_M(m)->name, obj->super.name);
+			return match_string(&NAME_M(m)->name, SDB_OBJ(host)->name);
 			break;
 		case SDB_SERVICE:
-			iter = sdb_llist_get_iter(SDB_STORE_OBJ(obj)->services);
+			iter = sdb_avltree_get_iter(host->services);
 			break;
 		case SDB_ATTRIBUTE:
-			iter = sdb_llist_get_iter(SDB_STORE_OBJ(obj)->attributes);
+			iter = sdb_avltree_get_iter(host->attributes);
 			break;
 	}
 
-	while (sdb_llist_iter_has_next(iter)) {
-		sdb_store_base_t *child = STORE_BASE(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 (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_base_t *obj)
+match_attr(sdb_store_matcher_t *m, sdb_host_t *host)
 {
 	sdb_attribute_t *attr;
 
 	assert(m->type == MATCHER_ATTR);
 	assert(ATTR_M(m)->name);
 
-	attr = SDB_ATTR(attr_get(obj, ATTR_M(m)->name));
+	attr = attr_get(host, ATTR_M(m)->name);
 	if (attr) {
 		char buf[sdb_data_strlen(&attr->value) + 1];
 		if (sdb_data_format(&attr->value, buf, sizeof(buf), SDB_UNQUOTED) <= 0)
@@ -210,55 +210,63 @@ match_attr(sdb_store_matcher_t *m, sdb_store_base_t *obj)
 } /* match_attr */
 
 static int
-match_lt(sdb_store_matcher_t *m, sdb_store_base_t *obj)
+match_lt(sdb_store_matcher_t *m, sdb_host_t *host)
 {
 	int status;
 	assert(m->type == MATCHER_LT);
-	status = COND_M(m)->cond->cmp(obj, COND_M(m)->cond);
+	status = COND_M(m)->cond->cmp(host, COND_M(m)->cond);
 	return (status != INT_MAX) && (status < 0);
 } /* match_lt */
 
 static int
-match_le(sdb_store_matcher_t *m, sdb_store_base_t *obj)
+match_le(sdb_store_matcher_t *m, sdb_host_t *host)
 {
 	int status;
 	assert(m->type == MATCHER_LE);
-	status = COND_M(m)->cond->cmp(obj, COND_M(m)->cond);
+	status = COND_M(m)->cond->cmp(host, COND_M(m)->cond);
 	return (status != INT_MAX) && (status <= 0);
 } /* match_le */
 
 static int
-match_eq(sdb_store_matcher_t *m, sdb_store_base_t *obj)
+match_eq(sdb_store_matcher_t *m, sdb_host_t *host)
 {
 	int status;
 	assert(m->type == MATCHER_EQ);
-	status = COND_M(m)->cond->cmp(obj, COND_M(m)->cond);
+	status = COND_M(m)->cond->cmp(host, COND_M(m)->cond);
 	return (status != INT_MAX) && (! status);
 } /* match_eq */
 
 static int
-match_ge(sdb_store_matcher_t *m, sdb_store_base_t *obj)
+match_ge(sdb_store_matcher_t *m, sdb_host_t *host)
 {
 	int status;
 	assert(m->type == MATCHER_GE);
-	status = COND_M(m)->cond->cmp(obj, COND_M(m)->cond);
+	status = COND_M(m)->cond->cmp(host, COND_M(m)->cond);
 	return (status != INT_MAX) && (status >= 0);
 } /* match_ge */
 
 static int
-match_gt(sdb_store_matcher_t *m, sdb_store_base_t *obj)
+match_gt(sdb_store_matcher_t *m, sdb_host_t *host)
 {
 	int status;
 	assert(m->type == MATCHER_GT);
-	status = COND_M(m)->cond->cmp(obj, COND_M(m)->cond);
+	status = COND_M(m)->cond->cmp(host, COND_M(m)->cond);
 	return (status != INT_MAX) && (status > 0);
 } /* match_gt */
 
-typedef int (*matcher_cb)(sdb_store_matcher_t *, sdb_store_base_t *);
+static int
+match_isnull(sdb_store_matcher_t *m, sdb_host_t *host)
+{
+	assert(m->type == MATCHER_ISNULL);
+	return attr_get(host, ISNULL_M(m)->attr_name) == NULL;
+} /* match_isnull */
+
+typedef int (*matcher_cb)(sdb_store_matcher_t *, sdb_host_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,
@@ -269,6 +277,7 @@ static matcher_cb matchers[] = {
 	match_eq,
 	match_ge,
 	match_gt,
+	match_isnull,
 };
 
 /*
@@ -542,6 +551,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,
@@ -572,11 +614,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,
@@ -587,6 +636,7 @@ static matcher_tostring_cb matchers_tostring[] = {
 	cond_tostring,
 	cond_tostring,
 	cond_tostring,
+	isnull_tostring,
 };
 
 /*
@@ -667,6 +717,13 @@ 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)
 {
@@ -675,12 +732,18 @@ parse_attr_cmp(const char *attr, const char *op, const sdb_data_t *value)
 	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 (! value)
+			return sdb_store_isnull_matcher(attr);
+		else
+			return NULL;
+	}
+	else if (! value)
+		return NULL;
+	else if (! strcasecmp(op, "<"))
 		matcher = sdb_store_lt_matcher;
 	else if (! strcasecmp(op, "<="))
 		matcher = sdb_store_le_matcher;
@@ -761,7 +824,7 @@ sdb_store_matcher_parse_cmp(const char *obj_type, const char *attr,
 		return NULL;
 	}
 
-	if (! strcasecmp(attr, "name"))
+	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);
@@ -800,7 +863,7 @@ 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_base_t *obj)
+sdb_store_matcher_matches(sdb_store_matcher_t *m, sdb_store_obj_t *obj)
 {
 	if (obj->type != SDB_HOST)
 		return 0;
@@ -812,7 +875,7 @@ sdb_store_matcher_matches(sdb_store_matcher_t *m, sdb_store_base_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, HOST(obj));
 } /* sdb_store_matcher_matches */
 
 char *
@@ -828,15 +891,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,
+sdb_store_scan(sdb_store_matcher_t *m, sdb_store_lookup_cb cb,
 		void *user_data)
 {
-	lookup_iter_data_t data = { m, cb, user_data };
+	scan_iter_data_t data = { m, 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 : */