X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=src%2Fcore%2Fstore-private.h;h=953a8826c741abbb21e0b8b3e9871922da3e00d8;hp=0df3c7ba041c5eae961e116231c87605e46b0a47;hb=7e192f00497c9837856530d2ca5559ec86715502;hpb=3da6e0cdfaba4755f5d272100e95528d33aae322

diff --git a/src/core/store-private.h b/src/core/store-private.h
index 0df3c7b..953a882 100644
--- a/src/core/store-private.h
+++ b/src/core/store-private.h
@@ -78,10 +78,22 @@ typedef struct {
 #define SVC(obj) ((sdb_service_t *)(obj))
 #define CONST_SVC(obj) ((const sdb_service_t *)(obj))
 
+typedef struct {
+	sdb_store_obj_t super;
+
+	sdb_avltree_t *attributes;
+	struct {
+		char *type;
+		char *id;
+	} store;
+} sdb_metric_t;
+#define METRIC(obj) ((sdb_metric_t *)(obj))
+
 typedef struct {
 	sdb_store_obj_t super;
 
 	sdb_avltree_t *services;
+	sdb_avltree_t *metrics;
 	sdb_avltree_t *attributes;
 } sdb_host_t;
 #define HOST(obj) ((sdb_host_t *)(obj))
@@ -92,66 +104,72 @@ typedef struct {
 #define _interval super.interval
 
 /*
- * conditionals
+ * expressions
  */
 
-/* compares an object using the specified conditional and taking the specified
- * filter into account */
-typedef int (*cmp_cb)(sdb_store_obj_t *, sdb_store_cond_t *,
-		sdb_store_matcher_t *);
+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_cond {
+struct sdb_store_expr {
 	sdb_object_t super;
-	cmp_cb cmp;
-};
 
-typedef struct {
-	sdb_store_cond_t super;
-	char *name;
-	sdb_store_expr_t *expr;
-} attr_cond_t;
-#define ATTR_C(obj) ((attr_cond_t *)(obj))
+	int type; /* see above */
+	int data_type;
+
+	sdb_store_expr_t *left;
+	sdb_store_expr_t *right;
+
+	sdb_data_t data;
+};
 
 /*
  * matchers
  */
 
-/* when adding to this, also update 'matchers' and 'matchers_tostring'
- * in store_lookup.c */
+/* when adding to this, also update 'MATCHER_SYM' below and 'matchers' in
+ * store_lookup.c */
 enum {
 	MATCHER_OR,
 	MATCHER_AND,
 	MATCHER_NOT,
-	MATCHER_NAME,
-	MATCHER_ATTR,
+	MATCHER_ANY,
+	MATCHER_ALL,
 	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_ATTR) ? "ATTR" \
+		: ((t) == MATCHER_ANY) ? "ANY" \
+		: ((t) == MATCHER_ALL) ? "ALL" \
 		: ((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;
@@ -179,36 +197,30 @@ typedef struct {
 } uop_matcher_t;
 #define UOP_M(m) ((uop_matcher_t *)(m))
 
-/* match any type of object by it's name */
+/* iter matcher */
 typedef struct {
 	sdb_store_matcher_t super;
+	int type;
+	sdb_store_matcher_t *m;
+} iter_matcher_t;
+#define ITER_M(m) ((iter_matcher_t *)(m))
 
-	int obj_type;
-	string_matcher_t name;
-} name_matcher_t;
-#define NAME_M(m) ((name_matcher_t *)(m))
-
-/* match attributes */
+/* compare operator matcher */
 typedef struct {
 	sdb_store_matcher_t super;
-	char *name;
-	string_matcher_t value;
-} attr_matcher_t;
-#define ATTR_M(m) ((attr_matcher_t *)(m))
+
+	/* 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))
 
 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))
 
-/* match using conditionals */
-typedef struct {
-	sdb_store_matcher_t super;
-	sdb_store_cond_t *cond;
-} cond_matcher_t;
-#define COND_M(m) ((cond_matcher_t *)(m))
-
 #ifdef __cplusplus
 } /* extern "C" */
 #endif