X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=src%2Ffrontend%2Fscanner.l;h=f17b689c97a5b98f03a47ac341981ac07e832f66;hp=5e80368d532872198edb7ea7bfb45dd60a9f0225;hb=34bfa9790e6e7ed1ba9f1d4ed17fa34a73a1b064;hpb=0d93606de8723dfe170b43883b9edc09f2bf060d

diff --git a/src/frontend/scanner.l b/src/frontend/scanner.l
index 5e80368..f17b689 100644
--- a/src/frontend/scanner.l
+++ b/src/frontend/scanner.l
@@ -37,13 +37,54 @@
 #include "frontend/grammar.h"
 #include "utils/error.h"
 
+#include <assert.h>
 #include <errno.h>
 
 #include <string.h>
 #include <stdlib.h>
 
+#include <time.h>
+
 #define YY_EXTRA_TYPE sdb_fe_yyextra_t *
 
+static struct {
+	const char *name;
+	int id;
+} reserved_words[] = {
+	{ "ALL",         ALL },
+	{ "AND",         AND },
+	{ "ANY",         ANY },
+	{ "END",         END },
+	{ "FETCH",       FETCH },
+	{ "FILTER",      FILTER },
+	{ "IN",          IN },
+	{ "IS",          IS },
+	{ "LIST",        LIST },
+	{ "LOOKUP",      LOOKUP },
+	{ "MATCHING",    MATCHING },
+	{ "NOT",         NOT },
+	{ "NULL",        NULL_T },
+	{ "OR",          OR },
+	{ "START",       START },
+	{ "TIMESERIES",  TIMESERIES },
+
+	/* object types */
+	{ "host",        HOST_T },
+	{ "hosts",       HOSTS_T },
+	{ "service",     SERVICE_T },
+	{ "services",    SERVICES_T },
+	{ "metric",      METRIC_T },
+	{ "metrics",     METRICS_T },
+	{ "attribute",   ATTRIBUTE_T },
+	{ "attributes",  ATTRIBUTES_T },
+	/* queryable fields */
+	{ "name",        NAME_T },
+	{ "last_update", LAST_UPDATE_T },
+	{ "age",         AGE_T },
+	{ "interval",    INTERVAL_T },
+	{ "backend",     BACKEND_T },
+};
+
 void
 sdb_fe_yyerror(YYLTYPE *lval, sdb_fe_yyscan_t scanner, const char *msg);
 
@@ -75,10 +116,16 @@ csc_start	\/\*
 csc_inside	([^*/]+|[^*]\/|\*[^/])
 csc_end		\*\/
 
+/*
+ * Strings and identifiers.
+ */
 identifier	([A-Za-z_][A-Za-z_0-9$]*)
 /* TODO: fully support SQL strings */
-string		('[^']*')
+string		('([^']|'')*')
 
+/*
+ * Numeric constants.
+ */
 dec			([\+\-]?[0-9]+)
 exp			([\+\-]?[0-9]+[Ee]\+?[0-9]+)
 integer		({dec}|{exp})
@@ -89,6 +136,12 @@ float4		([\+\-]?[Ii][Nn][Ff]([Ii][Nn][Ii][Tt][Yy])?)
 float5		([Nn][Aa][Nn])
 float		({float1}|{float2}|{float3}|{float4}|{float5})
 
+/*
+ * Time constants.
+ */
+date		([0-9]{4}-[0-9]{2}-[0-9]{2})
+time		([0-9]{1,2}:[0-9]{1,2}(:[0-9]{1,2}(\.[0-9]{1,9})?)?)
+
 %%
 
 {whitespace} |
