X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=src%2Ffrontend%2Fgrammar.y;h=31b71a0eba7665b94de03bd47c50a0cd989ff24e;hp=3a78d2490960a4f20cbe130f34e133852c08036f;hb=5ced2b9eb4d4def7d3ad5b1172004293e7a68e0e;hpb=2725e5e2024c134f05fd73baccda696572a24335

diff --git a/src/frontend/grammar.y b/src/frontend/grammar.y
index 3a78d24..31b71a0 100644
--- a/src/frontend/grammar.y
+++ b/src/frontend/grammar.y
@@ -38,9 +38,23 @@
 #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_iter_matcher(int m_type, sdb_store_expr_t *iter, const char *cmp,
+		sdb_store_expr_t *expr);
+
+/*
+ * public API
+ */
+
 int
 sdb_fe_yylex(YYSTYPE *yylval, YYLTYPE *yylloc, sdb_fe_yyscan_t yyscanner);
 
@@ -49,6 +63,8 @@ sdb_fe_yyget_extra(sdb_fe_yyscan_t scanner);
 
 void
 sdb_fe_yyerror(YYLTYPE *lval, sdb_fe_yyscan_t scanner, const char *msg);
+void
+sdb_fe_yyerrorf(YYLTYPE *lval, sdb_fe_yyscan_t scanner, const char *fmt, ...);
 
 /* quick access to the current parse tree */
 #define pt sdb_fe_yyget_extra(scanner)->parsetree
@@ -56,6 +72,15 @@ 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
 
+/* quick access to the parser's error buffer */
+#define errbuf sdb_fe_yyget_extra(scanner)->errbuf
+
+#define MODE_TO_STRING(m) \
+	(((m) == SDB_PARSE_DEFAULT) ? "statement" \
+		: ((m) == SDB_PARSE_COND) ? "condition" \
+		: ((m) == SDB_PARSE_ARITH) ? "arithmetic expression" \
+		: "UNKNOWN")
+
 %}
 
 %pure-parser
@@ -69,6 +94,7 @@ sdb_fe_yyerror(YYLTYPE *lval, sdb_fe_yyscan_t scanner, const char *msg);
 %union {
 	const char *sstr; /* static string */
 	char *str;
+	int integer;
 
 	sdb_data_t data;
 	sdb_time_t datetime;
@@ -78,6 +104,8 @@ sdb_fe_yyerror(YYLTYPE *lval, sdb_fe_yyscan_t scanner, const char *msg);
 
 	sdb_store_matcher_t *m;
 	sdb_store_expr_t *expr;
+
+	sdb_metric_store_t metric_store;
 }
 
 %start statements
@@ -86,15 +114,21 @@ sdb_fe_yyerror(YYLTYPE *lval, sdb_fe_yyscan_t scanner, const char *msg);
 
 %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 CMP_LT CMP_LE CMP_GE CMP_GT ALL ANY IN
 %token CONCAT
 
+%token HOST_T HOSTS_T SERVICE_T SERVICES_T METRIC_T METRICS_T
+%token ATTRIBUTE_T ATTRIBUTES_T
+%token NAME_T LAST_UPDATE_T AGE_T INTERVAL_T BACKEND_T VALUE_T
+
+%token LAST UPDATE
+
 %token START END
 
 /* NULL token */
 %token NULL_T
 
-%token FETCH LIST LOOKUP TIMESERIES
+%token FETCH LIST LOOKUP STORE TIMESERIES
 
 %token <str> IDENTIFIER STRING
 
@@ -109,6 +143,7 @@ sdb_fe_yyerror(YYLTYPE *lval, sdb_fe_yyscan_t scanner, const char *msg);
 %left CMP_EQUAL CMP_NEQUAL
 %left CMP_LT CMP_LE CMP_GE CMP_GT
 %nonassoc CMP_REGEX CMP_NREGEX
+%nonassoc IN
 %left CONCAT
 %nonassoc IS
 %left '+' '-'
@@ -122,6 +157,7 @@ sdb_fe_yyerror(YYLTYPE *lval, sdb_fe_yyscan_t scanner, const char *msg);
 	fetch_statement
 	list_statement
 	lookup_statement
+	store_statement
 	timeseries_statement
 	matching_clause
 	filter_clause
@@ -130,29 +166,37 @@ sdb_fe_yyerror(YYLTYPE *lval, sdb_fe_yyscan_t scanner, const char *msg);
 %type <m> matcher
 	compare_matcher
 
