Merging upstream version 1.37.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 19 insertions, 21 deletions

diff --git a/exporting/tests/netdata_doubles.c b/exporting/tests/netdata_doubles.c
index ee36e887a..7e5017a5f 100644
--- a/exporting/tests/netdata_doubles.c
+++ b/exporting/tests/netdata_doubles.c
@@ -177,20 +177,6 @@ const char *rrd_memory_mode_name(RRD_MEMORY_MODE id)
     return RRD_MEMORY_MODE_NONE_NAME;
 }
 
-NETDATA_DOUBLE rrdvar2number(RRDVAR *rv)
-{
-    (void)rv;
-    return 0;
-}
-
-int foreach_host_variable_callback(RRDHOST *host, int (*callback)(RRDVAR *rv, void *data), void *data)
-{
-    (void)host;
-    (void)callback;
-    (void)data;
-    return 0;
-}
-
 void rrdset_update_heterogeneous_flag(RRDSET *st)
 {
     (void)st;
@@ -212,11 +198,10 @@ time_t __mock_rrddim_query_latest_time(STORAGE_METRIC_HANDLE *db_metric_handle)
     return mock_type(time_t);
 }
 
-void __mock_rrddim_query_init(STORAGE_METRIC_HANDLE *db_metric_handle, struct rrddim_query_handle *handle, time_t start_time, time_t end_time, TIER_QUERY_FETCH tier_query_fetch_type)
+void __mock_rrddim_query_init(STORAGE_METRIC_HANDLE *db_metric_handle, struct rrddim_query_handle *handle, time_t start_time, time_t end_time)
 {
     (void)db_metric_handle;
     (void)handle;
-    (void)tier_query_fetch_type;
 
     function_called();
     check_expected(start_time);
@@ -248,10 +233,23 @@ void __mock_rrddim_query_finalize(struct rrddim_query_handle *handle)
     function_called();
 }
 
-void sql_store_chart_label(uuid_t *chart_uuid, int source_type, char *label, char *value)
+void rrdcalc_update_rrdlabels(RRDSET *st)
+{
+    (void)st;
+}
+
+void rrdpush_sender_send_this_host_variable_now(RRDHOST *host, const RRDVAR_ACQUIRED *rva)
+{
+    (void)host;
+    (void)rva;
+}
+
+void db_execute(const char *cmd)
 {
-    (void)chart_uuid;
-    (void)source_type;
-    (void)label;
-    (void)value;
+    (void)cmd;
+}
+
+DICTIONARY *rrdfamily_rrdvars_dict(const RRDFAMILY_ACQUIRED *rfa) {
+    (void)rfa;
+    return NULL;
 }