![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index 894cc22f706376ac5df8fff483803a612ea07284..c71d5ca078b5fbe9a3915013c183bb05ab6bd1f5 100644 (file)
--- a/src/frontend/analyzer.c
+++ b/src/frontend/analyzer.c
*/
static void
-iter_error(sdb_strbuf_t *errbuf, int op, int oper, int context)
+iter_error(sdb_strbuf_t *errbuf, int op, sdb_store_expr_t *iter, int context)
{
- sdb_strbuf_sprintf(errbuf, "Cannot use %s %s in %s context",
- MATCHER_SYM(op), SDB_STORE_TYPE_TO_NAME(oper),
+ sdb_strbuf_sprintf(errbuf, "Invalid %s iterator: %s %s "
+ "not iterable in %s context", MATCHER_SYM(op),
+ EXPR_TO_STRING(iter), SDB_STORE_TYPE_TO_NAME(iter->data_type),
SDB_STORE_TYPE_TO_NAME(context));
} /* iter_error */
static void
-iter_array_error(sdb_strbuf_t *errbuf, int op,
- int array_type, int cmp, int value_type)
+iter_op_error(sdb_strbuf_t *errbuf, int op,
+ int iter_type, int cmp, int value_type)
{
- sdb_strbuf_sprintf(errbuf, "Invalid array iterator %s %s %s %s",
- MATCHER_SYM(op), SDB_TYPE_TO_STRING(array_type),
+ sdb_strbuf_sprintf(errbuf, "Invalid iterator %s %s %s %s",
+ MATCHER_SYM(op), SDB_TYPE_TO_STRING(iter_type),
MATCHER_SYM(cmp), SDB_TYPE_TO_STRING(value_type));
- if ((array_type & 0xff) != value_type)
+ if ((iter_type & 0xff) != value_type)
sdb_strbuf_append(errbuf, " (type mismatch)");
else
sdb_strbuf_append(errbuf, " (invalid operator)");
-} /* iter_array_error */
+} /* iter_op_error */
static void
cmp_error(sdb_strbuf_t *errbuf, int op, int left, int right)
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)
{
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)
+analyze_matcher(int context, int parent_type,
+ sdb_store_matcher_t *m, sdb_strbuf_t *errbuf)
{
if (! m)
return 0;
case MATCHER_OR:
case MATCHER_AND:
assert(OP_M(m)->left && OP_M(m)->right);
- if (analyze_matcher(context, OP_M(m)->left, errbuf))
+ if (analyze_matcher(context, m->type, OP_M(m)->left, errbuf))
return -1;
- if (analyze_matcher(context, OP_M(m)->right, errbuf))
+ if (analyze_matcher(context, m->type, OP_M(m)->right, errbuf))
return -1;
break;
case MATCHER_NOT:
assert(UOP_M(m)->op);
- if (analyze_matcher(context, UOP_M(m)->op, errbuf))
+ if (analyze_matcher(context, m->type, UOP_M(m)->op, errbuf))
return -1;
break;
case MATCHER_ANY:
case MATCHER_ALL:
+ {
+ int type = -1;
+ int left_type = -1;
+
assert(ITER_M(m)->m);
+
+ if (ITER_M(m)->iter->type == TYPED_EXPR) {
+ type = (int)ITER_M(m)->iter->data.data.integer;
+ left_type = ITER_M(m)->iter->data_type;
+ }
+ else if (ITER_M(m)->iter->type == FIELD_VALUE) {
+ type = (int)ITER_M(m)->iter->data.data.integer;
+ /* element type of the field */
+ left_type = ITER_M(m)->iter->data_type & 0xff;
+ }
+ else {
+ iter_error(errbuf, m->type, ITER_M(m)->iter, context);
+ return -1;
+ }
+
if ((context != SDB_HOST)
&& (context != SDB_SERVICE)
&& (context != SDB_METRIC)) {
- iter_error(errbuf, m->type, ITER_M(m)->type, context);
+ iter_error(errbuf, m->type, ITER_M(m)->iter, context);
return -1;
}
- if (ITER_M(m)->type == context) {
- iter_error(errbuf, m->type, ITER_M(m)->type, context);
+ if (type == context) {
+ iter_error(errbuf, m->type, ITER_M(m)->iter, context);
return -1;
}
- if ((ITER_M(m)->type != SDB_SERVICE)
- && (ITER_M(m)->type != SDB_METRIC)
- && (ITER_M(m)->type != SDB_ATTRIBUTE)
- && (ITER_M(m)->type != SDB_FIELD_BACKEND)) {
- iter_error(errbuf, m->type, ITER_M(m)->type, context);
+ if ((type != SDB_SERVICE)
+ && (type != SDB_METRIC)
+ && (type != SDB_ATTRIBUTE)
+ && (type != SDB_FIELD_BACKEND)) {
+ iter_error(errbuf, m->type, ITER_M(m)->iter, context);
return -1;
}
- if ((context == SDB_SERVICE)
- && (ITER_M(m)->type == SDB_METRIC)) {
- iter_error(errbuf, m->type, ITER_M(m)->type, context);
+ if ((context == SDB_SERVICE) && (type == SDB_METRIC)) {
+ iter_error(errbuf, m->type, ITER_M(m)->iter, context);
return -1;
}
- else if ((context == SDB_METRIC)
- && (ITER_M(m)->type == SDB_SERVICE)) {
- iter_error(errbuf, m->type, ITER_M(m)->type, context);
+ else if ((context == SDB_METRIC) && (type == SDB_SERVICE)) {
+ iter_error(errbuf, m->type, ITER_M(m)->iter, context);
return -1;
}
- if (ITER_M(m)->type == SDB_FIELD_BACKEND) {
- /* array iterators only support simple comparison atm */
- if ((ITER_M(m)->m->type != MATCHER_LT)
- && (ITER_M(m)->m->type != MATCHER_LE)
- && (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_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,
- CMP_M(ITER_M(m)->m)->right->data_type);
- return -1;
- }
- if (CMP_M(ITER_M(m)->m)->right->data_type < 0)
- return 0; /* skip further type checks */
- if (CMP_M(ITER_M(m)->m)->right->data_type & SDB_TYPE_ARRAY) {
- iter_array_error(errbuf, m->type,
- CMP_M(ITER_M(m)->m)->left->data_type,
- ITER_M(m)->m->type,
- CMP_M(ITER_M(m)->m)->right->data_type);
- return -1;
- }
- if ((CMP_M(ITER_M(m)->m)->left->data_type & 0xff)
- != CMP_M(ITER_M(m)->m)->right->data_type) {
- iter_array_error(errbuf, m->type,
- CMP_M(ITER_M(m)->m)->left->data_type,
- ITER_M(m)->m->type,
+
+ /* any ary operator will do but these are the once
+ * we currently support */
+ if ((ITER_M(m)->m->type != MATCHER_LT)
+ && (ITER_M(m)->m->type != MATCHER_LE)
+ && (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_REGEX)
+ && (ITER_M(m)->m->type != MATCHER_NREGEX)) {
+ iter_op_error(errbuf, m->type,
+ left_type, ITER_M(m)->m->type,
+ CMP_M(ITER_M(m)->m)->right->data_type);
+ return -1;
+ }
+ if ((left_type >= 0)
+ && (CMP_M(ITER_M(m)->m)->right->data_type >= 0)) {
+ if (left_type != CMP_M(ITER_M(m)->m)->right->data_type) {
+ iter_op_error(errbuf, m->type,
+ left_type, ITER_M(m)->m->type,
CMP_M(ITER_M(m)->m)->right->data_type);
return -1;
}
}
- else if (analyze_matcher(ITER_M(m)->type, ITER_M(m)->m, errbuf))
+ if (analyze_matcher(type, m->type, ITER_M(m)->m, errbuf))
return -1;
break;
+ }
case MATCHER_LT:
case MATCHER_LE:
case MATCHER_NE:
case MATCHER_GE:
case MATCHER_GT:
- assert(CMP_M(m)->left && CMP_M(m)->right);
+ {
+ int left_type = -1;
+
+ assert(CMP_M(m)->right);
+ if ((parent_type == MATCHER_ALL)
+ || (parent_type == MATCHER_ANY)) {
+ assert(! CMP_M(m)->left);
+ }
+ else {
+ assert(CMP_M(m)->left);
+ left_type = CMP_M(m)->left->data_type;
+ }
+
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 ((left_type > 0) && (CMP_M(m)->right->data_type > 0)) {
+ if (left_type == CMP_M(m)->right->data_type)
+ return 0;
+ cmp_error(errbuf, m->type, left_type,
+ CMP_M(m)->right->data_type);
+ return -1;
+ }
+ if ((left_type > 0) && (left_type & SDB_TYPE_ARRAY)) {
+ cmp_error(errbuf, m->type, left_type,
CMP_M(m)->right->data_type);
return -1;
}
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_error(errbuf, m->type, left_type,
CMP_M(m)->right->data_type);
return -1;
}
break;
+ }
case MATCHER_IN:
+ case MATCHER_NIN:
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,
- CMP_M(m)->right->data_type);
- 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:
return -1;
}
- if (analyze_matcher(context, m, errbuf))
+ if (analyze_matcher(context, -1, m, errbuf))
status = -1;
- if (analyze_matcher(-1, filter, errbuf))
+ if (analyze_matcher(-1, -1, filter, errbuf))
status = -1;
return status;
} /* sdb_fe_analyze */