![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/core/data.c b/src/core/data.c
index 1f3aa82a42a641fad531c6b682363c51813af168..28d4c36ad66cbd92149ef6bea5a1f97d0e635ca4 100644 (file)
--- a/src/core/data.c
+++ b/src/core/data.c
#include <math.h>
+/*
+ * Operator support maxtrix.
+ * <type1> <op> <type2> -> op_matrix[<op>][<type1>][<type2>]
+ */
+
+/* add, sub, mul, div, mod, concat */
+
+/* integer, decimal, string, datetime, binary, regex */
+
+static int op_matrix[6][6][6] = {
+ /* SDB_DATA_ADD */
+ {
+ { SDB_TYPE_INTEGER, -1, -1, -1, -1, -1 },
+ { -1, SDB_TYPE_DECIMAL, -1, -1, -1, -1 },
+ { -1, -1, -1, -1, -1, -1 },
+ { -1, -1, -1, SDB_TYPE_DATETIME, -1, -1 },
+ { -1, -1, -1, -1, -1, -1 },
+ { -1, -1, -1, -1, -1, -1 },
+ },
+
+ /* SDB_DATA_SUB */
+ {
+ { SDB_TYPE_INTEGER, -1, -1, -1, -1, -1 },
+ { -1, SDB_TYPE_DECIMAL, -1, -1, -1, -1 },
+ { -1, -1, -1, -1, -1, -1 },
+ { -1, -1, -1, SDB_TYPE_DATETIME, -1, -1 },
+ { -1, -1, -1, -1, -1, -1 },
+ { -1, -1, -1, -1, -1, -1 },
+ },
+
+ /* SDB_DATA_MUL */
+ {
+ { SDB_TYPE_INTEGER, -1, -1, SDB_TYPE_DATETIME, -1, -1 },
+ { -1, SDB_TYPE_DECIMAL, -1, SDB_TYPE_DATETIME, -1, -1 },
+ { -1, -1, -1, -1, -1, -1 },
+ { SDB_TYPE_DATETIME, SDB_TYPE_DATETIME, -1, SDB_TYPE_DATETIME, -1, -1 },
+ { -1, -1, -1, -1, -1, -1 },
+ { -1, -1, -1, -1, -1, -1 },
+ },
+
+ /* SDB_DATA_DIV */
+ {
+ { SDB_TYPE_INTEGER, -1, -1, -1, -1, -1 },
+ { -1, SDB_TYPE_DECIMAL, -1, -1, -1, -1 },
+ { -1, -1, -1, -1, -1, -1 },
+ { SDB_TYPE_DATETIME, SDB_TYPE_DATETIME, -1, SDB_TYPE_DATETIME, -1, -1 },
+ { -1, -1, -1, -1, -1, -1 },
+ { -1, -1, -1, -1, -1, -1 },
+ },
+
+ /* SDB_DATA_MOD */
+ {
+ { SDB_TYPE_INTEGER, -1, -1, -1, -1, -1 },
+ { -1, SDB_TYPE_DECIMAL, -1, -1, -1, -1 },
+ { -1, -1, -1, -1, -1, -1 },
+ { SDB_TYPE_DATETIME, SDB_TYPE_DATETIME, -1, SDB_TYPE_DATETIME, -1, -1 },
+ { -1, -1, -1, -1, -1, -1 },
+ { -1, -1, -1, -1, -1, -1 },
+ },
+
+ /* SDB_DATA_CONCAT */
+ {
+ { -1, -1, -1, -1, -1, -1 },
+ { -1, -1, -1, -1, -1, -1 },
+ { -1, -1, SDB_TYPE_STRING, -1, -1, -1 },
+ { -1, -1, -1, -1, -1, -1 },
+ { -1, -1, -1, -1, SDB_TYPE_BINARY, -1 },
+ { -1, -1, -1, -1, -1, -1 },
+ },
+};
+
/*
* private helper functions
*/
return 1;
if ((datum->type == SDB_TYPE_REGEX) && (! datum->data.re.raw))
return 1;
- if ((datum->type & SDB_TYPE_ARRAY) && (! datum->data.array.values))
- return 1;
return 0;
} /* sdb_data_isnull */
return 0;
} /* sdb_data_inarray */
+int
+sdb_data_array_get(const sdb_data_t *array, size_t i, sdb_data_t *value)
+{
+ sdb_data_t tmp = SDB_DATA_INIT;
+ int type;
+
+ if ((! array) || (! (array->type & SDB_TYPE_ARRAY)))
+ return -1;
+ if (i >= array->data.array.length)
+ return -1;
+
+ type = array->type & 0xff;
+ if (type == SDB_TYPE_INTEGER) {
+ int64_t *v = array->data.array.values;
+ tmp.data.integer = v[i];
+ }
+ else if (type == SDB_TYPE_DECIMAL) {
+ double *v = array->data.array.values;
+ tmp.data.decimal = v[i];
+ }
+ else if (type == SDB_TYPE_STRING) {
+ char **v = array->data.array.values;
+ tmp.data.string = v[i];
+ }
+ else {
+ /* TODO */
+ errno = ENOTSUP;
+ return -1;
+ }
+
+ if (value) {
+ *value = tmp;
+ value->type = type;
+ }
+ return 0;
+} /* sdb_data_array_get */
+
int
sdb_data_parse_op(const char *op)
{
return 0;
}
switch (op) {
- case SDB_DATA_CONCAT:
- return data_concat(d1, d2, res);
- case SDB_DATA_ADD:
- return data_lin(d1, 1, d2, res);
- case SDB_DATA_SUB:
- return data_lin(d1, -1, d2, res);
- case SDB_DATA_MUL:
- return data_mul(d1, d2, res);
- case SDB_DATA_DIV:
- return data_div(d1, d2, res, NULL);
- case SDB_DATA_MOD:
- return data_div(d1, d2, NULL, res);
+ case SDB_DATA_CONCAT: return data_concat(d1, d2, res);
+ case SDB_DATA_ADD: return data_lin(d1, 1, d2, res);
+ case SDB_DATA_SUB: return data_lin(d1, -1, d2, res);
+ case SDB_DATA_MUL: return data_mul(d1, d2, res);
+ case SDB_DATA_DIV: return data_div(d1, d2, res, NULL);
+ case SDB_DATA_MOD: return data_div(d1, d2, NULL, res);
}
return -1;
} /* sdb_data_expr_eval */
+int
+sdb_data_expr_type(int op, int type1, int type2)
+{
+ int types_num = (int)SDB_STATIC_ARRAY_LEN(op_matrix[0]);
+
+ assert(SDB_STATIC_ARRAY_LEN(op_matrix[0])
+ == SDB_STATIC_ARRAY_LEN(op_matrix[0][0]));
+
+ if ((op <= 0) || (SDB_STATIC_ARRAY_LEN(op_matrix) < (size_t)op))
+ return -1;
+
+ /* arrays only support concat; type has to match */
+ if ((type1 & SDB_TYPE_ARRAY) || (type2 & SDB_TYPE_ARRAY)) {
+ if ((type1 != type2) || (op != SDB_DATA_CONCAT))
+ return -1;
+ return type1;
+ }
+ if ((type1 < 0) || (types_num < type1)
+ || (type2 < 0) || (types_num < type2))
+ return -1;
+
+ if ((type1 == SDB_TYPE_NULL) || (type2 == SDB_TYPE_NULL))
+ return SDB_TYPE_NULL;
+ return op_matrix[op - 1][type1 - 1][type2 - 1];
+} /* sdb_data_expr_type */
+
size_t
sdb_data_strlen(const sdb_data_t *datum)
{
}
else if (datum->type == SDB_TYPE_STRING) {
if (! datum->data.string)
- return 8; /* "<NULL>" */
+ return 6; /* NULL */
/* in the worst case, each character needs to be escaped */
return 2 * strlen(datum->data.string) + 2;
}
}
else if (datum->type == SDB_TYPE_BINARY) {
if (! datum->data.binary.datum)
- return 8; /* "<NULL>" */
+ return 6; /* NULL */
/* "\xNN" */
return 4 * datum->data.binary.length + 2;
}
else if (datum->type == SDB_TYPE_REGEX) {
if (! datum->data.re.raw)
- return 8; /* "<NULL>" */
+ return 6; /* NULL */
/* "/.../" */
return strlen(datum->data.re.raw) + 4;
}
else if (datum->type & SDB_TYPE_ARRAY) {
- /* TODO */
- errno = ENOTSUP;
- return 0;
+ size_t len = 2; /* [] */
+ size_t i;
+ for (i = 0; i < datum->data.array.length; ++i) {
+ sdb_data_t v = SDB_DATA_INIT;
+ sdb_data_array_get(datum, i, &v);
+ len += sdb_data_strlen(&v) + 1;
+ }
+ return len;
}
return 0;
} /* sdb_data_strlen */
@@ -673,11 +804,12 @@ sdb_data_format(const sdb_data_t *datum, char *buf, size_t buflen, int quoted)
{
char tmp[sdb_data_strlen(datum) + 1];
char *data = NULL;
+ _Bool is_null = 0;
int ret = -1;
size_t i, pos;
- if ((! datum) || (! buf))
+ if ((! datum) || (! buf) || (! buflen))
return -1;
if (datum->type == SDB_TYPE_INTEGER) {
}
else if (datum->type == SDB_TYPE_STRING) {
if (! datum->data.string)
- data = "<NULL>";
+ is_null = 1;
else {
pos = 0;
for (i = 0; i < strlen(datum->data.string); ++i) {
@@ -735,23 +867,51 @@ sdb_data_format(const sdb_data_t *datum, char *buf, size_t buflen, int quoted)
data = tmp;
}
else
- data = "<NULL>";
+ is_null = 1;
}
else if (datum->type == SDB_TYPE_REGEX) {
if (! datum->data.re.raw)
- data = "<NULL>";
+ is_null = 1;
else {
snprintf(tmp, sizeof(tmp), "/%s/", datum->data.re.raw);
data = tmp;
}
}
else if (datum->type & SDB_TYPE_ARRAY) {
- /* TODO */
- errno = ENOTSUP;
- return -1;
+ ret = 1;
+ buf[0] = '[';
+ for (i = 0; i < datum->data.array.length; ++i) {
+ sdb_data_t v = SDB_DATA_INIT;
+ int n;
+ if ((size_t)ret >= buflen - 1)
+ break;
+
+ if (ret > 1) {
+ buf[ret] = ',';
+ buf[ret + 1] = ' ';
+ ret += 2;
+ }
+
+ sdb_data_array_get(datum, i, &v);
+ n = sdb_data_format(&v, buf + ret, buflen - ret, quoted);
+ if (n > 0)
+ ret += n;
+ else
+ break;
+ }
+ if ((size_t)ret < buflen - 1) {
+ buf[ret] = ']';
+ buf[ret + 1] = '\0';
+ ++ret;
+ }
}
- if (data) {
+ if (is_null) {
+ /* never quote NULL */
+ strncpy(buf, "NULL", buflen);
+ ret = (int)SDB_MIN(buflen, 4);
+ }
+ else if (data) {
if (quoted == SDB_UNQUOTED)
ret = snprintf(buf, buflen, "%s", data);
else if (quoted == SDB_SINGLE_QUOTED)