store: Drop the special IS-NOT-NULL matcher.

[sysdb.git] / src / core / store-private.h

diff --git a/src/core/store-private.h b/src/core/store-private.h
index 4c38f1570bca1d449a4478fa33119e410cf33136..1342a5b58fca93508d93f00571753be9b7e3d5db 100644 (file)
--- a/src/core/store-private.h
+++ b/src/core/store-private.h
@@ -103,10 +103,24 @@ typedef struct {
 #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
  */
+
 enum {
+       TYPED_EXPR  = -3, /* obj type stored in data.data.integer */
        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) */
@@ -124,6 +138,14 @@ struct sdb_store_expr {
 
        sdb_data_t data;
 };
+#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" \
+               : ((e)->type == FIELD_VALUE) ? SDB_FIELD_TO_NAME((e)->data.data.integer) \
+               : ((e)->type == 0) ? "<constant>" \
+               : ((e)->type > 0) ? SDB_DATA_OP_TO_STRING((e)->type) \
+               : "<unknown>")
 
 /*
  * matchers
@@ -136,44 +158,47 @@ enum {
        MATCHER_AND,
        MATCHER_NOT,
        MATCHER_ANY,
+       MATCHER_ALL,
+       MATCHER_IN,
+       MATCHER_NIN,
+
+       /* unary operators */
+       MATCHER_ISNULL,
+
+       /* ary operators */
        MATCHER_LT,
        MATCHER_LE,
        MATCHER_EQ,
        MATCHER_NE,
        MATCHER_GE,
        MATCHER_GT,
-       MATCHER_IN,
        MATCHER_REGEX,
        MATCHER_NREGEX,
-       MATCHER_ISNULL,
-       MATCHER_ISNNULL,
+
+       /* a generic query */
+       MATCHER_QUERY,
 };
 
 #define MATCHER_SYM(t) \
        (((t) == MATCHER_OR) ? "OR" \
                : ((t) == MATCHER_AND) ? "AND" \
                : ((t) == MATCHER_NOT) ? "NOT" \
-               : ((t) == MATCHER_NAME) ? "NAME" \
                : ((t) == MATCHER_ANY) ? "ANY" \
+               : ((t) == MATCHER_ALL) ? "ALL" \
+               : ((t) == MATCHER_IN) ? "IN" \
+               : ((t) == MATCHER_NIN) ? "NOT IN" \
+               : ((t) == MATCHER_ISNULL) ? "IS NULL" \
                : ((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" \
+               : ((t) == MATCHER_QUERY) ? "QUERY" \
                : "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;
@@ -204,7 +229,7 @@ typedef struct {
 /* iter matcher */
 typedef struct {
        sdb_store_matcher_t super;
-       int type;
+       sdb_store_expr_t *iter;
        sdb_store_matcher_t *m;
 } iter_matcher_t;
 #define ITER_M(m) ((iter_matcher_t *)(m))
@@ -219,15 +244,6 @@ typedef struct {
 } 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;
-
-       int obj_type;
-       string_matcher_t name;
-} name_matcher_t;
-#define NAME_M(m) ((name_matcher_t *)(m))
-
 typedef struct {
        sdb_store_matcher_t super;
        sdb_store_expr_t *expr;