diff --git a/src/frontend/scanner.l b/src/frontend/scanner.l
index 5af85e047ec2913747f010638d884f9256cb1943..65ec9edceb79ff73769e03e37046123971d9b73f 100644 (file)
--- a/src/frontend/scanner.l
+++ b/src/frontend/scanner.l
const char *name;
int id;
} reserved_words[] = {
- { "AND", AND },
- { "END", END },
- { "FETCH", FETCH },
- { "FILTER", FILTER },
- { "IS", IS },
- { "LIST", LIST },
- { "LOOKUP", LOOKUP },
- { "MATCHING", MATCHING },
- { "NOT", NOT },
- { "NULL", NULL_T },
- { "OR", OR },
- { "START", START },
- { "TIMESERIES", TIMESERIES },
+ { "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.
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} {
struct tm tm;
char time[9], ns[10];
char *tmp;
+ int t;
memset(&tm, 0, sizeof(tm));
memset(time, '\0', sizeof(time));
return SCANNER_ERROR;
}
- yylval->datetime = SECS_TO_SDB_TIME(mktime(&tm));
+ 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;
}
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;
}