![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/core/data.c b/src/core/data.c
index 88c7f8246953d58f1af76a01a04e1919eb96f8c2..58c8b524e1111c662e7587aa5e1614d10d084b5d 100644 (file)
--- a/src/core/data.c
+++ b/src/core/data.c
/* integer, decimal, string, datetime, binary, regex */
-static int op_matrix[6][6][6] = {
+static int op_matrix[6][7][7] = {
/* 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 },
+ { -1, -1, -1, -1, -1, -1, -1, },
+ { -1, SDB_TYPE_INTEGER, -1, -1, -1, -1, -1 },
+ { -1, -1, SDB_TYPE_DECIMAL, -1, -1, -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, -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 },
+ { -1, -1, -1, -1, -1, -1, -1, },
+ { -1, SDB_TYPE_INTEGER, -1, -1, -1, -1, -1 },
+ { -1, -1, SDB_TYPE_DECIMAL, -1, -1, -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, -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 },
+ { -1, -1, -1, -1, -1, -1, -1, },
+ { -1, SDB_TYPE_INTEGER, -1, -1, SDB_TYPE_DATETIME, -1, -1 },
+ { -1, -1, SDB_TYPE_DECIMAL, -1, SDB_TYPE_DATETIME, -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, -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 },
+ { -1, -1, -1, -1, -1, -1, -1, },
+ { -1, SDB_TYPE_INTEGER, -1, -1, -1, -1, -1 },
+ { -1, -1, SDB_TYPE_DECIMAL, -1, -1, -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, -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 },
+ { -1, -1, -1, -1, -1, -1, -1, },
+ { -1, SDB_TYPE_INTEGER, -1, -1, -1, -1, -1 },
+ { -1, -1, SDB_TYPE_DECIMAL, -1, -1, -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, -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 },
+ { -1, -1, -1, -1, -1, -1, -1, },
+ { -1, -1, -1, -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, -1, -1, SDB_TYPE_BINARY, -1 },
+ { -1, -1, -1, -1, -1, -1, -1 },
},
};
{
int type = src->type & 0xff;
- if ((type == SDB_TYPE_INTEGER) || (type == SDB_TYPE_DECIMAL)) {
+ if ((type == SDB_TYPE_BOOLEAN) || (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);
v[i] = NULL;
}
}
+ else if (type == SDB_TYPE_BINARY) {
+ struct {
+ size_t length;
+ unsigned char *datum;
+ } *v = datum->data.array.values;
+ size_t i;
+
+ for (i = 0; i < datum->data.array.length; ++i) {
+ if (v[i].datum)
+ free(v[i].datum);
+ v[i].datum = NULL;
+ }
+ }
+ else if (type == SDB_TYPE_REGEX) {
+ struct {
+ char *raw;
+ regex_t regex;
+ } *v = datum->data.array.values;
+ size_t i;
+
+ for (i = 0; i < datum->data.array.length; ++i) {
+ if (v[i].raw) {
+ free(v[i].raw);
+ regfree(&v[i].regex);
+ }
+ v[i].raw = NULL;
+ }
+ }
} /* free_array_values */
/* compare two arrays element-by-element returning how the first non-equal
len = SDB_MIN(a1->data.array.length, a2->data.array.length);
- if (type == SDB_TYPE_INTEGER) {
+ if (type == SDB_TYPE_BOOLEAN) {
+ bool *v1 = a1->data.array.values;
+ bool *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_INTEGER) {
int64_t *v1 = a1->data.array.values;
int64_t *v2 = a2->data.array.values;
return diff;
}
}
+ else if (type == SDB_TYPE_DATETIME) {
+ sdb_time_t *v1 = a1->data.array.values;
+ sdb_time_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_BINARY) {
+ struct {
+ size_t length;
+ unsigned char *datum;
+ } *v1 = a1->data.array.values;
+ struct {
+ size_t length;
+ unsigned char *datum;
+ } *v2 = a2->data.array.values;
+
+ for (i = 0; i < len; ++i) {
+ int diff;
+
+ /* on a common prefix, the shorter datum sorts less */
+ if (v1[i].length < v2[i].length) {
+ diff = memcmp(v1[i].datum, v2[i].datum, v1[i].length);
+ diff = diff ? diff : -1;
+ }
+ else if (v1[i].length > v2[i].length) {
+ diff = memcmp(v1[i].datum, v2[i].datum, v2[i].length);
+ diff = diff ? diff : 1;
+ }
+ else
+ diff = memcmp(v1[i].datum, v2[i].datum, v1[i].length);
+
+ if (diff)
+ return diff;
+ }
+ }
+ else if (type == SDB_TYPE_REGEX) {
+ struct {
+ char *raw;
+ regex_t regex;
+ } *v1 = a1->data.array.values;
+ struct {
+ char *raw;
+ regex_t regex;
+ } *v2 = a2->data.array.values;
+
+ for (i = 0; i < len; ++i) {
+ int diff = strcasecmp(v1[i].raw, v2[i].raw);
+ if (diff)
+ return diff;
+ }
+ }
else {
- /* TODO */
- errno = ENOTSUP;
+ errno = EINVAL;
/* but fall through to ensure stable sorting: */
}
return SDB_CMP(a1->data.array.length, a2->data.array.length);
else
return -1;
- assert(s1 && s2);
-
new = malloc(len1 + len2 + 1);
if (! new)
return -1;
if (d1->type != d2->type)
return SDB_CMP(d1->type, d2->type);
- if (d1->type == SDB_TYPE_INTEGER)
+ if (d1->type == SDB_TYPE_BOOLEAN)
+ return SDB_CMP(d1->data.boolean, d2->data.boolean);
+ else if (d1->type == SDB_TYPE_INTEGER)
return SDB_CMP(d1->data.integer, d2->data.integer);
else if (d1->type == SDB_TYPE_DECIMAL)
return SDB_CMP(d1->data.decimal, d2->data.decimal);
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))
CMP_NULL(d1, d2);
- if (sdb_data_format(d1, d1_str, sizeof(d1_str), SDB_UNQUOTED) < 0)
+ if (! sdb_data_format(d1, d1_str, sizeof(d1_str), SDB_UNQUOTED))
return SDB_CMP(sizeof(d1_str), sizeof(d2_str));
- if (sdb_data_format(d2, d2_str, sizeof(d2_str), SDB_UNQUOTED) < 0)
+ if (! sdb_data_format(d2, d2_str, sizeof(d2_str), SDB_UNQUOTED))
return SDB_CMP(sizeof(d1_str), sizeof(d2_str));
return strcasecmp(d1_str, d2_str);
#undef CMP_NULL
} /* sdb_data_strcmp */
-_Bool
+bool
sdb_data_isnull(const sdb_data_t *datum)
{
if (! datum)
return 0;
} /* sdb_data_isnull */
-_Bool
+bool
sdb_data_inarray(const sdb_data_t *value, const sdb_data_t *array)
{
const void *values;
for (i = 0; i < length; ++i) {
size_t j;
- if (type == SDB_TYPE_INTEGER) {
+ if (type == SDB_TYPE_BOOLEAN) {
+ bool *v = array->data.array.values;
+ for (j = 0; j < array->data.array.length; ++j)
+ if (((const bool *)values)[i] == v[j])
+ break;
+ }
+ else if (type == SDB_TYPE_INTEGER) {
int64_t *v = array->data.array.values;
for (j = 0; j < array->data.array.length; ++j)
if (((const int64_t *)values)[i] == v[j])
return -1;
type = array->type & 0xff;
- if (type == SDB_TYPE_INTEGER) {
+ if (type == SDB_TYPE_BOOLEAN) {
+ bool *v = array->data.array.values;
+ tmp.data.boolean = v[i];
+ }
+ else if (type == SDB_TYPE_INTEGER) {
int64_t *v = array->data.array.values;
tmp.data.integer = v[i];
}
char **v = array->data.array.values;
tmp.data.string = v[i];
}
+ else if (type == SDB_TYPE_DATETIME) {
+ sdb_time_t *v = array->data.array.values;
+ tmp.data.datetime = v[i];
+ }
+ else if (type == SDB_TYPE_BINARY) {
+ struct {
+ size_t length;
+ unsigned char *datum;
+ } *v = array->data.array.values;
+ assert(sizeof(tmp.data.binary) == sizeof(v[i]));
+ memcpy(&tmp.data.binary, &v[i], sizeof(v[i]));
+ }
+ else if (type == SDB_TYPE_REGEX) {
+ struct {
+ char *raw;
+ regex_t regex;
+ } *v = array->data.array.values;
+ assert(sizeof(tmp.data.re) == sizeof(v[i]));
+ memcpy(&tmp.data.re, &v[i], sizeof(v[i]));
+ }
else {
- /* TODO */
- errno = ENOTSUP;
+ errno = EINVAL;
return -1;
}
if (! datum)
return 0;
- if (datum->type == SDB_TYPE_INTEGER) {
+ if (sdb_data_isnull(datum)) {
+ /* NULL */
+ return 4;
+ }
+ switch (datum->type) {
+ case SDB_TYPE_BOOLEAN:
+ /* true | false */
+ return 5;
+ case SDB_TYPE_INTEGER:
/* log(64) */
return 20;
- }
- else if (datum->type == SDB_TYPE_DECIMAL) {
+ case SDB_TYPE_DECIMAL:
/* XXX: -d.dddddde+dd or -ddddd.dddddd */
return 42;
- }
- else if (datum->type == SDB_TYPE_STRING) {
+ case SDB_TYPE_STRING:
if (! datum->data.string)
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_DATETIME) {
- /* "YYYY-MM-DD HH:MM:SS +zzzz" */
- return 27;
- }
- else if (datum->type == SDB_TYPE_BINARY) {
+ case SDB_TYPE_DATETIME:
+ /* "YYYY-MM-DD HH:MM:SS[.nnnnnnnnn] +zzzz" */
+ return 37;
+ case SDB_TYPE_BINARY:
if (! datum->data.binary.datum)
return 6; /* NULL */
/* "\xNN" */
return 4 * datum->data.binary.length + 2;
- }
- else if (datum->type == SDB_TYPE_REGEX) {
+ case SDB_TYPE_REGEX:
if (! datum->data.re.raw)
return 6; /* NULL */
/* "/.../" */
return strlen(datum->data.re.raw) + 4;
}
- else if (datum->type & SDB_TYPE_ARRAY) {
+ if (datum->type & SDB_TYPE_ARRAY) {
size_t len = 2; /* [] */
size_t i;
for (i = 0; i < datum->data.array.length; ++i) {
return 0;
} /* sdb_data_strlen */
-int
+size_t
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;
+ bool is_null = 0;
+ size_t ret = 0;
size_t i, pos;
- if ((! datum) || (! buf) || (! buflen))
- return -1;
+ if (! datum)
+ return 0;
- if (datum->type == SDB_TYPE_INTEGER) {
+ if (datum->type == SDB_TYPE_NULL) {
+ strncpy(buf, "NULL", buflen);
+ ret = 4;
+ }
+ else if (datum->type == SDB_TYPE_BOOLEAN) {
+ if (datum->data.boolean) {
+ strncpy(buf, "true", buflen);
+ ret = 4;
+ }
+ else {
+ strncpy(buf, "false", buflen);
+ ret = 5;
+ }
+ }
+ else if (datum->type == SDB_TYPE_INTEGER) {
ret = snprintf(buf, buflen, "%"PRIi64, datum->data.integer);
}
else if (datum->type == SDB_TYPE_DECIMAL) {
- ret = snprintf(buf, buflen, "%g", datum->data.decimal);
+ if (isnan(datum->data.decimal))
+ ret = snprintf(buf, buflen, "nan");
+ else
+ ret = snprintf(buf, buflen, "%g", datum->data.decimal);
}
else if (datum->type == SDB_TYPE_STRING) {
if (! datum->data.string)
}
}
else if (datum->type == SDB_TYPE_DATETIME) {
- if (! sdb_strftime(tmp, sizeof(tmp), "%F %T %z",
- datum->data.datetime))
+ if (! sdb_strftime(tmp, sizeof(tmp), datum->data.datetime))
return -1;
tmp[sizeof(tmp) - 1] = '\0';
data = tmp;
@@ -916,37 +1053,41 @@ sdb_data_format(const sdb_data_t *datum, char *buf, size_t buflen, int quoted)
}
else if (datum->type & SDB_TYPE_ARRAY) {
ret = 1;
- buf[0] = '[';
+ if (buflen > 0)
+ 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;
+ size_t n;
if (ret > 1) {
- buf[ret] = ',';
- buf[ret + 1] = ' ';
+ if (buflen > 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 (buflen > ret)
+ n = sdb_data_format(&v, buf + ret, buflen - ret, quoted);
+ else
+ n = sdb_data_format(&v, NULL, 0, quoted);
if (n > 0)
ret += n;
else
break;
}
- if ((size_t)ret < buflen - 1) {
+ if (buflen > ret + 1) {
buf[ret] = ']';
buf[ret + 1] = '\0';
- ++ret;
}
+ ++ret;
}
if (is_null) {
/* never quote NULL */
strncpy(buf, "NULL", buflen);
- ret = (int)SDB_MIN(buflen, 4);
+ ret = 4;
}
else if (data) {
if (quoted == SDB_UNQUOTED)
@@ -956,35 +1097,53 @@ sdb_data_format(const sdb_data_t *datum, char *buf, size_t buflen, int quoted)
else
ret = snprintf(buf, buflen, "\"%s\"", data);
}
- buf[buflen - 1] = '\0';
+ if (buflen > 0)
+ buf[buflen - 1] = '\0';
return ret;
} /* sdb_data_format */
int
-sdb_data_parse(char *str, int type, sdb_data_t *data)
+sdb_data_parse(const char *str, int type, sdb_data_t *data)
{
sdb_data_t tmp;
char *endptr = NULL;
+ if (! str) {
+ errno = EINVAL;
+ return -1;
+ }
+
errno = 0;
- if (type == SDB_TYPE_INTEGER) {
+ if (type == SDB_TYPE_BOOLEAN) {
+ if (! strcasecmp(str, "true"))
+ tmp.data.boolean = true;
+ else if (! strcasecmp(str, "false"))
+ tmp.data.boolean = false;
+ else
+ return -1;
+ }
+ else if (type == SDB_TYPE_INTEGER) {
tmp.data.integer = strtoll(str, &endptr, 0);
}
else if (type == SDB_TYPE_DECIMAL) {
tmp.data.decimal = strtod(str, &endptr);
}
else if (type == SDB_TYPE_STRING) {
- tmp.data.string = str;
+ tmp.data.string = strdup(str);
+ if (! tmp.data.string)
+ return -1;
}
else if (type == SDB_TYPE_DATETIME) {
double datetime = strtod(str, &endptr);
tmp.data.datetime = DOUBLE_TO_SDB_TIME(datetime);
}
else if (type == SDB_TYPE_BINARY) {
- /* we don't support any binary information containing 0-bytes */
+ /* we don't support any binary information containing 0-bytes here */
+ tmp.data.binary.datum = (unsigned char *)strdup(str);
+ if (! tmp.data.binary.datum)
+ return -1;
tmp.data.binary.length = strlen(str);
- tmp.data.binary.datum = (unsigned char *)str;
}
else if (type == SDB_TYPE_REGEX) {
tmp.data.re.raw = strdup(str);
sdb_data_sizeof(int type)
{
sdb_data_t v;
- if (type == SDB_TYPE_INTEGER)
+ if (type == SDB_TYPE_BOOLEAN)
+ return sizeof(v.data.boolean);
+ else if (type == SDB_TYPE_INTEGER)
return sizeof(v.data.integer);
else if (type == SDB_TYPE_DECIMAL)
return sizeof(v.data.decimal);