![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index d1dc82f3664783862ed84386ad309e4675066c4c..c5aad2c51f3670cd6f469d7650de349d6504a56a 100644 (file)
} attrs[] = {
{ "a", "k1", { SDB_TYPE_STRING, { .string = "v1" } } },
{ "a", "k2", { SDB_TYPE_INTEGER, { .integer = 123 } } },
+ { "b", "k1", { SDB_TYPE_STRING, { .string = "v2" } } },
};
size_t i;
for (i = 0; i < SDB_STATIC_ARRAY_LEN(metrics); ++i) {
int status = sdb_store_metric(metrics[i].host,
- metrics[i].metric, 1);
+ metrics[i].metric, /* store */ NULL, 1);
fail_unless(status == 0,
- "sdb_store_metric(%s, %s, 1) = %d; expected: 0",
+ "sdb_store_metric(%s, %s, NULL, 1) = %d; expected: 0",
metrics[i].host, metrics[i].metric, status);
}
for (i = 0; i < SDB_STATIC_ARRAY_LEN(golden_data); ++i) {
sdb_store_matcher_t *m, *n;
- char buf[1024];
int status;
m = sdb_store_name_matcher(golden_data[i].type,
status = sdb_store_matcher_matches(m, obj, /* filter */ NULL);
fail_unless(status == golden_data[i].expected,
- "sdb_store_matcher_matches(%s, <host a>, NULL) = %d; "
- "expected: %d",
- sdb_store_matcher_tostring(m, buf, sizeof(buf)),
- status, golden_data[i].expected);
+ "sdb_store_matcher_matches(%s->%s, <host a>, NULL) = %d; "
+ "expected: %d", SDB_STORE_TYPE_TO_NAME(golden_data[i].type),
+ golden_data[i].name, status, golden_data[i].expected);
n = sdb_store_inv_matcher(m);
fail_unless(n != NULL,
/* now match the inverted set of objects */
status = sdb_store_matcher_matches(n, obj, /* filter */ NULL);
fail_unless(status == !golden_data[i].expected,
- "sdb_store_matcher_matches(%s, <host a>, NULL) = %d; "
- "expected: %d",
- sdb_store_matcher_tostring(n, buf, sizeof(buf)),
- status, !golden_data[i].expected);
+ "sdb_store_matcher_matches(%s->%s, <host a>, NULL) = %d; "
+ "expected: %d", SDB_STORE_TYPE_TO_NAME(golden_data[i].type),
+ golden_data[i].name, status, !golden_data[i].expected);
sdb_object_deref(SDB_OBJ(n));
}
for (i = 0; i < SDB_STATIC_ARRAY_LEN(golden_data); ++i) {
sdb_store_matcher_t *m, *n;
- char buf[1024];
int status;
m = sdb_store_attr_matcher(golden_data[i].attr_name,
status = sdb_store_matcher_matches(m, obj, /* filter */ NULL);
fail_unless(status == golden_data[i].expected,
- "sdb_store_matcher_matches({%s, <host a>, NULL) = %d; "
- "expected: %d",
- sdb_store_matcher_tostring(m, buf, sizeof(buf)),
- status, golden_data[i].expected);
+ "sdb_store_matcher_matches(attribute[%s] = %s, "
+ "<host a>, NULL) = %d; expected: %d", golden_data[i].attr_name,
+ golden_data[i].attr_value, status, golden_data[i].expected);
n = sdb_store_inv_matcher(m);
fail_unless(n != NULL,
/* now match the inverted set of objects */
status = sdb_store_matcher_matches(n, obj, /* filter */ NULL);
fail_unless(status == !golden_data[i].expected,
- "sdb_store_matcher_matches({%s, <host a>, NULL) = %d; "
- "expected: %d",
- sdb_store_matcher_tostring(n, buf, sizeof(buf)),
+ "sdb_store_matcher_matches(attribute[%s] = %s, "
+ "<host a>, NULL) = %d; expected: %d",
+ golden_data[i].attr_name, golden_data[i].attr_value,
status, !golden_data[i].expected);
sdb_object_deref(SDB_OBJ(n));
{ "k1", { SDB_TYPE_STRING, { .string = "v1" } }, 0, 1, 1, 1, 0 },
{ "k1", { SDB_TYPE_STRING, { .string = "v2" } }, 1, 1, 0, 0, 0 },
{ "k1", { SDB_TYPE_STRING, { .string = "v0" } }, 0, 0, 0, 1, 1 },
+ { "k1", { SDB_TYPE_STRING, { .string = "0" } }, 0, 0, 0, 1, 1 },
{ "k2", { SDB_TYPE_INTEGER, { .integer = 123 } }, 0, 1, 1, 1, 0 },
{ "k2", { SDB_TYPE_INTEGER, { .integer = 124 } }, 1, 1, 0, 0, 0 },
{ "k2", { SDB_TYPE_INTEGER, { .integer = 122 } }, 0, 0, 0, 1, 1 },
{ "k3", { SDB_TYPE_STRING, { .string = "123" } }, 0, 0, 0, 0, 0 },
{ "k3", { SDB_TYPE_INTEGER, { .integer = 123 } }, 0, 0, 0, 0, 0 },
/* type mismatch */
- { "k1", { SDB_TYPE_INTEGER, { .integer = 0 } }, 0, 0, 0, 0, 0 },
- { "k2", { SDB_TYPE_STRING, { .string = "123" } }, 0, 0, 0, 0, 0 },
+ { "k1", { SDB_TYPE_INTEGER, { .integer = 0 } }, 0, 0, 0, 1, 1 },
+ { "k2", { SDB_TYPE_STRING, { .string = "123" } }, 0, 1, 1, 1, 0 },
};
int status;
for (j = 0; j < SDB_STATIC_ARRAY_LEN(tests); ++j) {
sdb_store_matcher_t *m;
- char m_str[1024];
m = tests[j].matcher(c);
fail_unless(m != NULL,
status = sdb_store_matcher_matches(m, obj, /* filter */ NULL);
fail_unless(status == tests[j].expected,
- "sdb_store_matcher_matches(%s, <obj>, NULL) = %d; "
- "expected: %d",
- sdb_store_matcher_tostring(m, m_str, sizeof(m_str)),
- status, tests[j].expected);
+ "sdb_store_matcher_matches(<m>, <obj>, NULL) = %d; "
+ "expected: %d", status, tests[j].expected);
sdb_object_deref(SDB_OBJ(m));
}
const sdb_data_t value;
int expected_lt, expected_le, expected_eq, expected_ge, expected_gt;
} golden_data[] = {
+ { "b", SDB_FIELD_NAME,
+ { SDB_TYPE_STRING, { .string = "a" } }, 0, 0, 0, 1, 1 },
+ { "b", SDB_FIELD_NAME,
+ { SDB_TYPE_STRING, { .string = "b" } }, 0, 1, 1, 1, 0 },
+ { "b", SDB_FIELD_NAME,
+ { SDB_TYPE_STRING, { .string = "c" } }, 1, 1, 0, 0, 0 },
/* last-update = 1 for all objects */
{ "a", SDB_FIELD_LAST_UPDATE,
{ SDB_TYPE_DATETIME, { .datetime = 1 } }, 0, 1, 1, 1, 0 },
{ SDB_TYPE_INTEGER, { .integer = 0 } }, 0, 0, 0, 0, 0 },
{ "a", SDB_FIELD_BACKEND,
{ SDB_TYPE_INTEGER, { .integer = 0 } }, 0, 0, 0, 0, 0 },
+ { "a", SDB_FIELD_BACKEND,
+ { SDB_TYPE_INTEGER, { .integer = 0 } }, 0, 0, 0, 0, 0 },
+ /* (64bit) integer value without zero-bytes */
+ { "a", SDB_FIELD_BACKEND,
+ { SDB_TYPE_INTEGER, { .integer = 0xffffffffffffffffL } },
+ 0, 0, 0, 0, 0 },
};
int status;
for (j = 0; j < SDB_STATIC_ARRAY_LEN(tests); ++j) {
sdb_store_matcher_t *m;
- char m_str[1024];
m = tests[j].matcher(c);
fail_unless(m != NULL,
status = sdb_store_matcher_matches(m, obj, /* filter */ NULL);
fail_unless(status == tests[j].expected,
- "sdb_store_matcher_matches(%s, <obj>, NULL) = %d; "
- "expected: %d",
- sdb_store_matcher_tostring(m, m_str, sizeof(m_str)),
- status, tests[j].expected);
+ "sdb_store_matcher_matches(<m>, <host '%s'>, NULL) = %d; "
+ "expected: %d", status, tests[j].expected);
sdb_object_deref(SDB_OBJ(m));
}
START_TEST(test_parse_cmp)
{
- sdb_data_t hostname = { SDB_TYPE_STRING, { .string = "hostname" } };
- sdb_data_t metricname = { SDB_TYPE_STRING, { .string = "metricname" } };
- sdb_data_t srvname = { SDB_TYPE_STRING, { .string = "srvname" } };
- sdb_data_t attrname = { SDB_TYPE_STRING, { .string = "attrname" } };
+ sdb_data_t hostname = { SDB_TYPE_STRING, { .string = "hostname" } };
+ sdb_data_t metricname = { SDB_TYPE_STRING, { .string = "metricname" } };
+ sdb_data_t srvname = { SDB_TYPE_STRING, { .string = "srvname" } };
+ sdb_data_t attrname = { SDB_TYPE_STRING, { .string = "attrname" } };
+ sdb_data_t attrvalue = { SDB_TYPE_INTEGER, { .integer = 4711 } };
sdb_store_matcher_t *check;
{ "host", NULL, "!~", &hostname, MATCHER_NOT },
{ "host", "attr", "=", &hostname, -1 },
{ "host", "attr", "!=", &hostname, -1 },
+ { "host", "attr", "!=", &attrvalue, -1 },
+ { "host", "attr", "<=", &attrvalue, -1 },
{ "host", NULL, "&^", &hostname, -1 },
{ "host", NULL, "<", &hostname, -1 },
{ "host", NULL, "<=", &hostname, -1 },
{ "metric", NULL, "!~", &metricname, MATCHER_NOT },
{ "metric", "attr", "=", &metricname, -1 },
{ "metric", "attr", "!=", &metricname, -1 },
+ { "metric", "attr", "!=", &attrvalue, -1 },
+ { "metric", "attr", "<=", &attrvalue, -1 },
{ "metric", NULL, "&^", &metricname, -1 },
{ "metric", NULL, "<", &metricname, -1 },
{ "metric", NULL, "<=", &metricname, -1 },
{ "service", NULL, "!~", &srvname, MATCHER_NOT },
{ "service", "attr", "=", &srvname, -1 },
{ "service", "attr", "!=", &srvname, -1 },
+ { "service", "attr", "!=", &attrvalue, -1 },
+ { "service", "attr", "<=", &attrvalue, -1 },
{ "service", NULL, "&^", &srvname, -1 },
{ "service", NULL, "<", &srvname, -1 },
{ "service", NULL, "<=", &srvname, -1 },
/* { "attribute", "attr", "=", &attrname, MATCHER_EQ }, */
{ "attribute", "attr", ">=", &attrname, MATCHER_GE },
{ "attribute", "attr", ">", &attrname, MATCHER_GT },
- { "attribute", "attr", "IS", NULL, MATCHER_ISNULL },
- { "attribute", "attr", "IS", &attrname, -1 },
{ "foo", NULL, "=", &attrname, -1 },
{ "foo", "attr", "=", &attrname, -1 },
};
fail_unless(check != NULL,
"sdb_store_matcher_parse_cmp(%s, %s, %s, %s) = %p; "
- "expected: NULL", golden_data[i].obj_type,
+ "expected: <expr>", golden_data[i].obj_type,
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 "
const sdb_data_t *value;
int expected;
} golden_data[] = {
+ { "name", "<", &string, MATCHER_LT },
+ { "name", "<=", &string, MATCHER_LE },
+ { "name", "=", &string, MATCHER_EQ },
+ { "name", ">=", &string, MATCHER_GE },
+ { "name", ">", &string, MATCHER_GT },
+ { "name", "!=", &string, MATCHER_NOT },
{ "last_update", "<", &datetime, MATCHER_LT },
{ "last_update", "<=", &datetime, MATCHER_LE },
{ "last_update", "=", &datetime, MATCHER_EQ },
{ "interval", "!=", &datetime, MATCHER_NOT },
{ "backend", "=", &string, MATCHER_EQ },
{ "backend", "!=", &string, MATCHER_NOT },
- /* the behavior for other operators on :backend
+ /* the behavior for other operators on .backend
* is currently unspecified */
{ "last_update", "=", NULL, -1 },
{ "last_update", "IS", NULL, -1 },
START_TEST(test_scan)
{
-#define PTR_RE "0x[0-9a-f]+"
struct {
const char *query;
const char *filter;
int expected;
- const char *tostring_re;
} golden_data[] = {
- { "host = 'a'", NULL, 1,
- "OBJ\\[host\\]\\{ NAME\\{ 'a', \\(nil\\) \\} \\}" },
- { "host = 'a'", "host = 'x'", 0, /* filter never matches */
- "OBJ\\[host\\]\\{ NAME\\{ 'a', \\(nil\\) \\} \\}" },
+ { "host = 'a'", NULL, 1 },
+ { "host = 'a'", "host = 'x'", 0 }, /* filter never matches */
{ "host = 'a'",
- "NOT attribute.x = ''", 1, /* filter always matches */
- "OBJ\\[host\\]\\{ NAME\\{ 'a', \\(nil\\) \\} \\}" },
- { "host =~ 'a|b'", NULL, 2,
- "OBJ\\[host\\]\\{ NAME\\{ NULL, "PTR_RE" \\} \\}" },
- { "host =~ 'host'", NULL, 0,
- "OBJ\\[host\\]\\{ NAME\\{ NULL, "PTR_RE" \\} \\}" },
- { "host =~ '.'", NULL, 3,
- "OBJ\\[host\\]\\{ NAME\\{ NULL, "PTR_RE" \\} \\}" },
- { "metric = 'm1'", NULL, 2,
- "OBJ\\[metric\\]\\{ NAME\\{ 'm1', \\(nil\\) } \\}" },
- { "metric= 'm1'", "host = 'x'", 0, /* filter never matches */
- "OBJ\\[metric\\]\\{ NAME\\{ 'm1', \\(nil\\) } \\}" },
+ "NOT attribute['x'] = ''", 1 }, /* filter always matches */
+ { "host =~ 'a|b'", NULL, 2 },
+ { "host =~ 'host'", NULL, 0 },
+ { "host =~ '.'", NULL, 3 },
+ { "metric = 'm1'", NULL, 2 },
+ { "metric= 'm1'", "host = 'x'", 0 }, /* filter never matches */
{ "metric = 'm1'",
- "NOT attribute.x = ''", 2, /* filter always matches */
- "OBJ\\[metric\\]\\{ NAME\\{ 'm1', \\(nil\\) } \\}" },
- { "metric =~ 'm'", NULL, 2,
- "OBJ\\[metric\\]\\{ NAME\\{ NULL, "PTR_RE" } \\}" },
- { "metric !~ 'm'", NULL, 1,
- "\\(NOT, OBJ\\[metric\\]\\{ NAME\\{ NULL, "PTR_RE" } \\}\\)" },
- { "metric =~ 'x'", NULL, 0,
- "OBJ\\[metric\\]\\{ NAME\\{ NULL, "PTR_RE" } \\}" },
- { "service = 's1'", NULL, 2,
- "OBJ\\[service\\]\\{ NAME\\{ 's1', \\(nil\\) } \\}" },
- { "service = 's1'", "host = 'x'", 0, /* filter never matches */
- "OBJ\\[service\\]\\{ NAME\\{ 's1', \\(nil\\) } \\}" },
+ "NOT attribute['x'] = ''", 2 }, /* filter always matches */
+ { "metric =~ 'm'", NULL, 2 },
+ { "metric !~ 'm'", NULL, 1 },
+ { "metric =~ 'x'", NULL, 0 },
+ { "service = 's1'", NULL, 2 },
+ { "service = 's1'", "host = 'x'", 0 }, /* filter never matches */
{ "service = 's1'",
- "NOT attribute.x = ''", 2, /* filter always matches */
- "OBJ\\[service\\]\\{ NAME\\{ 's1', \\(nil\\) } \\}" },
- { "service =~ 's'", NULL, 2,
- "OBJ\\[service\\]\\{ NAME\\{ NULL, "PTR_RE" } \\}" },
- { "service !~ 's'", NULL, 1,
- "\\(NOT, OBJ\\[service\\]\\{ NAME\\{ NULL, "PTR_RE" } \\}\\)" },
- { "attribute = 'k1'", NULL, 1,
- "OBJ\\[attribute\\]\\{ NAME\\{ 'k1', \\(nil\\) \\} " },
- { "attribute = 'k1'", "host = 'x'", 0, /* filter never matches */
- "OBJ\\[attribute\\]\\{ NAME\\{ 'k1', \\(nil\\) \\} " },
+ "NOT attribute['x'] = ''", 2 }, /* filter always matches */
+ { "service =~ 's'", NULL, 2 },
+ { "service !~ 's'", NULL, 1 },
+ { "attribute = 'k1'", NULL, 2 },
+ { "attribute = 'k1'", "host = 'x'", 0 }, /* filter never matches */
{ "attribute = 'k1'",
- "NOT attribute.x = ''", 1, /* filter always matches */
- "OBJ\\[attribute\\]\\{ NAME\\{ 'k1', \\(nil\\) \\} " },
- { "attribute = 'x'", NULL, 0,
- "OBJ\\[attribute\\]\\{ NAME\\{ 'x', \\(nil\\) \\}" },
- { "attribute.k1 = 'v1'", NULL, 1,
- "ATTR\\[k1\\]\\{ VALUE\\{ 'v1', \\(nil\\) \\} \\}" },
- { "attribute.k1 IS NULL", NULL, 2,
- "\\(IS NULL, ATTR\\[k1\\]\\)" },
- { "attribute.x1 IS NULL", NULL, 3,
- "\\(IS NULL, ATTR\\[x1\\]\\)" },
- { "attribute.k1 IS NOT NULL", NULL, 1,
- "\\(NOT, \\(IS NULL, ATTR\\[k1\\]\\)\\)" },
- { "attribute.x1 IS NOT NULL", NULL, 0,
- "\\(NOT, \\(IS NULL, ATTR\\[x1\\]\\)\\)" },
- { "attribute.k2 < 123", NULL, 0,
- "ATTR\\[k2\\]\\{ < 123 \\}" },
- { "attribute.k2 <= 123", NULL, 1,
- "ATTR\\[k2\\]\\{ <= 123 \\}" },
- { "attribute.k2 >= 123", NULL, 1,
- "ATTR\\[k2\\]\\{ >= 123 \\}" },
- { "attribute.k2 > 123", NULL, 0,
- "ATTR\\[k2\\]\\{ > 123 \\}" },
- { "attribute.k2 = 123", NULL, 1,
- "ATTR\\[k2\\]\\{ = 123 \\}" },
- { "attribute.k2 != 123", NULL, 2,
- "\\(NOT, ATTR\\[k2\\]\\{ = 123 \\}\\)" },
- { "attribute.k1 != 'v1'", NULL, 2,
- "\\(NOT, ATTR\\[k1\\]\\{ VALUE\\{ 'v1', \\(nil\\) \\} \\}\\)" },
- { "attribute.k1 != 'v2'", NULL, 3,
- "\\(NOT, ATTR\\[k1\\]\\{ VALUE\\{ 'v2', \\(nil\\) \\} \\}\\)" },
+ "NOT attribute['x'] = ''", 2 }, /* filter always matches */
+ { "attribute = 'x'", NULL, 0 },
+ { "attribute['k1'] = 'v1'", NULL, 1 },
+ { "attribute['k1'] IS NULL", NULL, 1 },
+ { "attribute['x1'] IS NULL", NULL, 3 },
+ { "attribute['k1'] IS NOT NULL", NULL, 2 },
+ { "attribute['x1'] IS NOT NULL", NULL, 0 },
+ { "attribute['k2'] < 123", NULL, 0 },
+ { "attribute['k2'] <= 123", NULL, 1 },
+ { "attribute['k2'] >= 123", NULL, 1 },
+ { "attribute['k2'] > 123", NULL, 0 },
+ { "attribute['k2'] = 123", NULL, 1 },
+ { "attribute['k2'] != 123", NULL, 0 },
+ { "attribute['k1'] != 'v1'", NULL, 1 },
+ { "attribute['k1'] != 'v2'", NULL, 1 },
{ "attribute != 'x' "
- "AND attribute.y !~ 'x'", NULL, 3,
- "\\(AND, "
- "\\(NOT, OBJ\\[attribute\\]\\{ NAME\\{ 'x', \\(nil\\) \\} \\}\\), "
- "\\(NOT, ATTR\\[y\\]\\{ VALUE\\{ NULL, "PTR_RE" \\} \\}\\)\\)" },
+ "AND attribute['y'] !~ 'x'", NULL, 3 },
};
int check, n;
for (i = 0; i < SDB_STATIC_ARRAY_LEN(golden_data); ++i) {
sdb_store_matcher_t *m, *filter = NULL;
- char buf[4096];
m = sdb_fe_parse_matcher(golden_data[i].query, -1);
fail_unless(m != NULL,
"expected: <matcher>", golden_data[i].filter);
}
- fail_unless(sdb_regmatches(golden_data[i].tostring_re,
- sdb_store_matcher_tostring(m, buf, sizeof(buf))) == 0,
- "sdb_fe_parse_matcher(%s, -1) = %s; expected: %s",
- golden_data[i].query,
- sdb_store_matcher_tostring(m, buf, sizeof(buf)),
- golden_data[i].tostring_re);
-
n = 0;
sdb_store_scan(m, filter, scan_cb, &n);
fail_unless(n == golden_data[i].expected,