X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=src%2Fcore%2Fstore_lookup.c;h=2e73780fbf8da67f51c7e040470d051668b20621;hp=94459cb097b1e21526f9c54f65d1cf3cd433c1ca;hb=42f08911b5ba35dbd0e3dadc0f3785f8fa3a946a;hpb=13997f70dfd15cceed0c12bb6ddef787bbbe04e1 diff --git a/src/core/store_lookup.c b/src/core/store_lookup.c index 94459cb..2e73780 100644 --- a/src/core/store_lookup.c +++ b/src/core/store_lookup.c @@ -49,10 +49,117 @@ #include +static int +expr_eval2(sdb_store_expr_t *e1, sdb_data_t *v1, + sdb_store_expr_t *e2, sdb_data_t *v2, + sdb_store_obj_t *obj, sdb_store_matcher_t *filter) +{ + if (e1->type) { + if (sdb_store_expr_eval(e1, obj, v1, filter)) + return -1; + } + else + *v1 = e1->data; + if (e2->type) { + if (sdb_store_expr_eval(e2, obj, v2, filter)) { + if (e1->type) + sdb_data_free_datum(v1); + return -1; + } + } + else + *v2 = e2->data; + return 0; +} /* expr_eval2 */ + +static void +expr_free_datum2(sdb_store_expr_t *e1, sdb_data_t *v1, + sdb_store_expr_t *e2, sdb_data_t *v2) +{ + if (e1->type) + sdb_data_free_datum(v1); + if (e2->type) + sdb_data_free_datum(v2); +} /* expr_free_datum2 */ + /* * matcher implementations */ +/* + * cmp_expr: + * Compare two values using the specified matcher operator. If strcmp_fallback + * is enabled, compare the string values in case of a type mismatch. + */ +static int +match_cmp_value(int op, sdb_data_t *v1, sdb_data_t *v2, bool strcmp_fallback) +{ + int status; + + if (sdb_data_isnull(v1) || (sdb_data_isnull(v2))) + status = INT_MAX; + else if (v1->type == v2->type) + status = sdb_data_cmp(v1, v2); + else if (! strcmp_fallback) + status = INT_MAX; + else + status = sdb_data_strcmp(v1, v2); + + if (status == INT_MAX) + return 0; + switch (op) { + case MATCHER_LT: return status < 0; + case MATCHER_LE: return status <= 0; + case MATCHER_EQ: return status == 0; + case MATCHER_NE: return status != 0; + case MATCHER_GE: return status >= 0; + case MATCHER_GT: return status > 0; + } + return 0; +} /* match_cmp_value */ + +static int +match_regex_value(int op, sdb_data_t *v, sdb_data_t *re) +{ + char value[sdb_data_strlen(v) + 1]; + int status = 0; + + assert((op == MATCHER_REGEX) + || (op == MATCHER_NREGEX)); + + if (sdb_data_isnull(v) || sdb_data_isnull(re)) + return 0; + + if (re->type == SDB_TYPE_STRING) { + sdb_data_t tmp = SDB_DATA_INIT; + + if (sdb_data_parse(re->data.string, SDB_TYPE_REGEX, &tmp)) + return 0; + + sdb_data_free_datum(re); + *re = tmp; + } + else if (re->type != SDB_TYPE_REGEX) + return 0; + + if (! sdb_data_format(v, value, sizeof(value), SDB_UNQUOTED)) + status = 0; + else if (! regexec(&re->data.re.regex, value, 0, NULL, 0)) + status = 1; + + if (op == MATCHER_NREGEX) + return !status; + return status; +} /* match_regex_value */ + +static int +match_value(int op, sdb_data_t *v1, sdb_data_t *v2, bool strcmp_fallback) +{ + if ((op == MATCHER_REGEX) || (op == MATCHER_NREGEX)) + return match_regex_value(op, v1, v2); + return match_cmp_value(op, v1, v2, strcmp_fallback); +} /* match_value */ + static int match_logical(sdb_store_matcher_t *m, sdb_store_obj_t *obj, sdb_store_matcher_t *filter) @@ -83,6 +190,63 @@ match_unary(sdb_store_matcher_t *m, sdb_store_obj_t *obj, return !sdb_store_matcher_matches(UOP_M(m)->op, obj, filter); } /* match_unary */ +/* iterate arrays: ANY/ALL */ +static int +match_iter_array(sdb_store_matcher_t *m, sdb_store_obj_t *obj, + sdb_store_matcher_t *filter) +{ + sdb_store_expr_t *e1, *e2; + sdb_data_t v1 = SDB_DATA_INIT; + sdb_data_t v2 = SDB_DATA_INIT; + + int status; + + assert(CMP_M(m)->left && CMP_M(m)->right); + + if ((ITER_M(m)->m->type < MATCHER_LT) + || (MATCHER_NREGEX < ITER_M(m)->m->type)) + return 0; + + e1 = CMP_M(ITER_M(m)->m)->left; + e2 = CMP_M(ITER_M(m)->m)->right; + + if (expr_eval2(e1, &v1, e2, &v2, obj, filter)) + return 0; + + if ((! (v1.type & SDB_TYPE_ARRAY)) || (v2.type & SDB_TYPE_ARRAY)) + status = 0; + else if (sdb_data_isnull(&v1) || (sdb_data_isnull(&v2))) + status = 0; + else { + size_t i; + int all = (int)(m->type == MATCHER_ALL); + + status = all; + for (i = 0; i < v1.data.array.length; ++i) { + sdb_data_t v = SDB_DATA_INIT; + if (sdb_data_array_get(&v1, i, &v)) { + status = 0; + break; + } + + if (match_value(ITER_M(m)->m->type, &v, &v2, + (e1->data_type) < 0 || (e2->data_type < 0))) { + if (! all) { + status = 1; + break; + } + } + else if (all) { + status = 0; + break; + } + } + } + + expr_free_datum2(e1, &v1, e2, &v2); + return status; +} /* match_iter_array */ + static int match_iter(sdb_store_matcher_t *m, sdb_store_obj_t *obj, sdb_store_matcher_t *filter) @@ -93,16 +257,23 @@ match_iter(sdb_store_matcher_t *m, sdb_store_obj_t *obj, assert((m->type == MATCHER_ANY) || (m->type == MATCHER_ALL)); - /* TODO: support all object types */ - if (obj->type != SDB_HOST) - return 0; - - if (ITER_M(m)->type == SDB_SERVICE) - iter = sdb_avltree_get_iter(HOST(obj)->services); - else if (ITER_M(m)->type == SDB_METRIC) - iter = sdb_avltree_get_iter(HOST(obj)->metrics); - else if (ITER_M(m)->type == SDB_ATTRIBUTE) - iter = sdb_avltree_get_iter(HOST(obj)->attributes); + if (ITER_M(m)->type == SDB_FIELD_BACKEND) + return match_iter_array(m, obj, filter); + + if (obj->type == SDB_HOST) { + if (ITER_M(m)->type == SDB_SERVICE) + iter = sdb_avltree_get_iter(HOST(obj)->services); + else if (ITER_M(m)->type == SDB_METRIC) + iter = sdb_avltree_get_iter(HOST(obj)->metrics); + else if (ITER_M(m)->type == SDB_ATTRIBUTE) + iter = sdb_avltree_get_iter(HOST(obj)->attributes); + } else if (obj->type == SDB_SERVICE) { + if (ITER_M(m)->type == SDB_ATTRIBUTE) + iter = sdb_avltree_get_iter(SVC(obj)->attributes); + } else if (obj->type == SDB_METRIC) { + if (ITER_M(m)->type == SDB_ATTRIBUTE) + iter = sdb_avltree_get_iter(METRIC(obj)->attributes); + } status = all; while (sdb_avltree_iter_has_next(iter)) { @@ -124,102 +295,32 @@ match_iter(sdb_store_matcher_t *m, sdb_store_obj_t *obj, return status; } /* match_iter */ -/* - * cmp_expr: - * Compare the values of two expressions when evaluating them using the - * specified stored object and filter. Returns a value less than, equal to, or - * greater than zero if the value of the first expression compares less than, - * equal to, or greater than the value of the second expression. Returns - * INT_MAX if any of the expressions could not be evaluated or if any of them - * evaluated to NULL. - */ -static int -cmp_expr(sdb_store_expr_t *e1, sdb_store_expr_t *e2, - sdb_store_obj_t *obj, sdb_store_matcher_t *filter) -{ - sdb_data_t v1 = SDB_DATA_INIT, v2 = SDB_DATA_INIT; - int status; - - if (sdb_store_expr_eval(e1, obj, &v1, filter)) - return INT_MAX; - if (sdb_store_expr_eval(e2, obj, &v2, filter)) { - sdb_data_free_datum(&v1); - return INT_MAX; - } - - if (sdb_data_isnull(&v1) || (sdb_data_isnull(&v2))) - status = INT_MAX; - else if (v1.type == v2.type) - status = sdb_data_cmp(&v1, &v2); - else if ((e1->data_type >= 0) && (e2->data_type >= 0)) - status = INT_MAX; - else - status = sdb_data_strcmp(&v1, &v2); - - sdb_data_free_datum(&v1); - sdb_data_free_datum(&v2); - return status; -} /* cmp_expr */ - -static int -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 = cmp_expr(CMP_M(m)->left, CMP_M(m)->right, obj, filter); - return (status != INT_MAX) && (status < 0); -} /* match_lt */ - static int -match_le(sdb_store_matcher_t *m, sdb_store_obj_t *obj, +match_cmp(sdb_store_matcher_t *m, sdb_store_obj_t *obj, sdb_store_matcher_t *filter) { + sdb_store_expr_t *e1 = CMP_M(m)->left; + sdb_store_expr_t *e2 = CMP_M(m)->right; + sdb_data_t v1 = SDB_DATA_INIT, v2 = SDB_DATA_INIT; int status; - 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_le */ -static int -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 = cmp_expr(CMP_M(m)->left, CMP_M(m)->right, obj, filter); - return (status != INT_MAX) && (! status); -} /* match_eq */ + assert((m->type == MATCHER_LT) + || (m->type == MATCHER_LE) + || (m->type == MATCHER_EQ) + || (m->type == MATCHER_NE) + || (m->type == MATCHER_GE) + || (m->type == MATCHER_GT)); + assert(e1 && e2); -static int -match_ne(sdb_store_matcher_t *m, sdb_store_obj_t *obj, - sdb_store_matcher_t *filter) -{ - int status; - assert(m->type == MATCHER_NE); - status = cmp_expr(CMP_M(m)->left, CMP_M(m)->right, obj, filter); - return (status != INT_MAX) && status; -} /* match_ne */ + if (expr_eval2(e1, &v1, e2, &v2, obj, filter)) + return 0; -static int -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 = cmp_expr(CMP_M(m)->left, CMP_M(m)->right, obj, filter); - return (status != INT_MAX) && (status >= 0); -} /* match_ge */ + status = match_cmp_value(m->type, &v1, &v2, + (e1->data_type) < 0 || (e2->data_type < 0)); -static int -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 = cmp_expr(CMP_M(m)->left, CMP_M(m)->right, obj, filter); - return (status != INT_MAX) && (status > 0); -} /* match_gt */ + expr_free_datum2(e1, &v1, e2, &v2); + return status; +} /* match_cmp */ static int match_in(sdb_store_matcher_t *m, sdb_store_obj_t *obj, @@ -228,17 +329,19 @@ match_in(sdb_store_matcher_t *m, sdb_store_obj_t *obj, sdb_data_t value = SDB_DATA_INIT, array = SDB_DATA_INIT; int status = 1; - assert(m->type == MATCHER_IN); + assert((m->type == MATCHER_IN) || (m->type == MATCHER_NIN)); + assert(CMP_M(m)->left && CMP_M(m)->right); - if ((sdb_store_expr_eval(CMP_M(m)->left, obj, &value, filter)) - || (sdb_store_expr_eval(CMP_M(m)->right, obj, &array, filter))) + if (expr_eval2(CMP_M(m)->left, &value, + CMP_M(m)->right, &array, obj, filter)) status = 0; if (status) status = sdb_data_inarray(&value, &array); - sdb_data_free_datum(&value); - sdb_data_free_datum(&array); + expr_free_datum2(CMP_M(m)->left, &value, CMP_M(m)->right, &array); + if (m->type == MATCHER_NIN) + return !status; return status; } /* match_in */ @@ -246,59 +349,19 @@ static int match_regex(sdb_store_matcher_t *m, sdb_store_obj_t *obj, sdb_store_matcher_t *filter) { - sdb_data_t v = SDB_DATA_INIT; + sdb_data_t regex = SDB_DATA_INIT, v = SDB_DATA_INIT; int status = 0; - regex_t regex; - _Bool free_regex = 0; - assert((m->type == MATCHER_REGEX) || (m->type == MATCHER_NREGEX)); + assert(CMP_M(m)->left && CMP_M(m)->right); - if (! CMP_M(m)->right->type) { - assert(CMP_M(m)->right->data.type == SDB_TYPE_REGEX); - regex = CMP_M(m)->right->data.data.re.regex; - } - else { - sdb_data_t tmp = SDB_DATA_INIT; - char *raw; - - if (sdb_store_expr_eval(CMP_M(m)->right, obj, &tmp, filter)) - return 0; - - if (tmp.type != SDB_TYPE_STRING) { - sdb_data_free_datum(&tmp); - return 0; - } - - raw = tmp.data.string; - if (sdb_data_parse(raw, SDB_TYPE_REGEX, &tmp)) { - free(raw); - return 0; - } + if (expr_eval2(CMP_M(m)->left, &v, CMP_M(m)->right, ®ex, obj, filter)) + return 0; - regex = tmp.data.re.regex; - free_regex = 1; - free(tmp.data.re.raw); - free(raw); - } + status = match_regex_value(m->type, &v, ®ex); - if ((sdb_store_expr_eval(CMP_M(m)->left, obj, &v, filter)) - || (sdb_data_isnull(&v))) - status = 0; - else { - char value[sdb_data_strlen(&v) + 1]; - if (sdb_data_format(&v, value, sizeof(value), SDB_UNQUOTED) < 0) - status = 0; - else if (! regexec(®ex, value, 0, NULL, 0)) - status = 1; - } - - if (free_regex) - regfree(®ex); - sdb_data_free_datum(&v); - if (m->type == MATCHER_NREGEX) - return !status; + expr_free_datum2(CMP_M(m)->left, &v, CMP_M(m)->right, ®ex); return status; } /* match_regex */ @@ -311,15 +374,22 @@ match_isnull(sdb_store_matcher_t *m, sdb_store_obj_t *obj, assert((m->type == MATCHER_ISNULL) || (m->type == MATCHER_ISNNULL)); - /* TODO: this might hide real errors; - * improve error reporting and propagation */ - if (sdb_store_expr_eval(ISNULL_M(m)->expr, obj, &v, filter) - || sdb_data_isnull(&v)) + if (ISNULL_M(m)->expr->type) { + /* TODO: this might hide real errors; + * improve error reporting and propagation */ + if (sdb_store_expr_eval(ISNULL_M(m)->expr, obj, &v, filter)) + return 1; + } + else + v = ISNULL_M(m)->expr->data; + + if (sdb_data_isnull(&v)) status = 1; else status = 0; - sdb_data_free_datum(&v); + if (ISNULL_M(m)->expr->type) + sdb_data_free_datum(&v); if (m->type == MATCHER_ISNNULL) return !status; return status; @@ -337,17 +407,22 @@ matchers[] = { match_unary, match_iter, match_iter, - match_lt, - match_le, - match_eq, - match_ne, - match_ge, - match_gt, match_in, - match_regex, - match_regex, + match_in, + + /* unary operators */ match_isnull, match_isnull, + + /* ary operators */ + match_cmp, + match_cmp, + match_cmp, + match_cmp, + match_cmp, + match_cmp, + match_regex, + match_regex, }; /* @@ -410,7 +485,7 @@ cmp_matcher_init(sdb_object_t *obj, va_list ap) CMP_M(obj)->right = va_arg(ap, sdb_store_expr_t *); sdb_object_ref(SDB_OBJ(CMP_M(obj)->right)); - if ((! CMP_M(obj)->left) || (! CMP_M(obj)->right)) + if (! CMP_M(obj)->right) return -1; return 0; } /* cmp_matcher_init */ @@ -501,7 +576,7 @@ sdb_store_matcher_t * sdb_store_any_matcher(int type, sdb_store_matcher_t *m) { if ((type != SDB_SERVICE) && (type != SDB_METRIC) - && (type != SDB_ATTRIBUTE)) + && (type != SDB_ATTRIBUTE) && (type != SDB_FIELD_BACKEND)) return NULL; return M(sdb_object_create("any-matcher", iter_type, MATCHER_ANY, type, m)); @@ -511,7 +586,7 @@ sdb_store_matcher_t * sdb_store_all_matcher(int type, sdb_store_matcher_t *m) { if ((type != SDB_SERVICE) && (type != SDB_METRIC) - && (type != SDB_ATTRIBUTE)) + && (type != SDB_ATTRIBUTE) && (type != SDB_FIELD_BACKEND)) return NULL; return M(sdb_object_create("all-matcher", iter_type, MATCHER_ALL, type, m)); @@ -566,6 +641,13 @@ sdb_store_in_matcher(sdb_store_expr_t *left, sdb_store_expr_t *right) MATCHER_IN, left, right)); } /* sdb_store_in_matcher */ +sdb_store_matcher_t * +sdb_store_nin_matcher(sdb_store_expr_t *left, sdb_store_expr_t *right) +{ + return M(sdb_object_create("not-in-matcher", cmp_type, + MATCHER_NIN, left, right)); +} /* sdb_store_in_matcher */ + sdb_store_matcher_t * sdb_store_regex_matcher(sdb_store_expr_t *left, sdb_store_expr_t *right) {