X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=t%2Funit%2Ffrontend%2Fparser_test.c;h=2368bcc4d3efe821a5342aa25ee07316ff69e7e1;hp=c0cbff8071f41deb146dc84bdce55b60a3633748;hb=5e20183e0a2264e0aed972ceff913374ab970248;hpb=4aa38193b15042cebf7ce773950c0366cc44cd76 diff --git a/t/unit/frontend/parser_test.c b/t/unit/frontend/parser_test.c index c0cbff8..2368bcc 100644 --- a/t/unit/frontend/parser_test.c +++ b/t/unit/frontend/parser_test.c @@ -53,166 +53,178 @@ START_TEST(test_parse) { ";;", -1, 0, 0 }, /* valid commands */ - { "FETCH host 'host'", -1, 1, CONNECTION_FETCH }, + { "FETCH host 'host'", -1, 1, SDB_CONNECTION_FETCH }, { "FETCH host 'host' FILTER " - "host = 'host'", -1, 1, CONNECTION_FETCH }, - - { "LIST hosts", -1, 1, CONNECTION_LIST }, - { "LIST hosts -- foo", -1, 1, CONNECTION_LIST }, - { "LIST hosts;", -1, 1, CONNECTION_LIST }, - { "LIST hosts; INVALID", 11, 1, CONNECTION_LIST }, + "age > 60s", -1, 1, SDB_CONNECTION_FETCH }, + { "FETCH service " + "'host'.'service'", -1, 1, SDB_CONNECTION_FETCH }, + { "FETCH metric " + "'host'.'metric'", -1, 1, SDB_CONNECTION_FETCH }, + + { "LIST hosts", -1, 1, SDB_CONNECTION_LIST }, + { "LIST hosts -- foo", -1, 1, SDB_CONNECTION_LIST }, + { "LIST hosts;", -1, 1, SDB_CONNECTION_LIST }, + { "LIST hosts; INVALID", 11, 1, SDB_CONNECTION_LIST }, { "LIST hosts FILTER " - "host = 'host'", -1, 1, CONNECTION_LIST }, - { "LIST services", -1, 1, CONNECTION_LIST }, + "age > 60s", -1, 1, SDB_CONNECTION_LIST }, + { "LIST services", -1, 1, SDB_CONNECTION_LIST }, { "LIST services FILTER " - "service = 'svc'", -1, 1, CONNECTION_LIST }, - { "LIST metrics", -1, 1, CONNECTION_LIST }, + "age > 60s", -1, 1, SDB_CONNECTION_LIST }, + { "LIST metrics", -1, 1, SDB_CONNECTION_LIST }, { "LIST metrics FILTER " - "metric = 'metric'", -1, 1, CONNECTION_LIST }, + "age > 60s", -1, 1, SDB_CONNECTION_LIST }, - { "LOOKUP hosts", -1, 1, CONNECTION_LOOKUP }, + { "LOOKUP hosts", -1, 1, SDB_CONNECTION_LOOKUP }, { "LOOKUP hosts MATCHING " - "host = 'host'", -1, 1, CONNECTION_LOOKUP }, + "name = 'host'", -1, 1, SDB_CONNECTION_LOOKUP }, { "LOOKUP hosts MATCHING NOT " - "host = 'host'", -1, 1, CONNECTION_LOOKUP }, + "name = 'host'", -1, 1, SDB_CONNECTION_LOOKUP }, { "LOOKUP hosts MATCHING " - "host =~ 'p' AND " - "service =~ 'p'", -1, 1, CONNECTION_LOOKUP }, + "name =~ 'p' AND " + "ANY service =~ 'p'", -1, 1, SDB_CONNECTION_LOOKUP }, { "LOOKUP hosts MATCHING NOT " - "host =~ 'p' AND " - "service =~ 'p'", -1, 1, CONNECTION_LOOKUP }, + "name =~ 'p' AND " + "ANY service =~ 'p'", -1, 1, SDB_CONNECTION_LOOKUP }, { "LOOKUP hosts MATCHING " - "host =~ 'p' AND " - "service =~ 'p' OR " - "service =~ 'r'", -1, 1, CONNECTION_LOOKUP }, + "name =~ 'p' AND " + "ANY service =~ 'p' OR " + "ANY service =~ 'r'", -1, 1, SDB_CONNECTION_LOOKUP }, { "LOOKUP hosts MATCHING NOT " - "host =~ 'p' AND " - "service =~ 'p' OR " - "service =~ 'r'", -1, 1, CONNECTION_LOOKUP }, - { "LOOKUP hosts MATCHING " - "host =~ 'p' " - "FILTER .age > 1D", -1, 1, CONNECTION_LOOKUP }, - { "LOOKUP hosts MATCHING " - "host =~ 'p' " - "FILTER .age > 1D AND " - ".interval < 240s" , -1, 1, CONNECTION_LOOKUP }, - { "LOOKUP hosts MATCHING " - "host =~ 'p' " - "FILTER NOT .age>1D", -1, 1, CONNECTION_LOOKUP }, - { "LOOKUP hosts MATCHING " - "host =~ 'p' " - "FILTER .age>" - ".interval", -1, 1, CONNECTION_LOOKUP }, + "name =~ 'p' AND " + "ANY service =~ 'p' OR " + "ANY service =~ 'r'", -1, 1, SDB_CONNECTION_LOOKUP }, + { "LOOKUP hosts MATCHING " + "name =~ 'p' " + "FILTER age > 1D", -1, 1, SDB_CONNECTION_LOOKUP }, + { "LOOKUP hosts MATCHING " + "name =~ 'p' " + "FILTER age > 1D AND " + "interval < 240s" , -1, 1, SDB_CONNECTION_LOOKUP }, + { "LOOKUP hosts MATCHING " + "name =~ 'p' " + "FILTER NOT age>1D", -1, 1, SDB_CONNECTION_LOOKUP }, + { "LOOKUP hosts MATCHING " + "name =~ 'p' " + "FILTER age>" + "interval", -1, 1, SDB_CONNECTION_LOOKUP }, + { "LOOKUP services", -1, 1, SDB_CONNECTION_LOOKUP }, + { "LOOKUP services MATCHING ANY " + "attribute =~ 'a'", -1, 1, SDB_CONNECTION_LOOKUP }, + { "LOOKUP metrics", -1, 1, SDB_CONNECTION_LOOKUP }, + { "LOOKUP metrics MATCHING ANY " + "attribute =~ 'a'", -1, 1, SDB_CONNECTION_LOOKUP }, { "TIMESERIES 'host'.'metric' " "START 2014-01-01 " "END 2014-12-31 " - "23:59:59", -1, 1, CONNECTION_TIMESERIES }, + "23:59:59", -1, 1, SDB_CONNECTION_TIMESERIES }, { "TIMESERIES 'host'.'metric' " "START 2014-02-02 " - "14:02", -1, 1, CONNECTION_TIMESERIES }, + "14:02", -1, 1, SDB_CONNECTION_TIMESERIES }, { "TIMESERIES 'host'.'metric' " - "END 2014-02-02", -1, 1, CONNECTION_TIMESERIES }, + "END 2014-02-02", -1, 1, SDB_CONNECTION_TIMESERIES }, { "TIMESERIES " - "'host'.'metric'", -1, 1, CONNECTION_TIMESERIES }, + "'host'.'metric'", -1, 1, SDB_CONNECTION_TIMESERIES }, /* string constants */ { "LOOKUP hosts MATCHING " - "host = ''''", -1, 1, CONNECTION_LOOKUP }, + "name = ''''", -1, 1, SDB_CONNECTION_LOOKUP }, { "LOOKUP hosts MATCHING " - "host = '''foo'", -1, 1, CONNECTION_LOOKUP }, + "name = '''foo'", -1, 1, SDB_CONNECTION_LOOKUP }, { "LOOKUP hosts MATCHING " - "host = 'f''oo'", -1, 1, CONNECTION_LOOKUP }, + "name = 'f''oo'", -1, 1, SDB_CONNECTION_LOOKUP }, { "LOOKUP hosts MATCHING " - "host = 'foo'''", -1, 1, CONNECTION_LOOKUP }, + "name = 'foo'''", -1, 1, SDB_CONNECTION_LOOKUP }, { "LOOKUP hosts MATCHING " - "host = '''", -1, -1, 0 }, + "name = '''", -1, -1, 0 }, /* numeric constants */ { "LOOKUP hosts MATCHING " - "attribute[foo] = " - "1234", -1, 1, CONNECTION_LOOKUP }, + "attribute['foo'] = " + "1234", -1, 1, SDB_CONNECTION_LOOKUP }, { "LOOKUP hosts MATCHING " - "attribute[foo] != " - "+234", -1, 1, CONNECTION_LOOKUP }, + "attribute['foo'] != " + "+234", -1, 1, SDB_CONNECTION_LOOKUP }, { "LOOKUP hosts MATCHING " - "attribute[foo] < " - "-234", -1, 1, CONNECTION_LOOKUP }, + "attribute['foo'] < " + "-234", -1, 1, SDB_CONNECTION_LOOKUP }, { "LOOKUP hosts MATCHING " - "attribute[foo] > " - "12.4", -1, 1, CONNECTION_LOOKUP }, + "attribute['foo'] > " + "12.4", -1, 1, SDB_CONNECTION_LOOKUP }, { "LOOKUP hosts MATCHING " - "attribute[foo] <= " - "12. + .3", -1, 1, CONNECTION_LOOKUP }, + "attribute['foo'] <= " + "12. + .3", -1, 1, SDB_CONNECTION_LOOKUP }, { "LOOKUP hosts MATCHING " - "attribute[foo] <= " - "'f' || 'oo'", -1, 1, CONNECTION_LOOKUP }, + "attribute['foo'] <= " + "'f' || 'oo'", -1, 1, SDB_CONNECTION_LOOKUP }, { "LOOKUP hosts MATCHING " - "attribute[foo] >= " - ".4", -1, 1, CONNECTION_LOOKUP }, + "attribute['foo'] >= " + ".4", -1, 1, SDB_CONNECTION_LOOKUP }, { "LOOKUP hosts MATCHING " - "attribute[foo] = " - "+12e3", -1, 1, CONNECTION_LOOKUP }, + "attribute['foo'] = " + "+12e3", -1, 1, SDB_CONNECTION_LOOKUP }, { "LOOKUP hosts MATCHING " - "attribute[foo] = " - "+12e-3", -1, 1, CONNECTION_LOOKUP }, + "attribute['foo'] = " + "+12e-3", -1, 1, SDB_CONNECTION_LOOKUP }, { "LOOKUP hosts MATCHING " - "attribute[foo] = " - "-12e+3", -1, 1, CONNECTION_LOOKUP }, + "attribute['foo'] = " + "-12e+3", -1, 1, SDB_CONNECTION_LOOKUP }, /* date, time, interval constants */ { "LOOKUP hosts MATCHING " - "attribute[foo] = " - "1 Y 42D", -1, 1, CONNECTION_LOOKUP }, + "attribute['foo'] = " + "1 Y 42D", -1, 1, SDB_CONNECTION_LOOKUP }, { "LOOKUP hosts MATCHING " - "attribute[foo] = " - "1s 42D", -1, 1, CONNECTION_LOOKUP }, + "attribute['foo'] = " + "1s 42D", -1, 1, SDB_CONNECTION_LOOKUP }, /* * TODO: Something like 1Y42D should work as well but it doesn't since * the scanner will tokenize it into {digit}{identifier} :-/ * { "LOOKUP hosts MATCHING " - "attribute[foo] = " - "1Y42D", -1, 1, CONNECTION_LOOKUP }, + "attribute['foo'] = " + "1Y42D", -1, 1, SDB_CONNECTION_LOOKUP }, */ /* NULL */ { "LOOKUP hosts MATCHING " - "attribute[foo] " - "IS NULL", -1, 1, CONNECTION_LOOKUP }, - { "LOOKUP hosts MATCHING " - "attribute[foo] " - "IS NOT NULL", -1, 1, CONNECTION_LOOKUP }, + "attribute['foo'] " + "IS NULL", -1, 1, SDB_CONNECTION_LOOKUP }, { "LOOKUP hosts MATCHING " - "NOT attribute[foo] " - "IS NULL", -1, 1, CONNECTION_LOOKUP }, + "attribute['foo'] " + "IS NOT NULL", -1, 1, SDB_CONNECTION_LOOKUP }, { "LOOKUP hosts MATCHING " - "host IS NULL", -1, -1, 0 }, + "NOT attribute['foo'] " + "IS NULL", -1, 1, SDB_CONNECTION_LOOKUP }, { "LOOKUP hosts MATCHING " - "service IS NULL", -1, -1, 0 }, + "ANY service IS NULL", -1, -1, 0 }, /* invalid numeric constants */ { "LOOKUP hosts MATCHING " - "attribute[foo] = " + "attribute['foo'] = " "+-12e+3", -1, -1, 0 }, { "LOOKUP hosts MATCHING " - "attribute[foo] = " + "attribute['foo'] = " "-12e-+3", -1, -1, 0 }, { "LOOKUP hosts MATCHING " - "attribute[foo] = " + "attribute['foo'] = " "e+3", -1, -1, 0 }, { "LOOKUP hosts MATCHING " - "attribute[foo] = " + "attribute['foo'] = " "3e", -1, -1, 0 }, /* following SQL standard, we don't support hex numbers */ { "LOOKUP hosts MATCHING " - "attribute[foo] = " + "attribute['foo'] = " "0x12", -1, -1, 0 }, /* invalid expressions */ { "LOOKUP hosts MATCHING " - "attribute[foo] = " + "attribute['foo'] = " "1.23 + 'foo'", -1, -1, 0 }, + { "LOOKUP hosts MATCHING " + "attr['foo'] = 1.23", -1, -1, 0 }, + { "LOOKUP hosts MATCHING " + "attr['foo'] IS NULL", -1, -1, 0 }, /* comments */ { "/* some comment */", -1, 0, 0 }, @@ -225,50 +237,73 @@ START_TEST(test_parse) { "LIST hosts; INVALID", -1, -1, 0 }, { "/* some incomplete", -1, -1, 0 }, + /* invalid commands */ { "LIST", -1, -1, 0 }, { "LIST foo", -1, -1, 0 }, { "LIST hosts MATCHING " - "host = 'host'", -1, -1, 0 }, + "name = 'host'", -1, -1, 0 }, { "LIST foo FILTER " - "host = 'host'", -1, -1, 0 }, + "age > 60s", -1, -1, 0 }, { "FETCH host 'host' MATCHING " - "host = 'host'", -1, -1, 0 }, + "name = 'host'", -1, -1, 0 }, + { "FETCH service 'host'",-1, -1, 0 }, + { "FETCH metric 'host'", -1, -1, 0 }, + { "FETCH host " + "'host'.'localhost'", -1, -1, 0 }, { "FETCH foo 'host'", -1, -1, 0 }, { "FETCH foo 'host' FILTER " - "host = 'host'", -1, -1, 0 }, + "age > 60s", -1, -1, 0 }, { "LOOKUP foo", -1, -1, 0 }, { "LOOKUP foo MATCHING " - "host = 'host'", -1, -1, 0 }, + "name = 'host'", -1, -1, 0 }, { "LOOKUP foo FILTER " - "host = 'host'", -1, -1, 0 }, + "age > 60s", -1, -1, 0 }, { "LOOKUP foo MATCHING " - "host = 'host' FILTER " - "host = 'host'", -1, -1, 0 }, + "name = 'host' FILTER " + "age > 60s", -1, -1, 0 }, { "LOOKUP hosts MATCHING " - "attribute[foo] <= " + "attribute['foo'] <= " "f || 'oo'", -1, -1, 0 }, { "LOOKUP hosts MATCHING " - "attribute[foo] <= " + "attribute['foo'] <= " "'f' || oo", -1, -1, 0 }, + { "LOOKUP hosts MATCHING " + "ANY host = 'host'", -1, -1, 0 }, + { "LOOKUP services MATCHING " + "ANY host = 'host'", -1, -1, 0 }, + { "LOOKUP services MATCHING " + "ANY service = 'svc'", -1, -1, 0 }, + { "LOOKUP services MATCHING " + "ANY metric = 'm'", -1, -1, 0 }, + { "LOOKUP metrics MATCHING " + "ANY host = 'host'", -1, -1, 0 }, + { "LOOKUP metrics MATCHING " + "ANY service = 'svc'", -1, -1, 0 }, + { "LOOKUP metrics MATCHING " + "ANY metric = 'm'", -1, -1, 0 }, }; - size_t i; + sdb_strbuf_t *errbuf = sdb_strbuf_create(64); sdb_llist_t *check; + size_t i; + for (i = 0; i < SDB_STATIC_ARRAY_LEN(golden_data); ++i) { sdb_object_t *obj; _Bool ok; - check = sdb_fe_parse(golden_data[i].query, golden_data[i].len); + check = sdb_fe_parse(golden_data[i].query, + golden_data[i].len, errbuf); if (golden_data[i].expected < 0) ok = check == 0; else ok = sdb_llist_len(check) == (size_t)golden_data[i].expected; - fail_unless(ok, "sdb_fe_parse(%s) = %p (len: %zu); expected: %d", - golden_data[i].query, check, sdb_llist_len(check), - golden_data[i].expected); + fail_unless(ok, "sdb_fe_parse(%s) = %p (len: %zu); expected: %d " + "(parser error: %s)", golden_data[i].query, check, + sdb_llist_len(check), golden_data[i].expected, + sdb_strbuf_string(errbuf)); if (! check) continue; @@ -287,6 +322,8 @@ START_TEST(test_parse) sdb_object_deref(obj); sdb_llist_destroy(check); } + + sdb_strbuf_destroy(errbuf); } END_TEST @@ -298,103 +335,193 @@ START_TEST(test_parse_matcher) int expected; } golden_data[] = { /* empty expressions */ - { NULL, -1, -1 }, - { "", -1, -1 }, - - /* valid expressions */ - { "host = 'localhost'", -1, MATCHER_NAME }, - { "host != 'localhost'", -1, MATCHER_NOT }, - { "host =~ 'host'", -1, MATCHER_NAME }, - { "host !~ 'host'", -1, MATCHER_NOT }, - { "host = 'localhost' -- foo", -1, MATCHER_NAME }, - { "host = 'host' ", 13, MATCHER_NAME }, + { NULL, -1, -1 }, + { "", -1, -1 }, + + /* match hosts by name */ + { "name < 'localhost'", -1, MATCHER_LT }, + { "name <= 'localhost'", -1, MATCHER_LE }, + { "name = 'localhost'", -1, MATCHER_EQ }, + { "name != 'localhost'", -1, MATCHER_NE }, + { "name >= 'localhost'", -1, MATCHER_GE }, + { "name > 'localhost'", -1, MATCHER_GT }, + { "name =~ 'host'", -1, MATCHER_REGEX }, + { "name !~ 'host'", -1, MATCHER_NREGEX }, + { "name = 'localhost' -- foo", -1, MATCHER_EQ }, + { "name = 'host' ", 13, MATCHER_EQ }, + { "name &^ 'localhost'", -1, -1 }, + /* match by backend */ + { "ANY backend < 'be'", -1, MATCHER_ANY }, + { "ANY backend <= 'be'", -1, MATCHER_ANY }, + { "ANY backend = 'be'", -1, MATCHER_ANY }, + { "ANY backend != 'be'", -1, MATCHER_ANY }, + { "ANY backend >= 'be'", -1, MATCHER_ANY }, + { "ANY backend > 'be'", -1, MATCHER_ANY }, + { "ALL backend < 'be'", -1, MATCHER_ALL }, + { "ALL backend <= 'be'", -1, MATCHER_ALL }, + { "ALL backend = 'be'", -1, MATCHER_ALL }, + { "ALL backend != 'be'", -1, MATCHER_ALL }, + { "ALL backend >= 'be'", -1, MATCHER_ALL }, + { "ALL backend > 'be'", -1, MATCHER_ALL }, + { "ANY backend &^ 'be'", -1, -1 }, /* match hosts by service */ - { "service = 'name'", -1, MATCHER_NAME }, - { "service != 'name'", -1, MATCHER_NOT }, - { "service =~ 'pattern'", -1, MATCHER_NAME }, - { "service !~ 'pattern'", -1, MATCHER_NOT }, + { "ANY service < 'name'", -1, MATCHER_ANY }, + { "ANY service <= 'name'", -1, MATCHER_ANY }, + { "ANY service = 'name'", -1, MATCHER_ANY }, + { "ANY service != 'name'", -1, MATCHER_ANY }, + { "ANY service >= 'name'", -1, MATCHER_ANY }, + { "ANY service > 'name'", -1, MATCHER_ANY }, + { "ANY service =~ 'pattern'", -1, MATCHER_ANY }, + { "ANY service !~ 'pattern'", -1, MATCHER_ANY }, + { "ANY service &^ 'name'", -1, -1 }, + { "ALL service < 'name'", -1, MATCHER_ALL }, + { "ALL service <= 'name'", -1, MATCHER_ALL }, + { "ALL service = 'name'", -1, MATCHER_ALL }, + { "ALL service != 'name'", -1, MATCHER_ALL }, + { "ALL service >= 'name'", -1, MATCHER_ALL }, + { "ALL service > 'name'", -1, MATCHER_ALL }, + { "ALL service =~ 'pattern'", -1, MATCHER_ALL }, + { "ALL service !~ 'pattern'", -1, MATCHER_ALL }, + { "ALL service &^ 'name'", -1, -1 }, + /* match hosts by metric */ + { "ANY metric < 'name'", -1, MATCHER_ANY }, + { "ANY metric <= 'name'", -1, MATCHER_ANY }, + { "ANY metric = 'name'", -1, MATCHER_ANY }, + { "ANY metric != 'name'", -1, MATCHER_ANY }, + { "ANY metric >= 'name'", -1, MATCHER_ANY }, + { "ANY metric > 'name'", -1, MATCHER_ANY }, + { "ANY metric =~ 'pattern'", -1, MATCHER_ANY }, + { "ANY metric !~ 'pattern'", -1, MATCHER_ANY }, + { "ANY metric &^ 'pattern'", -1, -1 }, + { "ALL metric < 'name'", -1, MATCHER_ALL }, + { "ALL metric <= 'name'", -1, MATCHER_ALL }, + { "ALL metric = 'name'", -1, MATCHER_ALL }, + { "ALL metric != 'name'", -1, MATCHER_ALL }, + { "ALL metric >= 'name'", -1, MATCHER_ALL }, + { "ALL metric > 'name'", -1, MATCHER_ALL }, + { "ALL metric =~ 'pattern'", -1, MATCHER_ALL }, + { "ALL metric !~ 'pattern'", -1, MATCHER_ALL }, + { "ALL metric &^ 'pattern'", -1, -1 }, /* match hosts by attribute */ - { "attribute = 'name'", -1, MATCHER_NAME }, - { "attribute != 'name'", -1, MATCHER_NOT }, - { "attribute =~ 'pattern'", -1, MATCHER_NAME }, - { "attribute !~ 'pattern'", -1, MATCHER_NOT }, + { "ANY attribute < 'name'", -1, MATCHER_ANY }, + { "ANY attribute <= 'name'", -1, MATCHER_ANY }, + { "ANY attribute = 'name'", -1, MATCHER_ANY }, + { "ANY attribute != 'name'", -1, MATCHER_ANY }, + { "ANY attribute >= 'name'", -1, MATCHER_ANY }, + { "ANY attribute > 'name'", -1, MATCHER_ANY }, + { "ANY attribute =~ 'pattern'", -1, MATCHER_ANY }, + { "ANY attribute !~ 'pattern'", -1, MATCHER_ANY }, + { "ANY attribute &^ 'pattern'", -1, -1 }, + { "ALL attribute < 'name'", -1, MATCHER_ALL }, + { "ALL attribute <= 'name'", -1, MATCHER_ALL }, + { "ALL attribute = 'name'", -1, MATCHER_ALL }, + { "ALL attribute != 'name'", -1, MATCHER_ALL }, + { "ALL attribute >= 'name'", -1, MATCHER_ALL }, + { "ALL attribute > 'name'", -1, MATCHER_ALL }, + { "ALL attribute =~ 'pattern'", -1, MATCHER_ALL }, + { "ALL attribute !~ 'pattern'", -1, MATCHER_ALL }, + { "ALL attribute &^ 'pattern'", -1, -1 }, /* composite expressions */ - { "host =~ 'pattern' AND " - "service =~ 'pattern'", -1, MATCHER_AND }, - { "host =~ 'pattern' OR " - "service =~ 'pattern'", -1, MATCHER_OR }, - { "NOT host = 'host'", -1, MATCHER_NOT }, + { "name =~ 'pattern' AND " + "ANY service =~ 'pattern'", -1, MATCHER_AND }, + { "name =~ 'pattern' OR " + "ANY service =~ 'pattern'", -1, MATCHER_OR }, + { "NOT name = 'host'", -1, MATCHER_NOT }, /* numeric expressions */ - { "attribute[foo] < 123", -1, MATCHER_LT }, - { "attribute[foo] <= 123", -1, MATCHER_LE }, - { "attribute[foo] = 123", -1, MATCHER_EQ }, - { "attribute[foo] >= 123", -1, MATCHER_GE }, - { "attribute[foo] > 123", -1, MATCHER_GT }, + { "attribute['foo'] < 123", -1, MATCHER_LT }, + { "attribute['foo'] <= 123", -1, MATCHER_LE }, + { "attribute['foo'] = 123", -1, MATCHER_EQ }, + { "attribute['foo'] >= 123", -1, MATCHER_GE }, + { "attribute['foo'] > 123", -1, MATCHER_GT }, /* datetime expressions */ - { "attribute[foo] = " - "2014-08-16", -1, MATCHER_EQ }, - { "attribute[foo] = " - "17:23", -1, MATCHER_EQ }, - { "attribute[foo] = " - "17:23:53", -1, MATCHER_EQ }, - { "attribute[foo] = " - "17:23:53.123", -1, MATCHER_EQ }, - { "attribute[foo] = " - "17:23:53.123456789", -1, MATCHER_EQ }, - { "attribute[foo] = " - "2014-08-16 17:23", -1, MATCHER_EQ }, - { "attribute[foo] = " - "2014-08-16 17:23:53", -1, MATCHER_EQ }, + { "attribute['foo'] = " + "2014-08-16", -1, MATCHER_EQ }, + { "attribute['foo'] = " + "17:23", -1, MATCHER_EQ }, + { "attribute['foo'] = " + "17:23:53", -1, MATCHER_EQ }, + { "attribute['foo'] = " + "17:23:53.123", -1, MATCHER_EQ }, + { "attribute['foo'] = " + "17:23:53.123456789", -1, MATCHER_EQ }, + { "attribute['foo'] = " + "2014-08-16 17:23", -1, MATCHER_EQ }, + { "attribute['foo'] = " + "2014-08-16 17:23:53", -1, MATCHER_EQ }, /* NULL; while this is an implementation detail, * IS NULL currently maps to an equality matcher */ - { "attribute[foo] IS NULL", -1, MATCHER_ISNULL }, - { "attribute[foo] IS NOT NULL", -1, MATCHER_NOT }, + { "attribute['foo'] IS NULL", -1, MATCHER_ISNULL }, + { "attribute['foo'] IS NOT NULL", -1, MATCHER_ISNNULL }, /* object field matchers */ - { ".last_update < 10s", -1, MATCHER_LT }, - { ".AGE <= 1m", -1, MATCHER_LE }, - { ".interval = 10h", -1, MATCHER_EQ }, - { ".Last_Update >= 24D", -1, MATCHER_GE }, - { ".age > 1M", -1, MATCHER_GT }, - { ".age != 20Y", -1, MATCHER_NOT }, - { ".backend != 'be'", -1, MATCHER_NOT }, - { ".age <= 2 * .interval", -1, MATCHER_LE }, + { "name < 'a'", -1, MATCHER_LT }, + { "name <= 'a'", -1, MATCHER_LE }, + { "name = 'a'", -1, MATCHER_EQ }, + { "name != 'a'", -1, MATCHER_NE }, + { "name >= 'a'", -1, MATCHER_GE }, + { "name > 'a'", -1, MATCHER_GT }, + { "last_update < 2014-10-01", -1, MATCHER_LT }, + { "last_update <= 2014-10-01", -1, MATCHER_LE }, + { "last_update = 2014-10-01", -1, MATCHER_EQ }, + { "last_update != 2014-10-01", -1, MATCHER_NE }, + { "last_update >= 2014-10-01", -1, MATCHER_GE }, + { "last_update > 2014-10-01", -1, MATCHER_GT }, + { "Last_Update >= 24D", -1, MATCHER_GE }, + { "age < 20s", -1, MATCHER_LT }, + { "age <= 20s", -1, MATCHER_LE }, + { "age = 20s", -1, MATCHER_EQ }, + { "age != 20s", -1, MATCHER_NE }, + { "age >= 20s", -1, MATCHER_GE }, + { "age > 20s", -1, MATCHER_GT }, + { "AGE <= 1m", -1, MATCHER_LE }, + { "age > 1M", -1, MATCHER_GT }, + { "age != 20Y", -1, MATCHER_NE }, + { "age <= 2 * interval", -1, MATCHER_LE }, + { "interval < 20s", -1, MATCHER_LT }, + { "interval <= 20s", -1, MATCHER_LE }, + { "interval = 20s", -1, MATCHER_EQ }, + { "interval != 20s", -1, MATCHER_NE }, + { "interval >= 20s", -1, MATCHER_GE }, + { "interval > 20s", -1, MATCHER_GT }, + { "'be' IN backend", -1, MATCHER_IN }, /* check operator precedence */ - { "host = 'name' OR " - "service = 'name' AND " - "attribute = 'name' OR " - "attribute[foo] = 'bar'", -1, MATCHER_OR }, - { "host = 'name' AND " - "service = 'name' AND " - "attribute = 'name' OR " - "attribute[foo] = 'bar'", -1, MATCHER_OR }, - { "host = 'name' AND " - "service = 'name' OR " - "attribute = 'name' AND " - "attribute[foo] = 'bar'", -1, MATCHER_OR }, - { "(host = 'name' OR " - "service = 'name') AND " - "(attribute = 'name' OR " - "attribute[foo] = 'bar')", -1, MATCHER_AND }, - { "NOT host = 'name' OR " - "service = 'name'", -1, MATCHER_OR }, - { "NOT host = 'name' OR " - "NOT service = 'name'", -1, MATCHER_OR }, - { "NOT (host = 'name' OR " - "NOT service = 'name')", -1, MATCHER_NOT }, + { "name = 'name' OR " + "ANY service = 'name' AND " + "ANY attribute = 'name' OR " + "attribute['foo'] = 'bar'", -1, MATCHER_OR }, + { "name = 'name' AND " + "ANY service = 'name' AND " + "ANY attribute = 'name' OR " + "attribute['foo'] = 'bar'", -1, MATCHER_OR }, + { "name = 'name' AND " + "ANY service = 'name' OR " + "ANY attribute = 'name' AND " + "attribute['foo'] = 'bar'", -1, MATCHER_OR }, + { "(name = 'name' OR " + "ANY service = 'name') AND " + "(ANY attribute = 'name' OR " + "attribute['foo'] = 'bar')", -1, MATCHER_AND }, + { "NOT name = 'name' OR " + "ANY service = 'name'", -1, MATCHER_OR }, + { "NOT name = 'name' OR " + "NOT ANY service = 'name'", -1, MATCHER_OR }, + { "NOT (name = 'name' OR " + "NOT ANY service = 'name')", -1, MATCHER_NOT }, /* syntax errors */ - { "LIST", -1, -1 }, - { "foo &^ bar", -1, -1 }, - { ".invalid", -1, -1 }, + { "LIST", -1, -1 }, + { "foo &^ bar", -1, -1 }, + { "invalid", -1, -1 }, }; + sdb_strbuf_t *errbuf = sdb_strbuf_create(64); size_t i; for (i = 0; i < SDB_STATIC_ARRAY_LEN(golden_data); ++i) { sdb_store_matcher_t *m; - m = sdb_fe_parse_matcher(golden_data[i].expr, golden_data[i].len); + m = sdb_fe_parse_matcher(golden_data[i].expr, + golden_data[i].len, errbuf); if (golden_data[i].expected < 0) { fail_unless(m == NULL, @@ -404,7 +531,8 @@ START_TEST(test_parse_matcher) } fail_unless(m != NULL, "sdb_fe_parse_matcher(%s) = NULL; " - "expected: ", golden_data[i].expr); + "expected: (parser error: %s)", + golden_data[i].expr, sdb_strbuf_string(errbuf)); fail_unless(M(m)->type == golden_data[i].expected, "sdb_fe_parse_matcher(%s) returned matcher of type %d; " "expected: %d", golden_data[i].expr, M(m)->type, @@ -412,6 +540,8 @@ START_TEST(test_parse_matcher) sdb_object_deref(SDB_OBJ(m)); } + + sdb_strbuf_destroy(errbuf); } END_TEST @@ -448,42 +578,44 @@ START_TEST(test_parse_expr) { "5 % 2", -1, 0 }, /* queryable fields */ - { ".last_update", -1, FIELD_VALUE }, - { ".AGE", -1, FIELD_VALUE }, - { ".interval", -1, FIELD_VALUE }, - { ".Last_Update", -1, FIELD_VALUE }, - { ".backend", -1, FIELD_VALUE }, + { "last_update", -1, FIELD_VALUE }, + { "AGE", -1, FIELD_VALUE }, + { "interval", -1, FIELD_VALUE }, + { "Last_Update", -1, FIELD_VALUE }, + { "backend", -1, FIELD_VALUE }, /* attributes */ - { "attribute[foo]", -1, ATTR_VALUE }, + { "attribute['foo']", -1, ATTR_VALUE }, /* arithmetic expressions */ - { ".age + .age", -1, SDB_DATA_ADD }, - { ".age - .age", -1, SDB_DATA_SUB }, - { ".age * .age", -1, SDB_DATA_MUL }, - { ".age / .age", -1, SDB_DATA_DIV }, - { ".age % .age", -1, SDB_DATA_MOD }, - { ".age || .age", -1, SDB_DATA_CONCAT }, + { "age + age", -1, SDB_DATA_ADD }, + { "age - age", -1, SDB_DATA_SUB }, + { "age * age", -1, SDB_DATA_MUL }, + { "age / age", -1, SDB_DATA_DIV }, + { "age % age", -1, SDB_DATA_MOD }, + { "age || age", -1, SDB_DATA_CONCAT }, /* operator precedence */ - { ".age + .age * .age", -1, SDB_DATA_ADD }, - { ".age * .age + .age", -1, SDB_DATA_ADD }, - { ".age + .age - .age", -1, SDB_DATA_SUB }, - { ".age - .age + .age", -1, SDB_DATA_ADD }, - { "(.age + .age) * .age", -1, SDB_DATA_MUL }, - { ".age + (.age * .age)", -1, SDB_DATA_ADD }, + { "age + age * age", -1, SDB_DATA_ADD }, + { "age * age + age", -1, SDB_DATA_ADD }, + { "age + age - age", -1, SDB_DATA_SUB }, + { "age - age + age", -1, SDB_DATA_ADD }, + { "(age + age) * age", -1, SDB_DATA_MUL }, + { "age + (age * age)", -1, SDB_DATA_ADD }, /* syntax errors */ { "LIST", -1, INT_MAX }, { "foo &^ bar", -1, INT_MAX }, - { ".invalid", -1, INT_MAX }, + { "invalid", -1, INT_MAX }, }; + sdb_strbuf_t *errbuf = sdb_strbuf_create(64); size_t i; for (i = 0; i < SDB_STATIC_ARRAY_LEN(golden_data); ++i) { sdb_store_expr_t *e; - e = sdb_fe_parse_expr(golden_data[i].expr, golden_data[i].len); + e = sdb_fe_parse_expr(golden_data[i].expr, + golden_data[i].len, errbuf); if (golden_data[i].expected == INT_MAX) { fail_unless(e == NULL, @@ -493,7 +625,8 @@ START_TEST(test_parse_expr) } fail_unless(e != NULL, "sdb_fe_parse_expr(%s) = NULL; " - "expected: ", golden_data[i].expr); + "expected: (parser error: %s)", + golden_data[i].expr, sdb_strbuf_string(errbuf)); fail_unless(e->type == golden_data[i].expected, "sdb_fe_parse_expr(%s) returned expression of type %d; " "expected: %d", golden_data[i].expr, e->type, @@ -501,6 +634,8 @@ START_TEST(test_parse_expr) sdb_object_deref(SDB_OBJ(e)); } + + sdb_strbuf_destroy(errbuf); } END_TEST