Code

store: Removed unused, old conditional matchers.
[sysdb.git] / src / core / store_lookup.c
index f1baea644a4c2f2b2ee16e18ecc3d531f0e4f723..05e6b74d51b70117bc01a06b1b17ca9ef0f77f50 100644 (file)
@@ -99,79 +99,6 @@ attr_get(sdb_host_t *host, const char *name, sdb_store_matcher_t *filter)
        return attr;
 } /* attr_get */
 
-/*
- * conditional implementations
- */
-
-static int
-attr_cmp(sdb_store_obj_t *obj, sdb_store_cond_t *cond,
-               sdb_store_matcher_t *filter)
-{
-       sdb_attribute_t *attr;
-       sdb_data_t value = SDB_DATA_INIT;
-       int status;
-
-       if (obj->type != SDB_HOST)
-               return INT_MAX;
-
-       if (sdb_store_expr_eval(ATTR_C(cond)->expr, obj, &value, filter))
-               return INT_MAX;
-
-       attr = attr_get(HOST(obj), ATTR_C(cond)->name, filter);
-       if (! attr)
-               status = INT_MAX;
-       else if (attr->value.type != value.type)
-               status = sdb_data_strcmp(&attr->value, &value);
-       else
-               status = sdb_data_cmp(&attr->value, &value);
-       sdb_data_free_datum(&value);
-       return status;
-} /* attr_cmp */
-
-static int
-obj_cmp(sdb_store_obj_t *obj, sdb_store_cond_t *cond,
-               sdb_store_matcher_t *filter)
-{
-       sdb_data_t obj_value = SDB_DATA_INIT;
-       sdb_data_t value = SDB_DATA_INIT;
-       int status;
-
-       if (sdb_store_expr_eval(OBJ_C(cond)->expr, obj, &value, filter))
-               return INT_MAX;
-
-       if (OBJ_C(cond)->field == SDB_FIELD_BACKEND) {
-               /* this implementation is not actually a conditional but rather checks
-                * for equality (or rather, existence) only */
-               size_t i;
-
-               if (value.type != SDB_TYPE_STRING)
-                       return INT_MAX;
-
-               status = INT_MAX;
-               for (i = 0; i < obj->backends_num; ++i) {
-                       if (! strcasecmp(obj->backends[i], value.data.string)) {
-                               status = 0;
-                               break;
-                       }
-               }
-               sdb_data_free_datum(&value);
-               return status;
-       }
-
-       if (sdb_store_get_field(obj, OBJ_C(cond)->field, &obj_value))
-               return INT_MAX;
-       if (obj_value.type != value.type) {
-               sdb_data_free_datum(&obj_value);
-               sdb_data_free_datum(&value);
-               return INT_MAX;
-       }
-
-       status = sdb_data_cmp(&obj_value, &value);
-       sdb_data_free_datum(&obj_value);
-       sdb_data_free_datum(&value);
-       return status;
-} /* obj_cmp */
-
 /*
  * matcher implementations
  */
@@ -323,56 +250,6 @@ match_child(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
        return status;
 } /* match_child */
 