@@ -103,32 +156,30 @@ float		({float1}|{float2}|{float3}|{float4}|{float5})
 	}
 
 {identifier} {
-		/* XXX: simplify handling of reserved words */
-		if (! strcasecmp(yytext, "AND"))
-			return AND;
-		else if (! strcasecmp(yytext, "FETCH"))
-			return FETCH;
-		else if (! strcasecmp(yytext, "IS"))
-			return IS;
-		else if (! strcasecmp(yytext, "LIST"))
-			return LIST;
-		else if (! strcasecmp(yytext, "LOOKUP"))
-			return LOOKUP;
-		else if (! strcasecmp(yytext, "MATCHING"))
-			return MATCHING;
-		else if (! strcasecmp(yytext, "NOT"))
-			return NOT;
-		else if (! strcasecmp(yytext, "NULL"))
-			return NULL_T;
-		else if (! strcasecmp(yytext, "OR"))
-			return OR;
+		size_t i;
+		for (i = 0; i < SDB_STATIC_ARRAY_LEN(reserved_words); ++i)
+			if (! strcasecmp(reserved_words[i].name, yytext))
+				return reserved_words[i].id;
 
 		yylval->str = strdup(yytext);
 		return IDENTIFIER;
 	}
 {string} {
+		char *quot;
+		size_t len;
+
+		/* remove the leading and trailing quote */
 		yytext[yyleng - 1] = '\0';
 		yylval->str = strdup(yytext + 1);
+
+		quot = yylval->str;
+		len = yyleng - 2;
+		while ((quot = strstr(quot, "''")) != NULL) {
+			memmove(quot, quot + 1, len - (quot - yylval->str) - 1);
+			yylval->str[len - 1] = '\0';
+			--len;
+			++quot;
+		}
 		return STRING;
 	}
 {integer} {
@@ -142,6 +193,64 @@ float		({float1}|{float2}|{float3}|{float4}|{float5})
 		return FLOAT;
 	}
 
+{date} {
+		struct tm tm;
+		memset(&tm, 0, sizeof(tm));
+		if (! strptime(yytext, "%Y-%m-%d", &tm)) {
+			char errmsg[1024];
+			snprintf(errmsg, sizeof(errmsg),
+				"Failed to parse '%s' as date", yytext);
+			sdb_fe_yyerror(yylloc, yyscanner, errmsg);
+			return SCANNER_ERROR;
+		}
+		yylval->datetime = SECS_TO_SDB_TIME(mktime(&tm));
+		return DATE;
+	}
+{time} {
+		struct tm tm;
+		char time[9], ns[10];
+		char *tmp;
+
+		memset(&tm, 0, sizeof(tm));
+		memset(time, '\0', sizeof(time));
+		memset(ns, '0', sizeof(ns));
+		ns[sizeof(ns) - 1] = '\0';
+
+		tmp = strchr(yytext, '.');
+		if (tmp) {
+			size_t i;
+			*tmp = '\0';
+			++tmp;
+			strncpy(ns, tmp, sizeof(ns));
+			for (i = strlen(ns); i < 9; ++i)
+				ns[i] = '0';
+		}
+		strncpy(time, yytext, sizeof(time));
+		if (tmp) {
+			/* reset for better error messages */
+			--tmp;
+			*tmp = '.';
+		}
+
+		tmp = strchr(time, ':');
+		assert(tmp);
+		tmp = strchr(tmp + 1, ':');
+		if (! tmp)
+			strncat(time, ":00", sizeof(time));
+
+		if (! strptime(time, "%H:%M:%S", &tm)) {
+			char errmsg[1024];
+			snprintf(errmsg, sizeof(errmsg),
+				"Failed to parse '%s' as time", yytext);
+			sdb_fe_yyerror(yylloc, yyscanner, errmsg);
+			return SCANNER_ERROR;
+		}
+
+		yylval->datetime = SECS_TO_SDB_TIME(mktime(&tm));
+		yylval->datetime += (sdb_time_t)strtoll(ns, NULL, 10);
+		return TIME;
+	}
+
 =	{ return CMP_EQUAL; }
 !=	{ return CMP_NEQUAL; }
 =~	{ return CMP_REGEX; }
@@ -166,7 +275,7 @@ sdb_fe_scanner_init(const char *str, int len, sdb_fe_yyextra_t *yyext)
 
 	if (sdb_fe_yylex_init(&scanner)) {
 		char errbuf[1024];
-		sdb_log(SDB_LOG_ERR, "frontend: yylex_init failed: %s",
+		sdb_strbuf_sprintf(yyext->errbuf, "yylex_init_failed: %s",
 			sdb_strerror(errno, errbuf, sizeof(errbuf)));
 		return NULL;
 	}