X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Ffrontend%2Fgrammar.y;h=92b55ebbd509eb9d62c975a3866c5aa67ce07534;hb=8075debb62385a01df5b8d344ad590cf0575c2eb;hp=8e5ddf6e5eff7a1e32646ad0d62795109a2b61f9;hpb=c08c6541795e2ca4da72640a449347d7b708b1dc;p=sysdb.git

diff --git a/src/frontend/grammar.y b/src/frontend/grammar.y
index 8e5ddf6..92b55eb 100644
--- a/src/frontend/grammar.y
+++ b/src/frontend/grammar.y
@@ -33,13 +33,31 @@
 
 #include "core/store.h"
 #include "core/store-private.h"
+#include "core/time.h"
 
 #include "utils/error.h"
 #include "utils/llist.h"
 
+#include <assert.h>
+
 #include <stdio.h>
 #include <string.h>
 
+/*
+ * private helper functions
+ */
+
+static sdb_store_matcher_t *
+name_matcher(const char *type_name, const char *cmp, sdb_store_expr_t *expr);
+
+static sdb_store_matcher_t *
+name_iter_matcher(int m_type, const char *type_name, const char *cmp,
+		sdb_store_expr_t *expr);
+
+/*
+ * public API
+ */
+
 int
 sdb_fe_yylex(YYSTYPE *yylval, YYLTYPE *yylloc, sdb_fe_yyscan_t yyscanner);
 
@@ -55,6 +73,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
@@ -69,29 +93,51 @@ sdb_fe_yyerror(YYLTYPE *lval, sdb_fe_yyscan_t scanner, const char *msg);
 	const char *sstr; /* static string */
 	char *str;
 
+	sdb_data_t data;
+	sdb_time_t datetime;
+
 	sdb_llist_t     *list;
 	sdb_conn_node_t *node;
 
 	sdb_store_matcher_t *m;
+	sdb_store_expr_t *expr;
 }
 
 %start statements
 
 %token SCANNER_ERROR
 
-%token AND OR NOT WHERE
+%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 ALL ANY IN
+%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
-%left NOT
+%right NOT
 %left CMP_EQUAL CMP_NEQUAL
-%left CMP_REGEX CMP_NREGEX
+%left CMP_LT CMP_LE CMP_GE CMP_GT
+%nonassoc CMP_REGEX CMP_NREGEX
+%nonassoc IN
+%left CONCAT
+%nonassoc IS
+%left '+' '-'
+%left '*' '/' '%'
+%left '[' ']'
 %left '(' ')'
 %left '.'
 
@@ -100,26 +146,40 @@ sdb_fe_yyerror(YYLTYPE *lval, sdb_fe_yyscan_t scanner, const char *msg);
 	fetch_statement
 	list_statement
 	lookup_statement
-	expression
+	timeseries_statement
+	matching_clause
+	filter_clause
+	condition
 
 %type <m> matcher
 	compare_matcher
 
-%type <sstr> op
+%type <expr> expression
+
+%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>
+%destructor { sdb_object_deref(SDB_OBJ($$)); } <node> <m> <expr>
+%destructor { sdb_data_free_datum(&$$); } <data>
 
 %%
 
 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 expression"));
+							"expecting %s"), MODE_TO_STRING(parser_mode));
+				sdb_fe_yyerror(&yylloc, scanner, errmsg);
 				sdb_object_deref(SDB_OBJ($3));
 				YYABORT;
 			}
