![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index 20864cae4d348ca2e3072e1e48945fd157cb6c66..4e29fdf85fb956312466d50b514e3bae984fb135 100644 (file)
--- a/src/frontend/analyzer.c
+++ b/src/frontend/analyzer.c
SDB_TYPE_TO_STRING(right));
} /* cmp_error */
+static void
+op_error(sdb_strbuf_t *errbuf, int op, int left, int right)
+{
+ sdb_strbuf_sprintf(errbuf, "Invalid operator %s for types %s and %s",
+ SDB_DATA_OP_TO_STRING(op), SDB_TYPE_TO_STRING(left),
+ SDB_TYPE_TO_STRING(right));
+} /* cmp_error */
+
+static int
+analyze_expr(int context, sdb_store_expr_t *e, sdb_strbuf_t *errbuf)
+{
+ if (! e)
+ return 0;
+
+ if ((e->type < TYPED_EXPR) || (SDB_DATA_CONCAT < e->type)) {
+ sdb_strbuf_sprintf(errbuf, "Invalid expression of type %d", e->type);
+ return -1;
+ }
+
+ switch (e->type) {
+ case TYPED_EXPR:
+ if (analyze_expr((int)e->data.data.integer, e->left, errbuf))
+ return -1;
+ if (context == (int)e->data.data.integer)
+ return 0;
+ if ((e->data.data.integer == SDB_HOST) &&
+ ((context == SDB_SERVICE) || (context == SDB_METRIC)))
+ return 0;
+ sdb_strbuf_sprintf(errbuf, "Invalid expression %s.%s "
+ "in %s context",
+ SDB_STORE_TYPE_TO_NAME(e->data.data.integer),
+ EXPR_TO_STRING(e->left), SDB_STORE_TYPE_TO_NAME(context));
+ return -1;
+
+ case ATTR_VALUE:
+ case FIELD_VALUE:
+ case 0:
+ break;
+
+ default:
+ if (analyze_expr(context, e->left, errbuf))
+ return -1;
+ if (analyze_expr(context, e->right, errbuf))
+ return -1;
+
+ if ((e->left->data_type > 0) && (e->right->data_type > 0)) {
+ if (sdb_data_expr_type(e->type, e->left->data_type,
+ e->right->data_type) < 0) {
+ op_error(errbuf, e->type, e->left->data_type,
+ e->right->data_type);
+ return -1;
+ }
+ }
+ break;
+ }
+ return 0;
+} /* analyze_expr */
+
static int
analyze_matcher(int context, sdb_store_matcher_t *m, sdb_strbuf_t *errbuf)
{
&& (ITER_M(m)->m->type != MATCHER_EQ)
&& (ITER_M(m)->m->type != MATCHER_NE)
&& (ITER_M(m)->m->type != MATCHER_GE)
- && (ITER_M(m)->m->type != MATCHER_GT)) {
+ && (ITER_M(m)->m->type != MATCHER_GT)
+ && (ITER_M(m)->m->type != MATCHER_REGEX)
+ && (ITER_M(m)->m->type != MATCHER_NREGEX)) {
iter_array_error(errbuf, m->type,
CMP_M(ITER_M(m)->m)->left->data_type,
ITER_M(m)->m->type,
case MATCHER_GE:
case MATCHER_GT:
assert(CMP_M(m)->left && CMP_M(m)->right);
+ if (analyze_expr(context, CMP_M(m)->left, errbuf))
+ return -1;
+ if (analyze_expr(context, CMP_M(m)->right, errbuf))
+ return -1;
+
+ if ((CMP_M(m)->left->data_type > 0)
+ && (CMP_M(m)->right->data_type > 0)) {
+ if (CMP_M(m)->left->data_type == CMP_M(m)->right->data_type)
+ return 0;
+ cmp_error(errbuf, m->type, CMP_M(m)->left->data_type,
+ CMP_M(m)->right->data_type);
+ return -1;
+ }
if ((CMP_M(m)->left->data_type > 0)
&& (CMP_M(m)->left->data_type & SDB_TYPE_ARRAY)) {
cmp_error(errbuf, m->type, CMP_M(m)->left->data_type,
break;
case MATCHER_IN:
- if ((CMP_M(m)->left->data_type > 0)
- && (CMP_M(m)->left->data_type & SDB_TYPE_ARRAY)) {
- cmp_error(errbuf, m->type, CMP_M(m)->left->data_type,
- CMP_M(m)->right->data_type);
+ if (analyze_expr(context, CMP_M(m)->left, errbuf))
return -1;
- }
+ if (analyze_expr(context, CMP_M(m)->right, errbuf))
+ return -1;
+
+ /* the left operand may be a scalar or an array but the element
+ * type has to match */
if ((CMP_M(m)->right->data_type > 0)
&& (! (CMP_M(m)->right->data_type & SDB_TYPE_ARRAY))) {
cmp_error(errbuf, m->type, CMP_M(m)->left->data_type,
CMP_M(m)->right->data_type);
return -1;
}
+ if ((CMP_M(m)->left->data_type > 0)
+ && (CMP_M(m)->right->data_type > 0)) {
+ if ((CMP_M(m)->left->data_type & 0xff)
+ != (CMP_M(m)->right->data_type & 0xff)) {
+ cmp_error(errbuf, m->type, CMP_M(m)->left->data_type,
+ CMP_M(m)->right->data_type);
+ return -1;
+ }
+ }
break;
case MATCHER_REGEX:
case MATCHER_NREGEX:
+ if (analyze_expr(context, CMP_M(m)->left, errbuf))
+ return -1;
+ if (analyze_expr(context, CMP_M(m)->right, errbuf))
+ return -1;
+
/* all types are supported for the left operand */
if ((CMP_M(m)->right->data_type > 0)
&& (CMP_M(m)->right->data_type != SDB_TYPE_REGEX)
case MATCHER_ISNULL:
case MATCHER_ISNNULL:
+ if (analyze_expr(context, ISNULL_M(m)->expr, errbuf))
+ return -1;
break;
default:
/* For now, this function checks basic matcher attributes only;
* later, this may be turned into one of multiple AST visitors. */
- if (node->cmd == CONNECTION_FETCH) {
+ if (node->cmd == SDB_CONNECTION_FETCH) {
conn_fetch_t *fetch = CONN_FETCH(node);
if ((fetch->type == SDB_HOST) && fetch->name) {
sdb_strbuf_sprintf(errbuf, "Unexpected STRING '%s'", fetch->name);
filter = fetch->filter->matcher;
context = fetch->type;
}
- else if (node->cmd == CONNECTION_LIST) {
+ else if (node->cmd == SDB_CONNECTION_LIST) {
if (CONN_LIST(node)->filter)
filter = CONN_LIST(node)->filter->matcher;
context = CONN_LIST(node)->type;
}
- else if (node->cmd == CONNECTION_LOOKUP) {
+ else if (node->cmd == SDB_CONNECTION_LOOKUP) {
if (CONN_LOOKUP(node)->matcher)
m = CONN_LOOKUP(node)->matcher->matcher;
if (CONN_LOOKUP(node)->filter)
filter = CONN_LOOKUP(node)->filter->matcher;
context = CONN_LOOKUP(node)->type;
}
- else if (node->cmd == CONNECTION_TIMESERIES)
+ else if ((node->cmd == SDB_CONNECTION_STORE_HOST)
+ || (node->cmd == SDB_CONNECTION_STORE_SERVICE)
+ || (node->cmd == SDB_CONNECTION_STORE_METRIC)
+ || (node->cmd == SDB_CONNECTION_STORE_ATTRIBUTE)) {
return 0;
- else
+ }
+ else if (node->cmd == SDB_CONNECTION_TIMESERIES) {
+ return 0;
+ }
+ else {
+ sdb_strbuf_sprintf(errbuf,
+ "Don't know how to analyze command %#x", node->cmd);
return -1;
+ }
if (analyze_matcher(context, m, errbuf))
status = -1;