index e2ec1b14936b3c6586bdd698bdd0c792519c61aa..a95f5877d38011dff4788e4655e8616bc27d420a 100644 (file)
--- a/src/core/store_lookup.c
+++ b/src/core/store_lookup.c
#include <limits.h>
+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
*/
* is enabled, compare the string values in case of a type mismatch.
*/
static int
-cmp_value(int op, sdb_data_t *v1, sdb_data_t *v2, _Bool strcmp_fallback)
+match_cmp_value(int op, sdb_data_t *v1, sdb_data_t *v2, bool strcmp_fallback)
{
int status;
if (status == INT_MAX)
return 0;
- else if (op == MATCHER_LT)
- return status < 0;
- else if (op == MATCHER_LE)
- return status <= 0;
- else if (op == MATCHER_EQ)
- return status == 0;
- else if (op == MATCHER_NE)
- return status != 0;
- else if (op == MATCHER_GE)
- return status >= 0;
- else if (op == MATCHER_GT)
- return status > 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;
-} /* cmp_value */
+} /* 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) < 0)
+ 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,
int status;
- /* TODO: fully support arbitrary operators (?) */
- if ((ITER_M(m)->m->type < MATCHER_LT) || (MATCHER_GT < ITER_M(m)->m->type))
+ 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 (sdb_store_expr_eval(e1, obj, &v1, filter))
- return 0;
- if (sdb_store_expr_eval(e2, obj, &v2, filter)) {
- sdb_data_free_datum(&v1);
+ if (expr_eval2(e1, &v1, e2, &v2, obj, filter))
return 0;
- }
if ((! (v1.type & SDB_TYPE_ARRAY)) || (v2.type & SDB_TYPE_ARRAY))
status = 0;
break;
}
- if (cmp_value(ITER_M(m)->m->type, &v, &v2,
+ if (match_value(ITER_M(m)->m->type, &v, &v2,
(e1->data_type) < 0 || (e2->data_type < 0))) {
if (! all) {
status = 1;
}
}
- sdb_data_free_datum(&v1);
- sdb_data_free_datum(&v2);
+ expr_free_datum2(e1, &v1, e2, &v2);
return status;
} /* match_iter_array */
|| (m->type == MATCHER_GE)
|| (m->type == MATCHER_GT));
- if (sdb_store_expr_eval(e1, obj, &v1, filter))
- return 0;
- if (sdb_store_expr_eval(e2, obj, &v2, filter)) {
- sdb_data_free_datum(&v1);
+ if (expr_eval2(e1, &v1, e2, &v2, obj, filter))
return 0;
- }
- status = cmp_value(m->type, &v1, &v2,
+ status = match_cmp_value(m->type, &v1, &v2,
(e1->data_type) < 0 || (e2->data_type < 0));
- sdb_data_free_datum(&v1);
- sdb_data_free_datum(&v2);
+ expr_free_datum2(e1, &v1, e2, &v2);
return status;
} /* match_cmp */
assert(m->type == MATCHER_IN);
- 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);
return status;
} /* match_in */
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));
- 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;
- }
-
- regex = tmp.data.re.regex;
- free_regex = 1;
- free(tmp.data.re.raw);
- free(raw);
- }
+ if (expr_eval2(CMP_M(m)->left, &v, CMP_M(m)->right, ®ex, obj, filter))
+ return 0;
- 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;
- }
+ status = match_regex_value(m->type, &v, ®ex);
- 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 */
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;
match_unary,
match_iter,
match_iter,
+ match_in,
+
+ /* unary operators */
+ match_isnull,
+ match_isnull,
+
+ /* ary operators */
match_cmp,
match_cmp,
match_cmp,
match_cmp,
match_cmp,
match_cmp,
- match_in,
match_regex,
match_regex,
- match_isnull,
- match_isnull,
};
/*