@@ -132,11 +192,32 @@ 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 expression"));
+							"expecting %s"), MODE_TO_STRING(parser_mode));
+				sdb_fe_yyerror(&yylloc, scanner, errmsg);
+				sdb_object_deref(SDB_OBJ($1));
+				YYABORT;
+			}
+
+			if ($1) {
+				sdb_llist_append(pt, SDB_OBJ($1));
+				sdb_object_deref(SDB_OBJ($1));
+			}
+		}
+	|
+	condition
+		{
+			/* only accepted in condition parse mode */
+			if (! (parser_mode & SDB_PARSE_COND)) {
+				char errmsg[1024];
+				snprintf(errmsg, sizeof(errmsg),
+						YY_("syntax error, unexpected condition, "
+							"expecting %s"), MODE_TO_STRING(parser_mode));
+				sdb_fe_yyerror(&yylloc, scanner, errmsg);
 				sdb_object_deref(SDB_OBJ($1));
 				YYABORT;
 			}
@@ -149,18 +230,26 @@ statements:
 	|
 	expression
 		{
-			/* only accept this in expression parse mode */
+			/* only accepted in expression parse mode */
 			if (! (parser_mode & SDB_PARSE_EXPR)) {
-				sdb_fe_yyerror(&yylloc, scanner,
+				char errmsg[1024];
+				snprintf(errmsg, sizeof(errmsg),
 						YY_("syntax error, unexpected expression, "
-							"expecting statement"));
+							"expecting %s"), MODE_TO_STRING(parser_mode));
+				sdb_fe_yyerror(&yylloc, scanner, errmsg);
 				sdb_object_deref(SDB_OBJ($1));
 				YYABORT;
 			}
 
 			if ($1) {
-				sdb_llist_append(pt, SDB_OBJ($1));
-				sdb_object_deref(SDB_OBJ($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));
 			}
 		}
 	;
@@ -172,6 +261,8 @@ statement:
 	|
 	lookup_statement
 	|
+	timeseries_statement
+	|
 	/* empty */
 		{
 			$$ = NULL;
@@ -179,75 +270,148 @@ statement:
 	;
 
 /*
- * 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) || (type == SDB_ATTRIBUTE)) {
+				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 <type> WHERE <expression>;
+ * LOOKUP <type> MATCHING <condition> [FILTER <condition>];
  *
- * Returns detailed information about <type> matching expression.
+ * Returns detailed information about <type> matching condition.
  */
 lookup_statement:
-	LOOKUP IDENTIFIER WHERE expression
+	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;
 		}
 	;
 
-expression:
+matching_clause:
+	MATCHING condition { $$ = $2; }
+	|
+	/* 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_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
 		{
 			if (! $1) {
 				/* TODO: improve error reporting */
 				sdb_fe_yyerror(&yylloc, scanner,
-						YY_("syntax error, invalid expression"));
+						YY_("syntax error, invalid condition"));
 				YYABORT;
 			}
 
 			$$ = 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;
 		}
 	;
@@ -284,22 +448,136 @@ matcher:
 		}
 	;
 
-/*
- * <object_type>.<object_attr> <op> <value>
- *
- * Parse matchers comparing object attributes with a value.
- */
 compare_matcher:
-	IDENTIFIER '.' IDENTIFIER op STRING
+	expression cmp expression
+		{
+			sdb_store_matcher_op_cb cb = sdb_store_parse_matcher_op($2);
+			assert(cb); /* else, the grammar accepts invalid 'cmp' */
+			$$ = cb($1, $3);
+			sdb_object_deref(SDB_OBJ($1));
+			sdb_object_deref(SDB_OBJ($3));
+		}
+	|
+	IDENTIFIER cmp expression
 		{
-			$$ = sdb_store_matcher_parse_cmp($1, $3, $4, $5);
+			$$ = name_matcher($1, $2, $3);
+			free($1); $1 = NULL;
+			sdb_object_deref(SDB_OBJ($3));
+		}
+	|
+	ANY IDENTIFIER cmp expression
+		{
+			$$ = name_iter_matcher(MATCHER_ANY, $2, $3, $4);
+			free($2); $2 = NULL;
+			sdb_object_deref(SDB_OBJ($4));
+		}
+	|
+	ALL IDENTIFIER cmp expression
+		{
+			$$ = name_iter_matcher(MATCHER_ALL, $2, $3, $4);
+			free($2); $2 = NULL;
+			sdb_object_deref(SDB_OBJ($4));
+		}
+	|
+	expression IS NULL_T
+		{
+			$$ = sdb_store_isnull_matcher($1);
+			sdb_object_deref(SDB_OBJ($1));
+		}
+	|
+	expression IS NOT NULL_T
+		{
+			$$ = sdb_store_isnnull_matcher($1);
+			sdb_object_deref(SDB_OBJ($1));
+		}
+	|
+	expression IN expression
+		{
+			$$ = sdb_store_in_matcher($1, $3);
+			sdb_object_deref(SDB_OBJ($1));
+			sdb_object_deref(SDB_OBJ($3));
+		}
+	;
+
+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;
+		}
+	|
+	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 ']'
+		{
+			if (strcasecmp($1, "attribute")) {
+				char errmsg[strlen($1) + strlen($3) + 32];
+				snprintf(errmsg, sizeof(errmsg),
+						YY_("unknown value %s[%s]"), $1, $3);
+				sdb_fe_yyerror(&yylloc, scanner, errmsg);
+				free($1); $1 = NULL;
+				free($3); $3 = NULL;
+				YYABORT;
+			}
+			$$ = sdb_store_expr_attrvalue($3);
 			free($1); $1 = NULL;
 			free($3); $3 = NULL;
-			free($5); $5 = NULL;
+		}
+	|
+	data
+		{
+			$$ = sdb_store_expr_constvalue(&$1);
+			sdb_data_free_datum(&$1);
 		}
 	;
 