-static int
-match_lt(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
-               sdb_store_matcher_t *filter)
-{
-       int status;
-       assert(m->type == MATCHER_LT);
-       status = COND_M(m)->cond->cmp(obj, COND_M(m)->cond, filter);
-       return (status != INT_MAX) && (status < 0);
-} /* match_lt */
-
-static int
-match_le(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
-               sdb_store_matcher_t *filter)
-{
-       int status;
-       assert(m->type == MATCHER_LE);
-       status = COND_M(m)->cond->cmp(obj, COND_M(m)->cond, filter);
-       return (status != INT_MAX) && (status <= 0);
-} /* match_le */
-
-static int
-match_eq(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
-               sdb_store_matcher_t *filter)
-{
-       int status;
-       assert(m->type == MATCHER_EQ);
-       status = COND_M(m)->cond->cmp(obj, COND_M(m)->cond, filter);
-       return (status != INT_MAX) && (! status);
-} /* match_eq */
-
-static int
-match_ge(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
-               sdb_store_matcher_t *filter)
-{
-       int status;
-       assert(m->type == MATCHER_GE);
-       status = COND_M(m)->cond->cmp(obj, COND_M(m)->cond, filter);
-       return (status != INT_MAX) && (status >= 0);
-} /* match_ge */
-
-static int
-match_gt(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
-               sdb_store_matcher_t *filter)
-{
-       int status;
-       assert(m->type == MATCHER_GT);
-       status = COND_M(m)->cond->cmp(obj, COND_M(m)->cond, filter);
-       return (status != INT_MAX) && (status > 0);
-} /* match_gt */
-
 /*
  * cmp_expr:
  * Compare the values of two expressions when evaluating them using the
@@ -530,7 +407,8 @@ match_regex(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
                free(raw);
        }
 
-       if (sdb_store_expr_eval(CMP_M(m)->left, obj, &v, filter))
+       if ((sdb_store_expr_eval(CMP_M(m)->left, obj, &v, filter))
+                       || (sdb_data_isnull(&v)))
                status = 0;
        else {
                char value[sdb_data_strlen(&v) + 1];
@@ -586,11 +464,6 @@ matchers[] = {
        match_child,
        match_child,
        match_child,
-       match_lt,
-       match_le,
-       match_eq,
-       match_ge,
-       match_gt,
        match_cmp_lt,
        match_cmp_le,
        match_cmp_eq,
@@ -604,69 +477,6 @@ matchers[] = {
        match_isnull,
 };
 
-/*
- * private conditional types
- */
-
-static int
-attr_cond_init(sdb_object_t *obj, va_list ap)
-{
-       const char *name = va_arg(ap, const char *);
-       sdb_store_expr_t *expr = va_arg(ap, sdb_store_expr_t *);
-
-       if (! name)
-               return -1;
-
-       SDB_STORE_COND(obj)->cmp = attr_cmp;
-
-       ATTR_C(obj)->name = strdup(name);
-       if (! ATTR_C(obj)->name)
-               return -1;
-       ATTR_C(obj)->expr = expr;
-       sdb_object_ref(SDB_OBJ(expr));
-       return 0;
-} /* attr_cond_init */
-
-static void
-attr_cond_destroy(sdb_object_t *obj)
-{
-       if (ATTR_C(obj)->name)
-               free(ATTR_C(obj)->name);
-       sdb_object_deref(SDB_OBJ(ATTR_C(obj)->expr));
-} /* attr_cond_destroy */
-
-static sdb_type_t attr_cond_type = {
-       /* size = */ sizeof(attr_cond_t),
-       /* init = */ attr_cond_init,
-       /* destroy = */ attr_cond_destroy,
-};
-
-static int
-obj_cond_init(sdb_object_t *obj, va_list ap)
-{
-       int field = va_arg(ap, int);
-       sdb_store_expr_t *expr = va_arg(ap, sdb_store_expr_t *);
-
-       SDB_STORE_COND(obj)->cmp = obj_cmp;
-
-       OBJ_C(obj)->field = field;
-       OBJ_C(obj)->expr = expr;
-       sdb_object_ref(SDB_OBJ(expr));
-       return 0;
-} /* obj_cond_init */
-
-static void
-obj_cond_destroy(sdb_object_t *obj)
-{
-       sdb_object_deref(SDB_OBJ(OBJ_C(obj)->expr));
-} /* obj_cond_destroy */
-
-static sdb_type_t obj_cond_type = {
-       /* size = */ sizeof(obj_cond_t),
-       /* init = */ obj_cond_init,
-       /* destroy = */ obj_cond_destroy,
-};
-
 /*
  * private matcher types
  */
@@ -745,28 +555,6 @@ attr_matcher_destroy(sdb_object_t *obj)
        string_matcher_destroy(&attr->value);
 } /* attr_matcher_destroy */
 
