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 060ec7bccf02c7b19acfccc7a6d29b5058986c01..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
  */
@@ -152,7 +164,6 @@ enum {
 
        /* unary operators */
        MATCHER_ISNULL,
-       MATCHER_ISNNULL,
 
        /* ary operators */
        MATCHER_LT,
@@ -177,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) ? "=" \
@@ -240,14 +250,6 @@ typedef struct {
 } isnull_matcher_t;
 #define ISNULL_M(m) ((isnull_matcher_t *)(m))
 
-typedef struct {
-       sdb_store_matcher_t super;
-       sdb_ast_node_t *ast;
-       sdb_store_matcher_t *matcher;
-       sdb_store_matcher_t *filter;
-} query_matcher_t;
-#define QUERY_M(m) ((query_matcher_t *)(m))
-
 #ifdef __cplusplus
 } /* extern "C" */
 #endif