diff --git a/src/frontend/grammar.y b/src/frontend/grammar.y
index a297714c074f20a22690245c5c51a8ab1f6d89bb..ef479efc336ba30e90182ae72557c0892091fc07 100644 (file)
--- a/src/frontend/grammar.y
+++ b/src/frontend/grammar.y
#include "core/store.h"
#include "core/store-private.h"
+#include "core/time.h"
#include "utils/error.h"
#include "utils/llist.h"
char *str;
sdb_data_t data;
+ sdb_time_t datetime;
sdb_llist_t *list;
sdb_conn_node_t *node;
%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 <str> IDENTIFIER STRING
%token <data> INTEGER FLOAT
+%token <datetime> DATE TIME
+
/* Precedence (lowest first): */
%left OR
%left AND
%nonassoc IS
%left '+' '-'
%left '*' '/' '%'
+%left '[' ']'
%left '(' ')'
%left '.'
fetch_statement
list_statement
lookup_statement
+ timeseries_statement
matching_clause
filter_clause
condition
%type <expr> expression
-%type <sstr> op
+%type <sstr> cmp
%type <data> data
interval interval_elem
+%type <datetime> datetime
+ start_clause end_clause
+
%destructor { free($$); } <str>
%destructor { sdb_object_deref(SDB_OBJ($$)); } <node> <m> <expr>
|
lookup_statement
|
+ timeseries_statement
+ |
/* empty */
{
$$ = NULL;
$$ = SDB_CONN_NODE(sdb_object_create_dT(/* name = */ NULL,
conn_fetch_t, conn_fetch_destroy));
+ CONN_FETCH($$)->type = SDB_HOST;
CONN_FETCH($$)->name = $3;
CONN_FETCH($$)->filter = CONN_MATCHER($4);
$$->cmd = CONNECTION_FETCH;
list_statement:
LIST IDENTIFIER filter_clause
{
- /* TODO: support other types as well */
- if (strcasecmp($2, "hosts")) {
+ 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_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;
$$ = SDB_CONN_NODE(sdb_object_create_dT(/* name = */ NULL,
conn_lookup_t, conn_lookup_destroy));
+ CONN_LOOKUP($$)->type = SDB_HOST;
CONN_LOOKUP($$)->matcher = CONN_MATCHER($3);
CONN_LOOKUP($$)->filter = CONN_MATCHER($4);
$$->cmd = CONNECTION_LOOKUP;
|
/* empty */ { $$ = NULL; }
+/*
+ * TIMESERIES <host>.<metric> [START <datetime>] [END <datetime>];
+ *
+ * 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.
*/
$$ = SDB_CONN_NODE(sdb_object_create_dT(/* name = */ NULL,
conn_matcher_t, conn_matcher_destroy));
- $$->cmd = CONNECTION_EXPR;
+ $$->cmd = CONNECTION_MATCHER;
CONN_MATCHER($$)->matcher = $1;
}
;
;
/*
- * <object_type>.<object_attr> <op> <value>
+ * <object_type>.<object_attr> <cmp> <value>
*
* 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 '[' IDENTIFIER ']' 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
+ IDENTIFIER '[' IDENTIFIER ']' IS NULL_T
{
$$ = sdb_store_matcher_parse_cmp($1, $3, "IS", NULL);
free($1); $1 = NULL;
free($3); $3 = NULL;
}
|
- IDENTIFIER '.' IDENTIFIER IS NOT NULL_T
+ IDENTIFIER '[' IDENTIFIER ']' IS NOT NULL_T
{
sdb_store_matcher_t *m;
m = sdb_store_matcher_parse_cmp($1, $3, "IS", NULL);
sdb_object_deref(SDB_OBJ($3)); $3 = NULL;
}
|
- ':' IDENTIFIER
+ 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 '[' IDENTIFIER ']'
+ {
+ $$ = sdb_store_expr_attrvalue($3);
+ free($1); $1 = NULL;
+ free($3); $3 = NULL;
+ }
+ |
data
{
$$ = sdb_store_expr_constvalue(&$1);
}
;
-op:
+cmp:
CMP_EQUAL { $$ = "="; }
|
CMP_NEQUAL { $$ = "!="; }
|
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
{