-%type <expr> expression
+%type <expr> expression arithmetic_expression object_expression
+
+%type <integer> object_type object_type_plural
+%type <integer> field
 
 %type <sstr> cmp
 
 %type <data> data
 	interval interval_elem
+	array array_elem_list
 
 %type <datetime> datetime
 	start_clause end_clause
+	last_update_clause
+
+%type <metric_store> metric_store_clause
 
 %destructor { free($$); } <str>
 %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,
+				sdb_fe_yyerrorf(&yylloc, scanner,
 						YY_("syntax error, unexpected statement, "
-							"expecting condition"));
+							"expecting %s"), MODE_TO_STRING(parser_mode));
 				sdb_object_deref(SDB_OBJ($3));
 				YYABORT;
 			}
@@ -165,11 +209,11 @@ 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,
+				sdb_fe_yyerrorf(&yylloc, scanner,
 						YY_("syntax error, unexpected statement, "
-							"expecting condition"));
+							"expecting %s"), MODE_TO_STRING(parser_mode));
 				sdb_object_deref(SDB_OBJ($1));
 				YYABORT;
 			}
@@ -182,11 +226,11 @@ statements:
 	|
 	condition
 		{
-			/* only accept this in condition parse mode */
+			/* only accepted in condition parse mode */
 			if (! (parser_mode & SDB_PARSE_COND)) {
-				sdb_fe_yyerror(&yylloc, scanner,
+				sdb_fe_yyerrorf(&yylloc, scanner,
 						YY_("syntax error, unexpected condition, "
-							"expecting statement"));
+							"expecting %s"), MODE_TO_STRING(parser_mode));
 				sdb_object_deref(SDB_OBJ($1));
 				YYABORT;
 			}
@@ -196,6 +240,29 @@ statements:
 				sdb_object_deref(SDB_OBJ($1));
 			}
 		}
+	|
+	expression
+		{
+			/* only accepted in expression parse mode */
+			if (! (parser_mode & SDB_PARSE_ARITH)) {
+				sdb_fe_yyerrorf(&yylloc, scanner,
+						YY_("syntax error, unexpected expression, "
+							"expecting %s"), MODE_TO_STRING(parser_mode));
+				sdb_object_deref(SDB_OBJ($1));
+				YYABORT;
+			}
+
+			if ($1) {
+				sdb_conn_node_t *n;
+				n = SDB_CONN_NODE(sdb_object_create_dT(/* name = */ NULL,
+							conn_expr_t, conn_expr_destroy));
+				n->cmd = SDB_CONNECTION_EXPR;
+				CONN_EXPR(n)->expr = $1;
+
+				sdb_llist_append(pt, SDB_OBJ(n));
+				sdb_object_deref(SDB_OBJ(n));
+			}
+		}
 	;
 
 statement:
@@ -205,6 +272,8 @@ statement:
 	|
 	lookup_statement
 	|
+	store_statement
+	|
 	timeseries_statement
 	|
 	/* empty */
@@ -219,27 +288,26 @@ statement:
  * Retrieve detailed information about a single host.
  */
 fetch_statement:
-	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;
-			}
-
+	FETCH object_type STRING filter_clause
+		{
 			$$ = 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($$)->type = $2;
+			CONN_FETCH($$)->host = $3;
+			CONN_FETCH($$)->name = NULL;
 			CONN_FETCH($$)->filter = CONN_MATCHER($4);
-			$$->cmd = CONNECTION_FETCH;
-			free($2); $2 = NULL;
+			$$->cmd = SDB_CONNECTION_FETCH;
+		}
+	|
+	FETCH object_type STRING '.' STRING filter_clause
+		{
+			$$ = SDB_CONN_NODE(sdb_object_create_dT(/* name = */ NULL,
+						conn_fetch_t, conn_fetch_destroy));
+			CONN_FETCH($$)->type = $2;
+			CONN_FETCH($$)->host = $3;
+			CONN_FETCH($$)->name = $5;
+			CONN_FETCH($$)->filter = CONN_MATCHER($6);
+			$$->cmd = SDB_CONNECTION_FETCH;
 		}
 	;
 
@@ -249,25 +317,13 @@ fetch_statement:
  * Returns a list of all hosts in the store.
  */
 list_statement:
