diff --git a/src/core/store_expr.c b/src/core/store_expr.c
index 8fc063d11e64ca621fd2206ad9a46b242d36cc48..80c1f4ac25c756383d579a1a92042045f5df6cec 100644 (file)
--- a/src/core/store_expr.c
+++ b/src/core/store_expr.c
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));
if ((context != SDB_HOST) && (context != SDB_SERVICE)
&& (context != SDB_METRIC) && (context != SDB_ATTRIBUTE))
return 0;
- return expr->data.data.integer == SDB_FIELD_BACKEND;
+ 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);
sdb_avltree_iter_t *tree = NULL;
sdb_data_t array = SDB_DATA_INIT;
- if ((! expr) || (! obj))
+ if (! expr)
return NULL;
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);
}
}
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 */