X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=t%2Funit%2Fparser%2Fparser_test.c;h=3d2e40cbc4df0b4e6c59e0415c421d3d996ae716;hp=cbcbe2c6b2716d628adade52a9f659f6ca28e370;hb=1ef0d00327e4b5f56b438f44053f48fd8b198baa;hpb=29aa1f75c4840710671488420208a2e029a308a9

diff --git a/t/unit/parser/parser_test.c b/t/unit/parser/parser_test.c
index cbcbe2c..3d2e40c 100644
--- a/t/unit/parser/parser_test.c
+++ b/t/unit/parser/parser_test.c
@@ -372,7 +372,7 @@ struct {
 	  "ANY service.service.name = 's'",
 	                         -1,  1, SDB_AST_TYPE_LOOKUP, SDB_HOST },
 
-	/* NULL */
+	/* NULL / TRUE / FALSE */
 	{ "LOOKUP hosts MATCHING "
 	  "attribute['foo'] "
 	  "IS NULL",             -1,  1, SDB_AST_TYPE_LOOKUP, SDB_HOST },
@@ -384,6 +384,26 @@ struct {
 	  "IS NULL",             -1,  1, SDB_AST_TYPE_LOOKUP, SDB_HOST },
 	{ "LOOKUP hosts MATCHING "
 	  "ANY service.name IS NULL", -1, -1, 0, 0 },
