diff --git a/src/frontend/grammar.y b/src/frontend/grammar.y
index e0d8e7ecc46136b01cb84546ba1d3e11d7fb9e2b..a2ae448cc744166875afd8e0f4904b5a186ad5cf 100644 (file)
--- a/src/frontend/grammar.y
+++ b/src/frontend/grammar.y
sdb_conn_node_t *node;
sdb_store_matcher_t *m;
+ sdb_store_expr_t *expr;
}
%start statements
%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
/* NULL token */
%token NULL_T
%left CMP_EQUAL CMP_NEQUAL
%left CMP_LT CMP_LE CMP_GE CMP_GT
%nonassoc CMP_REGEX CMP_NREGEX
+%left CONCAT
%nonassoc IS
+%left '+' '-'
+%left '*' '/' '%'
%left '(' ')'
%left '.'
fetch_statement
list_statement
lookup_statement
+ matching_clause
+ filter_clause
condition
%type <m> matcher
compare_matcher
+%type <expr> expression
+
%type <sstr> op
%type <data> data
+ interval interval_elem
%destructor { free($$); } <str>
-%destructor { sdb_object_deref(SDB_OBJ($$)); } <node> <m>
+%destructor { sdb_object_deref(SDB_OBJ($$)); } <node> <m> <expr>
%%
* Retrieve detailed information about a single host.
*/
fetch_statement:
- FETCH STRING
+ FETCH STRING filter_clause
{
$$ = SDB_CONN_NODE(sdb_object_create_dT(/* name = */ NULL,
conn_fetch_t, conn_fetch_destroy));
CONN_FETCH($$)->name = strdup($2);
+ CONN_FETCH($$)->filter = CONN_MATCHER($3);
$$->cmd = CONNECTION_FETCH;
free($2); $2 = NULL;
}
* Returns a list of all hosts in the store.
*/
list_statement:
- LIST
+ LIST filter_clause
{
- $$ = SDB_CONN_NODE(sdb_object_create_T(/* name = */ NULL,
- sdb_conn_node_t));
+ $$ = SDB_CONN_NODE(sdb_object_create_dT(/* name = */ NULL,
+ conn_list_t, conn_list_destroy));
+ CONN_LIST($$)->filter = CONN_MATCHER($2);
$$->cmd = CONNECTION_LIST;
}
;
/*
- * LOOKUP <type> MATCHING <condition>;
+ * LOOKUP <type> MATCHING <condition> [FILTER <condition>];
*
* Returns detailed information about <type> 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($$)->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; }
+
+/*
+ * Basic expressions.
+ */
+
condition:
matcher
{
}
$$ = 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 data
+ ':' 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_store_matcher_parse_cmp($1, NULL, $2, &$3);
+ $$ = sdb_store_matcher_parse_cmp($1, NULL, $2, $3);
free($1); $1 = NULL;
- sdb_data_free_datum(&$3);
+ sdb_object_deref(SDB_OBJ($3));
}
|
- IDENTIFIER '.' IDENTIFIER op data
+ IDENTIFIER '.' IDENTIFIER op expression
{
- $$ = sdb_store_matcher_parse_cmp($1, $3, $4, &$5);
+ $$ = sdb_store_matcher_parse_cmp($1, $3, $4, $5);
free($1); $1 = NULL;
free($3); $3 = NULL;
- sdb_data_free_datum(&$5);
+ sdb_object_deref(SDB_OBJ($5));
}
|
IDENTIFIER '.' IDENTIFIER IS NULL_T
}
;
+expression:
+ '(' expression ')'
+ {
+ $$ = $2;
+ }
+ |
+ expression '+' expression
+ {
+ $$ = sdb_store_expr_create(SDB_DATA_ADD, $1, $3);
+ sdb_object_deref(SDB_OBJ($1)); $1 = NULL;
+ sdb_object_deref(SDB_OBJ($3)); $3 = NULL;
+ }
+ |
+ expression '-' expression
+ {
+ $$ = sdb_store_expr_create(SDB_DATA_SUB, $1, $3);
+ sdb_object_deref(SDB_OBJ($1)); $1 = NULL;
+ sdb_object_deref(SDB_OBJ($3)); $3 = NULL;
+ }
+ |
+ expression '*' expression
+ {
+ $$ = sdb_store_expr_create(SDB_DATA_MUL, $1, $3);
+ sdb_object_deref(SDB_OBJ($1)); $1 = NULL;
+ sdb_object_deref(SDB_OBJ($3)); $3 = NULL;
+ }
+ |
+ expression '/' expression
+ {
+ $$ = sdb_store_expr_create(SDB_DATA_DIV, $1, $3);
+ sdb_object_deref(SDB_OBJ($1)); $1 = NULL;
+ sdb_object_deref(SDB_OBJ($3)); $3 = NULL;
+ }
+ |
+ expression '%' expression
+ {
+ $$ = sdb_store_expr_create(SDB_DATA_MOD, $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);
+ }
+ |
+ data
+ {
+ $$ = sdb_store_expr_constvalue(&$1);
+ sdb_data_free_datum(&$1);
+ }
+ ;
+
op:
CMP_EQUAL { $$ = "="; }
|
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;
+ }
+ }
;
%%