-	LIST IDENTIFIER filter_clause
-		{
-			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;
-			}
-
+	LIST object_type_plural filter_clause
+		{
 			$$ = SDB_CONN_NODE(sdb_object_create_dT(/* name = */ NULL,
 						conn_list_t, conn_list_destroy));
-			CONN_LIST($$)->type = type;
+			CONN_LIST($$)->type = $2;
 			CONN_LIST($$)->filter = CONN_MATCHER($3);
-			$$->cmd = CONNECTION_LIST;
-			free($2); $2 = NULL;
+			$$->cmd = SDB_CONNECTION_LIST;
 		}
 	;
 
@@ -277,27 +333,14 @@ list_statement:
  * Returns detailed information about <type> matching condition.
  */
 lookup_statement:
-	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 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;
-			}
-
+	LOOKUP object_type_plural matching_clause filter_clause
+		{
 			$$ = SDB_CONN_NODE(sdb_object_create_dT(/* name = */ NULL,
 						conn_lookup_t, conn_lookup_destroy));
-			CONN_LOOKUP($$)->type = SDB_HOST;
+			CONN_LOOKUP($$)->type = $2;
 			CONN_LOOKUP($$)->matcher = CONN_MATCHER($3);
 			CONN_LOOKUP($$)->filter = CONN_MATCHER($4);
-			$$->cmd = CONNECTION_LOOKUP;
-			free($2); $2 = NULL;
+			$$->cmd = SDB_CONNECTION_LOOKUP;
 		}
 	;
 
@@ -311,6 +354,95 @@ filter_clause:
 	|
 	/* empty */ { $$ = NULL; }
 
+/*
+ * STORE <type> <name>|<host>.<name> [LAST UPDATE <datetime>];
+ * STORE METRIC <host>.<name> STORE <type> <id> [LAST UPDATE <datetime>];
+ * STORE <type> ATTRIBUTE <parent>.<key> <datum> [LAST UPDATE <datetime>];
+ *
+ * Store or update an object in the database.
+ */
+store_statement:
+	STORE HOST_T STRING last_update_clause
+		{
+			$$ = SDB_CONN_NODE(sdb_object_create_dT(/* name = */ NULL,
+						conn_store_host_t, conn_store_host_destroy));
+			CONN_STORE_HOST($$)->name = $3;
+			CONN_STORE_HOST($$)->last_update = $4;
+			$$->cmd = SDB_CONNECTION_STORE_HOST;
+		}
+	|
+	STORE SERVICE_T STRING '.' STRING last_update_clause
+		{
+			$$ = SDB_CONN_NODE(sdb_object_create_dT(/* name = */ NULL,
+						conn_store_svc_t, conn_store_svc_destroy));
+			CONN_STORE_SVC($$)->hostname = $3;
+			CONN_STORE_SVC($$)->name = $5;
+			CONN_STORE_SVC($$)->last_update = $6;
+			$$->cmd = SDB_CONNECTION_STORE_SERVICE;
+		}
+	|
+	STORE METRIC_T STRING '.' STRING metric_store_clause last_update_clause
+		{
+			$$ = SDB_CONN_NODE(sdb_object_create_dT(/* name = */ NULL,
+						conn_store_metric_t, conn_store_metric_destroy));
+			CONN_STORE_METRIC($$)->hostname = $3;
+			CONN_STORE_METRIC($$)->name = $5;
+			CONN_STORE_METRIC($$)->store_type = $6.type;
+			CONN_STORE_METRIC($$)->store_id = $6.id;
+			CONN_STORE_METRIC($$)->last_update = $7;
+			$$->cmd = SDB_CONNECTION_STORE_METRIC;
+		}
+	|
+	STORE HOST_T ATTRIBUTE_T STRING '.' STRING data last_update_clause
+		{
+			$$ = SDB_CONN_NODE(sdb_object_create_dT(/* name = */ NULL,
+						conn_store_attr_t, conn_store_attr_destroy));
+			CONN_STORE_ATTR($$)->parent_type = SDB_HOST;
+			CONN_STORE_ATTR($$)->hostname = NULL;
+			CONN_STORE_ATTR($$)->parent = $4;
+			CONN_STORE_ATTR($$)->key = $6;
+			CONN_STORE_ATTR($$)->value = $7;
+			CONN_STORE_ATTR($$)->last_update = $8;
+			$$->cmd = SDB_CONNECTION_STORE_ATTRIBUTE;
+		}
+	|
+	STORE SERVICE_T ATTRIBUTE_T STRING '.' STRING '.' STRING data last_update_clause
+		{
+			$$ = SDB_CONN_NODE(sdb_object_create_dT(/* name = */ NULL,
+						conn_store_attr_t, conn_store_attr_destroy));
+			CONN_STORE_ATTR($$)->parent_type = SDB_SERVICE;
+			CONN_STORE_ATTR($$)->hostname = $4;
+			CONN_STORE_ATTR($$)->parent = $6;
+			CONN_STORE_ATTR($$)->key = $8;
+			CONN_STORE_ATTR($$)->value = $9;
+			CONN_STORE_ATTR($$)->last_update = $10;
+			$$->cmd = SDB_CONNECTION_STORE_ATTRIBUTE;
+		}
+	|
+	STORE METRIC_T ATTRIBUTE_T STRING '.' STRING '.' STRING data last_update_clause
+		{
+			$$ = SDB_CONN_NODE(sdb_object_create_dT(/* name = */ NULL,
+						conn_store_attr_t, conn_store_attr_destroy));
+			CONN_STORE_ATTR($$)->parent_type = SDB_METRIC;
+			CONN_STORE_ATTR($$)->hostname = $4;
+			CONN_STORE_ATTR($$)->parent = $6;
+			CONN_STORE_ATTR($$)->key = $8;
+			CONN_STORE_ATTR($$)->value = $9;
+			CONN_STORE_ATTR($$)->last_update = $10;
+			$$->cmd = SDB_CONNECTION_STORE_ATTRIBUTE;
+		}
+	;
+
+last_update_clause:
+	LAST UPDATE datetime { $$ = $3; }
+	|
+	/* empty */ { $$ = sdb_gettime(); }
+
+metric_store_clause:
+	STORE STRING STRING { $$.type = $2; $$.id = $3; }
+	|
+	/* empty */ { $$.type = $$.id = NULL; }
+
 /*
  * TIMESERIES <host>.<metric> [START <datetime>] [END <datetime>];
  *
@@ -325,7 +457,7 @@ timeseries_statement:
 			CONN_TS($$)->metric = $4;
 			CONN_TS($$)->opts.start = $5;
 			CONN_TS($$)->opts.end = $6;
-			$$->cmd = CONNECTION_TIMESERIES;
+			$$->cmd = SDB_CONNECTION_TIMESERIES;
 		}
 	;
 
@@ -355,7 +487,7 @@ condition:
 
 			$$ = SDB_CONN_NODE(sdb_object_create_dT(/* name = */ NULL,
 						conn_matcher_t, conn_matcher_destroy));
