![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b0af45e)
raw | patch | inline | side by side (parent: b0af45e)
| author | Sebastian Harl <sh@tokkee.org> | |
| Thu, 19 Jun 2014 14:21:31 +0000 (16:21 +0200) | ||
| committer | Sebastian Harl <sh@tokkee.org> | |
| Thu, 19 Jun 2014 14:21:31 +0000 (16:21 +0200) |
The attribute matcher will now be applied to host objects directly and then
match against that host's attributes. This further simplifies parse_cmp() and
the general workflow for matchers.
match against that host's attributes. This further simplifies parse_cmp() and
the general workflow for matchers.
| src/core/store-private.h | patch | blob | history | |
| src/core/store_lookup.c | patch | blob | history | |
| src/include/core/store.h | patch | blob | history | |
| t/unit/core/store_lookup_test.c | patch | blob | history |
index 64a70c31059f519f432a5ea40227441956bd7d25..05a963876638854f0bd290c9b454b0815c8b6c37 100644 (file)
--- a/src/core/store-private.h
+++ b/src/core/store-private.h
/* match attributes */
typedef struct {
/* match attributes */
typedef struct {
- obj_matcher_t super;
+ sdb_store_matcher_t super;
+ char *name;
/* XXX: this needs to be more flexible;
* add support for type-specific operators */
name_matcher_t value;
/* XXX: this needs to be more flexible;
* add support for type-specific operators */
name_matcher_t value;
index 1fe45dfe11f58510cd5ec6a884dc48135130cc5b..fe98e91dd62c7a72e3509a61e07e0ee610ea223a 100644 (file)
--- a/src/core/store_lookup.c
+++ b/src/core/store_lookup.c
match_logical(sdb_store_matcher_t *m, sdb_store_base_t *obj);
static int
match_unary(sdb_store_matcher_t *m, sdb_store_base_t *obj);
match_logical(sdb_store_matcher_t *m, sdb_store_base_t *obj);
static int
match_unary(sdb_store_matcher_t *m, sdb_store_base_t *obj);
-static int
-match_obj(sdb_store_matcher_t *m, sdb_store_base_t *obj);
/* specific matchers */
/* specific matchers */
static char *
attr_tostring(sdb_store_matcher_t *m, char *buf, size_t buflen)
{
static char *
attr_tostring(sdb_store_matcher_t *m, char *buf, size_t buflen)
{
- char name[buflen + 1], value[buflen + 1];
+ char value[buflen + 1];
if (! m) {
snprintf(buf, buflen, "ATTR{}");
if (! m) {
snprintf(buf, buflen, "ATTR{}");
}
assert(m->type == MATCHER_ATTR);
}
assert(m->type == MATCHER_ATTR);
- snprintf(buf, buflen, "ATTR{ NAME%s, VALUE%s }",
- obj_name_tostring(&OBJ_M(m)->name, name, sizeof(name)),
+ snprintf(buf, buflen, "ATTR[%s]{ VALUE%s }", ATTR_M(m)->name,
obj_name_tostring(&ATTR_M(m)->value, value, sizeof(value)));
return buf;
} /* attr_tostring */
obj_name_tostring(&ATTR_M(m)->value, value, sizeof(value)));
return buf;
} /* attr_tostring */
int status = 0;
assert(m && obj);
int status = 0;
assert(m && obj);
+ assert(m->type == MATCHER_NAME);
if (obj->type != SDB_HOST)
return 0;
if (obj->type != SDB_HOST)
return 0;
return status;
} /* match_name */
return status;
} /* match_name */
-/* match attribute specific values;
- * always call this function through match_obj() */
static int
static int
-match_attr(attr_matcher_t *m, sdb_store_base_t *obj)
+match_attr(sdb_store_matcher_t *m, sdb_store_base_t *obj)
{
{
+ sdb_llist_iter_t *iter = NULL;
+ int status = 0;
+
assert(m && obj);
assert(m && obj);
+ assert(m->type == MATCHER_ATTR);
- if (obj->type != SDB_ATTRIBUTE)
+ if (obj->type != SDB_HOST)
return 0;
return 0;
- {
- sdb_attribute_t *attr = SDB_ATTR(obj);
+ iter = sdb_llist_get_iter(SDB_STORE_OBJ(obj)->attributes);
+ while (sdb_llist_iter_has_next(iter)) {
+ sdb_attribute_t *attr = SDB_ATTR(sdb_llist_iter_get_next(iter));
char buf[sdb_data_strlen(&attr->value) + 1];
if (sdb_data_format(&attr->value, buf, sizeof(buf), SDB_UNQUOTED) <= 0)
return 0;
char buf[sdb_data_strlen(&attr->value) + 1];
if (sdb_data_format(&attr->value, buf, sizeof(buf), SDB_UNQUOTED) <= 0)
return 0;
- return match_obj_name(&m->value, buf);
+ if (match_obj_name(&ATTR_M(m)->value, buf)) {
+ status = 1;
+ break;
+ }
}
}
+ sdb_llist_iter_destroy(iter);
+ return status;
} /* match_attr */
/* match host specific values;
* always call this function through match_obj() */
static int
} /* match_attr */
/* match host specific values;
* always call this function through match_obj() */
static int
-match_host(host_matcher_t *m, sdb_store_base_t *obj)
+match_host(sdb_store_matcher_t *m, sdb_store_base_t *obj)
{
{
- sdb_llist_iter_t *iter;
+ int status;
assert(m && obj);
assert(m && obj);
+ assert(m->type == MATCHER_HOST);
if (obj->type != SDB_HOST)
return 0;
if (obj->type != SDB_HOST)
return 0;
- if (! m->attr)
- return 1;
+ status = match_obj_name(&OBJ_M(m)->name, obj->super.name);
+ if (! status)
+ return status;
- iter = sdb_llist_get_iter(SDB_STORE_OBJ(obj)->attributes);
- while (sdb_llist_iter_has_next(iter)) {
- sdb_store_base_t *attr = STORE_BASE(sdb_llist_iter_get_next(iter));
+ if (! HOST_M(m)->attr)
+ return 1;
- /* if any attribute matches, we found a matching host */
- if (match_obj(M(m->attr), attr)) {
- sdb_llist_iter_destroy(iter);
- return 1;
- }
- }
- sdb_llist_iter_destroy(iter);
- return 0;
+ return match_attr(M(HOST_M(m)->attr), obj);
} /* match_host */
/* generic matchers */
} /* match_host */
/* generic matchers */
match_logical,
match_unary,
match_name,
match_logical,
match_unary,
match_name,
- match_obj,
- match_obj,
+ match_attr,
+ match_host,
};
typedef char *(*matcher_tostring_cb)(sdb_store_matcher_t *, char *, size_t);
};
typedef char *(*matcher_tostring_cb)(sdb_store_matcher_t *, char *, size_t);
return !sdb_store_matcher_matches(UOP_M(m)->op, obj);
} /* match_unary */
return !sdb_store_matcher_matches(UOP_M(m)->op, obj);
} /* match_unary */
-static int
-match_obj(sdb_store_matcher_t *m, sdb_store_base_t *obj)
-{
- int status;
-
- assert(m && obj);
-
- status = match_obj_name(&OBJ_M(m)->name, obj->super.name);
- if (! status)
- return status;
-
- switch (m->type) {
- case MATCHER_ATTR:
- return match_attr(ATTR_M(m), obj);
- break;
- case MATCHER_HOST:
- return match_host(HOST_M(m), obj);
- break;
- default:
- assert(m->type != m->type);
- break;
- }
- return 0;
-} /* match_obj */
-
/*
* private matcher types
*/
/*
* private matcher types
*/
attr_matcher_init(sdb_object_t *obj, va_list ap)
{
attr_matcher_t *attr = ATTR_M(obj);
attr_matcher_init(sdb_object_t *obj, va_list ap)
{
attr_matcher_t *attr = ATTR_M(obj);
- int status;
-
- status = obj_matcher_init(obj, ap);
- if (! status)
- status = name_matcher_init(&attr->value, ap);
+ const char *name = va_arg(ap, const char *);
M(obj)->type = MATCHER_ATTR;
M(obj)->type = MATCHER_ATTR;
- return status;
+ if (name) {
+ attr->name = strdup(name);
+ if (! attr->name)
+ return -1;
+ }
+ return name_matcher_init(&attr->value, ap);
} /* attr_matcher_init */
static void
attr_matcher_destroy(sdb_object_t *obj)
{
attr_matcher_t *attr = ATTR_M(obj);
} /* attr_matcher_init */
static void
attr_matcher_destroy(sdb_object_t *obj)
{
attr_matcher_t *attr = ATTR_M(obj);
-
- obj_matcher_destroy(obj);
+ if (attr->name)
+ free(attr->name);
+ attr->name = NULL;
name_matcher_destroy(&attr->value);
} /* attr_matcher_destroy */
name_matcher_destroy(&attr->value);
} /* attr_matcher_destroy */
} /* sdb_store_name_matcher */
sdb_store_matcher_t *
} /* sdb_store_name_matcher */
sdb_store_matcher_t *
-sdb_store_attr_matcher(const char *attr_name, const char *attr_name_re,
- const char *attr_value, const char *attr_value_re)
+sdb_store_attr_matcher(const char *name, const char *value, _Bool re)
{
{
+ if (re)
+ return M(sdb_object_create("attr-matcher", attr_type,
+ name, NULL, value));
return M(sdb_object_create("attr-matcher", attr_type,
return M(sdb_object_create("attr-matcher", attr_type,
- attr_name, attr_name_re, attr_value, attr_value_re));
+ name, value, NULL));
} /* sdb_store_attr_matcher */
sdb_store_matcher_t *
} /* sdb_store_attr_matcher */
sdb_store_matcher_t *
sdb_store_matcher_t *m = NULL;
sdb_store_matcher_t *m = NULL;
- const char *matcher = NULL;
- const char *matcher_re = NULL;
-
if (! strcasecmp(obj_type, "host"))
type = SDB_HOST;
else if (! strcasecmp(obj_type, "service"))
if (! strcasecmp(obj_type, "host"))
type = SDB_HOST;
else if (! strcasecmp(obj_type, "service"))
/* TODO: support other operators */
if (! strcasecmp(op, "=")) {
/* TODO: support other operators */
if (! strcasecmp(op, "=")) {
- matcher = value;
+ /* nothing to do */
}
else if (! strcasecmp(op, "!=")) {
}
else if (! strcasecmp(op, "!=")) {
- matcher = value;
inv = 1;
}
else if (! strcasecmp(op, "=~")) {
inv = 1;
}
else if (! strcasecmp(op, "=~")) {
- matcher_re = value;
re = 1;
}
else if (! strcasecmp(op, "!~")) {
re = 1;
}
else if (! strcasecmp(op, "!~")) {
- matcher_re = value;
inv = 1;
re = 1;
}
inv = 1;
re = 1;
}
if (! strcasecmp(attr, "name"))
m = sdb_store_name_matcher(type, value, re);
if (! strcasecmp(attr, "name"))
m = sdb_store_name_matcher(type, value, re);
- else if (type == SDB_ATTRIBUTE) {
- m = sdb_store_host_matcher(/* name = */ NULL, NULL,
- sdb_store_attr_matcher(attr, NULL, matcher, matcher_re));
-
- /* pass ownership to the host matcher */
- if (m)
- sdb_object_deref(SDB_OBJ(HOST_M(m)->attr));
- }
+ else if (type == SDB_ATTRIBUTE)
+ m = sdb_store_attr_matcher(attr, value, re);
if (! m)
return NULL;
if (! m)
return NULL;
index 856e19c5220894e558e5e0f1d03afb68ac7dda23..e4dcd579261505e1303e1aa33d582837321403f9 100644 (file)
--- a/src/include/core/store.h
+++ b/src/include/core/store.h
* sdb_store_name_matcher:
* Creates a matcher matching by the specified object type's name. If 're' is
* true, the specified name is treated as a POSIX extended regular expression.
* sdb_store_name_matcher:
* Creates a matcher matching by the specified object type's name. If 're' is
* true, the specified name is treated as a POSIX extended regular expression.
- * Else, the exact name has to match.
+ * Else, the exact name has to match (case-insensitive).
*/
sdb_store_matcher_t *
sdb_store_name_matcher(int type, const char *name, _Bool re);
/*
* sdb_store_attr_matcher:
*/
sdb_store_matcher_t *
sdb_store_name_matcher(int type, const char *name, _Bool re);
/*
* sdb_store_attr_matcher:
- * Creates a matcher matching attributes based on their name or value. Either
- * a complete name (which will have to match completely but case-independent)
- * or an extended POSIX regular expression may be specified.
+ * Creates a matcher matching attributes based on their value. If 're' is
+ * true, the specified name is treated as a POSIX extended regular expression.
+ * Else, the exact name has to match (case-insensitive).
*/
sdb_store_matcher_t *
*/
sdb_store_matcher_t *
-sdb_store_attr_matcher(const char *attr_name, const char *attr_name_re,
- const char *attr_value, const char *attr_value_re);
+sdb_store_attr_matcher(const char *name, const char *value, _Bool re);
/*
* sdb_store_host_matcher:
/*
* sdb_store_host_matcher:
index 1a55d87844883b0af20bad5231dec0420c573072..4bbfcc23864aa17e3a85a3d4e0563a7da4928eb3 100644 (file)
const char *hostname_re;
const char *attr_name;
const char *hostname_re;
const char *attr_name;
- const char *attr_name_re;
const char *attr_value;
const char *attr_value;
- const char *attr_value_re;
+ _Bool re;
int expected;
} golden_data[] = {
{
/* host */ NULL, NULL,
int expected;
} golden_data[] = {
{
/* host */ NULL, NULL,
- /* attr */ NULL, NULL, NULL, NULL, 1
+ /* attr */ NULL, NULL, 0, 1
+ },
+ {
+ /* host */ NULL, NULL,
+ /* attr */ NULL, NULL, 1, 1
},
{
/* host */ "a", NULL,
},
{
/* host */ "a", NULL,
- /* attr */ NULL, NULL, NULL, NULL, 1
+ /* attr */ NULL, NULL, 0, 1
},
{
/* host */ "b", NULL,
},
{
/* host */ "b", NULL,
- /* attr */ NULL, NULL, NULL, NULL, 0
+ /* attr */ NULL, NULL, 0, 0
},
{
/* host */ NULL, "^a$",
},
{
/* host */ NULL, "^a$",
- /* attr */ NULL, NULL, NULL, NULL, 1
+ /* attr */ NULL, NULL, 0, 1
},
{
/* host */ NULL, "^b$",
},
{
/* host */ NULL, "^b$",
- /* attr */ NULL, NULL, NULL, NULL, 0
+ /* attr */ NULL, NULL, 0, 0
},
{
/* host */ "a", "^a$",
},
{
/* host */ "a", "^a$",
- /* attr */ NULL, NULL, NULL, NULL, 1
+ /* attr */ NULL, NULL, 0, 1
},
{
/* host */ "a", "^b$",
},
{
/* host */ "a", "^b$",
- /* attr */ NULL, NULL, NULL, NULL, 0
+ /* attr */ NULL, NULL, 0, 0
},
{
/* host */ "b", "^a$",
},
{
/* host */ "b", "^a$",
- /* attr */ NULL, NULL, NULL, NULL, 0
- },
- {
- /* host */ "a", "^a$",
- /* attr */ "k1", NULL, NULL, NULL, 1
+ /* attr */ NULL, NULL, 0, 0
},
{
/* host */ "a", "^a$",
},
{
/* host */ "a", "^a$",
- /* attr */ NULL, "^k", NULL, NULL, 1
+ /* attr */ "k1", NULL, 0, 1
},
{
/* host */ "a", "^a$",
},
{
/* host */ "a", "^a$",
- /* attr */ NULL, NULL, "v1", NULL, 1
+ /* attr */ NULL, "v1", 0, 1
},
{
/* host */ "a", "^a$",
},
{
/* host */ "a", "^a$",
- /* attr */ NULL, NULL, NULL, "^v1$", 1
- },
- {
- /* host */ "a", "^a$",
- /* attr */ "k1", "1", "v1", "1", 1
+ /* attr */ NULL, "^v1$", 1, 1
},
};
},
};
for (i = 0; i < SDB_STATIC_ARRAY_LEN(golden_data); ++i) {
sdb_store_matcher_t *h, *a, *n;
for (i = 0; i < SDB_STATIC_ARRAY_LEN(golden_data); ++i) {
sdb_store_matcher_t *h, *a, *n;
+ char buf[1024];
int status;
a = sdb_store_attr_matcher(golden_data[i].attr_name,
int status;
a = sdb_store_attr_matcher(golden_data[i].attr_name,
- golden_data[i].attr_name_re, golden_data[i].attr_value,
- golden_data[i].attr_value_re);
+ golden_data[i].attr_value, golden_data[i].re);
fail_unless(a != NULL,
"sdb_store_attr_matcher() = NULL; expected: <matcher>");
fail_unless(a != NULL,
"sdb_store_attr_matcher() = NULL; expected: <matcher>");
status = sdb_store_matcher_matches(h, obj);
fail_unless(status == golden_data[i].expected,
status = sdb_store_matcher_matches(h, obj);
fail_unless(status == golden_data[i].expected,
- "sdb_store_matcher_matches({{%s, %s},"
- "{%s, %s, %s, %s}}, <host a>) = %d; expected: %d",
- golden_data[i].hostname, golden_data[i].hostname_re,
- golden_data[i].attr_name, golden_data[i].attr_name_re,
- golden_data[i].attr_value, golden_data[i].attr_value_re,
+ "sdb_store_matcher_matches({%s, <host a>) = %d; expected: %d",
+ sdb_store_matcher_tostring(h, buf, sizeof(buf)),
status, golden_data[i].expected);
n = sdb_store_inv_matcher(h);
status, golden_data[i].expected);
n = sdb_store_inv_matcher(h);
/* now match the inverted set of objects */
status = sdb_store_matcher_matches(n, obj);
fail_unless(status == !golden_data[i].expected,
/* now match the inverted set of objects */
status = sdb_store_matcher_matches(n, obj);
fail_unless(status == !golden_data[i].expected,
- "sdb_store_matcher_matches(NOT{{%s, %s},"
- "{%s, %s, %s, %s}}, <host a>) = %d; expected: %d",
- golden_data[i].hostname, golden_data[i].hostname_re,
- golden_data[i].attr_name, golden_data[i].attr_name_re,
- golden_data[i].attr_value, golden_data[i].attr_value_re,
+ "sdb_store_matcher_matches({%s, <host a>) = %d; expected: %d",
+ sdb_store_matcher_tostring(n, buf, sizeof(buf)),
status, !golden_data[i].expected);
sdb_object_deref(SDB_OBJ(n));
status, !golden_data[i].expected);
sdb_object_deref(SDB_OBJ(n));
fail_unless(status == !golden_data[i].expected,
"sdb_store_matcher_matches(%s, <host a>) = %d; expected: %d",
sdb_store_matcher_tostring(n, buf, sizeof(buf)),
fail_unless(status == !golden_data[i].expected,
"sdb_store_matcher_matches(%s, <host a>) = %d; expected: %d",
sdb_store_matcher_tostring(n, buf, sizeof(buf)),
- status, golden_data[i].expected);
+ status, !golden_data[i].expected);
sdb_object_deref(SDB_OBJ(n));
}
sdb_object_deref(SDB_OBJ(n));
}
{ "attribute", "name", "!=", "attrname", MATCHER_NOT },
{ "attribute", "name", "=~", "attrname", MATCHER_NAME },
{ "attribute", "name", "!~", "attrname", MATCHER_NOT },
{ "attribute", "name", "!=", "attrname", MATCHER_NOT },
{ "attribute", "name", "=~", "attrname", MATCHER_NAME },
{ "attribute", "name", "!~", "attrname", MATCHER_NOT },
- { "attribute", "attr", "=", "attrname", MATCHER_HOST },
+ { "attribute", "attr", "=", "attrname", MATCHER_ATTR },
{ "attribute", "attr", "!=", "attrname", MATCHER_NOT },
{ "attribute", "attr", "!=", "attrname", MATCHER_NOT },
- { "attribute", "attr", "=~", "attrname", MATCHER_HOST },
+ { "attribute", "attr", "=~", "attrname", MATCHER_ATTR },
{ "attribute", "attr", "!~", "attrname", MATCHER_NOT },
{ "attribute", "attr", "&^", "attrname", -1 },
};
{ "attribute", "attr", "!~", "attrname", MATCHER_NOT },
{ "attribute", "attr", "&^", "attrname", -1 },
};
{ "attribute.name = 'x'", 0,
"OBJ\\[attribute\\]\\{ NAME\\{ 'x', \\(nil\\) \\}" },
{ "attribute.k1 = 'v1'", 1,
{ "attribute.name = 'x'", 0,
"OBJ\\[attribute\\]\\{ NAME\\{ 'x', \\(nil\\) \\}" },
{ "attribute.k1 = 'v1'", 1,
- "HOST\\{ NAME\\{ NULL, \\(nil\\) \\}, ATTR\\{ "
- "NAME\\{ 'k1', \\(nil\\) }, VALUE\\{ 'v1', \\(nil\\) \\} "
- "\\} \\}" },
+ "ATTR\\[k1\\]\\{ VALUE\\{ 'v1', \\(nil\\) \\} \\}" },
{ "attribute.k1 != 'v1'", 2,
{ "attribute.k1 != 'v1'", 2,
- "\\(NOT, HOST\\{ NAME\\{ NULL, \\(nil\\) \\}, ATTR\\{ "
- "NAME\\{ 'k1', \\(nil\\) }, VALUE\\{ 'v1', \\(nil\\) \\} "
- "\\} \\})" },
+ "\\(NOT, ATTR\\[k1\\]\\{ VALUE\\{ 'v1', \\(nil\\) \\} \\}\\)" },
{ "attribute.k1 != 'v2'", 3,
{ "attribute.k1 != 'v2'", 3,
- "\\(NOT, HOST\\{ NAME\\{ NULL, \\(nil\\) \\}, ATTR\\{ "
- "NAME\\{ 'k1', \\(nil\\) }, VALUE\\{ 'v2', \\(nil\\) \\} "
- "\\} \\})" },
+ "\\(NOT, ATTR\\[k1\\]\\{ VALUE\\{ 'v2', \\(nil\\) \\} \\}\\)" },
{ "attribute.name != 'x' "
"AND attribute.y !~ 'x'", 3,
{ "attribute.name != 'x' "
"AND attribute.y !~ 'x'", 3,
- "\\(AND, \\(NOT, OBJ\\[attribute\\]\\{ NAME\\{ 'x', \\(nil\\) \\} "
- "\\}\\), \\(NOT, HOST\\{ NAME\\{ NULL, \\(nil\\) \\}, ATTR\\{ "
- "NAME\\{ 'y', \\(nil\\) }, VALUE\\{ NULL, "PTR_RE" \\} "
- "\\} \\}\\)\\)" },
+ "\\(AND, "
+ "\\(NOT, OBJ\\[attribute\\]\\{ NAME\\{ 'x', \\(nil\\) \\} \\}\\), "
+ "\\(NOT, ATTR\\[y\\]\\{ VALUE\\{ NULL, "PTR_RE" \\} \\}\\)\\)" },
};
int check, n;
};
int check, n;