X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fcore%2Fstore-private.h;h=750a0b32bbb4e83706f5ac7658e25cf8e48904bf;hb=e4925baf923191b68f211354f57e743b7500d0c8;hp=6dc68c0c1fe6f837a55c61b1c92b5208d342cf58;hpb=dd74510898e5a480fc18a1acad7aa4196f732efe;p=sysdb.git

diff --git a/src/core/store-private.h b/src/core/store-private.h
index 6dc68c0..750a0b3 100644
--- a/src/core/store-private.h
+++ b/src/core/store-private.h
@@ -103,6 +103,27 @@ typedef struct {
 #define _last_update super.last_update
 #define _interval super.interval
 
+/*
+ * expressions
+ */
+enum {
+	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) */
+	/* >0: operator id */
+};
+
+struct sdb_store_expr {
+	sdb_object_t super;
+
+	int type; /* see above */
+
+	sdb_store_expr_t *left;
+	sdb_store_expr_t *right;
+
+	sdb_data_t data;
+};
+
 /*
  * conditionals
  */
@@ -135,20 +156,33 @@ typedef struct {
  * matchers
  */
 
-/* when adding to this, also update 'matchers' and 'matchers_tostring'
- * in store_lookup.c */
+/* when adding to this, also update 'MATCHER_SYM' below as well as 'matchers'
+ * and 'matchers_tostring' in store_lookup.c */
 enum {
 	MATCHER_OR,
 	MATCHER_AND,
 	MATCHER_NOT,
 	MATCHER_NAME,
 	MATCHER_ATTR,
+	MATCHER_SERVICE,
+	MATCHER_METRIC,
+	MATCHER_ATTRIBUTE,
 	MATCHER_LT,
 	MATCHER_LE,
 	MATCHER_EQ,
 	MATCHER_GE,
 	MATCHER_GT,
+	MATCHER_CMP_LT,
+	MATCHER_CMP_LE,
+	MATCHER_CMP_EQ,
+	MATCHER_CMP_NE,
+	MATCHER_CMP_GE,
+	MATCHER_CMP_GT,
+	MATCHER_IN,
+	MATCHER_REGEX,
+	MATCHER_NREGEX,
 	MATCHER_ISNULL,
+	MATCHER_ISNNULL,
 };
 
 #define MATCHER_SYM(t) \
@@ -157,12 +191,20 @@ enum {
 		: ((t) == MATCHER_NOT) ? "NOT" \
 		: ((t) == MATCHER_NAME) ? "NAME" \
 		: ((t) == MATCHER_ATTR) ? "ATTR" \
+		: ((t) == MATCHER_SERVICE) ? "SERVICE" \
+		: ((t) == MATCHER_METRIC) ? "METRIC" \
+		: ((t) == MATCHER_ATTRIBUTE) ? "ATTRIBUTE" \
 		: ((t) == MATCHER_LT) ? "<" \
 		: ((t) == MATCHER_LE) ? "<=" \
 		: ((t) == MATCHER_EQ) ? "=" \
+		: ((t) == MATCHER_CMP_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 */
@@ -198,6 +240,23 @@ typedef struct {
 } uop_matcher_t;
 #define UOP_M(m) ((uop_matcher_t *)(m))
 
+/* child matcher */
+typedef struct {
+	sdb_store_matcher_t super;
+	sdb_store_matcher_t *m;
+} child_matcher_t;
+#define CHILD_M(m) ((child_matcher_t *)(m))
+
+/* compare operator matcher */
+typedef struct {
+	sdb_store_matcher_t super;
+
+	/* left and right hand expressions */
+	sdb_store_expr_t *left;
+	sdb_store_expr_t *right;
+} 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;
@@ -217,7 +276,7 @@ typedef struct {
 
 typedef struct {
 	sdb_store_matcher_t super;
-	char *attr_name; /* we only support matching attributes */
+	sdb_store_expr_t *expr;
 } isnull_matcher_t;
 #define ISNULL_M(m) ((isnull_matcher_t *)(m))