![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/frontend/grammar.y b/src/frontend/grammar.y
index 08d194deeac438290b55dd570356e31d6099a449..9cf98eef406c2b5ecb54096706fd4abba8849050 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 <m> matcher
%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;
;
/*
- * FETCH <hostname>;
+ * FETCH <type> <hostname> [FILTER <condition>];
*
* 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 <type> [FILTER <condition>];
*
* 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;
}
;
* 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($$)->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; }
|
- 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;
- }
+ /* empty */ { $$ = NULL; }
+filter_clause:
+ FILTER condition { $$ = $2; }
+ |
+ /* 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_lookup_t, conn_lookup_destroy));
- CONN_LOOKUP($$)->matcher = CONN_MATCHER($4);
- CONN_LOOKUP($$)->filter = CONN_MATCHER($6);
- $$->cmd = CONNECTION_LOOKUP;
- free($2); $2 = 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
{
* Parse matchers comparing object attributes with a value.
*/
compare_matcher:
- ':' IDENTIFIER op expression
+ '.' IDENTIFIER op expression
{
$$ = sdb_store_matcher_parse_field_cmp($2, $3, $4);
free($2); $2 = NULL;
sdb_object_deref(SDB_OBJ($3));
}
|
- IDENTIFIER '.' IDENTIFIER op expression
+ IDENTIFIER '[' IDENTIFIER ']' op 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
+ '.' IDENTIFIER
{
int field = sdb_store_parse_field_name($2);
free($2); $2 = NULL;
|
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
{