X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Ffrontend%2Fgrammar.y;h=cc0d5b94d475d6ccce027aab7e3601e957ecdc1a;hb=9a70712af541f43df7a2fb0b31442bec587eba8d;hp=57174290b00dc97c00aa50d9e1d6841ff45f3dad;hpb=90ada5c7c86cf280b2a4468e285671e9314e0d29;p=sysdb.git diff --git a/src/frontend/grammar.y b/src/frontend/grammar.y index 5717429..cc0d5b9 100644 --- a/src/frontend/grammar.y +++ b/src/frontend/grammar.y @@ -33,6 +33,7 @@ #include "core/store.h" #include "core/store-private.h" +#include "core/time.h" #include "utils/error.h" #include "utils/llist.h" @@ -55,6 +56,12 @@ sdb_fe_yyerror(YYLTYPE *lval, sdb_fe_yyscan_t scanner, const char *msg); /* quick access to the parser mode */ #define parser_mode sdb_fe_yyget_extra(scanner)->mode +#define MODE_TO_STRING(m) \ + (((m) == SDB_PARSE_DEFAULT) ? "statement" \ + : ((m) == SDB_PARSE_COND) ? "condition" \ + : ((m) == SDB_PARSE_EXPR) ? "expression" \ + : "UNKNOWN") + %} %pure-parser @@ -70,6 +77,7 @@ sdb_fe_yyerror(YYLTYPE *lval, sdb_fe_yyscan_t scanner, const char *msg); char *str; sdb_data_t data; + sdb_time_t datetime; sdb_llist_t *list; sdb_conn_node_t *node; @@ -82,20 +90,24 @@ sdb_fe_yyerror(YYLTYPE *lval, sdb_fe_yyscan_t scanner, const char *msg); %token SCANNER_ERROR -%token AND OR IS NOT MATCHING +%token AND OR IS NOT MATCHING FILTER %token CMP_EQUAL CMP_NEQUAL CMP_REGEX CMP_NREGEX %token CMP_LT CMP_LE CMP_GE CMP_GT %token CONCAT +%token START END + /* NULL token */ %token NULL_T -%token FETCH LIST LOOKUP +%token FETCH LIST LOOKUP TIMESERIES %token IDENTIFIER STRING %token INTEGER FLOAT +%token DATE TIME + /* Precedence (lowest first): */ %left OR %left AND @@ -107,6 +119,7 @@ sdb_fe_yyerror(YYLTYPE *lval, sdb_fe_yyscan_t scanner, const char *msg); %nonassoc IS %left '+' '-' %left '*' '/' '%' +%left '[' ']' %left '(' ')' %left '.' @@ -115,6 +128,9 @@ sdb_fe_yyerror(YYLTYPE *lval, sdb_fe_yyscan_t scanner, const char *msg); fetch_statement list_statement lookup_statement + timeseries_statement + matching_clause + filter_clause condition %type matcher @@ -122,24 +138,30 @@ sdb_fe_yyerror(YYLTYPE *lval, sdb_fe_yyscan_t scanner, const char *msg); %type expression -%type op +%type cmp %type data interval interval_elem +%type datetime + start_clause end_clause + %destructor { free($$); } %destructor { sdb_object_deref(SDB_OBJ($$)); } +%destructor { sdb_data_free_datum(&$$); } %% statements: statements ';' statement { - /* only accept this in default parse mode */ + /* only accepted in default parse mode */ if (parser_mode != SDB_PARSE_DEFAULT) { - sdb_fe_yyerror(&yylloc, scanner, + char errmsg[1024]; + snprintf(errmsg, sizeof(errmsg), YY_("syntax error, unexpected statement, " - "expecting condition")); + "expecting %s"), MODE_TO_STRING(parser_mode)); + sdb_fe_yyerror(&yylloc, scanner, errmsg); sdb_object_deref(SDB_OBJ($3)); YYABORT; } @@ -152,11 +174,13 @@ statements: | statement { - /* only accept this in default parse mode */ + /* only accepted in default parse mode */ if (parser_mode != SDB_PARSE_DEFAULT) { - sdb_fe_yyerror(&yylloc, scanner, + char errmsg[1024]; + snprintf(errmsg, sizeof(errmsg), YY_("syntax error, unexpected statement, " - "expecting condition")); + "expecting %s"), MODE_TO_STRING(parser_mode)); + sdb_fe_yyerror(&yylloc, scanner, errmsg); sdb_object_deref(SDB_OBJ($1)); YYABORT; } @@ -169,11 +193,13 @@ statements: | condition { - /* only accept this in condition parse mode */ + /* only accepted in condition parse mode */ if (! (parser_mode & SDB_PARSE_COND)) { - sdb_fe_yyerror(&yylloc, scanner, + char errmsg[1024]; + snprintf(errmsg, sizeof(errmsg), YY_("syntax error, unexpected condition, " - "expecting statement")); + "expecting %s"), MODE_TO_STRING(parser_mode)); + sdb_fe_yyerror(&yylloc, scanner, errmsg); sdb_object_deref(SDB_OBJ($1)); YYABORT; } @@ -183,6 +209,31 @@ statements: sdb_object_deref(SDB_OBJ($1)); } } + | + expression + { + /* only accepted in expression parse mode */ + if (! (parser_mode & SDB_PARSE_EXPR)) { + char errmsg[1024]; + snprintf(errmsg, sizeof(errmsg), + YY_("syntax error, unexpected expression, " + "expecting %s"), MODE_TO_STRING(parser_mode)); + sdb_fe_yyerror(&yylloc, scanner, errmsg); + sdb_object_deref(SDB_OBJ($1)); + YYABORT; + } + + if ($1) { + sdb_conn_node_t *n; + n = SDB_CONN_NODE(sdb_object_create_dT(/* name = */ NULL, + conn_expr_t, conn_expr_destroy)); + n->cmd = CONNECTION_EXPR; + CONN_EXPR(n)->expr = $1; + + sdb_llist_append(pt, SDB_OBJ(n)); + sdb_object_deref(SDB_OBJ(n)); + } + } ; statement: @@ -192,6 +243,8 @@ statement: | lookup_statement | + timeseries_statement + | /* empty */ { $$ = NULL; @@ -199,62 +252,135 @@ statement: ; /* - * FETCH ; + * FETCH [FILTER ]; * * Retrieve detailed information about a single host. */ fetch_statement: - FETCH STRING + FETCH IDENTIFIER STRING filter_clause { + /* TODO: support other types as well */ + if (strcasecmp($2, "host")) { + char errmsg[strlen($2) + 32]; + snprintf(errmsg, sizeof(errmsg), + YY_("unknown data-source %s"), $2); + sdb_fe_yyerror(&yylloc, scanner, errmsg); + free($2); $2 = NULL; + free($3); $3 = NULL; + sdb_object_deref(SDB_OBJ($4)); + YYABORT; + } + $$ = SDB_CONN_NODE(sdb_object_create_dT(/* name = */ NULL, conn_fetch_t, conn_fetch_destroy)); - CONN_FETCH($$)->name = strdup($2); + CONN_FETCH($$)->type = SDB_HOST; + CONN_FETCH($$)->name = $3; + CONN_FETCH($$)->filter = CONN_MATCHER($4); $$->cmd = CONNECTION_FETCH; free($2); $2 = NULL; } ; /* - * LIST; + * LIST [FILTER ]; * * Returns a list of all hosts in the store. */ list_statement: - LIST + LIST IDENTIFIER filter_clause { - $$ = SDB_CONN_NODE(sdb_object_create_T(/* name = */ NULL, - sdb_conn_node_t)); + int type = sdb_store_parse_object_type_plural($2); + if (type < 0) { + char errmsg[strlen($2) + 32]; + snprintf(errmsg, sizeof(errmsg), + YY_("unknown data-source %s"), $2); + sdb_fe_yyerror(&yylloc, scanner, errmsg); + free($2); $2 = NULL; + sdb_object_deref(SDB_OBJ($3)); + YYABORT; + } + + $$ = SDB_CONN_NODE(sdb_object_create_dT(/* name = */ NULL, + conn_list_t, conn_list_destroy)); + CONN_LIST($$)->type = type; + CONN_LIST($$)->filter = CONN_MATCHER($3); $$->cmd = CONNECTION_LIST; + free($2); $2 = NULL; } ; /* - * LOOKUP MATCHING ; + * LOOKUP MATCHING [FILTER ]; * * Returns detailed information about matching condition. */ lookup_statement: - LOOKUP IDENTIFIER MATCHING condition + LOOKUP IDENTIFIER matching_clause filter_clause { /* TODO: support other types as well */ if (strcasecmp($2, "hosts")) { char errmsg[strlen($2) + 32]; snprintf(errmsg, sizeof(errmsg), - YY_("unknown table %s"), $2); + YY_("unknown data-source %s"), $2); sdb_fe_yyerror(&yylloc, scanner, errmsg); free($2); $2 = NULL; + sdb_object_deref(SDB_OBJ($3)); sdb_object_deref(SDB_OBJ($4)); YYABORT; } $$ = SDB_CONN_NODE(sdb_object_create_dT(/* name = */ NULL, conn_lookup_t, conn_lookup_destroy)); - CONN_LOOKUP($$)->matcher = CONN_MATCHER($4); + CONN_LOOKUP($$)->type = SDB_HOST; + CONN_LOOKUP($$)->matcher = CONN_MATCHER($3); + CONN_LOOKUP($$)->filter = CONN_MATCHER($4); $$->cmd = CONNECTION_LOOKUP; free($2); $2 = NULL; } ; +matching_clause: + MATCHING condition { $$ = $2; } + | + /* empty */ { $$ = NULL; } + +filter_clause: + FILTER condition { $$ = $2; } + | + /* empty */ { $$ = NULL; } + +/* + * TIMESERIES . [START ] [END ]; + * + * Returns a time-series for the specified host's metric. + */ +timeseries_statement: + TIMESERIES STRING '.' STRING start_clause end_clause + { + $$ = SDB_CONN_NODE(sdb_object_create_dT(/* name = */ NULL, + conn_ts_t, conn_ts_destroy)); + CONN_TS($$)->hostname = $2; + CONN_TS($$)->metric = $4; + CONN_TS($$)->opts.start = $5; + CONN_TS($$)->opts.end = $6; + $$->cmd = CONNECTION_TIMESERIES; + } + ; + +start_clause: + START datetime { $$ = $2; } + | + /* empty */ { $$ = sdb_gettime() - SDB_INTERVAL_HOUR; } + +end_clause: + END datetime { $$ = $2; } + | + /* empty */ { $$ = sdb_gettime(); } + +/* + * Basic expressions. + */ + condition: matcher { @@ -266,8 +392,8 @@ condition: } $$ = SDB_CONN_NODE(sdb_object_create_dT(/* name = */ NULL, - conn_node_matcher_t, conn_matcher_destroy)); - $$->cmd = CONNECTION_EXPR; + conn_matcher_t, conn_matcher_destroy)); + $$->cmd = CONNECTION_MATCHER; CONN_MATCHER($$)->matcher = $1; } ; @@ -305,50 +431,43 @@ matcher: ; /* - * . + * . * * Parse matchers comparing object attributes with a value. */ compare_matcher: - ':' IDENTIFIER op expression + '.' IDENTIFIER cmp expression { $$ = sdb_store_matcher_parse_field_cmp($2, $3, $4); free($2); $2 = NULL; sdb_object_deref(SDB_OBJ($4)); } | - IDENTIFIER op expression + IDENTIFIER cmp expression { $$ = sdb_store_matcher_parse_cmp($1, NULL, $2, $3); free($1); $1 = NULL; sdb_object_deref(SDB_OBJ($3)); } | - IDENTIFIER '.' IDENTIFIER op expression + IDENTIFIER '[' STRING ']' cmp expression { - $$ = sdb_store_matcher_parse_cmp($1, $3, $4, $5); + $$ = sdb_store_matcher_parse_cmp($1, $3, $5, $6); free($1); $1 = NULL; free($3); $3 = NULL; - sdb_object_deref(SDB_OBJ($5)); + sdb_object_deref(SDB_OBJ($6)); } | - IDENTIFIER '.' IDENTIFIER IS NULL_T + expression IS NULL_T { - $$ = sdb_store_matcher_parse_cmp($1, $3, "IS", NULL); - free($1); $1 = NULL; - free($3); $3 = NULL; + $$ = sdb_store_isnull_matcher($1); + sdb_object_deref(SDB_OBJ($1)); } | - IDENTIFIER '.' IDENTIFIER IS NOT NULL_T + expression IS NOT NULL_T { - sdb_store_matcher_t *m; - m = sdb_store_matcher_parse_cmp($1, $3, "IS", NULL); - free($1); $1 = NULL; - free($3); $3 = NULL; - - /* sdb_store_inv_matcher return NULL if m==NULL */ - $$ = sdb_store_inv_matcher(m); - sdb_object_deref(SDB_OBJ(m)); + $$ = sdb_store_isnnull_matcher($1); + sdb_object_deref(SDB_OBJ($1)); } ; @@ -393,6 +512,27 @@ expression: sdb_object_deref(SDB_OBJ($3)); $3 = NULL; } | + expression CONCAT expression + { + $$ = sdb_store_expr_create(SDB_DATA_CONCAT, $1, $3); + sdb_object_deref(SDB_OBJ($1)); $1 = NULL; + sdb_object_deref(SDB_OBJ($3)); $3 = NULL; + } + | + '.' IDENTIFIER + { + int field = sdb_store_parse_field_name($2); + free($2); $2 = NULL; + $$ = sdb_store_expr_fieldvalue(field); + } + | + IDENTIFIER '[' STRING ']' + { + $$ = sdb_store_expr_attrvalue($3); + free($1); $1 = NULL; + free($3); $3 = NULL; + } + | data { $$ = sdb_store_expr_constvalue(&$1); @@ -400,7 +540,7 @@ expression: } ; -op: +cmp: CMP_EQUAL { $$ = "="; } | CMP_NEQUAL { $$ = "!="; } @@ -425,9 +565,19 @@ data: | FLOAT { $$ = $1; } | + datetime { $$.type = SDB_TYPE_DATETIME; $$.data.datetime = $1; } + | interval { $$ = $1; } ; +datetime: + DATE TIME { $$ = $1 + $2; } + | + DATE { $$ = $1; } + | + TIME { $$ = $1; } + ; + interval: interval interval_elem {