-static int
-cond_matcher_init(sdb_object_t *obj, va_list ap)
-{
-       int type = va_arg(ap, int);
-       sdb_store_cond_t *cond = va_arg(ap, sdb_store_cond_t *);
-
-       if (! cond)
-               return -1;
-
-       sdb_object_ref(SDB_OBJ(cond));
-
-       M(obj)->type = type;
-       COND_M(obj)->cond = cond;
-       return 0;
-} /* cond_matcher_init */
-
-static void
-cond_matcher_destroy(sdb_object_t *obj)
-{
-       sdb_object_deref(SDB_OBJ(COND_M(obj)->cond));
-} /* cond_matcher_destroy */
-
 static int
 op_matcher_init(sdb_object_t *obj, va_list ap)
 {
@@ -887,12 +675,6 @@ static sdb_type_t attr_type = {
        /* destroy = */ attr_matcher_destroy,
 };
 
-static sdb_type_t cond_type = {
-       /* size = */ sizeof(cond_matcher_t),
-       /* init = */ cond_matcher_init,
-       /* destroy = */ cond_matcher_destroy,
-};
-
 static sdb_type_t op_type = {
        /* size = */ sizeof(op_matcher_t),
        /* init = */ op_matcher_init,
@@ -927,20 +709,6 @@ static sdb_type_t isnull_type = {
  * public API
  */
 
-sdb_store_cond_t *
-sdb_store_attr_cond(const char *name, sdb_store_expr_t *expr)
-{
-       return SDB_STORE_COND(sdb_object_create("attr-cond", attr_cond_type,
-                               name, expr));
-} /* sdb_store_attr_cond */
-
-sdb_store_cond_t *
-sdb_store_obj_cond(int field, sdb_store_expr_t *expr)
-{
-       return SDB_STORE_COND(sdb_object_create("obj-cond", obj_cond_type,
-                               field, expr));
-} /* sdb_store_obj_cond */
-
 sdb_store_matcher_t *
 sdb_store_name_matcher(int type, const char *name, _Bool re)
 {
@@ -989,41 +757,6 @@ sdb_store_child_matcher(int type, sdb_store_matcher_t *m)
        return M(sdb_object_create("any-matcher", child_type, type, m));
 } /* sdb_store_child_matcher */
 
-sdb_store_matcher_t *
-sdb_store_lt_matcher(sdb_store_cond_t *cond)
-{
-       return M(sdb_object_create("lt-matcher", cond_type,
-                               MATCHER_LT, cond));
-} /* sdb_store_lt_matcher */
-
-sdb_store_matcher_t *
-sdb_store_le_matcher(sdb_store_cond_t *cond)
-{
-       return M(sdb_object_create("le-matcher", cond_type,
-                               MATCHER_LE, cond));
-} /* sdb_store_le_matcher */
-
-sdb_store_matcher_t *
-sdb_store_eq_matcher(sdb_store_cond_t *cond)
-{
-       return M(sdb_object_create("eq-matcher", cond_type,
-                               MATCHER_EQ, cond));
-} /* sdb_store_eq_matcher */
-
-sdb_store_matcher_t *
-sdb_store_ge_matcher(sdb_store_cond_t *cond)
-{
-       return M(sdb_object_create("ge-matcher", cond_type,
-                               MATCHER_GE, cond));
-} /* sdb_store_ge_matcher */
-
-sdb_store_matcher_t *
-sdb_store_gt_matcher(sdb_store_cond_t *cond)
-{
-       return M(sdb_object_create("gt-matcher", cond_type,
-                               MATCHER_GT, cond));
-} /* sdb_store_gt_matcher */
-
 /*
  * TODO: Rename sdb_store_cmp_* to sdb_store_* once the old code is unused and
  * has been removed.
@@ -1185,58 +918,8 @@ maybe_inv_matcher(sdb_store_matcher_t *m, _Bool inv)
        return tmp;
 } /* maybe_inv_matcher */
 
-static int
-parse_cond_op(const char *op,
-               sdb_store_matcher_t *(**matcher)(sdb_store_cond_t *), _Bool *inv)
-{
-       *inv = 0;
-       if (! strcasecmp(op, "<"))
-               *matcher = sdb_store_lt_matcher;
-       else if (! strcasecmp(op, "<="))
-               *matcher = sdb_store_le_matcher;
-       else if (! strcasecmp(op, "="))
-               *matcher = sdb_store_eq_matcher;
-       else if (! strcasecmp(op, ">="))
-               *matcher = sdb_store_ge_matcher;
-       else if (! strcasecmp(op, ">"))
-               *matcher = sdb_store_gt_matcher;
-       else if (! strcasecmp(op, "!=")) {
-               *matcher = sdb_store_eq_matcher;
-               *inv = 1;
-       }
-       else
-               return -1;
-       return 0;
-} /* parse_cond_op */
-
-static sdb_store_matcher_t *
-parse_attr_cmp(const char *attr, const char *op, sdb_store_expr_t *expr)
-{
-       sdb_store_matcher_t *(*matcher)(sdb_store_cond_t *) = NULL;
-       sdb_store_matcher_t *m;
-       sdb_store_cond_t *cond;
-       _Bool inv = 0;
-
-       if (! attr)
-               return NULL;
-
-       if (! expr)
-               return NULL;
-       else if (parse_cond_op(op, &matcher, &inv))
-               return NULL;
-
-       cond = sdb_store_attr_cond(attr, expr);
-       if (! cond)
-               return NULL;
-
-       m = matcher(cond);
-       /* pass ownership to 'm' or destroy in case of an error */
-       sdb_object_deref(SDB_OBJ(cond));
-       return maybe_inv_matcher(m, inv);
-} /* parse_attr_cmp */
-
 sdb_store_matcher_t *
-sdb_store_matcher_parse_cmp(const char *obj_type, const char *attr,
+sdb_store_matcher_parse_cmp(const char *obj_type,
                const char *op, sdb_store_expr_t *expr)
 {
        int type = -1;
@@ -1271,8 +954,6 @@ sdb_store_matcher_parse_cmp(const char *obj_type, const char *attr,
                inv = 1;
                re = 1;
        }
-       else if (type == SDB_ATTRIBUTE)
-               return parse_attr_cmp(attr, op, expr);
        else
                return NULL;
 
@@ -1282,51 +963,14 @@ sdb_store_matcher_parse_cmp(const char *obj_type, const char *attr,
        if (sdb_store_expr_eval(expr, /* obj */ NULL, &value, /* filter */ NULL)
                        || (value.type != SDB_TYPE_STRING)) {
                sdb_data_free_datum(&value);
-               if (type != SDB_ATTRIBUTE)
-                       return NULL;
-               return parse_attr_cmp(attr, op, expr);
+               return NULL;
        }
 
-       if (! attr)
-               m = sdb_store_name_matcher(type, value.data.string, re);
-       else if (type == SDB_ATTRIBUTE)
-               m = sdb_store_attr_matcher(attr, value.data.string, re);
-
+       m = sdb_store_name_matcher(type, value.data.string, re);
        sdb_data_free_datum(&value);
        return maybe_inv_matcher(m, inv);
 } /* sdb_store_matcher_parse_cmp */
 
-sdb_store_matcher_t *
-sdb_store_matcher_parse_field_cmp(const char *name, const char *op,
-               sdb_store_expr_t *expr)
-{
-       sdb_store_matcher_t *(*matcher)(sdb_store_cond_t *) = NULL;
-       sdb_store_matcher_t *m;
-       sdb_store_cond_t *cond;
-       _Bool inv = 0;
-
-       int field;
-
-       if (! expr)
-               return NULL;
-
-       field = sdb_store_parse_field_name(name);
-       if (field < 0)
-               return NULL;
-
-       if (parse_cond_op(op, &matcher, &inv))
-               return NULL;
-       cond = sdb_store_obj_cond(field, expr);
-       if (! cond)
-               return NULL;
-
-       assert(matcher);
-       m = matcher(cond);
-       /* pass ownership to 'm' or destroy in case of an error */
-       sdb_object_deref(SDB_OBJ(cond));
-       return maybe_inv_matcher(m, inv);
-} /* sdb_store_matcher_parse_field_cmp */
-
 sdb_store_matcher_t *
 sdb_store_dis_matcher(sdb_store_matcher_t *left, sdb_store_matcher_t *right)
 {