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

[sysdb.git] / src / core / store_lookup.c

diff --git a/src/core/store_lookup.c b/src/core/store_lookup.c
index 18a0235536e3f154128ff576cbc624c9dfa49a5f..f72e26dd4e6f4e153ebc2728c4f0b5d067e4fd4d 100644 (file)
--- a/src/core/store_lookup.c
+++ b/src/core/store_lookup.c
@@ -301,7 +301,7 @@ match_isnull(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
        sdb_data_t v = SDB_DATA_INIT;
        int status;
 
-       assert((m->type == MATCHER_ISNULL) || (m->type == MATCHER_ISNNULL));
+       assert(m->type == MATCHER_ISNULL);
 
        if (ISNULL_M(m)->expr->type) {
                /* TODO: this might hide real errors;
@@ -319,8 +319,6 @@ match_isnull(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
 
        if (ISNULL_M(m)->expr->type)
                sdb_data_free_datum(&v);
-       if (m->type == MATCHER_ISNNULL)
-               return !status;
        return status;
 } /* match_isnull */
 
@@ -341,7 +339,6 @@ matchers[] = {
 
        /* unary operators */
        match_isnull,
-       match_isnull,
 
        /* ary operators */
        match_cmp,
@@ -352,6 +349,8 @@ matchers[] = {
        match_cmp,
        match_regex,
        match_regex,
+
+       NULL, /* QUERY */
 };
 
 /*
@@ -454,7 +453,7 @@ static int
 isnull_matcher_init(sdb_object_t *obj, va_list ap)
 {
        M(obj)->type = va_arg(ap, int);
-       if ((M(obj)->type != MATCHER_ISNULL) && (M(obj)->type != MATCHER_ISNNULL))
+       if (M(obj)->type != MATCHER_ISNULL)
                return -1;
 
        ISNULL_M(obj)->expr = va_arg(ap, sdb_store_expr_t *);
@@ -635,13 +634,6 @@ sdb_store_isnull_matcher(sdb_store_expr_t *expr)
                                MATCHER_ISNULL, expr));
 } /* sdb_store_isnull_matcher */
 
-sdb_store_matcher_t *
-sdb_store_isnnull_matcher(sdb_store_expr_t *expr)
-{
-       return M(sdb_object_create("isnull-matcher", isnull_type,
-                               MATCHER_ISNNULL, expr));
-} /* sdb_store_isnnull_matcher */
-
 sdb_store_matcher_op_cb
 sdb_store_parse_matcher_op(const char *op)
 {
@@ -744,6 +736,8 @@ sdb_store_matcher_matches(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
        if ((m->type < 0) || ((size_t)m->type >= SDB_STATIC_ARRAY_LEN(matchers)))
                return 0;
 
+       if (! matchers[m->type])
+               return 0;
        return matchers[m->type](m, obj, filter);
 } /* sdb_store_matcher_matches */