X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fcore%2Fstore_expr.c;h=a0047a1f12e1fa8498ef0ed5255373478f98a070;hb=93b9a7b401a9ec48239c0de6b55aa2377849c2c8;hp=0a8757f0911568b5b9b2cf8c66ad1fcc0ade62cd;hpb=bd23ae3fbe9af45288d515bd5e85742f8766fcf1;p=sysdb.git

diff --git a/src/core/store_expr.c b/src/core/store_expr.c
index 0a8757f..a0047a1 100644
--- a/src/core/store_expr.c
+++ b/src/core/store_expr.c
@@ -59,6 +59,8 @@ expr_init(sdb_object_t *obj, va_list ap)
 	if (type <= 0) {
 		if (! value)
 			return -1;
+		if ((type == TYPED_EXPR) && (! left))
+			return -1;
 	} else {
 		if (value)
 			return -1;
@@ -75,6 +77,9 @@ expr_init(sdb_object_t *obj, va_list ap)
 	expr->type  = type;
 	expr->left  = left;
 	expr->right = right;
+
+	/* unknown for now */
+	expr->data_type = -1;
 	return 0;
 } /* expr_init */
 
@@ -103,29 +108,54 @@ sdb_store_expr_t *
 sdb_store_expr_create(int op, sdb_store_expr_t *left, sdb_store_expr_t *right)
 {
 	sdb_data_t value = SDB_DATA_INIT;
+	sdb_store_expr_t *e;
 
 	if ((op < 0) || (SDB_DATA_CONCAT < op) || (! left) || (! right))
 		return NULL;
 
-	if (left->type || right->type)
-		return SDB_STORE_EXPR(sdb_object_create("store-expr", expr_type,
+	if (left->type || right->type) {
+		e = SDB_STORE_EXPR(sdb_object_create("store-expr", expr_type,
 					op, left, right, NULL));
+		e->data_type = sdb_data_expr_type(op, left->type, right->type);
+		return e;
+	}
 	/* else: both expressions are constant values; evaluate now */
 
 	if (sdb_data_expr_eval(op, &left->data, &right->data, &value))
 		return NULL;
-	return SDB_STORE_EXPR(sdb_object_create("store-constvalue", expr_type,
+	e = SDB_STORE_EXPR(sdb_object_create("store-constvalue", expr_type,
 				0, NULL, NULL, &value));
+	e->data_type = value.type;
+	return e;
 } /* sdb_store_expr_create */
 
+sdb_store_expr_t *
+sdb_store_expr_typed(int typ, sdb_store_expr_t *expr)
+{
+	sdb_data_t value = { SDB_TYPE_INTEGER, { .integer = typ } };
+	sdb_store_expr_t *e;
+
+	if ((typ < SDB_HOST) || (SDB_ATTRIBUTE < typ))
+		return NULL;
+
+	e = SDB_STORE_EXPR(sdb_object_create("store-typedexpr", expr_type,
+				TYPED_EXPR, expr, NULL, &value));
+	e->data_type = expr->data_type;
+	return e;
+} /* sdb_store_expr_typed */
+
 sdb_store_expr_t *
 sdb_store_expr_fieldvalue(int field)
 {
 	sdb_data_t value = { SDB_TYPE_INTEGER, { .integer = field } };
-	if ((field < 0) || (SDB_FIELD_BACKEND < field))
+	sdb_store_expr_t *e;
+
+	if ((field < SDB_FIELD_NAME) || (SDB_FIELD_BACKEND < field))
 		return NULL;
-	return SDB_STORE_EXPR(sdb_object_create("store-fieldvalue", expr_type,
+	e = SDB_STORE_EXPR(sdb_object_create("store-fieldvalue", expr_type,
 				FIELD_VALUE, NULL, NULL, &value));
+	e->data_type = SDB_FIELD_TYPE(field);
+	return e;
 } /* sdb_store_expr_fieldvalue */
 
 sdb_store_expr_t *
@@ -142,6 +172,7 @@ sdb_store_expr_attrvalue(const char *name)
 				ATTR_VALUE, NULL, NULL, &value));
 	if (! expr)
 		free(value.data.string);
+	expr->data_type = -1;
 	return expr;
 } /* sdb_store_expr_attrvalue */
 
@@ -149,10 +180,14 @@ sdb_store_expr_t *
 sdb_store_expr_constvalue(const sdb_data_t *value)
 {
 	sdb_data_t data = SDB_DATA_INIT;
+	sdb_store_expr_t *e;
+
 	if (sdb_data_copy(&data, value))
 		return NULL;
-	return SDB_STORE_EXPR(sdb_object_create("store-constvalue", expr_type,
+	e = SDB_STORE_EXPR(sdb_object_create("store-constvalue", expr_type,
 				0, NULL, NULL, &data));
+	e->data_type = data.type;
+	return e;
 } /* sdb_store_expr_constvalue */
 
 int
@@ -172,8 +207,28 @@ sdb_store_expr_eval(sdb_store_expr_t *expr, sdb_store_obj_t *obj,
 		return sdb_data_copy(res, &expr->data);
 	else if (expr->type == FIELD_VALUE)
 		return sdb_store_get_field(obj, (int)expr->data.data.integer, res);
-	else if (expr->type == ATTR_VALUE)
-		return sdb_store_get_attr(obj, expr->data.data.string, res, filter);
+	else if (expr->type == ATTR_VALUE) {
+		status = sdb_store_get_attr(obj, expr->data.data.string, res, filter);
+		if ((status < 0) && obj) {
+			/* attribute does not exist => NULL */
+			status = 0;
+			res->type = SDB_TYPE_STRING;
+			res->data.string = NULL;
+		}
+		return status;
+	}
+	else if (expr->type == TYPED_EXPR) {
+		int typ = (int)expr->data.data.integer;
+		if (typ != obj->type) {
+			/* we support self-references and { service, metric } -> host */
+			if ((typ != SDB_HOST)
+					|| ((obj->type != SDB_SERVICE)
+						&& (obj->type != SDB_METRIC)))
+				return -1;
+			obj = obj->parent;
+		}
+		return sdb_store_expr_eval(expr->left, obj, res, filter);
+	}
 
 	if (sdb_store_expr_eval(expr->left, obj, &v1, filter))
 		return -1;