3 files changed, 63 insertions, 64 deletions
diff --git a/web/api/queries/incremental_sum/README.md b/web/api/queries/incremental_sum/README.md
index 44301172e..9b89f3188 100644
--- a/web/api/queries/incremental_sum/README.md
+++ b/web/api/queries/incremental_sum/README.md
@@ -1,6 +1,10 @@
 <!--
 title: "Incremental Sum (`incremental_sum`)"
+sidebar_label: "Incremental Sum (`incremental_sum`)"
 custom_edit_url: https://github.com/netdata/netdata/edit/master/web/api/queries/incremental_sum/README.md
+learn_status: "Published"
+learn_topic_type: "References"
+learn_rel_path: "Developers/Web/Api/Queries"
 -->
 
 # Incremental Sum (`incremental_sum`)
diff --git a/web/api/queries/incremental_sum/incremental_sum.c b/web/api/queries/incremental_sum/incremental_sum.c
index afca530c3..88072f297 100644
--- a/web/api/queries/incremental_sum/incremental_sum.c
+++ b/web/api/queries/incremental_sum/incremental_sum.c
@@ -5,62 +5,3 @@
 // ----------------------------------------------------------------------------
 // incremental sum
 
-struct grouping_incremental_sum {
-    NETDATA_DOUBLE first;
-    NETDATA_DOUBLE last;
-    size_t count;
-};
-
-void grouping_create_incremental_sum(RRDR *r, const char *options __maybe_unused) {
-    r->internal.grouping_data = onewayalloc_callocz(r->internal.owa, 1, sizeof(struct grouping_incremental_sum));
-}
-
-// resets when switches dimensions
-// so, clear everything to restart
-void grouping_reset_incremental_sum(RRDR *r) {
-    struct grouping_incremental_sum *g = (struct grouping_incremental_sum *)r->internal.grouping_data;
-    g->first = 0;
-    g->last = 0;
-    g->count = 0;
-}
-
-void grouping_free_incremental_sum(RRDR *r) {
-    onewayalloc_freez(r->internal.owa, r->internal.grouping_data);
-    r->internal.grouping_data = NULL;
-}
-
-void grouping_add_incremental_sum(RRDR *r, NETDATA_DOUBLE value) {
-    struct grouping_incremental_sum *g = (struct grouping_incremental_sum *)r->internal.grouping_data;
-
-    if(unlikely(!g->count)) {
-        g->first = value;
-        g->count++;
-    }
-    else {
-        g->last = value;
-        g->count++;
-    }
-}
-
-NETDATA_DOUBLE grouping_flush_incremental_sum(RRDR *r, RRDR_VALUE_FLAGS *rrdr_value_options_ptr) {
-    struct grouping_incremental_sum *g = (struct grouping_incremental_sum *)r->internal.grouping_data;
-
-    NETDATA_DOUBLE value;
-
-    if(unlikely(!g->count)) {
-        value = 0.0;
-        *rrdr_value_options_ptr |= RRDR_VALUE_EMPTY;
-    }
-    else if(unlikely(g->count == 1)) {
-        value = 0.0;
-    }
-    else {
-        value = g->last - g->first;
-    }
-
-    g->first = 0.0;
-    g->last = 0.0;
-    g->count = 0;
-
-    return value;
-}
diff --git a/web/api/queries/incremental_sum/incremental_sum.h b/web/api/queries/incremental_sum/incremental_sum.h
index c24507fcf..dd6483b2c 100644
--- a/web/api/queries/incremental_sum/incremental_sum.h
+++ b/web/api/queries/incremental_sum/incremental_sum.h
@@ -6,10 +6,64 @@
 #include "../query.h"
 #include "../rrdr.h"
 
-void grouping_create_incremental_sum(RRDR *r, const char *options __maybe_unused);
-void grouping_reset_incremental_sum(RRDR *r);
-void grouping_free_incremental_sum(RRDR *r);
-void grouping_add_incremental_sum(RRDR *r, NETDATA_DOUBLE value);
-NETDATA_DOUBLE grouping_flush_incremental_sum(RRDR *r, RRDR_VALUE_FLAGS *rrdr_value_options_ptr);
+struct tg_incremental_sum {
+    NETDATA_DOUBLE first;
+    NETDATA_DOUBLE last;
+    size_t count;
+};
+
+static inline void tg_incremental_sum_create(RRDR *r, const char *options __maybe_unused) {
+    r->time_grouping.data = onewayalloc_callocz(r->internal.owa, 1, sizeof(struct tg_incremental_sum));
+}
+
+// resets when switches dimensions
+// so, clear everything to restart
+static inline void tg_incremental_sum_reset(RRDR *r) {
+    struct tg_incremental_sum *g = (struct tg_incremental_sum *)r->time_grouping.data;
+    g->first = 0;
+    g->last = 0;
+    g->count = 0;
+}
+
+static inline void tg_incremental_sum_free(RRDR *r) {
+    onewayalloc_freez(r->internal.owa, r->time_grouping.data);
+    r->time_grouping.data = NULL;
+}
+
+static inline void tg_incremental_sum_add(RRDR *r, NETDATA_DOUBLE value) {
+    struct tg_incremental_sum *g = (struct tg_incremental_sum *)r->time_grouping.data;
+
+    if(unlikely(!g->count)) {
+        g->first = value;
+        g->count++;
+    }
+    else {
+        g->last = value;
+        g->count++;
+    }
+}
+
+static inline NETDATA_DOUBLE tg_incremental_sum_flush(RRDR *r, RRDR_VALUE_FLAGS *rrdr_value_options_ptr) {
+    struct tg_incremental_sum *g = (struct tg_incremental_sum *)r->time_grouping.data;
+
+    NETDATA_DOUBLE value;
+
+    if(unlikely(!g->count)) {
+        value = 0.0;
+        *rrdr_value_options_ptr |= RRDR_VALUE_EMPTY;
+    }
+    else if(unlikely(g->count == 1)) {
+        value = 0.0;
+    }
+    else {
+        value = g->last - g->first;
+    }
+
+    g->first = 0.0;
+    g->last = 0.0;
+    g->count = 0;
+
+    return value;
+}
 
 #endif //NETDATA_API_QUERY_INCREMENTAL_SUM_H