[tokkee]

tokkee.org

Code

projects / sysdb.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 4dc515a)
store_lookup: Pass a data-object to parse_cmp().
authorSebastian Harl <sh@tokkee.org>
Mon, 23 Jun 2014 16:43:40 +0000 (18:43 +0200)
committerSebastian Harl <sh@tokkee.org>
Mon, 23 Jun 2014 16:43:40 +0000 (18:43 +0200)
That'll allow for comparing attribute values of any type.

src/core/store_lookup.c patch | blob | history
src/frontend/grammar.y patch | blob | history
src/include/core/store.h patch | blob | history
t/unit/core/store_lookup_test.c patch | blob | history

diff --git a/src/core/store_lookup.c b/src/core/store_lookup.c
index 501d7d198b5129c2de51b7bfa9d2a65c649b75e9..658f931ab30bc3fe64dd30b53e439416ad6a9ae6 100644 (file)
--- a/src/core/store_lookup.c
+++ b/src/core/store_lookup.c
@@ -668,12 +668,11 @@ sdb_store_gt_matcher(sdb_store_cond_t *cond)
 } /* sdb_store_gt_matcher */
 
 static sdb_store_matcher_t *
 } /* sdb_store_gt_matcher */
 
 static sdb_store_matcher_t *
-parse_attr_cmp(const char *attr, const char *op, const char *value)
+parse_attr_cmp(const char *attr, const char *op, const sdb_data_t *value)
 {
        sdb_store_matcher_t *(*matcher)(sdb_store_cond_t *) = NULL;
        sdb_store_matcher_t *m;
        sdb_store_cond_t *cond;
 {
        sdb_store_matcher_t *(*matcher)(sdb_store_cond_t *) = NULL;
        sdb_store_matcher_t *m;
        sdb_store_cond_t *cond;
-       sdb_data_t data;
 
        /* TODO: this will reject any attributes called "name";
         * use a different syntax for querying objects by name */
 
        /* TODO: this will reject any attributes called "name";
         * use a different syntax for querying objects by name */
@@ -694,12 +693,7 @@ parse_attr_cmp(const char *attr, const char *op, const char *value)
        else
                return NULL;
 
        else
                return NULL;
 
-       data.type = SDB_TYPE_STRING;
-       data.data.string = strdup(value);
-       if (! data.data.string)
-               return NULL;
-       cond = sdb_store_attr_cond(attr, &data);
-       free(data.data.string);
+       cond = sdb_store_attr_cond(attr, value);
        if (! cond)
                return NULL;
 
        if (! cond)
                return NULL;
 
@@ -711,7 +705,7 @@ parse_attr_cmp(const char *attr, const char *op, const char *value)
 
 sdb_store_matcher_t *
 sdb_store_matcher_parse_cmp(const char *obj_type, const char *attr,
 
 sdb_store_matcher_t *
 sdb_store_matcher_parse_cmp(const char *obj_type, const char *attr,
-               const char *op, const char *value)
+               const char *op, const sdb_data_t *value)
 {
        int type = -1;
        _Bool inv = 0;
 {
        int type = -1;
        _Bool inv = 0;
@@ -747,10 +741,13 @@ sdb_store_matcher_parse_cmp(const char *obj_type, const char *attr,
        else
                return NULL;
 
        else
                return NULL;
 
+       if (value->type != SDB_TYPE_STRING)
+               return NULL;
+
        if (! strcasecmp(attr, "name"))
        if (! strcasecmp(attr, "name"))
-               m = sdb_store_name_matcher(type, value, re);
+               m = sdb_store_name_matcher(type, value->data.string, re);
        else if (type == SDB_ATTRIBUTE)
        else if (type == SDB_ATTRIBUTE)
-               m = sdb_store_attr_matcher(attr, value, re);
+               m = sdb_store_attr_matcher(attr, value->data.string, re);
 
        if (! m)
                return NULL;
 
        if (! m)
                return NULL;
diff --git a/src/frontend/grammar.y b/src/frontend/grammar.y
index 8e5ddf6e5eff7a1e32646ad0d62795109a2b61f9..402e17087f692744f2dea73068654daced1d1134 100644 (file)
--- a/src/frontend/grammar.y
+++ b/src/frontend/grammar.y
@@ -292,7 +292,8 @@ matcher:
 compare_matcher:
        IDENTIFIER '.' IDENTIFIER op STRING
                {
 compare_matcher:
        IDENTIFIER '.' IDENTIFIER op STRING
                {
-                       $$ = sdb_store_matcher_parse_cmp($1, $3, $4, $5);
+                       sdb_data_t data = { SDB_TYPE_STRING, { .string = $5 } };
+                       $$ = sdb_store_matcher_parse_cmp($1, $3, $4, &data);
                        free($1); $1 = NULL;
                        free($3); $3 = NULL;
                        free($5); $5 = NULL;
                        free($1); $1 = NULL;
                        free($3); $3 = NULL;
                        free($5); $5 = NULL;
diff --git a/src/include/core/store.h b/src/include/core/store.h
index ecaf21d0bbd6b974483290a94dce38916dd285c4..59200815482e9d5540837dfd1fce07e19fdfd743 100644 (file)
--- a/src/include/core/store.h
+++ b/src/include/core/store.h
@@ -221,7 +221,7 @@ sdb_store_gt_matcher(sdb_store_cond_t *cond);
  */
 sdb_store_matcher_t *
 sdb_store_matcher_parse_cmp(const char *obj_type, const char *attr,
  */
 sdb_store_matcher_t *
 sdb_store_matcher_parse_cmp(const char *obj_type, const char *attr,
-               const char *op, const char *value);
+               const char *op, const sdb_data_t *value);
 
 /*
  * sdb_store_dis_matcher:
 
 /*
  * sdb_store_dis_matcher:
diff --git a/t/unit/core/store_lookup_test.c b/t/unit/core/store_lookup_test.c
index 4e3e6971b4b7ad07529c74c1fc652a0fd51ca768..b5cb0d2000df93f75249ccb9fb31064cd542123c 100644 (file)
--- a/t/unit/core/store_lookup_test.c
+++ b/t/unit/core/store_lookup_test.c
@@ -387,6 +387,10 @@ END_TEST
 
 START_TEST(test_parse_cmp)
 {
 
 START_TEST(test_parse_cmp)
 {
+       sdb_data_t hostname = { SDB_TYPE_STRING, { .string = "hostname" } };
+       sdb_data_t srvname  = { SDB_TYPE_STRING, { .string = "srvname" } };
+       sdb_data_t attrname = { SDB_TYPE_STRING, { .string = "attrname" } };
+
        sdb_store_matcher_t *check;
 
        size_t i;
        sdb_store_matcher_t *check;
 
        size_t i;
@@ -395,75 +399,80 @@ START_TEST(test_parse_cmp)
                const char *obj_type;
                const char *attr;
                const char *op;
                const char *obj_type;
                const char *attr;
                const char *op;
-               const char *value;
+               const sdb_data_t value;
                int expected;
        } golden_data[] = {
                int expected;
        } golden_data[] = {
-               { "host",      "name", "=",  "hostname", MATCHER_NAME },
-               { "host",      "name", "!=", "hostname", MATCHER_NOT },
-               { "host",      "name", "=~", "hostname", MATCHER_NAME },
-               { "host",      "name", "!~", "hostname", MATCHER_NOT },
-               { "host",      "attr", "=",  "hostname", -1 },
-               { "host",      "attr", "!=", "hostname", -1 },
-               { "host",      "name", "&^", "hostname", -1 },
-               { "host",      "name", "<",  "hostname", -1 },
-               { "host",      "name", "<=", "hostname", -1 },
-               { "host",      "name", ">=", "hostname", -1 },
-               { "host",      "name", ">",  "hostname", -1 },
-               { "service",   "name", "=",  "srvname",  MATCHER_NAME },
-               { "service",   "name", "!=", "srvname",  MATCHER_NOT },
-               { "service",   "name", "=~", "srvname",  MATCHER_NAME },
-               { "service",   "name", "!~", "srvname",  MATCHER_NOT },
-               { "service",   "attr", "=",  "srvname",  -1 },
-               { "service",   "attr", "!=", "srvname",  -1 },
-               { "service",   "name", "&^", "srvname",  -1 },
-               { "service",   "name", "<",  "srvname",  -1 },
-               { "service",   "name", "<=", "srvname",  -1 },
-               { "service",   "name", ">=", "srvname",  -1 },
-               { "service",   "name", ">",  "srvname",  -1 },
-               { "attribute", "name", "=",  "attrname", MATCHER_NAME },
-               { "attribute", "name", "!=", "attrname", MATCHER_NOT },
-               { "attribute", "name", "=~", "attrname", MATCHER_NAME },
-               { "attribute", "name", "!~", "attrname", MATCHER_NOT },
-               { "attribute", "name", "<",  "attrname", -1 },
-               { "attribute", "name", "<=", "attrname", -1 },
-               { "attribute", "name", ">=", "attrname", -1 },
-               { "attribute", "name", ">",  "attrname", -1 },
-               { "attribute", "attr", "=",  "attrname", MATCHER_ATTR },
-               { "attribute", "attr", "!=", "attrname", MATCHER_NOT },
-               { "attribute", "attr", "=~", "attrname", MATCHER_ATTR },
-               { "attribute", "attr", "!~", "attrname", MATCHER_NOT },
-               { "attribute", "attr", "&^", "attrname", -1 },
-               { "attribute", "attr", "<",  "attrname", MATCHER_LT },
-               { "attribute", "attr", "<=", "attrname", MATCHER_LE },
-/*             { "attribute", "attr", "=",  "attrname", MATCHER_EQ }, */
-               { "attribute", "attr", ">=", "attrname", MATCHER_GE },
-               { "attribute", "attr", ">",  "attrname", MATCHER_GT },
-               { "foo",       "name", "=",  "bar",      -1 },
-               { "foo",       "attr", "=",  "bar",      -1 },
+               { "host",      "name", "=",  hostname, MATCHER_NAME },
+               { "host",      "name", "!=", hostname, MATCHER_NOT },
+               { "host",      "name", "=~", hostname, MATCHER_NAME },
+               { "host",      "name", "!~", hostname, MATCHER_NOT },
+               { "host",      "attr", "=",  hostname, -1 },
+               { "host",      "attr", "!=", hostname, -1 },
+               { "host",      "name", "&^", hostname, -1 },
+               { "host",      "name", "<",  hostname, -1 },
+               { "host",      "name", "<=", hostname, -1 },
+               { "host",      "name", ">=", hostname, -1 },
+               { "host",      "name", ">",  hostname, -1 },
+               { "service",   "name", "=",  srvname,  MATCHER_NAME },
+               { "service",   "name", "!=", srvname,  MATCHER_NOT },
+               { "service",   "name", "=~", srvname,  MATCHER_NAME },
+               { "service",   "name", "!~", srvname,  MATCHER_NOT },
+               { "service",   "attr", "=",  srvname,  -1 },
+               { "service",   "attr", "!=", srvname,  -1 },
+               { "service",   "name", "&^", srvname,  -1 },
+               { "service",   "name", "<",  srvname,  -1 },
+               { "service",   "name", "<=", srvname,  -1 },
+               { "service",   "name", ">=", srvname,  -1 },
+               { "service",   "name", ">",  srvname,  -1 },
+               { "attribute", "name", "=",  attrname, MATCHER_NAME },
+               { "attribute", "name", "!=", attrname, MATCHER_NOT },
+               { "attribute", "name", "=~", attrname, MATCHER_NAME },
+               { "attribute", "name", "!~", attrname, MATCHER_NOT },
+               { "attribute", "name", "<",  attrname, -1 },
+               { "attribute", "name", "<=", attrname, -1 },
+               { "attribute", "name", ">=", attrname, -1 },
+               { "attribute", "name", ">",  attrname, -1 },
+               { "attribute", "attr", "=",  attrname, MATCHER_ATTR },
+               { "attribute", "attr", "!=", attrname, MATCHER_NOT },
+               { "attribute", "attr", "=~", attrname, MATCHER_ATTR },
+               { "attribute", "attr", "!~", attrname, MATCHER_NOT },
+               { "attribute", "attr", "&^", attrname, -1 },
+               { "attribute", "attr", "<",  attrname, MATCHER_LT },
+               { "attribute", "attr", "<=", attrname, MATCHER_LE },
+/*             { "attribute", "attr", "=",  attrname, MATCHER_EQ }, */
+               { "attribute", "attr", ">=", attrname, MATCHER_GE },
+               { "attribute", "attr", ">",  attrname, MATCHER_GT },
+               { "foo",       "name", "=",  attrname, -1 },
+               { "foo",       "attr", "=",  attrname, -1 },
        };
 
        for (i = 0; i < SDB_STATIC_ARRAY_LEN(golden_data); ++i) {
        };
 
        for (i = 0; i < SDB_STATIC_ARRAY_LEN(golden_data); ++i) {
+               char buf[1024];
+
                check = sdb_store_matcher_parse_cmp(golden_data[i].obj_type,
                check = sdb_store_matcher_parse_cmp(golden_data[i].obj_type,
-                               golden_data[i].attr, golden_data[i].op, golden_data[i].value);
+                               golden_data[i].attr, golden_data[i].op,
+                               &golden_data[i].value);
+
+               if (sdb_data_format(&golden_data[i].value,
+                                       buf, sizeof(buf), SDB_UNQUOTED) < 0)
+                       snprintf(buf, sizeof(buf), "ERR");
 
                if (golden_data[i].expected == -1) {
                        fail_unless(check == NULL,
                                        "sdb_store_matcher_parse_cmp(%s, %s, %s, %s) = %p; "
                                        "expected: NULL", golden_data[i].obj_type,
 
                if (golden_data[i].expected == -1) {
                        fail_unless(check == NULL,
                                        "sdb_store_matcher_parse_cmp(%s, %s, %s, %s) = %p; "
                                        "expected: NULL", golden_data[i].obj_type,
-                                       golden_data[i].attr, golden_data[i].op,
-                                       golden_data[i].value, check);
+                                       golden_data[i].attr, golden_data[i].op, buf, check);
                        continue;
                }
 
                fail_unless(check != NULL,
                                "sdb_store_matcher_parse_cmp(%s, %s, %s, %s) = %p; "
                                "expected: NULL", golden_data[i].obj_type,
                        continue;
                }
 
                fail_unless(check != NULL,
                                "sdb_store_matcher_parse_cmp(%s, %s, %s, %s) = %p; "
                                "expected: NULL", golden_data[i].obj_type,
-                               golden_data[i].attr, golden_data[i].op,
-                               golden_data[i].value, check);
+                               golden_data[i].attr, golden_data[i].op, buf, check);
                fail_unless(M(check)->type == golden_data[i].expected,
                                "sdb_store_matcher_parse_cmp(%s, %s, %s, %s) returned matcher "
                                "of type %d; expected: %d", golden_data[i].obj_type,
                fail_unless(M(check)->type == golden_data[i].expected,
                                "sdb_store_matcher_parse_cmp(%s, %s, %s, %s) returned matcher "
                                "of type %d; expected: %d", golden_data[i].obj_type,
-                               golden_data[i].attr, golden_data[i].op, golden_data[i].value,
+                               golden_data[i].attr, golden_data[i].op, buf,
                                M(check)->type, golden_data[i].expected);
 
                sdb_object_deref(SDB_OBJ(check));
                                M(check)->type, golden_data[i].expected);
 
                sdb_object_deref(SDB_OBJ(check));
System DataBase (SysDB)