-			$$->cmd = CONNECTION_EXPR;
+			$$->cmd = SDB_CONNECTION_MATCHER;
 			CONN_MATCHER($$)->matcher = $1;
 		}
 	;
@@ -392,55 +524,83 @@ matcher:
 		}
 	;
 
-/*
- * <object_type>.<object_attr> <cmp> <value>
- *
- * Parse matchers comparing object attributes with a value.
- */
 compare_matcher:
-	'.' IDENTIFIER cmp expression
+	expression cmp expression
 		{
-			$$ = sdb_store_matcher_parse_field_cmp($2, $3, $4);
-			free($2); $2 = NULL;
+			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));
+		}
+	|
+	ANY expression cmp expression
+		{
+			$$ = name_iter_matcher(MATCHER_ANY, $2, $3, $4);
+			sdb_object_deref(SDB_OBJ($2));
 			sdb_object_deref(SDB_OBJ($4));
 		}
 	|
-	IDENTIFIER cmp expression
+	ALL expression cmp expression
 		{
-			$$ = sdb_store_matcher_parse_cmp($1, NULL, $2, $3);
-			free($1); $1 = NULL;
-			sdb_object_deref(SDB_OBJ($3));
+			$$ = name_iter_matcher(MATCHER_ALL, $2, $3, $4);
+			sdb_object_deref(SDB_OBJ($2));
+			sdb_object_deref(SDB_OBJ($4));
 		}
 	|
-	IDENTIFIER '[' IDENTIFIER ']' cmp expression
+	expression IS NULL_T
 		{
-			$$ = sdb_store_matcher_parse_cmp($1, $3, $5, $6);
-			free($1); $1 = NULL;
-			free($3); $3 = NULL;
-			sdb_object_deref(SDB_OBJ($6));
+			$$ = sdb_store_isnull_matcher($1);
+			sdb_object_deref(SDB_OBJ($1));
 		}
 	|
