diff --git a/source/libs/monitorfw/inc/taos_assert.h b/source/libs/monitorfw/inc/taos_test.h similarity index 97% rename from source/libs/monitorfw/inc/taos_assert.h rename to source/libs/monitorfw/inc/taos_test.h index b73e6572b6..b881b2cee2 100644 --- a/source/libs/monitorfw/inc/taos_assert.h +++ b/source/libs/monitorfw/inc/taos_test.h @@ -14,8 +14,6 @@ * limitations under the License. */ -#include - #ifndef TAOS_TEST_H #define TAOS_TEST_H diff --git a/source/libs/monitorfw/src/taos_collector.c b/source/libs/monitorfw/src/taos_collector.c index 6ba34725b7..21ebb3f737 100644 --- a/source/libs/monitorfw/src/taos_collector.c +++ b/source/libs/monitorfw/src/taos_collector.c @@ -22,7 +22,7 @@ #include "taos_collector_registry.h" // Private -#include "taos_assert.h" +#include "taos_test.h" #include "taos_collector_t.h" #include "taos_log.h" #include "taos_map_i.h" diff --git a/source/libs/monitorfw/src/taos_collector_registry.c b/source/libs/monitorfw/src/taos_collector_registry.c index f028dabce8..94295bf9c0 100644 --- a/source/libs/monitorfw/src/taos_collector_registry.c +++ b/source/libs/monitorfw/src/taos_collector_registry.c @@ -24,7 +24,7 @@ #include "taos_collector_registry.h" // Private -#include "taos_assert.h" +#include "taos_test.h" #include "taos_collector_registry_t.h" #include "taos_collector_t.h" #include "taos_errors.h" diff --git a/source/libs/monitorfw/src/taos_counter.c b/source/libs/monitorfw/src/taos_counter.c index 5588286988..ef7d41cf2c 100644 --- a/source/libs/monitorfw/src/taos_counter.c +++ b/source/libs/monitorfw/src/taos_counter.c @@ -20,7 +20,7 @@ #include "taos_alloc.h" // Private -#include "taos_assert.h" +#include "taos_test.h" #include "taos_errors.h" #include "taos_log.h" #include "taos_metric_i.h" diff --git a/source/libs/monitorfw/src/taos_gauge.c b/source/libs/monitorfw/src/taos_gauge.c index 5b3eedeb84..00bf22c44d 100644 --- a/source/libs/monitorfw/src/taos_gauge.c +++ b/source/libs/monitorfw/src/taos_gauge.c @@ -20,7 +20,7 @@ #include "taos_alloc.h" // Private -#include "taos_assert.h" +#include "taos_test.h" #include "taos_errors.h" #include "taos_log.h" #include "taos_metric_i.h" diff --git a/source/libs/monitorfw/src/taos_linked_list.c b/source/libs/monitorfw/src/taos_linked_list.c index eab1d3f5db..293f3f60a8 100644 --- a/source/libs/monitorfw/src/taos_linked_list.c +++ b/source/libs/monitorfw/src/taos_linked_list.c @@ -18,7 +18,7 @@ #include "taos_alloc.h" // Private -#include "taos_assert.h" +#include "taos_test.h" #include "taos_linked_list_i.h" #include "taos_linked_list_t.h" #include "taos_log.h" diff --git a/source/libs/monitorfw/src/taos_map.c b/source/libs/monitorfw/src/taos_map.c index ba325ac517..2f5bf566c2 100644 --- a/source/libs/monitorfw/src/taos_map.c +++ b/source/libs/monitorfw/src/taos_map.c @@ -21,13 +21,13 @@ #include "taos_alloc.h" // Private -#include "taos_assert.h" #include "taos_errors.h" #include "taos_linked_list_i.h" #include "taos_linked_list_t.h" #include "taos_log.h" #include "taos_map_i.h" #include "taos_map_t.h" +#include "taos_test.h" #define TAOS_MAP_INITIAL_SIZE 32 diff --git a/source/libs/monitorfw/src/taos_metric.c b/source/libs/monitorfw/src/taos_metric.c index 7d35dc2421..42564437d0 100644 --- a/source/libs/monitorfw/src/taos_metric.c +++ b/source/libs/monitorfw/src/taos_metric.c @@ -20,13 +20,13 @@ #include "taos_alloc.h" // Private -#include "taos_assert.h" #include "taos_errors.h" #include "taos_log.h" #include "taos_map_i.h" #include "taos_metric_formatter_i.h" #include "taos_metric_i.h" #include "taos_metric_sample_i.h" +#include "taos_test.h" char *taos_metric_type_map[4] = {"counter", "gauge", "histogram", "summary"}; diff --git a/source/libs/monitorfw/src/taos_metric_formatter.c b/source/libs/monitorfw/src/taos_metric_formatter.c index 3d3b456aad..a20a8d919c 100644 --- a/source/libs/monitorfw/src/taos_metric_formatter.c +++ b/source/libs/monitorfw/src/taos_metric_formatter.c @@ -20,7 +20,6 @@ #include "taos_alloc.h" // Private -#include "taos_assert.h" #include "taos_collector_t.h" #include "taos_linked_list_t.h" #include "taos_map_i.h" @@ -28,7 +27,7 @@ #include "taos_metric_sample_t.h" #include "taos_metric_t.h" #include "taos_string_builder_i.h" - +#include "taos_test.h" taos_metric_formatter_t *taos_metric_formatter_new() { taos_metric_formatter_t *self = (taos_metric_formatter_t *)taos_malloc(sizeof(taos_metric_formatter_t)); diff --git a/source/libs/monitorfw/src/taos_metric_formatter_custom.c b/source/libs/monitorfw/src/taos_metric_formatter_custom.c index 1cf8560d21..da05d09d9c 100644 --- a/source/libs/monitorfw/src/taos_metric_formatter_custom.c +++ b/source/libs/monitorfw/src/taos_metric_formatter_custom.c @@ -21,7 +21,7 @@ #include "taos_metric_sample_t.h" #include "tjson.h" #include "taos_monitor_util_i.h" -#include "taos_assert.h" +#include "taos_test.h" #include "tdef.h" #include "taos_collector_t.h" #include "taos_log.h" diff --git a/source/libs/monitorfw/src/taos_metric_sample.c b/source/libs/monitorfw/src/taos_metric_sample.c index e45671bd79..e4b41d5475 100644 --- a/source/libs/monitorfw/src/taos_metric_sample.c +++ b/source/libs/monitorfw/src/taos_metric_sample.c @@ -20,11 +20,11 @@ #include "taos_alloc.h" // Private -#include "taos_assert.h" #include "taos_errors.h" #include "taos_log.h" #include "taos_metric_sample_i.h" #include "taos_metric_sample_t.h" +#include "taos_test.h" #ifdef C11_ATOMIC #include diff --git a/source/libs/monitorfw/src/taos_string_builder.c b/source/libs/monitorfw/src/taos_string_builder.c index 5180a72d5c..6e3fe1d2e3 100644 --- a/source/libs/monitorfw/src/taos_string_builder.c +++ b/source/libs/monitorfw/src/taos_string_builder.c @@ -20,9 +20,9 @@ #include "taos_alloc.h" // Private -#include "taos_assert.h" #include "taos_string_builder_i.h" #include "taos_string_builder_t.h" +#include "taos_test.h" // The initial size of a string created via taos_string_builder #define TAOS_STRING_BUILDER_INIT_SIZE 32