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 cde2216327582968966d6f053adc62174ee0de99..1342a5b58fca93508d93f00571753be9b7e3d5db 100644 (file)
--- a/src/core/store-private.h
+++ b/src/core/store-private.h
@@ -103,6 +103,18 @@ 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
  */
@@ -126,6 +138,7 @@ 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" \
@@ -151,7 +164,6 @@ enum {
 
        /* unary operators */
        MATCHER_ISNULL,
-       MATCHER_ISNNULL,
 
        /* ary operators */
        MATCHER_LT,
@@ -162,6 +174,9 @@ enum {
        MATCHER_GT,
        MATCHER_REGEX,
        MATCHER_NREGEX,
+
+       /* a generic query */
+       MATCHER_QUERY,
 };
 
 #define MATCHER_SYM(t) \
@@ -173,7 +188,6 @@ enum {
                : ((t) == MATCHER_IN) ? "IN" \
                : ((t) == MATCHER_NIN) ? "NOT IN" \
                : ((t) == MATCHER_ISNULL) ? "IS NULL" \
-               : ((t) == MATCHER_ISNNULL) ? "IS NOT NULL" \
                : ((t) == MATCHER_LT) ? "<" \
                : ((t) == MATCHER_LE) ? "<=" \
                : ((t) == MATCHER_EQ) ? "=" \
@@ -182,6 +196,7 @@ enum {
                : ((t) == MATCHER_GT) ? ">" \
                : ((t) == MATCHER_REGEX) ? "=~" \
                : ((t) == MATCHER_NREGEX) ? "!~" \
+               : ((t) == MATCHER_QUERY) ? "QUERY" \
                : "UNKNOWN")
 
 /* matcher base type */