X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=src%2Fcore%2Fstore_expr.c;h=642255e4ab94c77028e1f1779d77fd56bfe3584a;hp=80c1f4ac25c756383d579a1a92042045f5df6cec;hb=c1907b60719f4e9a8e5b29aef5c8e25d62f4cde2;hpb=bbd1b997cf153d54878efebc182bd88f1c64d45c

diff --git a/src/core/store_expr.c b/src/core/store_expr.c
index 80c1f4a..642255e 100644
--- a/src/core/store_expr.c
+++ b/src/core/store_expr.c
@@ -39,6 +39,7 @@
 #include "core/object.h"
 
 #include <assert.h>
+#include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -55,6 +56,7 @@ struct sdb_store_expr_iter {
 
 	sdb_data_t array;
 	size_t array_idx;
+	bool free_array;
 
 	sdb_store_matcher_t *filter;
 };
@@ -261,44 +263,6 @@ sdb_store_expr_eval(sdb_store_expr_t *expr, sdb_store_obj_t *obj,
 	return status;
 } /* sdb_store_expr_eval */
 
-bool
-sdb_store_expr_iterable(sdb_store_expr_t *expr, int context)
-{
-	if (expr->type == TYPED_EXPR) {
-		if ((context != SDB_HOST) && (context != SDB_SERVICE)
-				&& (context != SDB_METRIC))
-			return 0;
-		if (context == expr->data.data.integer)
-			return 0;
-		if ((expr->data.data.integer != SDB_SERVICE)
-				&& (expr->data.data.integer != SDB_METRIC)
-				&& (expr->data.data.integer != SDB_ATTRIBUTE))
-			return 0;
-		if ((context == SDB_SERVICE)
-				&& (expr->data.data.integer == SDB_METRIC))
-			return 0;
-		else if ((context == SDB_METRIC)
-				&& (expr->data.data.integer == SDB_SERVICE))
-			return 0;
-		return 1;
-	}
-	else if (expr->type == FIELD_VALUE) {
-		if ((context != SDB_HOST) && (context != SDB_SERVICE)
-				&& (context != SDB_METRIC) && (context != SDB_ATTRIBUTE))
-			return 0;
-		if (expr->data.data.integer == SDB_FIELD_BACKEND)
-			return 1;
-		else if (expr->data.data.integer == SDB_FIELD_VALUE)
-			/* we don't current support this just like when using
-			 * the attribute[<name>] syntax */
-			return 0;
-	}
-	else if (! expr->type) {
-		return !!(expr->data.type & SDB_TYPE_ARRAY);
-	}
-	return 0;
-} /* sdb_store_expr_iterable */
-
 sdb_store_expr_iter_t *
 sdb_store_expr_iter(sdb_store_expr_t *expr, sdb_store_obj_t *obj,
 		sdb_store_matcher_t *filter)
@@ -306,6 +270,7 @@ sdb_store_expr_iter(sdb_store_expr_t *expr, sdb_store_obj_t *obj,
 	sdb_store_expr_iter_t *iter;
 	sdb_avltree_iter_t *tree = NULL;
 	sdb_data_t array = SDB_DATA_INIT;
+	bool free_array = 0;
 
 	if (! expr)
 		return NULL;
@@ -345,15 +310,27 @@ sdb_store_expr_iter(sdb_store_expr_t *expr, sdb_store_obj_t *obj,
 		if (expr->data.type & SDB_TYPE_ARRAY)
 			array = expr->data;
 	}
-	else
-		return NULL;
+	else {
+		sdb_data_t value = SDB_DATA_INIT;
+		if (sdb_store_expr_eval(expr, obj, &value, filter))
+			return NULL;
+		if (! (value.type & SDB_TYPE_ARRAY)) {
+			sdb_data_free_datum(&value);
+			return NULL;
+		}
+		array = value;
+		free_array = 1;
+	}
 
 	if ((! tree) && (array.type == SDB_TYPE_NULL))
 		return NULL;
 
 	iter = calloc(1, sizeof(*iter));
-	if (! iter)
+	if (! iter) {
+		if (free_array)
+			sdb_data_free_datum(&array);
 		return NULL;
+	}
 
 	sdb_object_ref(SDB_OBJ(obj));
 	sdb_object_ref(SDB_OBJ(expr));
@@ -363,6 +340,7 @@ sdb_store_expr_iter(sdb_store_expr_t *expr, sdb_store_obj_t *obj,
 	iter->expr = expr;
 	iter->tree = tree;
 	iter->array = array;
+	iter->free_array = free_array;
 	iter->filter = filter;
 	return iter;
 } /* sdb_store_expr_iter */
@@ -379,6 +357,8 @@ sdb_store_expr_iter_destroy(sdb_store_expr_iter_t *iter)
 		sdb_avltree_iter_destroy(iter->tree);
 	iter->tree = NULL;
 
+	if (iter->free_array)
+		sdb_data_free_datum(&iter->array);
 	iter->array = null;
 	iter->array_idx = 0;