-	IDENTIFIER '[' IDENTIFIER ']' IS NULL_T
+	expression IS NOT NULL_T
 		{
-			$$ = sdb_store_matcher_parse_cmp($1, $3, "IS", NULL);
-			free($1); $1 = NULL;
-			free($3); $3 = NULL;
+			$$ = sdb_store_isnnull_matcher($1);
+			sdb_object_deref(SDB_OBJ($1));
 		}
 	|
-	IDENTIFIER '[' IDENTIFIER ']' IS NOT NULL_T
+	expression IN expression
 		{
-			sdb_store_matcher_t *m;
-			m = sdb_store_matcher_parse_cmp($1, $3, "IS", NULL);
-			free($1); $1 = NULL;
-			free($3); $3 = NULL;
-
-			/* sdb_store_inv_matcher return NULL if m==NULL */
-			$$ = sdb_store_inv_matcher(m);
-			sdb_object_deref(SDB_OBJ(m));
+			$$ = sdb_store_in_matcher($1, $3);
+			sdb_object_deref(SDB_OBJ($1));
+			sdb_object_deref(SDB_OBJ($3));
+		}
+	|
+	expression NOT IN expression
+		{
+			$$ = sdb_store_nin_matcher($1, $4);
+			sdb_object_deref(SDB_OBJ($1));
+			sdb_object_deref(SDB_OBJ($4));
 		}
 	;
 
 expression:
+	arithmetic_expression
+		{
+			if (! $1) {
+				/* we should have better error messages here
+				 * TODO: maybe let the analyzer handle this instead */
+				sdb_fe_yyerror(&yylloc, scanner,
+						YY_("syntax error, invalid arithmetic expression"));
+				YYABORT;
+			}
+			$$ = $1;
+		}
+	|
+	object_expression
+		{
+			$$ = $1;
+		}
+	|
+	data
+		{
+			$$ = sdb_store_expr_constvalue(&$1);
+			sdb_data_free_datum(&$1);
+		}
+	;
+
+arithmetic_expression:
 	'(' expression ')'
 		{
 			$$ = $2;
@@ -481,20 +641,69 @@ expression:
 			sdb_object_deref(SDB_OBJ($3)); $3 = NULL;
 		}
 	|
-	'.' IDENTIFIER
+	expression CONCAT expression
 		{
-			int field = sdb_store_parse_field_name($2);
-			free($2); $2 = NULL;
-			$$ = sdb_store_expr_fieldvalue(field);
+			$$ = 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;
+		}
+	;
+
+object_expression:
+	object_type '.' object_expression
+		{
+			$$ = sdb_store_expr_typed($1, $3);
+			sdb_object_deref(SDB_OBJ($3));
 		}
 	|
-	data
+	ATTRIBUTE_T '.' object_expression
 		{
-			$$ = sdb_store_expr_constvalue(&$1);
-			sdb_data_free_datum(&$1);
+			$$ = sdb_store_expr_typed(SDB_ATTRIBUTE, $3);
+			sdb_object_deref(SDB_OBJ($3));
+		}
+	|
+	field
+		{
+			$$ = sdb_store_expr_fieldvalue($1);
+		}
+	|
+	ATTRIBUTE_T '[' STRING ']'
+		{
+			$$ = sdb_store_expr_attrvalue($3);
+			free($3); $3 = NULL;
 		}
 	;
 
+object_type:
+	HOST_T { $$ = SDB_HOST; }
+	|
+	SERVICE_T { $$ = SDB_SERVICE; }
+	|
+	METRIC_T { $$ = SDB_METRIC; }
+	;
+
+object_type_plural:
+	HOSTS_T { $$ = SDB_HOST; }
+	|
+	SERVICES_T { $$ = SDB_SERVICE; }
+	|
+	METRICS_T { $$ = SDB_METRIC; }
+	;
+
+field:
+	NAME_T { $$ = SDB_FIELD_NAME; }
+	|
+	LAST_UPDATE_T { $$ = SDB_FIELD_LAST_UPDATE; }
+	|
+	AGE_T { $$ = SDB_FIELD_AGE; }
+	|
+	INTERVAL_T { $$ = SDB_FIELD_INTERVAL; }
+	|
+	BACKEND_T { $$ = SDB_FIELD_BACKEND; }
+	|
+	VALUE_T { $$ = SDB_FIELD_VALUE; }
+	;
+
 cmp:
 	CMP_EQUAL { $$ = "="; }
 	|
