diff --git a/src/core/data.c b/src/core/data.c
index eeead556899382b1e78270714a3e69eadc349129..c1e99a8cab82ed742b76a8d8165fe44ceb999269 100644 (file)
--- a/src/core/data.c
+++ b/src/core/data.c
#include "core/data.h"
#include "utils/error.h"
+#include <assert.h>
+
#include <errno.h>
#include <inttypes.h>
else
return -1;
- if (s1 || s2) {
- new = malloc(len1 + len2 + 1);
- if (! new)
- return -1;
- }
- else
- new = NULL;
+ assert(s1 && s2);
+
+ new = malloc(len1 + len2 + 1);
+ if (! new)
+ return -1;
if (len1)
memcpy(new, s1, len1);
if (len2)
memcpy(new + len1, s2, len2);
- if (new)
- new[len1 + len2] = '\0';
+ new[len1 + len2] = '\0';
res->type = d1->type;
if (res->type == SDB_TYPE_STRING) {
* public API
*/
+const sdb_data_t SDB_DATA_NULL = SDB_DATA_INIT;
+
int
sdb_data_copy(sdb_data_t *dst, const sdb_data_t *src)
{
return -1;
tmp = *src;
- switch (src->type) {
- case SDB_TYPE_STRING:
+ if (src->type == SDB_TYPE_STRING) {
+ if (src->data.string) {
tmp.data.string = strdup(src->data.string);
if (! tmp.data.string)
return -1;
- break;
- case SDB_TYPE_BINARY:
+ }
+ }
+ else if (src->type == SDB_TYPE_BINARY) {
+ if (src->data.binary.datum) {
tmp.data.binary.datum = malloc(src->data.binary.length);
if (! tmp.data.binary.datum)
return -1;
memcpy(tmp.data.binary.datum, src->data.binary.datum,
src->data.binary.length);
- break;
+ }
+ }
+ else if (src->type == SDB_TYPE_REGEX) {
+ if (src->data.re.raw) {
+ tmp.data.re.raw = strdup(src->data.re.raw);
+ if (! tmp.data.re.raw)
+ return -1;
+ /* we need to recompile because the regex might point to
+ * dynamically allocated memory */
+ if (regcomp(&tmp.data.re.regex, tmp.data.re.raw,
+ REG_EXTENDED | REG_ICASE | REG_NOSUB)) {
+ free(tmp.data.re.raw);
+ return -1;
+ }
+ }
+ else
+ memset(&tmp.data.re.regex, 0, sizeof(tmp.data.re.regex));
}
sdb_data_free_datum(dst);
if (! datum)
return;
- switch (datum->type) {
- case SDB_TYPE_STRING:
- if (datum->data.string)
- free(datum->data.string);
- datum->data.string = NULL;
- break;
- case SDB_TYPE_BINARY:
- if (datum->data.binary.datum)
- free(datum->data.binary.datum);
- datum->data.binary.datum = NULL;
- datum->data.binary.length = 0;
- break;
+ if (datum->type == SDB_TYPE_STRING) {
+ if (datum->data.string)
+ free(datum->data.string);
+ datum->data.string = NULL;
+ }
+ else if (datum->type == SDB_TYPE_BINARY) {
+ if (datum->data.binary.datum)
+ free(datum->data.binary.datum);
+ datum->data.binary.datum = NULL;
+ datum->data.binary.length = 0;
+ }
+ else if (datum->type == SDB_TYPE_REGEX) {
+ if (datum->data.re.raw) {
+ free(datum->data.re.raw);
+ regfree(&datum->data.re.regex);
+ }
+ datum->data.re.raw = NULL;
+ memset(&datum->data.re.regex, 0, sizeof(datum->data.re.regex));
}
} /* sdb_data_free_datum */
if (d1->type != d2->type)
return SDB_CMP(d1->type, d2->type);
- switch (d1->type) {
- case SDB_TYPE_INTEGER:
- return SDB_CMP(d1->data.integer, d2->data.integer);
- case SDB_TYPE_DECIMAL:
- return SDB_CMP(d1->data.decimal, d2->data.decimal);
- case SDB_TYPE_STRING:
- CMP_NULL(d1->data.string, d2->data.string);
- return strcasecmp(d1->data.string, d2->data.string);
- case SDB_TYPE_DATETIME:
- return SDB_CMP(d1->data.datetime, d2->data.datetime);
- case SDB_TYPE_BINARY:
- {
- int diff;
-
- CMP_NULL(d1->data.binary.datum, d2->data.binary.datum);
-
- /* on a common prefix, the shorter datum sorts less */
- if (d1->data.binary.length < d2->data.binary.length) {
- diff = memcmp(d1->data.binary.datum, d2->data.binary.datum,
- d1->data.binary.length);
- diff = diff ? diff : -1;
- }
- else if (d1->data.binary.length > d2->data.binary.length) {
- diff = memcmp(d1->data.binary.datum, d2->data.binary.datum,
- d2->data.binary.length);
- diff = diff ? diff : 1;
- }
- else
- diff = memcmp(d1->data.binary.datum, d2->data.binary.datum,
- d1->data.binary.length);
+ 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);
+ else if (d1->type == SDB_TYPE_STRING) {
+ CMP_NULL(d1->data.string, d2->data.string);
+ return strcasecmp(d1->data.string, d2->data.string);
+ }
+ else if (d1->type == SDB_TYPE_DATETIME)
+ return SDB_CMP(d1->data.datetime, d2->data.datetime);
+ else if (d1->type == SDB_TYPE_BINARY) {
+ int diff;
+
+ CMP_NULL(d1->data.binary.datum, d2->data.binary.datum);
- return diff;
+ /* on a common prefix, the shorter datum sorts less */
+ if (d1->data.binary.length < d2->data.binary.length) {
+ diff = memcmp(d1->data.binary.datum, d2->data.binary.datum,
+ d1->data.binary.length);
+ diff = diff ? diff : -1;
}
- default:
- return -1;
+ else if (d1->data.binary.length > d2->data.binary.length) {
+ diff = memcmp(d1->data.binary.datum, d2->data.binary.datum,
+ d2->data.binary.length);
+ diff = diff ? diff : 1;
+ }
+ else
+ diff = memcmp(d1->data.binary.datum, d2->data.binary.datum,
+ d1->data.binary.length);
+
+ return diff;
}
-#undef CMP_NULL
+ else if (d1->type == SDB_TYPE_REGEX) {
+ CMP_NULL(d1->data.re.raw, d2->data.re.raw);
+ return strcmp(d1->data.re.raw, d2->data.re.raw);
+ }
+ return -1;
} /* sdb_data_cmp */
+int
+sdb_data_strcmp(const sdb_data_t *d1, const sdb_data_t *d2)
+{
+ char d1_str[sdb_data_strlen(d1) + 1];
+ char d2_str[sdb_data_strlen(d2) + 1];
+
+ if (sdb_data_isnull(d1))
+ d1 = NULL;
+ if (sdb_data_isnull(d2))
+ d2 = NULL;
+
+ CMP_NULL(d1, d2);
+
+ if (sdb_data_format(d1, d1_str, sizeof(d1_str), SDB_UNQUOTED) < 0)
+ return SDB_CMP(sizeof(d1_str), sizeof(d2_str));
+ if (sdb_data_format(d2, d2_str, sizeof(d2_str), SDB_UNQUOTED) < 0)
+ return SDB_CMP(sizeof(d1_str), sizeof(d2_str));
+
+ return strcasecmp(d1_str, d2_str);
+#undef CMP_NULL
+} /* sdb_data_strcmp */
+
_Bool
sdb_data_isnull(const sdb_data_t *datum)
{
if (! datum)
return 1;
+ if (datum->type == SDB_TYPE_NULL)
+ return 1;
if ((datum->type == SDB_TYPE_STRING) && (! datum->data.string))
return 1;
if ((datum->type == SDB_TYPE_BINARY) && (! datum->data.binary.datum))
return 1;
+ if ((datum->type == SDB_TYPE_REGEX) && (! datum->data.re.raw))
+ return 1;
return 0;
} /* sdb_data_isnull */
+int
+sdb_data_parse_op(const char *op)
+{
+ if (! strcmp(op, "+"))
+ return SDB_DATA_ADD;
+ else if (! strcmp(op, "-"))
+ return SDB_DATA_SUB;
+ else if (! strcmp(op, "*"))
+ return SDB_DATA_MUL;
+ else if (! strcmp(op, "/"))
+ return SDB_DATA_DIV;
+ else if (! strcmp(op, "%"))
+ return SDB_DATA_MOD;
+ else if (! strcmp(op, "||"))
+ return SDB_DATA_CONCAT;
+ return -1;
+} /* sdb_data_parse_op */
+
int
sdb_data_expr_eval(int op, const sdb_data_t *d1, const sdb_data_t *d2,
sdb_data_t *res)
{
if ((! d1) || (! d2) || (! res))
return -1;
+ if (sdb_data_isnull(d1) || sdb_data_isnull(d2)) {
+ *res = SDB_DATA_NULL;
+ return 0;
+ }
switch (op) {
case SDB_DATA_CONCAT:
return data_concat(d1, d2, res);
if (! datum)
return 0;
- switch (datum->type) {
- case SDB_TYPE_INTEGER:
- /* log(64) */
- return 20;
- case SDB_TYPE_DECIMAL:
- /* XXX: -0xN.NNNNNNp+NNN */
- return 42;
- case SDB_TYPE_STRING:
- if (! datum->data.string)
- return 8; /* "<NULL>" */
- /* in the worst case, each character needs to be escaped */
- return 2 * strlen(datum->data.string) + 2;
- case SDB_TYPE_DATETIME:
- /* "YYYY-MM-DD HH:MM:SS +zzzz" */
- return 27;
- case SDB_TYPE_BINARY:
- if (! datum->data.binary.datum)
- return 8; /* "<NULL>" */
- /* "\xNN" */
- return 4 * datum->data.binary.length + 2;
+ if (datum->type == SDB_TYPE_INTEGER) {
+ /* log(64) */
+ return 20;
+ }
+ else if (datum->type == SDB_TYPE_DECIMAL) {
+ /* XXX: -d.dddddde+dd or -ddddd.dddddd */
+ return 42;
+ }
+ else if (datum->type == SDB_TYPE_STRING) {
+ if (! datum->data.string)
+ return 8; /* "<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) {
+ if (! datum->data.binary.datum)
+ return 8; /* "<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 strlen(datum->data.re.raw) + 4;
}
return 0;
} /* sdb_data_strlen */
@@ -411,64 +493,70 @@ sdb_data_format(const sdb_data_t *datum, char *buf, size_t buflen, int quoted)
if ((! datum) || (! buf))
return -1;
- switch (datum->type) {
- case SDB_TYPE_INTEGER:
- ret = snprintf(buf, buflen, "%"PRIi64, datum->data.integer);
- break;
- case SDB_TYPE_DECIMAL:
- ret = snprintf(buf, buflen, "%a", datum->data.decimal);
- break;
- case SDB_TYPE_STRING:
- if (! datum->data.string)
- data = "<NULL>";
- else {
- pos = 0;
- for (i = 0; i < strlen(datum->data.string); ++i) {
- char byte = datum->data.string[i];
-
- if ((byte == '\\') || (byte == '"')) {
- tmp[pos] = '\\';
- ++pos;
- }
- tmp[pos] = byte;
- ++pos;
- }
- tmp[pos] = '\0';
- data = tmp;
- }
- break;
- case SDB_TYPE_DATETIME:
- if (! sdb_strftime(tmp, sizeof(tmp), "%F %T %z",
- datum->data.datetime))
- return -1;
- tmp[sizeof(tmp) - 1] = '\0';
- data = tmp;
- break;
- case SDB_TYPE_BINARY:
+ 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);
+ }
+ else if (datum->type == SDB_TYPE_STRING) {
+ if (! datum->data.string)
+ data = "<NULL>";
+ else {
pos = 0;
- for (i = 0; i < datum->data.binary.length; ++i) {
- int byte = (int)datum->data.binary.datum[i];
- char hex[] = {'0', '1', '2', '3', '4', '5', '6', '7',
- '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
-
- tmp[pos] = '\\';
- tmp[pos + 1] = 'x';
- pos += 2;
+ for (i = 0; i < strlen(datum->data.string); ++i) {
+ char byte = datum->data.string[i];
- if (byte > 0xf) {
- tmp[pos] = hex[byte >> 4];
+ if ((byte == '\\') || (byte == '"')) {
+ tmp[pos] = '\\';
++pos;
}
- tmp[pos] = hex[byte & 0xf];
+ tmp[pos] = byte;
++pos;
}
- if (datum->data.binary.datum) {
- tmp[pos] = '\0';
- data = tmp;
+ tmp[pos] = '\0';
+ data = tmp;
+ }
+ }
+ else if (datum->type == SDB_TYPE_DATETIME) {
+ if (! sdb_strftime(tmp, sizeof(tmp), "%F %T %z",
+ datum->data.datetime))
+ return -1;
+ tmp[sizeof(tmp) - 1] = '\0';
+ data = tmp;
+ }
+ else if (datum->type == SDB_TYPE_BINARY) {
+ pos = 0;
+ for (i = 0; i < datum->data.binary.length; ++i) {
+ int byte = (int)datum->data.binary.datum[i];
+ char hex[] = {'0', '1', '2', '3', '4', '5', '6', '7',
+ '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
+
+ tmp[pos] = '\\';
+ tmp[pos + 1] = 'x';
+ pos += 2;
+
+ if (byte > 0xf) {
+ tmp[pos] = hex[byte >> 4];
+ ++pos;
}
- else
- data = "<NULL>";
- break;
+ tmp[pos] = hex[byte & 0xf];
+ ++pos;
+ }
+ if (datum->data.binary.datum) {
+ tmp[pos] = '\0';
+ data = tmp;
+ }
+ else
+ data = "<NULL>";
+ }
+ else if (datum->type == SDB_TYPE_REGEX) {
+ if (! datum->data.re.raw)
+ data = "<NULL>";
+ else {
+ snprintf(tmp, sizeof(tmp), "/%s/", datum->data.re.raw);
+ data = tmp;
+ }
}
if (data) {
char *endptr = NULL;
errno = 0;
- switch (type) {
- case SDB_TYPE_INTEGER:
- tmp.data.integer = strtoll(str, &endptr, 0);
- break;
- case SDB_TYPE_DECIMAL:
- tmp.data.decimal = strtod(str, &endptr);
- break;
- case SDB_TYPE_STRING:
- tmp.data.string = str;
- break;
- case SDB_TYPE_DATETIME:
- {
- double datetime = strtod(str, &endptr);
- tmp.data.datetime = DOUBLE_TO_SDB_TIME(datetime);
- }
- break;
- case SDB_TYPE_BINARY:
- /* we don't support any binary information containing 0-bytes */
- tmp.data.binary.length = strlen(str);
- tmp.data.binary.datum = (unsigned char *)str;
- break;
- default:
- errno = EINVAL;
+ 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;
+ }
+ 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 */
+ 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);
+ if (! tmp.data.re.raw)
+ return -1;
+ if (regcomp(&tmp.data.re.regex, tmp.data.re.raw,
+ REG_EXTENDED | REG_ICASE | REG_NOSUB)) {
+ sdb_log(SDB_LOG_ERR, "core: Failed to compile regular "
+ "expression '%s'", tmp.data.re.raw);
+ free(tmp.data.re.raw);
return -1;
+ }
+ if (! data) {
+ tmp.type = SDB_TYPE_REGEX;
+ sdb_data_free_datum(&tmp);
+ }
+ }
+ else {
+ errno = EINVAL;
+ return -1;
}
if ((type == SDB_TYPE_INTEGER) || (type == SDB_TYPE_DECIMAL)
return 0;
} /* sdb_data_parse */
+size_t
+sdb_data_sizeof(int type)
+{
+ sdb_data_t v;
+ if (type == SDB_TYPE_INTEGER)
+ return sizeof(v.data.integer);
+ else if (type == SDB_TYPE_DECIMAL)
+ return sizeof(v.data.decimal);
+ else if (type == SDB_TYPE_STRING)
+ return sizeof(v.data.string);
+ else if (type == SDB_TYPE_DATETIME)
+ return sizeof(v.data.datetime);
+ else if (type == SDB_TYPE_BINARY)
+ return sizeof(v.data.binary);
+ else if (type == SDB_TYPE_REGEX)
+ return sizeof(v.data.re);
+ return 0;
+} /* sdb_data_sizeof */
+
/* vim: set tw=78 sw=4 ts=4 noexpandtab : */