X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fcore%2Fstore_lookup.c;h=a95f5877d38011dff4788e4655e8616bc27d420a;hb=af74f327da5e6ebe01d5e5e6f8fa19646e203eed;hp=e2ec1b14936b3c6586bdd698bdd0c792519c61aa;hpb=2ebe67e1b7d71c3e7e9b7ab06944637b143daba9;p=sysdb.git

diff --git a/src/core/store_lookup.c b/src/core/store_lookup.c
index e2ec1b1..a95f587 100644
--- a/src/core/store_lookup.c
+++ b/src/core/store_lookup.c
@@ -49,6 +49,39 @@
 
 #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
  */
@@ -59,7 +92,7 @@
  * 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;
 
@@ -74,20 +107,58 @@ cmp_value(int op, sdb_data_t *v1, sdb_data_t *v2, _Bool strcmp_fallback)
 
 	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,
@@ -130,19 +201,15 @@ match_iter_array(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;
@@ -160,7 +227,7 @@ match_iter_array(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
 				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;
@@ -174,8 +241,7 @@ match_iter_array(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
 		}
 	}
 
-	sdb_data_free_datum(&v1);
-	sdb_data_free_datum(&v2);
+	expr_free_datum2(e1, &v1, e2, &v2);
 	return status;
 } /* match_iter_array */
 
@@ -243,18 +309,13 @@ match_cmp(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
 			|| (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 */
 
@@ -267,15 +328,14 @@ match_in(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
 
 	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 */
 
@@ -283,59 +343,18 @@ 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));
 
-	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, &regex, 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(&regex, value, 0, NULL, 0))
-			status = 1;
-	}
+	status = match_regex_value(m->type, &v, &regex);
 
-	if (free_regex)
-		regfree(&regex);
-	sdb_data_free_datum(&v);
-	if (m->type == MATCHER_NREGEX)
-		return !status;
+	expr_free_datum2(CMP_M(m)->left, &v, CMP_M(m)->right, &regex);
 	return status;
 } /* match_regex */
 
@@ -348,15 +367,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;
@@ -374,17 +400,21 @@ matchers[] = {
 	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,
 };
 
 /*