X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=src%2Fcore%2Fstore_expr.c;h=6405002cfda3187177dc9b49dae9ce2bc8e82322;hp=ddaeccd1f5f0dac21f196e2879d17b226b351dea;hb=060c0cebbae60bd3d90691858465d462fba0d952;hpb=30fc5131b3ad5b854f34755c92a970f4bdf9cd7c

diff --git a/src/core/store_expr.c b/src/core/store_expr.c
index ddaeccd..6405002 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;
 };
@@ -167,7 +169,7 @@ sdb_store_expr_fieldvalue(int field)
 	sdb_data_t value = { SDB_TYPE_INTEGER, { .integer = field } };
 	sdb_store_expr_t *e;
 
-	if ((field < SDB_FIELD_NAME) || (SDB_FIELD_BACKEND < field))
+	if ((field < SDB_FIELD_NAME) || (SDB_FIELD_TIMESERIES < field))
 		return NULL;
 	e = SDB_STORE_EXPR(sdb_object_create("store-fieldvalue", expr_type,
 				FIELD_VALUE, NULL, NULL, &value));
@@ -261,39 +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;
-		return expr->data.data.integer == SDB_FIELD_BACKEND;
-	}
-	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)
@@ -301,11 +270,31 @@ 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) || (! obj))
+	if (! expr)
 		return NULL;
 
+	while (expr->type == TYPED_EXPR) {
+		int type = (int)expr->data.data.integer;
+
+		if (obj->type == type) {
+			/* self reference */
+		}
+		else if ((type == SDB_HOST)
+				&& ((obj->type == SDB_SERVICE)
+					|| (obj->type == SDB_METRIC))) {
+			/* reference to parent host */
+			obj = obj->parent;
+		}
+		else
+			break;
+		expr = expr->left;
+	}
+
 	if (expr->type == TYPED_EXPR) {
+		if (! obj)
+			return NULL;
 		if (obj->type == SDB_HOST) {
 			if (expr->data.data.integer == SDB_SERVICE)
 				tree = sdb_avltree_get_iter(HOST(obj)->services);
@@ -324,6 +313,8 @@ sdb_store_expr_iter(sdb_store_expr_t *expr, sdb_store_obj_t *obj,
 		}
 	}
 	else if (expr->type == FIELD_VALUE) {
+		if (! obj)
+			return NULL;
 		if (expr->data.data.integer == SDB_FIELD_BACKEND) {
 			/* while scanning the store, we hold a read lock, so it's safe to
 			 * access the data without copying */
@@ -336,15 +327,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));
@@ -354,6 +357,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 */
@@ -370,6 +374,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;
 
@@ -385,8 +391,21 @@ sdb_store_expr_iter_has_next(sdb_store_expr_iter_t *iter)
 	if (! iter)
 		return 0;
 
-	if (iter->tree)
+	if (iter->tree) {
+		/* this function may be called before get_next,
+		 * so we'll have to apply filters here as well */
+		if (iter->filter) {
+			sdb_store_obj_t *child;
+			while ((child = STORE_OBJ(sdb_avltree_iter_peek_next(iter->tree)))) {
+				if (sdb_store_matcher_matches(iter->filter, child, NULL))
+					break;
+				(void)sdb_avltree_iter_get_next(iter->tree);
+			}
+		}
+
 		return sdb_avltree_iter_has_next(iter->tree);
+	}
+
 	return iter->array_idx < iter->array.data.array.length;
 } /* sdb_store_expr_iter_has_next */
 
@@ -417,10 +436,13 @@ sdb_store_expr_iter_get_next(sdb_store_expr_iter_t *iter)
 		}
 
 		/* Skip over any filtered objects */
-		if (iter->filter)
-			while ((child = STORE_OBJ(sdb_avltree_iter_peek_next(iter->tree))))
+		if (iter->filter) {
+			while ((child = STORE_OBJ(sdb_avltree_iter_peek_next(iter->tree)))) {
 				if (sdb_store_matcher_matches(iter->filter, child, NULL))
 					break;
+				(void)sdb_avltree_iter_get_next(iter->tree);
+			}
+		}
 
 		return ret;
 	}