index 6a50736be23752fe6ea96c2beaccda8815ea9c8d..894cc22f706376ac5df8fff483803a612ea07284 100644 (file)
--- a/src/frontend/analyzer.c
+++ b/src/frontend/analyzer.c
SDB_TYPE_TO_STRING(right));
} /* cmp_error */
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;
+ break;
+ }
+ return 0;
+} /* analyze_expr */
+
static int
analyze_matcher(int context, sdb_store_matcher_t *m, sdb_strbuf_t *errbuf)
{
static int
analyze_matcher(int context, sdb_store_matcher_t *m, sdb_strbuf_t *errbuf)
{
case MATCHER_GE:
case MATCHER_GT:
assert(CMP_M(m)->left && CMP_M(m)->right);
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)
+ && (CMP_M(m)->left->data_type == CMP_M(m)->right->data_type))
+ return 0;
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,
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:
break;
case MATCHER_IN:
+ 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)->left->data_type & SDB_TYPE_ARRAY)) {
cmp_error(errbuf, m->type, CMP_M(m)->left->data_type,
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,
case MATCHER_REGEX:
case MATCHER_NREGEX:
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)
/* 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:
case MATCHER_ISNULL:
case MATCHER_ISNNULL:
+ if (analyze_expr(context, ISNULL_M(m)->expr, errbuf))
+ return -1;
break;
default:
break;
default:
filter = CONN_LOOKUP(node)->filter->matcher;
context = CONN_LOOKUP(node)->type;
}
filter = CONN_LOOKUP(node)->filter->matcher;
context = CONN_LOOKUP(node)->type;
}
- else if (node->cmd == SDB_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;
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;
return -1;
+ }
if (analyze_matcher(context, m, errbuf))
status = -1;
if (analyze_matcher(context, m, errbuf))
status = -1;