+	{ "LOOKUP hosts MATCHING "
+	  "attribute['foo'] "
+	  "IS TRUE",             -1,  1, SDB_AST_TYPE_LOOKUP, SDB_HOST },
+	{ "LOOKUP hosts MATCHING "
+	  "attribute['foo'] "
+	  "IS NOT TRUE",         -1,  1, SDB_AST_TYPE_LOOKUP, SDB_HOST },
+	{ "LOOKUP hosts MATCHING "
+	  "NOT attribute['foo'] "
+	  "IS TRUE",             -1,  1, SDB_AST_TYPE_LOOKUP, SDB_HOST },
+	{ "LOOKUP hosts MATCHING "
+	  "attribute['foo'] "
+	  "IS FALSE",            -1,  1, SDB_AST_TYPE_LOOKUP, SDB_HOST },
+	{ "LOOKUP hosts MATCHING "
+	  "attribute['foo'] "
+	  "IS NOT FALSE",        -1,  1, SDB_AST_TYPE_LOOKUP, SDB_HOST },
+	{ "LOOKUP hosts MATCHING "
+	  "NOT attribute['foo'] "
+	  "IS FALSE",            -1,  1, SDB_AST_TYPE_LOOKUP, SDB_HOST },
+	{ "LOOKUP metrics MATCHING "
+	  "timeseries IS TRUE",  -1,  1, SDB_AST_TYPE_LOOKUP, SDB_METRIC },
 
 	/* invalid numeric constants */
 	{ "LOOKUP hosts MATCHING "
@@ -439,6 +459,10 @@ struct {
 	  "value = 'a'",           -1, -1, 0, 0 },
 	{ "LIST metrics FILTER "
 	  "name.1 = 'a'",          -1, -1, 0, 0 },
+	{ "LIST hosts FILTER "
+	  "timeseries IS TRUE",    -1, -1, 0, 0 },
+	{ "LIST services FILTER "
+	  "timeseries IS TRUE",    -1, -1, 0, 0 },
 
 	/* type mismatches */
 	{ "LOOKUP hosts MATCHING "
@@ -530,6 +554,14 @@ struct {
 	  "name + 1 IS NULL",    -1, -1, 0, 0 },
 	{ "LOOKUP hosts FILTER "
 	  "name + 1 IS NULL",    -1, -1, 0, 0 },
+	{ "LOOKUP hosts MATCHING "
+	  "name + 1 IS TRUE",    -1, -1, 0, 0 },
+	{ "LOOKUP hosts FILTER "
+	  "name + 1 IS TRUE",    -1, -1, 0, 0 },
+	{ "LOOKUP hosts MATCHING "
+	  "name + 1 IS FALSE",   -1, -1, 0, 0 },
+	{ "LOOKUP hosts FILTER "
+	  "name + 1 IS FALSE",   -1, -1, 0, 0 },
 
 	/* invalid iterators */
 	{ "LOOKUP hosts MATCHING "
@@ -805,12 +837,13 @@ struct {
 	{ "ALL attribute.name !~ 'pattern'",   -1,  SDB_AST_ALL },
 	{ "ALL attribute.name &^ 'pattern'",   -1,  -1 },
 	{ "ANY attribute !~ 'pattern'",        -1,  -1 },
+
 	/* composite expressions */
 	{ "name =~ 'pattern' AND "
-	  "ANY service.name =~ 'pattern'",     -1,  SDB_AST_AND },
+	  "ANY service.name =~ 'pattern'",  -1,  SDB_AST_AND },
 	{ "name =~ 'pattern' OR "
-	  "ANY service.name =~ 'pattern'",     -1,  SDB_AST_OR },
-	{ "NOT name = 'host'",                 -1,  SDB_AST_NOT },
+	  "ANY service.name =~ 'pattern'",  -1,  SDB_AST_OR },
+	{ "NOT name = 'host'",              -1,  SDB_AST_NOT },
 	/* numeric expressions */
 	{ "attribute['foo'] < 123",         -1,  SDB_AST_LT },
 	{ "attribute['foo'] <= 123",        -1,  SDB_AST_LE },
@@ -832,9 +865,13 @@ struct {
 	  "2014-08-16 17:23",               -1,  SDB_AST_EQ },
 	{ "attribute['foo'] = "
 	  "2014-08-16 17:23:53",            -1,  SDB_AST_EQ },
-	/* NULL */
+	/* NULL / TRUE / FALSE */
 	{ "attribute['foo'] IS NULL",       -1,  SDB_AST_ISNULL },
 	{ "attribute['foo'] IS NOT NULL",   -1,  SDB_AST_NOT },
+	{ "attribute['foo'] IS TRUE",       -1,  SDB_AST_ISTRUE },
+	{ "attribute['foo'] IS NOT TRUE",   -1,  SDB_AST_NOT },
+	{ "attribute['foo'] IS FALSE",      -1,  SDB_AST_ISFALSE },
+	{ "attribute['foo'] IS NOT FALSE",  -1,  SDB_AST_NOT },
 	/* array expressions */
 	{ "backend < ['a']",                -1,  SDB_AST_LT },
 	{ "backend <= ['a']",               -1,  SDB_AST_LE },
@@ -878,6 +915,13 @@ struct {
 	{ "'be' NOT IN backend",            -1,  SDB_AST_NOT },
 	{ "['a','b'] IN backend",           -1,  SDB_AST_IN },
 	{ "['a','b'] NOT IN backend",       -1,  SDB_AST_NOT },
+	{ "timeseries IS TRUE",             -1,  SDB_AST_ISTRUE },
+	{ "timeseries IS FALSE",            -1,  SDB_AST_ISFALSE },
+	{ "timeseries IS NOT TRUE",         -1,  SDB_AST_NOT },
+	{ "timeseries IS NOT FALSE",        -1,  SDB_AST_NOT },
+	{ "timeseries > 0",                 -1,  -1 },
+	{ "timeseries = TRUE",              -1,  -1 },
+	{ "timeseries != FALSE",            -1,  -1 },
 
 	/* check operator precedence */
 	{ "name = 'name' OR "
@@ -1008,6 +1052,20 @@ struct {
 	{ "(age + age) * age",    -1, SDB_AST_MUL, SDB_TYPE_DATETIME },
 	{ "age + (age * age)",    -1, SDB_AST_ADD, SDB_TYPE_DATETIME },
 
+	/* boolean expressions */
+	{ "timeseries + 1",               -1, -1, -1 },
+	{ "timeseries - 1",               -1, -1, -1 },
+	{ "timeseries * 1",               -1, -1, -1 },
+	{ "timeseries / 1",               -1, -1, -1 },
+	{ "timeseries \% 1",              -1, -1, -1 },
+	{ "timeseries CONCAT 1",          -1, -1, -1 },
+	{ "timeseries + timeseries",      -1, -1, -1 },
+	{ "timeseries - timeseries",      -1, -1, -1 },
+	{ "timeseries * timeseries",      -1, -1, -1 },
+	{ "timeseries / timeseries",      -1, -1, -1 },
+	{ "timeseries \% timeseries",     -1, -1, -1 },
+	{ "timeseries CONCAT timeseries", -1, -1, -1 },
+
 	/* syntax errors */
 	{ "LIST",                 -1, -1, -1 },
 	{ "foo &^ bar",           -1, -1, -1 },