-op:
+cmp:
 	CMP_EQUAL { $$ = "="; }
 	|
 	CMP_NEQUAL { $$ = "!="; }
@@ -307,6 +585,70 @@ op:
 	CMP_REGEX { $$ = "=~"; }
 	|
 	CMP_NREGEX { $$ = "!~"; }
+	|
+	CMP_LT { $$ = "<"; }
+	|
+	CMP_LE { $$ = "<="; }
+	|
+	CMP_GE { $$ = ">="; }
+	|
+	CMP_GT { $$ = ">"; }
+	;
+
+data:
+	STRING { $$.type = SDB_TYPE_STRING; $$.data.string = $1; }
+	|
+	INTEGER { $$ = $1; }
+	|
+	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
+		{
+			$$.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;
+			}
+		}
 	;
 
 %%
@@ -317,5 +659,52 @@ sdb_fe_yyerror(YYLTYPE *lval, sdb_fe_yyscan_t scanner, const char *msg)
 	sdb_log(SDB_LOG_ERR, "frontend: parse error: %s", msg);
 } /* sdb_fe_yyerror */
 
+static sdb_store_matcher_t *
+name_matcher(const char *type_name, const char *cmp, sdb_store_expr_t *expr)
+{
+	int type = sdb_store_parse_object_type(type_name);
+	sdb_store_matcher_op_cb cb = sdb_store_parse_matcher_op(cmp);
+	sdb_store_expr_t *e;
+	sdb_store_matcher_t *m;
+	assert(cb);
+
+	/* TODO: this only works as long as queries
+	 * are limited to hosts */
+	if (type != SDB_HOST)
+		return NULL;
+
+	e = sdb_store_expr_fieldvalue(SDB_FIELD_NAME);
+	m = cb(e, expr);
+	sdb_object_deref(SDB_OBJ(e));
+	return m;
+} /* name_matcher */
+
+static sdb_store_matcher_t *
+name_iter_matcher(int m_type, const char *type_name, const char *cmp,
+		sdb_store_expr_t *expr)
+{
+	int type = sdb_store_parse_object_type(type_name);
+	sdb_store_matcher_op_cb cb = sdb_store_parse_matcher_op(cmp);
+	sdb_store_expr_t *e;
+	sdb_store_matcher_t *m, *tmp = NULL;
+	assert(cb);
+
+	/* TODO: this only works as long as queries
+	 * are limited to hosts */
+	if (type == SDB_HOST) {
+		return NULL;
+	}
+
+	e = sdb_store_expr_fieldvalue(SDB_FIELD_NAME);
+	m = cb(e, expr);
+	if (m_type == MATCHER_ANY)
+		tmp = sdb_store_any_matcher(type, m);
+	else if (m_type == MATCHER_ALL)
+		tmp = sdb_store_all_matcher(type, m);
+	sdb_object_deref(SDB_OBJ(m));
+	sdb_object_deref(SDB_OBJ(e));
+	return tmp;
+} /* name_iter_matcher */
+
 /* vim: set tw=78 sw=4 ts=4 noexpandtab : */