bool xstr_is_int(const char * str);
bool xstr_is_float(const char * str);
bool xstr_is_graph(const char * str);
-double xstr_to_double(const char * src, size_t len);
+double xstr_to_double(const char * src);
uint64_t xstr_to_uint64(const char * src, size_t len);
char * xstr_dup(const char * src, size_t * n);
int main(int argc, char * argv[])
{
- /* set local to LC_ALL */
- (void) setlocale(LC_ALL, "");
+ /* set local to LC_ALL and C to force a period over comma for float */
+ (void) setlocale(LC_ALL, "C");
/* initialize random */
srand(time(NULL));
assert(current != NULL);
while (current->next != NULL)
+ {
current = current->next;
+ }
current->next = malloc(sizeof(argparse_args_t));
current->next->argument = argument;
current->next->next = NULL;
{
case ARGPARSE_ERR_MISSING_VALUE:
if (current->argument->shortcut)
+ {
snprintf(buffer,
ARGPARSE_ERR_SIZE,
"argument -%c/--%s: expected one argument",
current->argument->shortcut,
current->argument->name);
+ }
else
+ {
snprintf(buffer,
ARGPARSE_ERR_SIZE,
"argument --%s: expected one argument",
current->argument->name);
+ }
break;
case ARGPARSE_ERR_UNRECOGNIZED_ARGUMENT:
snprintf(buffer,
break;
case ARGPARSE_ERR_INVALID_CHOICE:
if (current->argument->shortcut)
+ {
snprintf(buffer,
ARGPARSE_ERR_SIZE,
"argument -%c/--%s: invalid choice: '%s'",
current->argument->shortcut,
current->argument->name,
argv[argn]);
+ }
else
+ {
snprintf(buffer,
ARGPARSE_ERR_SIZE,
"argument --%s: invalid choice: '%s'",
current->argument->name,
argv[argn]);
+ }
break;
case ARGPARSE_ERR_ARGUMENT_TOO_LONG:
snprintf(buffer,
case ARGPARSE_STORE_FALSE:
case ARGPARSE_STORE_INT:
if (current->argument->pt_value_int32_t == 0)
+ {
*current->argument->pt_value_int32_t =
current->argument->default_int32_t;
+ }
continue;
case ARGPARSE_STORE_STRING:
case ARGPARSE_STORE_STR_CHOICE:
if (!strlen(current->argument->str_value))
+ {
strcpy(
current->argument->str_value,
current->argument->str_default);
+ }
continue;
}
}
case ARGPARSE_STORE_TRUE:
case ARGPARSE_STORE_FALSE:
if (current->argument->shortcut)
+ {
snprintf(buffer, ARGPARSE_HELP_SIZE,
"[-%c] ",
current->argument->shortcut);
+ }
else
+ {
snprintf(buffer, ARGPARSE_HELP_SIZE,
"[--%s] ",
current->argument->name);
+ }
break;
case ARGPARSE_STORE_STRING:
case ARGPARSE_STORE_INT:
xstr_replace_char(uname, '-', '_');
xstr_upper_case(uname);
if (current->argument->shortcut)
+ {
snprintf(buffer, ARGPARSE_HELP_SIZE,
"[-%c %s] ",
current->argument->shortcut,
uname);
+ }
else
+ {
snprintf(buffer, ARGPARSE_HELP_SIZE,
"[--%s %s] ",
current->argument->name,
uname);
+ }
break;
case ARGPARSE_STORE_STR_CHOICE:
if (current->argument->shortcut)
+ {
snprintf(buffer, ARGPARSE_HELP_SIZE,
"[-%c {%s}] ",
current->argument->shortcut,
current->argument->choices);
+ }
else
+ {
snprintf(buffer, ARGPARSE_HELP_SIZE,
"[--%s {%s}] ",
current->argument->name,
current->argument->choices);
+ }
break;
}
line_size = ident + strlen(buffer);
}
else
+ {
printf("%s", buffer);
+ }
}
printf("\n");
}
case ARGPARSE_STORE_TRUE:
case ARGPARSE_STORE_FALSE:
if (current->argument->shortcut)
+ {
snprintf(buffer, ARGPARSE_HELP_SIZE,
" -%c,",
current->argument->shortcut);
+ }
snprintf(buffer, ARGPARSE_HELP_SIZE,
"%s --%s",
buffer,
xstr_replace_char(uname, '-', '_');
xstr_upper_case(uname);
if (current->argument->shortcut)
+ {
snprintf(buffer, ARGPARSE_HELP_SIZE,
" -%c %s,",
current->argument->shortcut,
uname);
+ }
snprintf(buffer, ARGPARSE_HELP_SIZE,
"%s --%s %s",
buffer,
}
line_size = strlen(buffer);
if (line_size > 24)
+ {
printf("%s\n%*c", buffer, 24, ' ');
+ }
else
+ {
printf("%-*s", 24, buffer);
+ }
printf("%s\n", current->argument->help);
}
/* check if we have exactly one match */
if (num_matches == 0)
+ {
return ARGPARSE_ERR_UNRECOGNIZED_ARGUMENT;
+ }
if (num_matches > 1)
+ {
return ARGPARSE_ERR_AMBIGUOUS_OPTION;
+ }
/* store true/false are not expecting more, they can be handled here */
if ( (*arg)->argument->action == ARGPARSE_STORE_TRUE ||
/* we expect a value an this value should not start with - */
if (++(*argn) == argc || *argv[*argn] == '-')
+ {
return ARGPARSE_ERR_MISSING_VALUE;
+ }
if (strlen(argv[*argn]) >= ARGPARSE_MAX_LEN_ARG)
{
{
/* quit if not enough left to match choice */
if (len_rest < len_choice)
+ {
return false;
+ }
/* when we should check, perform the check */
if ( check &&
strncmp(walk, choice, len_choice) == 0 &&
(len_rest == len_choice || walk[len_choice] == ','))
+ {
return true;
+ }
/* set check true again when a comma is found */
check = *walk == ',';
return NULL;
}
+ /* Loop over all aggregations */
while (1)
{
gid = children->node->children->node->cl_obj->gid;
/*
* Return a new allocated points object or the same object as source.
- * In case of an error NULL is returned and an error message is set or a
- * signal is raised.
+ * In case of an error NULL is returned and an error message is set.
*/
siridb_points_t * siridb_aggregate_run(
siridb_points_t * source,
case CLERI_GID_R_FLOAT:
aggr->filter_tp = TP_DOUBLE;
- aggr->filter_via.real = xstr_to_double(node->str, node->len);
+ aggr->filter_via.real = xstr_to_double(node->str);
break;
case CLERI_GID_STRING:
if (points == NULL)
{
sprintf(err_msg, "Memory allocation error.");
- return NULL; /* signal is raised */
+ return NULL;
}
/* set time-stamp */
if (points == NULL)
{
sprintf(err_msg, "Memory allocation error.");
- return NULL; /* signal is raised */
+ return NULL;
}
goup_ts = GROUP_TS(source->data);
if (points->len < max_sz)
{
/* shrink points allocation */
- point = (siridb_point_t *)
- realloc(points->data, points->len * sizeof(siridb_point_t));
+ point = realloc(points->data, points->len * sizeof(siridb_point_t));
if (point == NULL && points->len)
{
/* not critical */
series->buffer = siridb_points_new(buffer->len, series->tp);
if (series->buffer == NULL)
{
- return -1; /* signal is raised */
+ /* TODO: maybe we can remove the ERR_ALLOC */
+ ERR_ALLOC
+ return -1;
}
return (buffer->empty->len) ?
size_t source_len,
char * err_msg)
{
- siridb_group_t * group = (siridb_group_t *) malloc(sizeof(siridb_group_t));
+ siridb_group_t * group = malloc(sizeof(siridb_group_t));
if (group == NULL)
{
ERR_ALLOC
cleri_node_t * node = query->nodes->node->children->next->next->node;
- double drop_threshold = xstr_to_double(node->str, node->len);
+ double drop_threshold = xstr_to_double(node->str);
if (drop_threshold < 0.0 || drop_threshold > 1.0)
{
for (; q_select->vec_index < q_select->vec->len;
++q_select->vec_index)
{
+ const char * name;
+ size_t i;
+
if (required_shard > MAX_BATCH_REQUIRE_SHARD)
{
async_more = 1;
uv_mutex_unlock(&siridb->series_mutex);
- if (points != NULL)
+ if (points == NULL)
{
- const char * name;
- size_t i;
+ MEM_ERR_RET
+ }
- for (i = 1; points->len && i < q_select->alist->len; i++)
+ for (i = 1; points->len && i < q_select->alist->len; i++)
+ {
+ aggr_points = siridb_aggregate_run(
+ points,
+ (siridb_aggr_t *) q_select->alist->data[i],
+ query->err_msg);
+
+ if (aggr_points != points)
{
- aggr_points = siridb_aggregate_run(
- points,
- (siridb_aggr_t *) q_select->alist->data[i],
- query->err_msg);
+ siridb_points_free(points);
+ }
- if (aggr_points != points)
- {
- siridb_points_free(points);
- }
+ if (aggr_points == NULL)
+ {
+ siridb_query_send_error(handle, CPROTO_ERR_QUERY);
+ return;
+ }
- if (aggr_points == NULL)
- {
- siridb_query_send_error(handle, CPROTO_ERR_QUERY);
- return;
- }
+ points = aggr_points;
+ }
- points = aggr_points;
- }
+ q_select->n += points->len;
- q_select->n += points->len;
+ if (q_select->merge_as == NULL)
+ {
+ name = siridb_presuf_name(
+ q_select->presuf,
+ series->name,
+ series->name_len);
- if (q_select->merge_as == NULL)
+ if (name == NULL || ct_add(q_select->result, name, points))
{
- name = siridb_presuf_name(
- q_select->presuf,
- series->name,
- series->name_len);
-
- if (name == NULL || ct_add(q_select->result, name, points))
- {
- sprintf(query->err_msg, "Error adding points to map.");
- siridb_points_free(points);
- log_critical("Critical error adding points");
- siridb_query_send_error(handle, CPROTO_ERR_QUERY);
- return;
- }
+ sprintf(query->err_msg, "Error adding points to map.");
+ siridb_points_free(points);
+ log_critical("Critical error adding points");
+ siridb_query_send_error(handle, CPROTO_ERR_QUERY);
+ return;
}
- else
- {
- vec_t ** plist;
+ }
+ else
+ {
+ vec_t ** plist;
- name = siridb_presuf_name(
- q_select->presuf,
- q_select->merge_as,
- strlen(q_select->merge_as));
+ name = siridb_presuf_name(
+ q_select->presuf,
+ q_select->merge_as,
+ strlen(q_select->merge_as));
- plist = (vec_t **) ct_getaddr(q_select->result, name);
+ plist = (vec_t **) ct_getaddr(q_select->result, name);
- if ( name == NULL ||
- plist == NULL ||
- vec_append_safe(plist, points))
- {
- sprintf(query->err_msg, "Error adding points to map.");
- siridb_points_free(points);
- log_critical("Critical error adding points");
- siridb_query_send_error(handle, CPROTO_ERR_QUERY);
- return;
- }
+ if ( name == NULL ||
+ plist == NULL ||
+ vec_append_safe(plist, points))
+ {
+ sprintf(query->err_msg, "Error adding points to map.");
+ siridb_points_free(points);
+ log_critical("Critical error adding points");
+ siridb_query_send_error(handle, CPROTO_ERR_QUERY);
+ return;
}
}
}
*/
siridb_lookup_t * siridb_lookup_new(uint_fast16_t num_pools)
{
- siridb_lookup_t * lookup =
- (siridb_lookup_t *) calloc(1, sizeof(siridb_lookup_t));
+ siridb_lookup_t * lookup = calloc(1, sizeof(siridb_lookup_t));
if (lookup == NULL)
{
}
/*
- * Returns NULL and raises a SIGNAL in case an error has occurred.
+ * Returns NULL in case an error has occurred.
*/
siridb_points_t * siridb_points_new(size_t size, points_tp tp)
{
- siridb_points_t * points =
- (siridb_points_t *) malloc(sizeof(siridb_points_t));
+ siridb_points_t * points = malloc(sizeof(siridb_points_t));
if (points == NULL)
{
- ERR_ALLOC
+ return NULL;
}
- else
+
+ points->len = 0;
+ points->tp = tp;
+ points->data = malloc(sizeof(siridb_point_t) * size);
+ if (points->data == NULL)
{
- points->len = 0;
- points->tp = tp;
- points->data =
- (siridb_point_t *) malloc(sizeof(siridb_point_t) * size);
- if (points->data == NULL)
- {
- ERR_ALLOC
- free(points);
- points = NULL;
- }
+ free(points);
+ return NULL;
}
+
return points;
}
{
return NULL;
}
- siridb_points_t * cpoints =
- (siridb_points_t *) malloc(sizeof(siridb_points_t));
+ siridb_points_t * cpoints = malloc(sizeof(siridb_points_t));
if (cpoints != NULL)
{
size_t sz = sizeof(siridb_point_t) * points->len;
if (points == NULL)
{
- return NULL; /* signal is raised */
+ ERR_ALLOC /* TODO: maybe remove ERR_ALLOC */
+ return NULL;
}
for (i = 0; i < len; i++)
points = siridb_points_new(size, series->tp);
if (points == NULL)
{
- return -1; /* signal is raised */
+ /* TODO: check if we can remove this ERR_ALLOC */
+ ERR_ALLOC
+ return -1;
}
for (i = start; i < end; i++)
return;
}
}
+
+ assert (0);
/* We should not get here since args should always
* contain a valid log level
*/
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <errno.h>
void xstr_lower_case(char * sptr)
{
for (; *sptr != '\0'; sptr++)
- *sptr = tolower( (unsigned char) * sptr);
+ {
+ *sptr = tolower( (unsigned char) * sptr);
+ }
}
void xstr_upper_case(char * sptr)
{
for (; *sptr != '\0'; sptr++)
- *sptr = toupper( (unsigned char) * sptr);
+ {
+ *sptr = toupper( (unsigned char) * sptr);
+ }
}
void xstr_replace_char(char * sptr, char orig, char repl)
* - string is allowed to have one dot (.) at most but not required
* - string can start with a plus (+) or minus (-) sign.
*/
-double xstr_to_double(const char * src, size_t len)
+double xstr_to_double(const char * str)
{
- char * pt = (char *) src;
- assert (len);
- double d = 0;
- double convert;
- uint64_t r1 = 0;
+ double d;
+ double negative = 0;
- switch (*pt)
+ switch (*str)
{
case '-':
- assert (len > 1);
- convert = -1.0;
- ++pt;
- --len;
+ negative = -1.0;
+ ++str;
break;
case '+':
- assert (len > 1);
- convert = 1.0;
- ++pt;
- --len;
+ ++str;
break;
- default:
- convert = 1.0;
}
- for (; len && isdigit(*pt); --len, ++pt)
- {
- r1 = 10 * r1 + *pt - '0';
- }
+ if (*str == 'i')
+ return negative ? negative * INFINITY : INFINITY;
+
+ if (*str == 'n')
+ return NAN;
+
+ if (errno == ERANGE)
+ errno = 0;
- d = (double) r1;
+ d = strtod(str, NULL);
- if (len && --len)
+ if (errno == ERANGE)
{
- uint64_t r2;
- double power;
- ++pt;
- r2 = *pt - '0';
- for (power = -1.0f; --len && isdigit(*(++pt)); power--)
- {
- r2 = 10 * r2 + *pt - '0';
- }
+ assert (d == HUGE_VAL || d == -HUGE_VAL);
- d += pow(10.0f, power) * (double) r2;
+ d = d == HUGE_VAL ? INFINITY : -INFINITY;
+ errno = 0;
}
- return convert * d;
+ return negative ? negative * d : d;
}
/*
/* xstr_to_double */
{
- _assert (xstr_to_double("0.5", 3) == 0.5);
- _assert (xstr_to_double("0.55", 3) == 0.5);
- _assert (xstr_to_double("123.456", 7) == 123.456);
- _assert (xstr_to_double("123", 3) == 123);
- _assert (xstr_to_double("1234", 3) == 123);
- _assert (xstr_to_double("123.", 4) == 123);
- _assert (xstr_to_double("123.", 3) == 123);
- _assert (xstr_to_double("+1234", 4) == 123);
- _assert (xstr_to_double("-1234", 4) == -123);
- _assert (xstr_to_double("123456.", 3) == 123);
- _assert (xstr_to_double("-0.5", 4) == -0.5);
- _assert (xstr_to_double("-0.56", 4) == -0.5);
- _assert (xstr_to_double("+0.5", 4) == 0.5);
- _assert (xstr_to_double("+0.56", 4) == 0.5);
- _assert (xstr_to_double("-.5", 3) == -0.5);
- _assert (xstr_to_double("+.55", 3) == 0.5);
- _assert (xstr_to_double(".55", 2) == 0.5);
- _assert (xstr_to_double("-.55", 3) == -0.5);
+ _assert (xstr_to_double("0.5") == 0.5);
+ _assert (xstr_to_double("0.55") == 0.55);
+ _assert (xstr_to_double("123.456") == 123.456);
+ _assert (xstr_to_double("123") == 123.0);
+ _assert (xstr_to_double("123.") == 123.0);
+ _assert (xstr_to_double("123.") == 123.0);
+ _assert (xstr_to_double("+1234") == 1234.0);
+ _assert (xstr_to_double("-1234") == -1234.0);
+ _assert (xstr_to_double("123456.") == 123456.0);
+ _assert (xstr_to_double("-0.5") == -0.5);
+ _assert (xstr_to_double("-0.56") == -0.56);
+ _assert (xstr_to_double("+0.5") == 0.5);
+ _assert (xstr_to_double("-.5") == -0.5);
+ _assert (xstr_to_double("+.55") == 0.55);
+ _assert (xstr_to_double(".55") == 0.55);
+ _assert (xstr_to_double("-.55") == -0.55);
}
return test_end();
projects / siridb-server.git / commitdiff