diff --git a/src/frontend/grammar.y b/src/frontend/grammar.y
index 0afbd9edb32461c00eb36f2248d0259204b1d930..92bfd1f5c60d2ab24d5e0b6f82b90e7e4ce73c71 100644 (file)
--- a/src/frontend/grammar.y
+++ b/src/frontend/grammar.y
%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
%type <sstr> op
%type <data> data
+ interval interval_elem
%destructor { free($$); } <str>
%destructor { sdb_object_deref(SDB_OBJ($$)); } <node> <m> <expr>
;
/*
- * LOOKUP <type> MATCHING <condition>;
+ * LOOKUP <type> MATCHING <condition> [FILTER <condition>];
*
* Returns detailed information about <type> matching condition.
*/
$$->cmd = CONNECTION_LOOKUP;
free($2); $2 = NULL;
}
+ |
+ LOOKUP IDENTIFIER MATCHING condition FILTER condition
+ {
+ /* TODO: support other types as well */
+ if (strcasecmp($2, "hosts")) {
+ char errmsg[strlen($2) + 32];
+ snprintf(errmsg, sizeof(errmsg),
+ YY_("unknown table %s"), $2);
+ sdb_fe_yyerror(&yylloc, scanner, errmsg);
+ free($2); $2 = NULL;
+ 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($$)->filter = CONN_MATCHER($6);
+ $$->cmd = CONNECTION_LOOKUP;
+ free($2); $2 = NULL;
+ }
;
condition:
}
$$ = SDB_CONN_NODE(sdb_object_create_dT(/* name = */ NULL,
- conn_node_matcher_t, conn_matcher_destroy));
+ conn_matcher_t, conn_matcher_destroy));
$$->cmd = CONNECTION_EXPR;
CONN_MATCHER($$)->matcher = $1;
}
* Parse matchers comparing object attributes with a value.
*/
compare_matcher:
+ ':' IDENTIFIER op expression
+ {
+ $$ = sdb_store_matcher_parse_field_cmp($2, $3, $4);
+ free($2); $2 = NULL;
+ sdb_object_deref(SDB_OBJ($4));
+ }
+ |
IDENTIFIER op expression
{
- sdb_data_t value = SDB_DATA_INIT;
- if (sdb_store_expr_eval($3, &value)) {
- sdb_object_deref(SDB_OBJ($3));
- free($1); $1 = NULL;
- sdb_fe_yyerror(&yylloc, scanner,
- YY_("syntax error, failed to evaluate expression"));
- YYABORT;
- }
- sdb_object_deref(SDB_OBJ($3));
- $$ = sdb_store_matcher_parse_cmp($1, NULL, $2, &value);
+ $$ = sdb_store_matcher_parse_cmp($1, NULL, $2, $3);
free($1); $1 = NULL;
- sdb_data_free_datum(&value);
+ sdb_object_deref(SDB_OBJ($3));
}
|
IDENTIFIER '.' IDENTIFIER op expression
{
- sdb_data_t value = SDB_DATA_INIT;
- if (sdb_store_expr_eval($5, &value)) {
- sdb_object_deref(SDB_OBJ($5));
- free($1); $1 = NULL;
- free($3); $3 = NULL;
- sdb_fe_yyerror(&yylloc, scanner,
- YY_("syntax error, failed to evaluate expression"));
- YYABORT;
- }
- sdb_object_deref(SDB_OBJ($5));
- $$ = sdb_store_matcher_parse_cmp($1, $3, $4, &value);
+ $$ = sdb_store_matcher_parse_cmp($1, $3, $4, $5);
free($1); $1 = NULL;
free($3); $3 = NULL;
- sdb_data_free_datum(&value);
+ sdb_object_deref(SDB_OBJ($5));
}
|
IDENTIFIER '.' IDENTIFIER IS NULL_T
INTEGER { $$ = $1; }
|
FLOAT { $$ = $1; }
+ |
+ interval { $$ = $1; }
+ ;
+
+interval:
+ interval interval_elem
+ {
+ $$.data.datetime = $1.data.datetime + $2.data.datetime;
+ }
+ |
+ interval_elem { $$ = $1; }
+ ;
+
+interval_elem:
+ INTEGER IDENTIFIER
+ {
+ sdb_time_t unit = 1;
+
+ unit = sdb_strpunit($2);
+ if (! unit) {
+ char errmsg[strlen($2) + 32];
+ snprintf(errmsg, sizeof(errmsg),
+ YY_("invalid time unit %s"), $2);
+ sdb_fe_yyerror(&yylloc, scanner, errmsg);
+ free($2); $2 = NULL;
+ YYABORT;
+ }
+ free($2); $2 = NULL;
+
+ $$.type = SDB_TYPE_DATETIME;
+ $$.data.datetime = (sdb_time_t)$1.data.integer * unit;
+
+ if ($1.data.integer < 0) {
+ sdb_fe_yyerror(&yylloc, scanner,
+ YY_("syntax error, negative intervals not supported"));
+ YYABORT;
+ }
+ }
;
%%