@@ -523,6 +732,8 @@ data:
 	datetime { $$.type = SDB_TYPE_DATETIME; $$.data.datetime = $1; }
 	|
 	interval { $$ = $1; }
+	|
+	array { $$ = $1; }
 	;
 
 datetime:
@@ -549,10 +760,8 @@ interval_elem:
 
 			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);
+				sdb_fe_yyerrorf(&yylloc, scanner,
+						YY_("syntax error, invalid time unit %s"), $2);
 				free($2); $2 = NULL;
 				YYABORT;
 			}
@@ -569,13 +778,105 @@ interval_elem:
 		}
 	;
 
+array:
+	'[' array_elem_list ']'
+		{
+			$$ = $2;
+		}
+	;
+
+array_elem_list:
+	array_elem_list ',' data
+		{
+			size_t elem_size;
+
+			if (($3.type & SDB_TYPE_ARRAY) || (($1.type & 0xff) != $3.type)) {
+				sdb_fe_yyerrorf(&yylloc, scanner, YY_("syntax error, "
+						"cannot use element of type %s in array of type %s"),
+						SDB_TYPE_TO_STRING($3.type),
+						SDB_TYPE_TO_STRING($1.type));
+				sdb_data_free_datum(&$1);
+				sdb_data_free_datum(&$3);
+				YYABORT;
+			}
+
+			elem_size = sdb_data_sizeof($3.type);
+			$1.data.array.values = realloc($1.data.array.values,
+					($1.data.array.length + 1) * elem_size);
+			if (! $1.data.array.values) {
+				sdb_fe_yyerror(&yylloc, scanner, YY_("out of memory"));
+				YYABORT;
+			}
+
+			memcpy((char *)$1.data.array.values
+						+ $1.data.array.length * elem_size,
+					&$3.data, elem_size);
+			++$1.data.array.length;
+
+			$$ = $1;
+		}
+	|
+	data
+		{
+			size_t elem_size;
+
+			if ($1.type & SDB_TYPE_ARRAY) {
+				sdb_fe_yyerrorf(&yylloc, scanner, YY_("syntax error, "
+						"cannot construct array of type %s"),
+						SDB_TYPE_TO_STRING($1.type));
+				sdb_data_free_datum(&$1);
+				YYABORT;
+			}
+
+			$$ = $1;
+			$$.type = $1.type | SDB_TYPE_ARRAY;
+			$$.data.array.length = 1;
+			elem_size = sdb_data_sizeof($1.type);
+			$$.data.array.values = malloc(elem_size);
+			if (! $$.data.array.values ) {
+				sdb_fe_yyerror(&yylloc, scanner, YY_("out of memory"));
+				YYABORT;
+			}
+			memcpy($$.data.array.values, &$1.data, elem_size);
+		}
+	;
+
 %%
 
 void
 sdb_fe_yyerror(YYLTYPE *lval, sdb_fe_yyscan_t scanner, const char *msg)
 {
 	sdb_log(SDB_LOG_ERR, "frontend: parse error: %s", msg);
+	sdb_strbuf_sprintf(errbuf, "%s", msg);
 } /* sdb_fe_yyerror */
 
+void
+sdb_fe_yyerrorf(YYLTYPE *lval, sdb_fe_yyscan_t scanner, const char *fmt, ...)
+{
+	va_list ap, aq;
+	va_start(ap, fmt);
+	va_copy(aq, ap);
+	sdb_vlog(SDB_LOG_ERR, fmt, ap);
+	sdb_strbuf_vsprintf(errbuf, fmt, aq);
+	va_end(ap);
+} /* sdb_fe_yyerrorf */
+
+static sdb_store_matcher_t *
+name_iter_matcher(int type, sdb_store_expr_t *iter, const char *cmp,
+		sdb_store_expr_t *expr)
+{
+	sdb_store_matcher_op_cb cb = sdb_store_parse_matcher_op(cmp);
+	sdb_store_matcher_t *m, *tmp = NULL;
+	assert(cb);
+
+	m = cb(NULL, expr);
+	if (type == MATCHER_ANY)
+		tmp = sdb_store_any_matcher(iter, m);
+	else if (type == MATCHER_ALL)
+		tmp = sdb_store_all_matcher(iter, m);
+	sdb_object_deref(SDB_OBJ(m));
+	return tmp;
+} /* name_iter_matcher */
+
 /* vim: set tw=78 sw=4 ts=4 noexpandtab : */