X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=src%2Fcore%2Fstore-private.h;h=e8514879c1e8ba43ad5af1ec89791a09452357e0;hp=2b6b09662f36a91bad7821ed8baacd152ac7e98c;hb=ed2c9fc3e4ca6840a5a31c735f0cfc02fd21d4fc;hpb=59947b2a42517a95b9c4451c8ebca0c0d8aadc11

diff --git a/src/core/store-private.h b/src/core/store-private.h
index 2b6b096..e851487 100644
--- a/src/core/store-private.h
+++ b/src/core/store-private.h
@@ -48,6 +48,7 @@ extern "C" {
 
 struct sdb_store_obj {
 	sdb_object_t super;
+#define _name super.name
 
 	/* object type */
 	int type;
@@ -66,17 +67,17 @@ typedef struct {
 	sdb_store_obj_t super;
 
 	sdb_data_t value;
-} sdb_attribute_t;
-#define ATTR(obj) ((sdb_attribute_t *)(obj))
-#define CONST_ATTR(obj) ((const sdb_attribute_t *)(obj))
+} attr_t;
+#define ATTR(obj) ((attr_t *)(obj))
+#define CONST_ATTR(obj) ((const attr_t *)(obj))
 
 typedef struct {
 	sdb_store_obj_t super;
 
 	sdb_avltree_t *attributes;
-} sdb_service_t;
-#define SVC(obj) ((sdb_service_t *)(obj))
-#define CONST_SVC(obj) ((const sdb_service_t *)(obj))
+} service_t;
+#define SVC(obj) ((service_t *)(obj))
+#define CONST_SVC(obj) ((const service_t *)(obj))
 
 typedef struct {
 	sdb_store_obj_t super;
@@ -95,14 +96,26 @@ typedef struct {
 	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))
+} host_t;
+#define HOST(obj) ((host_t *)(obj))
+#define CONST_HOST(obj) ((const host_t *)(obj))
 
 /* shortcuts for accessing service/host attributes */
 #define _last_update super.last_update
 #define _interval super.interval
 
+/*
+ * querying
+ */
+
+struct sdb_store_query {
+	sdb_object_t super;
+	sdb_ast_node_t *ast;
+	sdb_store_matcher_t *matcher;
+	sdb_store_matcher_t *filter;
+};
+#define QUERY(m) ((sdb_store_query_t *)(m))
+
 /*
  * expressions
  */
@@ -126,7 +139,7 @@ struct sdb_store_expr {
 
 	sdb_data_t data;
 };
-#define EXPR_INIT { SDB_OBJECT_INIT, 0, -1, NULL, NULL, SDB_DATA_INIT }
+#define CONST_EXPR(v) { SDB_OBJECT_INIT, 0, (v).type, NULL, NULL, (v) }
 #define EXPR_TO_STRING(e) \
 	(((e)->type == TYPED_EXPR) ? "<typed>" \
 		: ((e)->type == ATTR_VALUE) ? "attribute" \
@@ -148,11 +161,11 @@ enum {
 	MATCHER_ANY,
 	MATCHER_ALL,
 	MATCHER_IN,
-	MATCHER_NIN,
 
 	/* unary operators */
 	MATCHER_ISNULL,
-	MATCHER_ISNNULL,
+	MATCHER_ISTRUE,
+	MATCHER_ISFALSE,
 
 	/* ary operators */
 	MATCHER_LT,
@@ -163,6 +176,9 @@ enum {
 	MATCHER_GT,
 	MATCHER_REGEX,
 	MATCHER_NREGEX,
+
+	/* a generic query */
+	MATCHER_QUERY,
 };
 
 #define MATCHER_SYM(t) \
@@ -172,9 +188,9 @@ enum {
 		: ((t) == MATCHER_ANY) ? "ANY" \
 		: ((t) == MATCHER_ALL) ? "ALL" \
 		: ((t) == MATCHER_IN) ? "IN" \
-		: ((t) == MATCHER_NIN) ? "NOT IN" \
 		: ((t) == MATCHER_ISNULL) ? "IS NULL" \
-		: ((t) == MATCHER_ISNNULL) ? "IS NOT NULL" \
+		: ((t) == MATCHER_ISTRUE) ? "IS TRUE" \
+		: ((t) == MATCHER_ISFALSE) ? "IS FALSE" \
 		: ((t) == MATCHER_LT) ? "<" \
 		: ((t) == MATCHER_LE) ? "<=" \
 		: ((t) == MATCHER_EQ) ? "=" \
@@ -183,6 +199,7 @@ enum {
 		: ((t) == MATCHER_GT) ? ">" \
 		: ((t) == MATCHER_REGEX) ? "=~" \
 		: ((t) == MATCHER_NREGEX) ? "!~" \
+		: ((t) == MATCHER_QUERY) ? "QUERY" \
 		: "UNKNOWN")
 
 /* matcher base type */
@@ -233,8 +250,8 @@ typedef struct {
 typedef struct {
 	sdb_store_matcher_t super;
 	sdb_store_expr_t *expr;
-} isnull_matcher_t;
-#define ISNULL_M(m) ((isnull_matcher_t *)(m))
+} unary_matcher_t;
+#define UNARY_M(m) ((unary_matcher_t *)(m))
 
 #ifdef __cplusplus
 } /* extern "C" */