![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index c692b8c1620c2eee4e6e9908e380ada0bec3faf3..d53bd58f35d743228ee054ccdfdd530e94360f6f 100644 (file)
--- a/src/core/store_lookup.c
+++ b/src/core/store_lookup.c
if (obj->type != SDB_HOST)
return INT_MAX;
- if (sdb_store_expr_eval(ATTR_C(cond)->expr, &value))
+ if (sdb_store_expr_eval(ATTR_C(cond)->expr, obj, &value))
return INT_MAX;
attr = attr_get(HOST(obj), ATTR_C(cond)->name, filter);
sdb_data_t value = SDB_DATA_INIT;
int status;
- switch (OBJ_C(cond)->field) {
- case SDB_FIELD_LAST_UPDATE:
- obj_value.type = SDB_TYPE_DATETIME;
- obj_value.data.datetime = obj->last_update;
- break;
- case SDB_FIELD_AGE:
- obj_value.type = SDB_TYPE_DATETIME;
- obj_value.data.datetime = sdb_gettime() - obj->last_update;
- break;
- case SDB_FIELD_INTERVAL:
- obj_value.type = SDB_TYPE_DATETIME;
- obj_value.data.datetime = obj->interval;
- break;
- case SDB_FIELD_BACKEND:
- obj_value.type = SDB_TYPE_STRING;
- obj_value.data.string = NULL; /* handled separately */
- break;
- default:
- return INT_MAX;
- }
-
- if (sdb_store_expr_eval(OBJ_C(cond)->expr, &value))
+ if (sdb_store_get_field(obj, OBJ_C(cond)->field, &obj_value))
+ return INT_MAX;
+ if (sdb_store_expr_eval(OBJ_C(cond)->expr, obj, &value))
return INT_MAX;
if (obj_value.type != value.type) {
case SDB_SERVICE:
iter = sdb_avltree_get_iter(HOST(obj)->services);
break;
+ case SDB_METRIC:
+ iter = sdb_avltree_get_iter(HOST(obj)->metrics);
+ break;
case SDB_ATTRIBUTE:
iter = sdb_avltree_get_iter(HOST(obj)->attributes);
break;
return buf;
}
- if (sdb_store_expr_eval(expr, &value))
+ if (sdb_store_expr_eval(expr, NULL, &value))
snprintf(value_str, sizeof(value_str), "ERR");
else if (sdb_data_format(&value, value_str, sizeof(value_str),
SDB_SINGLE_QUOTED) < 0)
MATCHER_ISNULL, attr_name));
} /* sdb_store_isnull_matcher */
+int
+sdb_store_parse_object_type_plural(const char *name)
+{
+ if (! strcasecmp(name, "hosts"))
+ return SDB_HOST;
+ else if (! strcasecmp(name, "services"))
+ return SDB_SERVICE;
+ else if (! strcasecmp(name, "metrics"))
+ return SDB_METRIC;
+ return -1;
+} /* sdb_store_parse_object_type_plural */
+
+int
+sdb_store_parse_field_name(const char *name)
+{
+ if (! strcasecmp(name, "last_update"))
+ return SDB_FIELD_LAST_UPDATE;
+ else if (! strcasecmp(name, "age"))
+ return SDB_FIELD_AGE;
+ else if (! strcasecmp(name, "interval"))
+ return SDB_FIELD_INTERVAL;
+ else if (! strcasecmp(name, "backend"))
+ return SDB_FIELD_BACKEND;
+ return -1;
+} /* sdb_store_parse_field_name */
+
+static sdb_store_matcher_t *
+maybe_inv_matcher(sdb_store_matcher_t *m, _Bool inv)
+{
+ sdb_store_matcher_t *tmp;
+
+ if ((! m) || (! inv))
+ return m;
+
+ tmp = sdb_store_inv_matcher(m);
+ /* pass ownership to the inverse matcher */
+ sdb_object_deref(SDB_OBJ(m));
+ return tmp;
+} /* maybe_inv_matcher */
+
+static int
+parse_cond_op(const char *op,
+ sdb_store_matcher_t *(**matcher)(sdb_store_cond_t *), _Bool *inv)
+{
+ *inv = 0;
+ if (! strcasecmp(op, "<"))
+ *matcher = sdb_store_lt_matcher;
+ else if (! strcasecmp(op, "<="))
+ *matcher = sdb_store_le_matcher;
+ else if (! strcasecmp(op, "="))
+ *matcher = sdb_store_eq_matcher;
+ else if (! strcasecmp(op, ">="))
+ *matcher = sdb_store_ge_matcher;
+ else if (! strcasecmp(op, ">"))
+ *matcher = sdb_store_gt_matcher;
+ else if (! strcasecmp(op, "!=")) {
+ *matcher = sdb_store_eq_matcher;
+ *inv = 1;
+ }
+ else
+ return -1;
+ return 0;
+} /* parse_cond_op */
+
static sdb_store_matcher_t *
parse_attr_cmp(const char *attr, const char *op, sdb_store_expr_t *expr)
{
}
else if (! expr)
return NULL;
- else if (! strcasecmp(op, "<"))
- matcher = sdb_store_lt_matcher;
- else if (! strcasecmp(op, "<="))
- matcher = sdb_store_le_matcher;
- else if (! strcasecmp(op, "="))
- matcher = sdb_store_eq_matcher;
- else if (! strcasecmp(op, ">="))
- matcher = sdb_store_ge_matcher;
- else if (! strcasecmp(op, ">"))
- matcher = sdb_store_gt_matcher;
- else if (! strcasecmp(op, "!=")) {
- matcher = sdb_store_eq_matcher;
- inv = 1;
- }
- else
+ else if (parse_cond_op(op, &matcher, &inv))
return NULL;
cond = sdb_store_attr_cond(attr, expr);
m = matcher(cond);
/* pass ownership to 'm' or destroy in case of an error */
sdb_object_deref(SDB_OBJ(cond));
- if (! m)
- return NULL;
-
- if (inv) {
- sdb_store_matcher_t *tmp;
- tmp = sdb_store_inv_matcher(m);
- /* pass ownership to the inverse matcher */
- sdb_object_deref(SDB_OBJ(m));
- m = tmp;
- }
- return m;
+ return maybe_inv_matcher(m, inv);
} /* parse_attr_cmp */
sdb_store_matcher_t *
type = SDB_HOST;
else if (! strcasecmp(obj_type, "service"))
type = SDB_SERVICE;
+ else if (! strcasecmp(obj_type, "metric"))
+ type = SDB_METRIC;
else if (! strcasecmp(obj_type, "attribute"))
type = SDB_ATTRIBUTE;
else
if (! expr)
return NULL;
- if (sdb_store_expr_eval(expr, &value))
+ if (sdb_store_expr_eval(expr, NULL, &value))
return NULL;
if (value.type != SDB_TYPE_STRING) {
sdb_data_free_datum(&value);
+ if (type != SDB_ATTRIBUTE)
+ return NULL;
return parse_attr_cmp(attr, op, expr);
}
m = sdb_store_attr_matcher(attr, value.data.string, re);
sdb_data_free_datum(&value);
+ return maybe_inv_matcher(m, inv);
+} /* sdb_store_matcher_parse_cmp */
- if (! m)
+sdb_store_matcher_t *
+sdb_store_matcher_parse_field_cmp(const char *name, 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;
+
+ int field;
+
+ if (! expr)
return NULL;
- if (inv) {
- sdb_store_matcher_t *tmp;
- tmp = sdb_store_inv_matcher(m);
- /* pass ownership to the inverse matcher */
- sdb_object_deref(SDB_OBJ(m));
- m = tmp;
- }
- return m;
-} /* sdb_store_matcher_parse_cmp */
+ field = sdb_store_parse_field_name(name);
+ if (field < 0)
+ return NULL;
+
+ if (parse_cond_op(op, &matcher, &inv))
+ return NULL;
+ cond = sdb_store_obj_cond(field, expr);
+ if (! cond)
+ return NULL;
+
+ assert(matcher);
+ m = matcher(cond);
+ /* pass ownership to 'm' or destroy in case of an error */
+ sdb_object_deref(SDB_OBJ(cond));
+ return maybe_inv_matcher(m, inv);
+} /* sdb_store_matcher_parse_field_cmp */
sdb_store_matcher_t *
sdb_store_dis_matcher(sdb_store_matcher_t *left, sdb_store_matcher_t *right)