![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/core/data.c b/src/core/data.c
index c1e99a8cab82ed742b76a8d8165fe44ceb999269..2994b5f50d3e18348dd183a553c719322e48002c 100644 (file)
--- a/src/core/data.c
+++ b/src/core/data.c
* private helper functions
*/
+/* this function supports in-place copies */
+static int
+copy_array_values(sdb_data_t *dst, const sdb_data_t *src, size_t elem_size)
+{
+ int type = src->type & 0xff;
+
+ if ((type == SDB_TYPE_INTEGER) || (type == SDB_TYPE_DECIMAL)) {
+ if (dst != src)
+ memcpy(dst->data.array.values, src->data.array.values,
+ src->data.array.length * elem_size);
+ }
+ else if (type == SDB_TYPE_STRING) {
+ char **s = src->data.array.values;
+ char **d = dst->data.array.values;
+ size_t i;
+
+ for (i = 0; i < src->data.array.length; ++i) {
+ d[i] = strdup(s[i]);
+ if (! d[i])
+ return -1;
+ }
+ }
+ else {
+ /* TODO */
+ errno = ENOTSUP;
+ return -1;
+ }
+ return 0;
+} /* copy_array_values */
+
+static void
+free_array_values(sdb_data_t *datum)
+{
+ int type = datum->type & 0xff;
+
+ if (type == SDB_TYPE_STRING) {
+ char **v = datum->data.array.values;
+ size_t i;
+
+ for (i = 0; i < datum->data.array.length; ++i) {
+ if (v[i])
+ free(v[i]);
+ v[i] = NULL;
+ }
+ }
+} /* free_array_values */
+
+/* compare two arrays element-by-element returning how the first non-equal
+ * elements compare to each other */
+static int
+array_cmp(const sdb_data_t *a1, const sdb_data_t *a2)
+{
+ int type = a1->type & 0xff;
+ size_t len, i;
+
+ assert((a1->type == a2->type) && (a1->type & SDB_TYPE_ARRAY));
+
+ len = SDB_MIN(a1->data.array.length, a2->data.array.length);
+
+ if (type == SDB_TYPE_INTEGER) {
+ int64_t *v1 = a1->data.array.values;
+ int64_t *v2 = a2->data.array.values;
+
+ for (i = 0; i < len; ++i)
+ if (v1[i] != v2[i])
+ return SDB_CMP(v1[i], v2[i]);
+ }
+ else if (type == SDB_TYPE_DECIMAL) {
+ double *v1 = a1->data.array.values;
+ double *v2 = a2->data.array.values;
+
+ for (i = 0; i < len; ++i)
+ if (v1[i] != v2[i])
+ return SDB_CMP(v1[i], v2[i]);
+ }
+ else if (type == SDB_TYPE_STRING) {
+ char **v1 = a1->data.array.values;
+ char **v2 = a2->data.array.values;
+
+ for (i = 0; i < len; ++i) {
+ int diff = strcasecmp(v1[i], v2[i]);
+ if (diff)
+ return diff;
+ }
+ }
+ else {
+ /* TODO */
+ errno = ENOTSUP;
+ /* but fall through to ensure stable sorting: */
+ }
+ return SDB_CMP(a1->data.array.length, a2->data.array.length);
+} /* array_cmp */
+
/* Calculate the linear function 'd1 + n * d2'. */
static int
data_lin(const sdb_data_t *d1, int n, const sdb_data_t *d2, sdb_data_t *res)
unsigned char *s1, *s2;
size_t len1, len2;
+ /* TODO: support array plus element */
if (d1->type != d2->type)
return -1;
len1 = d1->data.binary.length;
len2 = d2->data.binary.length;
}
+ else if (d1->type & SDB_TYPE_ARRAY) {
+ size_t elem_size = sdb_data_sizeof(d1->type & 0xff);
+ s1 = (unsigned char *)d1->data.array.values;
+ s2 = (unsigned char *)d2->data.array.values;
+ len1 = d1->data.array.length * elem_size;
+ len2 = d2->data.array.length * elem_size;
+ }
else
return -1;
if (res->type == SDB_TYPE_STRING) {
res->data.string = (char *)new;
}
- else {
+ else if (res->type == SDB_TYPE_BINARY) {
res->data.binary.datum = new;
res->data.binary.length = len1 + len2;
}
+ else if (d1->type & SDB_TYPE_ARRAY) {
+ res->data.array.values = new;
+ res->data.array.length = d1->data.array.length + d2->data.array.length;
+ if (copy_array_values(res, res, sdb_data_sizeof(res->type & 0xff))) {
+ /* this leaks already copied values but there's not much we can
+ * do and this should only happen if we're in trouble anyway */
+ free(new);
+ res->data.array.values = NULL;
+ res->data.array.length = 0;
+ return -1;
+ }
+ }
return 0;
} /* data_concat */
else
memset(&tmp.data.re.regex, 0, sizeof(tmp.data.re.regex));
}
+ else if (src->type & SDB_TYPE_ARRAY) {
+ if (src->data.array.values) {
+ size_t elem_size = sdb_data_sizeof(src->type & 0xff);
+ tmp.data.array.values = calloc(src->data.array.length, elem_size);
+ if (! tmp.data.array.values)
+ return -1;
+ if (copy_array_values(&tmp, src, elem_size)) {
+ sdb_data_free_datum(&tmp);
+ return -1;
+ }
+ }
+ }
sdb_data_free_datum(dst);
*dst = tmp;
datum->data.re.raw = NULL;
memset(&datum->data.re.regex, 0, sizeof(datum->data.re.regex));
}
+ else if (datum->type & SDB_TYPE_ARRAY) {
+ free_array_values(datum);
+ if (datum->data.array.values)
+ free(datum->data.array.values);
+ datum->data.array.values = NULL;
+ datum->data.array.length = 0;
+ }
} /* sdb_data_free_datum */
int
CMP_NULL(d1->data.re.raw, d2->data.re.raw);
return strcmp(d1->data.re.raw, d2->data.re.raw);
}
+ else if (d1->type & SDB_TYPE_ARRAY) {
+ CMP_NULL(d1->data.array.values, d2->data.array.values);
+ return array_cmp(d1, d2);
+ }
return -1;
} /* sdb_data_cmp */
char d1_str[sdb_data_strlen(d1) + 1];
char d2_str[sdb_data_strlen(d2) + 1];
+ if ((d1->type & SDB_TYPE_ARRAY) || (d2->type & SDB_TYPE_ARRAY)) {
+ /* TODO */
+ errno = ENOTSUP;
+ return -1;
+ }
+
if (sdb_data_isnull(d1))
d1 = NULL;
if (sdb_data_isnull(d2))
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 */
+_Bool
+sdb_data_inarray(const sdb_data_t *value, const sdb_data_t *array)
+{
+ size_t i;
+
+ if (sdb_data_isnull(value) || sdb_data_isnull(array))
+ return 0;
+ if ((value->type & SDB_TYPE_ARRAY) || (! (array->type & SDB_TYPE_ARRAY)))
+ return 0;
+ if (value->type != (array->type & 0xff))
+ return 0;
+
+ if (value->type == SDB_TYPE_INTEGER) {
+ int64_t *v = array->data.array.values;
+ for (i = 0; i < array->data.array.length; ++i)
+ if (value->data.integer == v[i])
+ return 1;
+ }
+ else if (value->type == SDB_TYPE_DECIMAL) {
+ double *v = array->data.array.values;
+ for (i = 0; i < array->data.array.length; ++i)
+ if (value->data.decimal == v[i])
+ return 1;
+ }
+ else if (value->type == SDB_TYPE_STRING) {
+ char **v = array->data.array.values;
+ for (i = 0; i < array->data.array.length; ++i)
+ if (!strcasecmp(value->data.string, v[i]))
+ return 1;
+ }
+ else {
+ /* TODO */
+ errno = ENOTSUP;
+ return 0;
+ }
+ return 0;
+} /* sdb_data_inarray */
+
int
sdb_data_parse_op(const char *op)
{
}
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;
+ }
return 0;
} /* sdb_data_strlen */
{
char tmp[sdb_data_strlen(datum) + 1];
char *data = NULL;
+ _Bool is_null = 0;
int ret = -1;
size_t i, pos;
}
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) {
@@ -548,18 +736,28 @@ 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;
+ }
- 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)
sdb_data_free_datum(&tmp);
}
}
+ else if (type & SDB_TYPE_ARRAY) {
+ /* TODO */
+ errno = ENOTSUP;
+ return -1;
+ }
else {
errno = EINVAL;
return -1;