X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fcore%2Fstore-private.h;h=97e8a6c2fcce7fff076b2f0275ead0a2ae42306a;hb=93b9a7b401a9ec48239c0de6b55aa2377849c2c8;hp=550668db2ebd1259818411c8a7fe7e769e8012db;hpb=643b6cdd66f789baac6a4f13d1466f7688e22670;p=sysdb.git

diff --git a/src/core/store-private.h b/src/core/store-private.h
index 550668d..97e8a6c 100644
--- a/src/core/store-private.h
+++ b/src/core/store-private.h
@@ -106,7 +106,9 @@ typedef struct {
 /*
  * expressions
  */
+
 enum {
+	TYPED_EXPR  = -3, /* obj type stored in data.data.integer */
 	ATTR_VALUE  = -2, /* attr name stored in data.data.string */
 	FIELD_VALUE = -1, /* field type stored in data.data.integer */
 	/*  0: const value (stored in data) */
@@ -117,12 +119,20 @@ struct sdb_store_expr {
 	sdb_object_t super;
 
 	int type; /* see above */
+	int data_type;
 
 	sdb_store_expr_t *left;
 	sdb_store_expr_t *right;
 
 	sdb_data_t data;
 };
+#define EXPR_TO_STRING(e) \
+	(((e)->type == TYPED_EXPR) ? "<typed>" \
+		: ((e)->type == ATTR_VALUE) ? "attribute" \
+		: ((e)->type == FIELD_VALUE) ? SDB_FIELD_TO_NAME((e)->data.data.integer) \
+		: ((e)->type == 0) ? "<constant>" \
+		: ((e)->type > 0) ? SDB_DATA_OP_TO_STRING((e)->type) \
+		: "<unknown>")
 
 /*
  * matchers
@@ -134,50 +144,44 @@ enum {
 	MATCHER_OR,
 	MATCHER_AND,
 	MATCHER_NOT,
-	MATCHER_NAME,
-	MATCHER_SERVICE,
-	MATCHER_METRIC,
-	MATCHER_ATTRIBUTE,
+	MATCHER_ANY,
+	MATCHER_ALL,
+	MATCHER_IN,
+
+	/* unary operators */
+	MATCHER_ISNULL,
+	MATCHER_ISNNULL,
+
+	/* ary operators */
 	MATCHER_LT,
 	MATCHER_LE,
 	MATCHER_EQ,
 	MATCHER_NE,
 	MATCHER_GE,
 	MATCHER_GT,
-	MATCHER_IN,
 	MATCHER_REGEX,
 	MATCHER_NREGEX,
-	MATCHER_ISNULL,
-	MATCHER_ISNNULL,
 };
 
 #define MATCHER_SYM(t) \
 	(((t) == MATCHER_OR) ? "OR" \
 		: ((t) == MATCHER_AND) ? "AND" \
 		: ((t) == MATCHER_NOT) ? "NOT" \
-		: ((t) == MATCHER_NAME) ? "NAME" \
-		: ((t) == MATCHER_SERVICE) ? "SERVICE" \
-		: ((t) == MATCHER_METRIC) ? "METRIC" \
-		: ((t) == MATCHER_ATTRIBUTE) ? "ATTRIBUTE" \
+		: ((t) == MATCHER_ANY) ? "ANY" \
+		: ((t) == MATCHER_ALL) ? "ALL" \
+		: ((t) == MATCHER_IN) ? "IN" \
+		: ((t) == MATCHER_ISNULL) ? "IS NULL" \
+		: ((t) == MATCHER_ISNNULL) ? "IS NOT NULL" \
 		: ((t) == MATCHER_LT) ? "<" \
 		: ((t) == MATCHER_LE) ? "<=" \
 		: ((t) == MATCHER_EQ) ? "=" \
 		: ((t) == MATCHER_NE) ? "!=" \
 		: ((t) == MATCHER_GE) ? ">=" \
 		: ((t) == MATCHER_GT) ? ">" \
-		: ((t) == MATCHER_IN) ? "IN" \
 		: ((t) == MATCHER_REGEX) ? "=~" \
 		: ((t) == MATCHER_NREGEX) ? "!~" \
-		: ((t) == MATCHER_ISNULL) ? "IS NULL" \
-		: ((t) == MATCHER_ISNNULL) ? "IS NOT NULL" \
 		: "UNKNOWN")
 
-/* match the name of something */
-typedef struct {
-	char    *name;
-	regex_t *name_re;
-} string_matcher_t;
-
 /* matcher base type */
 struct sdb_store_matcher {
 	sdb_object_t super;
@@ -205,12 +209,13 @@ typedef struct {
 } uop_matcher_t;
 #define UOP_M(m) ((uop_matcher_t *)(m))
 
-/* child matcher */
+/* iter matcher */
 typedef struct {
 	sdb_store_matcher_t super;
+	int type;
 	sdb_store_matcher_t *m;
-} child_matcher_t;
-#define CHILD_M(m) ((child_matcher_t *)(m))
+} iter_matcher_t;
+#define ITER_M(m) ((iter_matcher_t *)(m))
 
 /* compare operator matcher */
 typedef struct {
@@ -222,15 +227,6 @@ typedef struct {
 } cmp_matcher_t;
 #define CMP_M(m) ((cmp_matcher_t *)(m))
 
-/* match any type of object by it's name */
-typedef struct {
-	sdb_store_matcher_t super;
-
-	int obj_type;
-	string_matcher_t name;
-} name_matcher_t;
-#define NAME_M(m) ((name_matcher_t *)(m))
-
 typedef struct {
 	sdb_store_matcher_t super;
 	sdb_store_expr_t *expr;