X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=src%2Fcore%2Fstore-private.h;h=c6350b3530c4a2518ce0a515da601c1256768700;hp=eea43164fed967c4b4e2bdec92e426c10d56e3d0;hb=31566d5c9218638665c0992ccf0b5286899ef855;hpb=135992ebf12bf7aa866848650cbb47d3d3726c6d

diff --git a/src/core/store-private.h b/src/core/store-private.h
index eea4316..c6350b3 100644
--- a/src/core/store-private.h
+++ b/src/core/store-private.h
@@ -33,6 +33,7 @@
 #define SDB_CORE_STORE_PRIVATE_H 1
 
 #include "core/store.h"
+#include "utils/avltree.h"
 
 #include <sys/types.h>
 #include <regex.h>
@@ -41,6 +42,10 @@
 extern "C" {
 #endif
 
+/*
+ * core types
+ */
+
 struct sdb_store_obj {
 	sdb_object_t super;
 
@@ -68,7 +73,7 @@ typedef struct {
 typedef struct {
 	sdb_store_obj_t super;
 
-	sdb_llist_t *attributes;
+	sdb_avltree_t *attributes;
 } sdb_service_t;
 #define SVC(obj) ((sdb_service_t *)(obj))
 #define CONST_SVC(obj) ((const sdb_service_t *)(obj))
@@ -76,8 +81,20 @@ typedef struct {
 typedef struct {
 	sdb_store_obj_t super;
 
-	sdb_llist_t *services;
-	sdb_llist_t *attributes;
+	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))
 #define CONST_HOST(obj) ((const sdb_host_t *)(obj))
@@ -86,12 +103,35 @@ 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
  */
 
-/* compares a host using the specified conditional */
-typedef int (*cmp_cb)(sdb_host_t *, sdb_store_cond_t *);
+/* 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 *);
 
 struct sdb_store_cond {
 	sdb_object_t super;
@@ -101,27 +141,48 @@ struct sdb_store_cond {
 typedef struct {
 	sdb_store_cond_t super;
 	char *name;
-	sdb_data_t value;
+	sdb_store_expr_t *expr;
 } attr_cond_t;
 #define ATTR_C(obj) ((attr_cond_t *)(obj))
 
+typedef struct {
+	sdb_store_cond_t super;
+	int field;
+	sdb_store_expr_t *expr;
+} obj_cond_t;
+#define OBJ_C(obj) ((obj_cond_t *)(obj))
+
 /*
  * 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_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) \
@@ -130,11 +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 */
@@ -170,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;
@@ -187,6 +274,12 @@ typedef struct {
 } attr_matcher_t;
 #define ATTR_M(m) ((attr_matcher_t *)(m))
 
+typedef struct {
+	sdb_store_matcher_t super;
+	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;