diff --git a/src/frontend/scanner.l b/src/frontend/scanner.l
index 4bd5655e04bd9d870ccadcafa5da15d9c7c3ba74..6781122c3c2b830547b66a0fe82a7e57b3f15cb4 100644 (file)
--- a/src/frontend/scanner.l
+++ b/src/frontend/scanner.l
#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[] = {
- { "AND", AND },
- { "FETCH", FETCH },
- { "FILTER", FILTER },
- { "IS", IS },
- { "LIST", LIST },
- { "LOOKUP", LOOKUP },
- { "MATCHING", MATCHING },
- { "NOT", NOT },
- { "NULL", NULL_T },
- { "OR", OR },
+ { "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
*/
identifier ([A-Za-z_][A-Za-z_0-9$]*)
/* TODO: fully support SQL strings */
-string ('[^']*')
+string ('([^']|'')*')
/*
* Numeric constants.
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} |
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} {
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;
+ int t;
+
+ 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) - strlen(time) - 1);
+
+ 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;
+ }
+
+ t = tm.tm_sec + 60 * tm.tm_min + 3600 * tm.tm_hour;
+ yylval->datetime = SECS_TO_SDB_TIME(t);
+ yylval->datetime += (sdb_time_t)strtoll(ns, NULL, 10);
+ return TIME;
+ }
+
= { return CMP_EQUAL; }
!= { return CMP_NEQUAL; }
=~ { return CMP_REGEX; }
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;
}