![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index 05e6b74d51b70117bc01a06b1b17ca9ef0f77f50..180d17931d2c603fb0e295b5b06f4c9637d5cb8a 100644 (file)
--- a/src/core/store_lookup.c
+++ b/src/core/store_lookup.c
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
*/
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)
{
sdb_avltree_iter_t *iter = NULL;
- int status = 0;
+ int status;
+ int all = 0;
assert((m->type == MATCHER_SERVICE)
|| (m->type == MATCHER_METRIC)
if (obj->type != SDB_HOST)
return 0;
+ /* negated matchers should only match if the respective positive matchers
+ * do not match; that is if the negated matcher matchers *all* children */
+ if ((CHILD_M(m)->m->type == MATCHER_NE)
+ || (CHILD_M(m)->m->type == MATCHER_NREGEX))
+ all = 1;
+
if (m->type == MATCHER_SERVICE)
iter = sdb_avltree_get_iter(HOST(obj)->services);
else if (m->type == MATCHER_METRIC)
iter = sdb_avltree_get_iter(HOST(obj)->metrics);
- else if (m->type == SDB_ATTRIBUTE)
+ else if (m->type == MATCHER_ATTRIBUTE)
iter = sdb_avltree_get_iter(HOST(obj)->attributes);
+ status = all;
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)))
+ sdb_store_obj_t *child = STORE_OBJ(sdb_avltree_iter_get_next(iter));
+ if (filter && (! sdb_store_matcher_matches(filter, child, NULL)))
continue;
- if (sdb_store_matcher_matches(CHILD_M(m)->m, obj, filter)) {
- status = 1;
+ if (sdb_store_matcher_matches(CHILD_M(m)->m, child, filter)) {
+ if (! all) {
+ status = 1;
+ break;
+ }
+ } else if (all) {
+ status = 0;
break;
}
}
} /* 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,
match_logical,
match_unary,
match_name,
- match_attr,
match_child,
match_child,
match_child,
- match_cmp_lt,
- match_cmp_le,
- match_cmp_eq,
- match_cmp_ne,
- match_cmp_ge,
- match_cmp_gt,
+ match_lt,
+ match_le,
+ match_eq,
+ match_ne,
+ match_ge,
+ match_gt,
match_in,
match_regex,
match_regex,
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
op_matcher_init(sdb_object_t *obj, va_list ap)
{
/* 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 op_type = {
/* size = */ sizeof(op_matcher_t),
/* init = */ op_matcher_init,
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)
{
return M(sdb_object_create("any-matcher", child_type, type, m));
} /* sdb_store_child_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)
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, "!~"))
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)
{
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 */