diff --git a/src/core/store_expr.c b/src/core/store_expr.c
index 4d1fccb47399b540777d1729977fb8473be37316..7d674bc2f6b8e77bd87432b81532b34313da17ad 100644 (file)
--- a/src/core/store_expr.c
+++ b/src/core/store_expr.c
#include "sysdb.h"
#include "core/store-private.h"
+#include "core/data.h"
#include "core/object.h"
#include <assert.h>
struct sdb_store_expr {
sdb_object_t super;
+ /*
+ * type:
+ * -1: field value (field type store in data.data.integer)
+ * 0: const value (stored in data)
+ * >0: operator id
+ */
int type;
+
sdb_store_expr_t *left;
sdb_store_expr_t *right;
sdb_store_expr_t *expr = SDB_STORE_EXPR(obj);
- if (! type) {
+ if (type <= 0) {
if (! value)
return -1;
} else {
sdb_store_expr_t *
sdb_store_expr_create(int op, sdb_store_expr_t *left, sdb_store_expr_t *right)
{
+ if ((op < 0) || (SDB_DATA_CONCAT < op))
+ return NULL;
return SDB_STORE_EXPR(sdb_object_create("store-expr", expr_type,
op, left, right, NULL));
} /* sdb_store_expr_create */
+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))
+ return NULL;
+ return SDB_STORE_EXPR(sdb_object_create("store-fieldvalue", expr_type,
+ -1, NULL, NULL, &value));
+} /* sdb_store_expr_fieldvalue */
+
sdb_store_expr_t *
sdb_store_expr_constvalue(const sdb_data_t *value)
{
} /* sdb_store_expr_constvalue */
int
-sdb_store_expr_eval(sdb_store_expr_t *expr, sdb_data_t *res)
+sdb_store_expr_eval(sdb_store_expr_t *expr, sdb_store_obj_t *obj,
+ sdb_data_t *res)
{
sdb_data_t v1 = SDB_DATA_INIT, v2 = SDB_DATA_INIT;
if (! expr->type)
return sdb_data_copy(res, &expr->data);
+ else if (expr->type < 0)
+ return sdb_store_get_field(obj, (int)expr->data.data.integer, res);
- if (sdb_store_expr_eval(expr->left, &v1))
+ if (sdb_store_expr_eval(expr->left, obj, &v1))
return -1;
- if (sdb_store_expr_eval(expr->right, &v2)) {
+ if (sdb_store_expr_eval(expr->right, obj, &v2)) {
sdb_data_free_datum(&v1);
return -1;
}