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

diff --git a/src/core/store-private.h b/src/core/store-private.h
index 603648c..6dc68c0 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,7 +42,11 @@
 extern "C" {
 #endif
 
-struct sdb_store_base {
+/*
+ * core types
+ */
+
+struct sdb_store_obj {
 	sdb_object_t super;
 
 	/* object type */
@@ -50,13 +55,15 @@ struct sdb_store_base {
 	/* common meta information */
 	sdb_time_t last_update;
 	sdb_time_t interval; /* moving average */
-	sdb_store_base_t *parent;
+	char **backends;
+	size_t backends_num;
+	sdb_store_obj_t *parent;
 };
-#define STORE_BASE(obj) ((sdb_store_base_t *)(obj))
-#define STORE_CONST_BASE(obj) ((const sdb_store_base_t *)(obj))
+#define STORE_OBJ(obj) ((sdb_store_obj_t *)(obj))
+#define STORE_CONST_OBJ(obj) ((const sdb_store_obj_t *)(obj))
 
 typedef struct {
-	sdb_store_base_t super;
+	sdb_store_obj_t super;
 
 	sdb_data_t value;
 } sdb_attribute_t;
@@ -64,18 +71,30 @@ typedef struct {
 #define CONST_ATTR(obj) ((const sdb_attribute_t *)(obj))
 
 typedef struct {
-	sdb_store_base_t super;
+	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))
 
 typedef struct {
-	sdb_store_base_t super;
+	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))
 
-	sdb_llist_t *services;
-	sdb_llist_t *attributes;
+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))
@@ -88,8 +107,10 @@ typedef struct {
  * conditionals
  */
 
-/* compares a store object using the specified conditional */
-typedef int (*cmp_cb)(sdb_store_base_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;
@@ -99,10 +120,17 @@ 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
  */
@@ -120,6 +148,7 @@ enum {
 	MATCHER_EQ,
 	MATCHER_GE,
 	MATCHER_GT,
+	MATCHER_ISNULL,
 };
 
 #define MATCHER_SYM(t) \
@@ -133,6 +162,7 @@ enum {
 		: ((t) == MATCHER_EQ) ? "=" \
 		: ((t) == MATCHER_GE) ? ">=" \
 		: ((t) == MATCHER_GT) ? ">" \
+		: ((t) == MATCHER_ISNULL) ? "IS NULL" \
 		: "UNKNOWN")
 
 /* match the name of something */
@@ -185,6 +215,12 @@ typedef struct {
 } attr_matcher_t;
 #define ATTR_M(m) ((attr_matcher_t *)(m))
 
+typedef struct {
+	sdb_store_matcher_t super;
+	char *attr_name; /* we only support matching attributes */
+} isnull_matcher_t;
+#define ISNULL_M(m) ((isnull_matcher_t *)(m))
+
 /* match using conditionals */
 typedef struct {
 	sdb_store_matcher_t super;