From 7877a98bd9c00db5e81dd2f8c734cba2bab20be7 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 12 Aug 2022 09:26:17 +0200 Subject: Merging upstream version 1.36.0. Signed-off-by: Daniel Baumann --- exporting/tests/exporting_fixtures.c | 39 ++++++++++++------------------------ 1 file changed, 13 insertions(+), 26 deletions(-) (limited to 'exporting/tests/exporting_fixtures.c') diff --git a/exporting/tests/exporting_fixtures.c b/exporting/tests/exporting_fixtures.c index 501fc405c..aae1c53fb 100644 --- a/exporting/tests/exporting_fixtures.c +++ b/exporting/tests/exporting_fixtures.c @@ -41,17 +41,9 @@ int setup_rrdhost() localhost->tags = strdupz("TAG1=VALUE1 TAG2=VALUE2"); - struct label *label = calloc(1, sizeof(struct label)); - label->key = strdupz("key1"); - label->value = strdupz("value1"); - label->label_source = LABEL_SOURCE_NETDATA_CONF; - localhost->labels.head = label; - - label = calloc(1, sizeof(struct label)); - label->key = strdupz("key2"); - label->value = strdupz("value2"); - label->label_source = LABEL_SOURCE_AUTO; - localhost->labels.head->next = label; + localhost->host_labels = rrdlabels_create(); + rrdlabels_add(localhost->host_labels, "key1", "value1", RRDLABEL_SRC_CONFIG); + rrdlabels_add(localhost->host_labels, "key2", "value2", RRDLABEL_SRC_CONFIG); localhost->rrdset_root = calloc(1, sizeof(RRDSET)); RRDSET *st = localhost->rrdset_root; @@ -71,13 +63,13 @@ int setup_rrdhost() rd->collections_counter++; rd->next = NULL; - rd->state = calloc(1, sizeof(*rd->state)); - rd->state->query_ops.oldest_time = __mock_rrddim_query_oldest_time; - rd->state->query_ops.latest_time = __mock_rrddim_query_latest_time; - rd->state->query_ops.init = __mock_rrddim_query_init; - rd->state->query_ops.is_finished = __mock_rrddim_query_is_finished; - rd->state->query_ops.next_metric = __mock_rrddim_query_next_metric; - rd->state->query_ops.finalize = __mock_rrddim_query_finalize; + rd->tiers[0] = calloc(1, sizeof(struct rrddim_tier)); + rd->tiers[0]->query_ops.oldest_time = __mock_rrddim_query_oldest_time; + rd->tiers[0]->query_ops.latest_time = __mock_rrddim_query_latest_time; + rd->tiers[0]->query_ops.init = __mock_rrddim_query_init; + rd->tiers[0]->query_ops.is_finished = __mock_rrddim_query_is_finished; + rd->tiers[0]->query_ops.next_metric = __mock_rrddim_query_next_metric; + rd->tiers[0]->query_ops.finalize = __mock_rrddim_query_finalize; return 0; } @@ -87,19 +79,14 @@ int teardown_rrdhost() RRDDIM *rd = localhost->rrdset_root->dimensions; free((void *)rd->name); free((void *)rd->id); - free(rd->state); + free(rd->tiers[0]); free(rd); RRDSET *st = localhost->rrdset_root; free((void *)st->name); free(st); - free(localhost->labels.head->next->key); - free(localhost->labels.head->next->value); - free(localhost->labels.head->next); - free(localhost->labels.head->key); - free(localhost->labels.head->value); - free(localhost->labels.head); + rrdlabels_destroy(localhost->host_labels); free((void *)localhost->tags); free(localhost); @@ -124,7 +111,7 @@ int teardown_initialized_engine(void **state) struct engine *engine = *state; teardown_rrdhost(); - buffer_free(engine->instance_root->labels); + buffer_free(engine->instance_root->labels_buffer); buffer_free(engine->instance_root->buffer); teardown_configured_engine(state); -- cgit v1.2.3