![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index e5dad19a960b2c18bebd8172452a58ac41bcb8fd..2e73780fbf8da67f51c7e040470d051668b20621 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
-match_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;
} /* match_cmp_value */
else if (re->type != SDB_TYPE_REGEX)
return 0;
- if (sdb_data_format(v, value, sizeof(value), SDB_UNQUOTED) < 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;
} /* match_regex_value */
static int
-match_value(int op, sdb_data_t *v1, sdb_data_t *v2, _Bool strcmp_fallback)
+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);
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 (sdb_store_expr_eval(e1, obj, &v1, filter))
+ if (expr_eval2(e1, &v1, e2, &v2, obj, filter))
return 0;
- if (sdb_store_expr_eval(e2, obj, &v2, filter)) {
- sdb_data_free_datum(&v1);
- return 0;
- }
if ((! (v1.type & SDB_TYPE_ARRAY)) || (v2.type & SDB_TYPE_ARRAY))
status = 0;
}
}
- 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_NE)
|| (m->type == MATCHER_GE)
|| (m->type == MATCHER_GT));
+ assert(e1 && e2);
- if (sdb_store_expr_eval(e1, obj, &v1, filter))
+ if (expr_eval2(e1, &v1, e2, &v2, obj, filter))
return 0;
- if (sdb_store_expr_eval(e2, obj, &v2, filter)) {
- sdb_data_free_datum(&v1);
- return 0;
- }
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 */
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 */
assert((m->type == MATCHER_REGEX)
|| (m->type == MATCHER_NREGEX));
+ assert(CMP_M(m)->left && CMP_M(m)->right);
- if (sdb_store_expr_eval(CMP_M(m)->left, obj, &v, filter))
- return 0;
- else if (! CMP_M(m)->right->type)
- regex = CMP_M(m)->right->data;
- else if (sdb_store_expr_eval(CMP_M(m)->right, obj, ®ex, filter)) {
- sdb_data_free_datum(&v);
+ if (expr_eval2(CMP_M(m)->left, &v, CMP_M(m)->right, ®ex, obj, filter))
return 0;
- }
status = match_regex_value(m->type, &v, ®ex);
- sdb_data_free_datum(&v);
- if (CMP_M(m)->right->type)
- sdb_data_free_datum(®ex);
+ 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_iter,
match_iter,
match_in,
+ match_in,
/* unary operators */
match_isnull,
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 */
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)
{