renames

10 files changed, 64 insertions, 66 deletions

diff --git a/include/fieldstat/fieldstat.h b/include/fieldstat/fieldstat.h
index 86b20d8..fe12529 100644
--- a/include/fieldstat/fieldstat.h
+++ b/include/fieldstat/fieldstat.h
@@ -175,26 +175,24 @@ struct field_list
 */
 void fieldstat_get_cubes(const struct fieldstat *instance, int **cube_ids, int *n_cube);
 
-void fieldstat_get_metric_in_cell(const struct fieldstat *instance, int cube_id, const struct field_list *cell_dimensions, int **metric_id_out, size_t *n_metric_out);
+void fieldstat_cell_get_metrics(const struct fieldstat *instance, int cube_id, const struct field_list *cell_dimensions, int **metric_id_out, size_t *n_metric_out);
 
 // query the name of the metric, return NULL if metric_id is invalid.
-const char *fieldstat_get_metric_name(const struct fieldstat *instance, int cube_id, int metric_id);
+const char *fieldstat_metric_get_name(const struct fieldstat *instance, int cube_id, int metric_id);
 
 // query the type of the metric. return (enum metric_type)-1 if metric_id is invalid.
-enum metric_type fieldstat_get_metric_type(const struct fieldstat *instance, int cube_id, int metric_id);
+enum metric_type fieldstat_metric_get_type(const struct fieldstat *instance, int cube_id, int metric_id);
 
 /*
     get the cell_dimensions added to cube when calling fieldstat_counter_incrby, fieldstat_counter_set, fieldstat_hll_add, fieldstat_histogram_record.
 */
 void fieldstat_cube_get_cells(const struct fieldstat *instance, int cube_id, struct field_list **cell_dimensions, size_t *n_cell);
-//todo: topk 的输出应该是有序的，总不能外面再排一遍
-// todo：_cube_删了，因为其实所有的都跟cube有关
 
 /*
     get the field of fieldstat_cube_create. User free them by calling fieldstat_field_list_arr_free(struct field_list *, 1)
     return NULL when ID is invalid.
 */
-struct field_list *fieldstat_cube_get_dimensions(const struct fieldstat *instance, int cube_id);
+struct field_list *fieldstat_cube_get_dimension(const struct fieldstat *instance, int cube_id);
 
 int fieldstat_cube_get_metric_id_by_name(const struct fieldstat *instance, int cube_id, const char *metric_name);
 
@@ -206,7 +204,7 @@ int fieldstat_find_cube(const struct fieldstat *instance, const struct field *cu
 /* 
     get the cell numbers in a cube. Return FS_ERR_INVALID_CUBE_ID if cube_id is invalid.
 */
-int fieldstat_get_used_sampling(const struct fieldstat *instance, int cube_id);
+int fieldstat_cube_get_cell_number(const struct fieldstat *instance, int cube_id);
 
 /*
     * @brief Get the value of a metric of a cell.
diff --git a/src/exporter/cjson_exporter.c b/src/exporter/cjson_exporter.c
index 31727c2..3c8fdd4 100644
--- a/src/exporter/cjson_exporter.c
+++ b/src/exporter/cjson_exporter.c
@@ -461,7 +461,7 @@ int cell_iter_next_cube(struct cell_iter *iter) {
             continue;
         }
 
-        iter->cube_dimension = fieldstat_cube_get_dimensions(iter->instance, iter->cube_ids[iter->curr_cube_idx]);
+        iter->cube_dimension = fieldstat_cube_get_dimension(iter->instance, iter->cube_ids[iter->curr_cube_idx]);
         iter->curr_cell_idx = 0;
         return 1;
     }
@@ -505,7 +505,7 @@ int cell_iter_next(struct cell_iter *iter) {
 
 struct export_kv_pair *cell_query_with_iter(const struct cell_iter *iter, int metric_id) {
     int cube_id = iter->cube_ids[iter->curr_cube_idx];
-    enum metric_type type = fieldstat_get_metric_type(iter->instance, cube_id, metric_id);
+    enum metric_type type = fieldstat_metric_get_type(iter->instance, cube_id, metric_id);
     struct export_kv_pair *ret = NULL;
     if (type == METRIC_TYPE_COUNTER) {
         long long value;
@@ -514,7 +514,7 @@ struct export_kv_pair *cell_query_with_iter(const struct cell_iter *iter, int me
             return NULL;
         }
         ret = malloc(sizeof(struct export_kv_pair));
-        ret->key = strdup(fieldstat_get_metric_name(iter->instance, cube_id, metric_id));
+        ret->key = strdup(fieldstat_metric_get_name(iter->instance, cube_id, metric_id));
         ret->type = FIELD_VALUE_INTEGER;
         ret->value_longlong = value;
         return ret;
@@ -527,7 +527,7 @@ struct export_kv_pair *cell_query_with_iter(const struct cell_iter *iter, int me
             return NULL;
         }
         ret = malloc(sizeof(struct export_kv_pair));
-        ret->key = strdup(fieldstat_get_metric_name(iter->instance, cube_id, metric_id));
+        ret->key = strdup(fieldstat_metric_get_name(iter->instance, cube_id, metric_id));
         ret->type = FIELD_VALUE_CSTRING;
         ret->value_str = value;
         return ret;
@@ -620,7 +620,7 @@ int json_obj_add(struct cellwise_rec_for_export *tag_field_pair, const struct ce
     struct export_kv_pair **fields = NULL;
     int *metric_ids = NULL;
     size_t n_metric = 0;
-    fieldstat_get_metric_in_cell(iter->instance, iter->cube_ids[iter->curr_cube_idx], &iter->cell_dimension[iter->curr_cell_idx], &metric_ids, &n_metric);
+    fieldstat_cell_get_metrics(iter->instance, iter->cube_ids[iter->curr_cube_idx], &iter->cell_dimension[iter->curr_cell_idx], &metric_ids, &n_metric);
     if (n_metric == 0) {
         // printf("cannot get metric in cell\n");
         return 0;
@@ -670,7 +670,7 @@ struct cellwise_rec_for_export *read_tag_and_field(const struct fieldstat *insta
 
     size_t n_cell_total = 0;
     for (int i = 0; i < cube_id_len; i++) {
-        n_cell_total += fieldstat_get_used_sampling(instance, cube_id[i]);
+        n_cell_total += fieldstat_cube_get_cell_number(instance, cube_id[i]);
     }
     free(cube_id);
     if (n_cell_total == 0) {
diff --git a/src/fieldstat.c b/src/fieldstat.c
index 3ba01e4..431626d 100644
--- a/src/fieldstat.c
+++ b/src/fieldstat.c
@@ -228,7 +228,7 @@ void fieldstat_get_cubes(const struct fieldstat *instance, int **cube_ids, int *
     cube_manager_list(instance->cube_manager, cube_ids, n_cube);
 }
 
-struct field_list *fieldstat_cube_get_dimensions(const struct fieldstat *instance, int cube_id)
+struct field_list *fieldstat_cube_get_dimension(const struct fieldstat *instance, int cube_id)
 {
     const struct cube *cube = cube_manager_get_cube_by_id(instance->cube_manager, cube_id);
     if (cube == NULL) {
@@ -321,7 +321,7 @@ void fieldstat_field_list_arr_free(struct field_list *field_lists, size_t n_fiel
 
 //uninitialized
 
-const char *fieldstat_get_metric_name(const struct fieldstat *instance, int cube_id, int metric_id)
+const char *fieldstat_metric_get_name(const struct fieldstat *instance, int cube_id, int metric_id)
 {
     const struct cube *cube = cube_manager_get_cube_by_id(instance->cube_manager, cube_id);
     if (cube == NULL) {
@@ -330,7 +330,7 @@ const char *fieldstat_get_metric_name(const struct fieldstat *instance, int cube
     return cube_get_metric_name(cube, metric_id);
 }
 
-enum metric_type fieldstat_get_metric_type(const struct fieldstat *instance, int cube_id, int metric_id)
+enum metric_type fieldstat_metric_get_type(const struct fieldstat *instance, int cube_id, int metric_id)
 {
     const struct cube *cube = cube_manager_get_cube_by_id(instance->cube_manager, cube_id);
     if (cube == NULL) {
@@ -349,7 +349,7 @@ void fieldstat_cube_get_cells(const struct fieldstat *instance, int cube_id, str
     cube_get_cells(cube, cell_dimensions, n_cell);
 }
 
-int fieldstat_get_used_sampling(const struct fieldstat *instance, int cube_id)
+int fieldstat_cube_get_cell_number(const struct fieldstat *instance, int cube_id)
 {
     if (instance == NULL) {
         return FS_ERR_NULL_HANDLER;
@@ -377,7 +377,7 @@ int fieldstat_find_cube(const struct fieldstat *instance, const struct field *cu
     return cube_id;
 }
 
-void fieldstat_get_metric_in_cell(const struct fieldstat *instance, int cube_id, const struct field_list *cell_dimensions, int **metric_id_out, size_t *n_metric_out)
+void fieldstat_cell_get_metrics(const struct fieldstat *instance, int cube_id, const struct field_list *cell_dimensions, int **metric_id_out, size_t *n_metric_out)
 {
     const struct cube *cube = cube_manager_get_cube_by_id(instance->cube_manager, cube_id);
     return cube_get_metrics_in_cell(cube, cell_dimensions, metric_id_out, n_metric_out);
diff --git a/test/test_empty_tags.cpp b/test/test_empty_tags.cpp
index 9cbaead..7de6489 100644
--- a/test/test_empty_tags.cpp
+++ b/test/test_empty_tags.cpp
@@ -59,7 +59,7 @@ TEST(test_empty_tag, merge)
     int n_cube = 0;
     fieldstat_get_cubes(instance_dst, &ret_cube_id_arr, &n_cube);
     int ret_cell_id = ret_cube_id_arr[0];
-    struct field_list *shared_tag = fieldstat_cube_get_dimensions(instance_dst, ret_cell_id);
+    struct field_list *shared_tag = fieldstat_cube_get_dimension(instance_dst, ret_cell_id);
     EXPECT_EQ(shared_tag->n_field, 0);
     EXPECT_TRUE(shared_tag->field == NULL);
     fieldstat_field_list_arr_free(shared_tag, 1);
@@ -83,7 +83,7 @@ TEST(test_empty_tag, merge_topk)
     int n_cube = 0;
     fieldstat_get_cubes(instance_dst, &ret_cube_id_arr, &n_cube);
     int ret_cell_id = ret_cube_id_arr[0];
-    struct field_list *shared_tag = fieldstat_cube_get_dimensions(instance_dst, ret_cell_id);
+    struct field_list *shared_tag = fieldstat_cube_get_dimension(instance_dst, ret_cell_id);
     EXPECT_EQ(shared_tag->n_field, 0);
     EXPECT_TRUE(shared_tag->field == NULL);
     fieldstat_field_list_arr_free(shared_tag, 1);
@@ -112,7 +112,7 @@ TEST(test_empty_tag, merge_spreadsketch)
     int n_cube = 0;
     fieldstat_get_cubes(instance_dst, &ret_cube_id_arr, &n_cube);
     int ret_cell_id = ret_cube_id_arr[0];
-    struct field_list *shared_tag = fieldstat_cube_get_dimensions(instance_dst, ret_cell_id);
+    struct field_list *shared_tag = fieldstat_cube_get_dimension(instance_dst, ret_cell_id);
     EXPECT_EQ(shared_tag->n_field, 0);
     EXPECT_TRUE(shared_tag->field == NULL);
     fieldstat_field_list_arr_free(shared_tag, 1);
diff --git a/test/test_fuzz_test.cpp b/test/test_fuzz_test.cpp
index 46f60e4..34c0711 100644
--- a/test/test_fuzz_test.cpp
+++ b/test/test_fuzz_test.cpp
@@ -176,7 +176,7 @@ TEST(Fuzz_test, many_instance_random_flow_unregister_calibrate_reset_fork_merge_
     struct fieldstat *instance_in_focus = dest;
     fieldstat_get_cubes(instance_in_focus, &cube_ids, &cube_num);
     for (int i = 0; i < cube_num; i++) {
-        struct field_list *shared_tag_out = fieldstat_cube_get_dimensions(instance_in_focus, cube_ids[i]);
+        struct field_list *shared_tag_out = fieldstat_cube_get_dimension(instance_in_focus, cube_ids[i]);
 
         size_t cell_num0;
         struct field_list *tags0;
@@ -306,7 +306,7 @@ TEST(Fuzz_test, many_instance_random_flow_unregister_calibrate_reset_fork_merge_
     struct fieldstat *instance_in_focus = dest;
     fieldstat_get_cubes(instance_in_focus, &cube_ids, &cube_num);
     for (int i = 0; i < cube_num; i++) {
-        struct field_list *shared_tag_out = fieldstat_cube_get_dimensions(instance_in_focus, cube_ids[i]);
+        struct field_list *shared_tag_out = fieldstat_cube_get_dimension(instance_in_focus, cube_ids[i]);
 
         size_t cell_num;
         struct field_list *fields;
@@ -446,7 +446,7 @@ TEST(Fuzz_test, many_instance_random_flow_unregister_calibrate_reset_fork_merge_
     fieldstat_get_cubes(instance_in_focus, &cube_ids, &cube_num);
     double sum_accuracy = 0;
     for (int i = 0; i < cube_num; i++) {
-        struct field_list *shared_tag_out = fieldstat_cube_get_dimensions(instance_in_focus, cube_ids[i]);
+        struct field_list *shared_tag_out = fieldstat_cube_get_dimension(instance_in_focus, cube_ids[i]);
 
         size_t cell_num;
         struct field_list *cells;
diff --git a/test/test_merge.cpp b/test/test_merge.cpp
index 46583d1..7aa1cf9 100644
--- a/test/test_merge.cpp
+++ b/test/test_merge.cpp
@@ -106,7 +106,7 @@ TEST(unit_test_merge, new_cube_and_metric_to_empty_comprehensive)
     int n_cube;
     fieldstat_get_cubes(instance_dest, &cube_id_dest, &n_cube);
     EXPECT_TRUE(n_cube == 1);
-    EXPECT_STREQ(fieldstat_get_metric_name(instance_dest, cube_id_dest[0], 0), "metric_name");
+    EXPECT_STREQ(fieldstat_metric_get_name(instance_dest, cube_id_dest[0], 0), "metric_name");
 
     fieldstat_free(instance);
     fieldstat_free(instance_dest);
@@ -128,7 +128,7 @@ TEST(unit_test_merge, new_cell_on_existing_cube_and_metric_comprehensive)
     int n_cube;
     fieldstat_get_cubes(instance_dest, &cube_id_dest, &n_cube);
     EXPECT_TRUE(n_cube == 1);
-    EXPECT_STREQ(fieldstat_get_metric_name(instance_dest, cube_id_dest[0], 0), "metric_name");
+    EXPECT_STREQ(fieldstat_metric_get_name(instance_dest, cube_id_dest[0], 0), "metric_name");
     free(cube_id_dest);
     long long measure = merge_test_fieldstat_counter_get(instance, cube_id, metric_id);
     EXPECT_EQ(measure, 10086);
@@ -156,7 +156,7 @@ TEST(unit_test_merge, merge_existing_cell_on_existing_cube_and_metric_comprehens
 
     fieldstat_merge(instance_dest, instance);
 
-    EXPECT_STREQ(fieldstat_get_metric_name(instance_dest, cube_id, 0), "metric_name");
+    EXPECT_STREQ(fieldstat_metric_get_name(instance_dest, cube_id, 0), "metric_name");
     long long measure = merge_test_fieldstat_counter_get(instance_dest, cube_id, metric_id);
     EXPECT_EQ(measure, 10);
 
@@ -210,17 +210,17 @@ TEST(unit_test_merge, new_too_many_cells_on_multiple_metric_given_source_cube_re
 
     int *metric_ids = NULL;
     size_t n_metrics = 0;
-    fieldstat_get_metric_in_cell(instance_dest, 0, &TEST_FIELD_LIST_STRING, &metric_ids, &n_metrics);
+    fieldstat_cell_get_metrics(instance_dest, 0, &TEST_FIELD_LIST_STRING, &metric_ids, &n_metrics);
     EXPECT_EQ(n_metrics, 1);
-    EXPECT_STREQ(fieldstat_get_metric_name(instance_dest, 0, metric_ids[0]), "metric name1");
+    EXPECT_STREQ(fieldstat_metric_get_name(instance_dest, 0, metric_ids[0]), "metric name1");
     free(metric_ids);
 
-    fieldstat_get_metric_in_cell(instance_dest, 0, &TEST_FIELD_LIST_INT, &metric_ids, &n_metrics);
+    fieldstat_cell_get_metrics(instance_dest, 0, &TEST_FIELD_LIST_INT, &metric_ids, &n_metrics);
     EXPECT_EQ(n_metrics, 1);
-    EXPECT_STREQ(fieldstat_get_metric_name(instance_dest, 0, metric_ids[0]), "metric name3");
+    EXPECT_STREQ(fieldstat_metric_get_name(instance_dest, 0, metric_ids[0]), "metric name3");
     free(metric_ids);
      // 3nd cell failed to merge, because max sampling is 2
-    fieldstat_get_metric_in_cell(instance_dest, 0, &TEST_FIELD_LIST_DOUBLE, &metric_ids, &n_metrics);
+    fieldstat_cell_get_metrics(instance_dest, 0, &TEST_FIELD_LIST_DOUBLE, &metric_ids, &n_metrics);
     EXPECT_EQ(n_metrics, 0);
 
     fieldstat_free(instance);
@@ -242,7 +242,7 @@ TEST(unit_test_merge, new_cube_and_metric_to_empty_topk)
     int n_cube;
     fieldstat_get_cubes(instance_dest, &cube_id_dest, &n_cube);
     EXPECT_TRUE(n_cube == 1);
-    EXPECT_STREQ(fieldstat_get_metric_name(instance_dest, cube_id_dest[0], 0), "metric_name");
+    EXPECT_STREQ(fieldstat_metric_get_name(instance_dest, cube_id_dest[0], 0), "metric_name");
 
     fieldstat_free(instance);
     fieldstat_free(instance_dest);
@@ -265,7 +265,7 @@ TEST(unit_test_merge, new_cell_on_existing_cube_and_metric_topk)
     int n_cube;
     fieldstat_get_cubes(instance_dest, &cube_id_dest, &n_cube);
     EXPECT_TRUE(n_cube == 1);
-    EXPECT_STREQ(fieldstat_get_metric_name(instance_dest,cube_id_dest[0], 0), "metric_name");
+    EXPECT_STREQ(fieldstat_metric_get_name(instance_dest,cube_id_dest[0], 0), "metric_name");
     free(cube_id_dest);
     long long measure = merge_test_fieldstat_counter_get(instance, cube_id, metric_id);
     EXPECT_EQ(measure, 10086);
@@ -299,7 +299,7 @@ TEST(unit_test_merge, merge_existing_cell_on_existing_cube_and_metric_topk)
     fieldstat_get_cubes(instance_dest, &cube_id_dest, &n_cube);
     EXPECT_TRUE(n_cube == 1);
     int ret_cube_id = cube_id_dest[0];
-    EXPECT_STREQ(fieldstat_get_metric_name(instance_dest,cube_id_dest[0], 0), "metric_name");
+    EXPECT_STREQ(fieldstat_metric_get_name(instance_dest,cube_id_dest[0], 0), "metric_name");
     free(cube_id_dest);
 
     struct field_list *tag_list = NULL;
@@ -521,7 +521,7 @@ TEST(unit_test_merge, new_cube_and_metric_to_empty_spreadsketch) {
     int n_cube;
     fieldstat_get_cubes(instance_dest, &cube_id_dest, &n_cube);
     EXPECT_TRUE(n_cube == 1);
-    EXPECT_STREQ(fieldstat_get_metric_name(instance_dest, cube_id_dest[0], 0), "metric");
+    EXPECT_STREQ(fieldstat_metric_get_name(instance_dest, cube_id_dest[0], 0), "metric");
 
     free(cube_id_dest);
     fieldstat_free(instance);
@@ -544,7 +544,7 @@ TEST(unit_test_merge, new_cell_on_existing_cube_and_metric_spreadsketch) {
     int n_cube;
     fieldstat_get_cubes(instance_dest, &cube_id_dest, &n_cube);
     EXPECT_TRUE(n_cube == 1);
-    EXPECT_STREQ(fieldstat_get_metric_name(instance_dest, cube_id_dest[0], 0), "metric");
+    EXPECT_STREQ(fieldstat_metric_get_name(instance_dest, cube_id_dest[0], 0), "metric");
     long long measure = merge_test_fieldstat_hll_get(instance, cube_id, metric_id);
     EXPECT_NEAR(measure, 2, 0.3);
 
diff --git a/test/test_metric_counter.cpp b/test/test_metric_counter.cpp
index b5b231d..c8360a7 100644
--- a/test/test_metric_counter.cpp
+++ b/test/test_metric_counter.cpp
@@ -46,7 +46,7 @@ void test_assert_standard_instance(const struct fieldstat *instance)
     int ret_cell_id = ret_cube_id_arr[0];
     free(ret_cube_id_arr);
     EXPECT_EQ(ret_cell_id, 0);
-    const char *name = fieldstat_get_metric_name(instance, ret_cell_id, 0);
+    const char *name = fieldstat_metric_get_name(instance, ret_cell_id, 0);
     EXPECT_STREQ(name, "czz_test counter metric");
 
     struct field_list *tag_list = NULL;
@@ -58,7 +58,7 @@ void test_assert_standard_instance(const struct fieldstat *instance)
 
     int *metric_id = NULL;
     size_t n_metric = 0;
-    fieldstat_get_metric_in_cell(instance, 0, &tag_list[0], &metric_id, &n_metric);
+    fieldstat_cell_get_metrics(instance, 0, &tag_list[0], &metric_id, &n_metric);
     EXPECT_EQ(n_metric, 1);
     EXPECT_EQ(metric_id[0], 0);
     free(metric_id);
diff --git a/test/test_metric_histogram.cpp b/test/test_metric_histogram.cpp
index c99a565..39132d3 100644
--- a/test/test_metric_histogram.cpp
+++ b/test/test_metric_histogram.cpp
@@ -35,7 +35,7 @@ void test_assert_standard_instance(const struct fieldstat *instance)
     int ret_cell_id = ret_cube_id_arr[0];
     free(ret_cube_id_arr);
     EXPECT_EQ(ret_cell_id, 0);
-    const char *name = fieldstat_get_metric_name(instance, ret_cell_id, 0);
+    const char *name = fieldstat_metric_get_name(instance, ret_cell_id, 0);
     EXPECT_STREQ(name, "czz_test hdr metric");
 
 
@@ -48,7 +48,7 @@ void test_assert_standard_instance(const struct fieldstat *instance)
 
     int *metric_id = NULL;
     size_t n_metric = 0;
-    fieldstat_get_metric_in_cell(instance, 0, &tag_list[0], &metric_id, &n_metric);
+    fieldstat_cell_get_metrics(instance, 0, &tag_list[0], &metric_id, &n_metric);
     EXPECT_EQ(n_metric, 1);
     EXPECT_EQ(metric_id[0], 0);
     free(metric_id);
diff --git a/test/test_metric_hll.cpp b/test/test_metric_hll.cpp
index bbfc36a..301863e 100644
--- a/test/test_metric_hll.cpp
+++ b/test/test_metric_hll.cpp
@@ -37,7 +37,7 @@ void test_assert_standard_instance(const struct fieldstat *instance)
     int ret_cell_id = ret_cube_id_arr[0];
     free(ret_cube_id_arr);
     EXPECT_EQ(ret_cell_id, 0);
-    const char *name = fieldstat_get_metric_name(instance, ret_cell_id, 0);
+    const char *name = fieldstat_metric_get_name(instance, ret_cell_id, 0);
     EXPECT_STREQ(name, "czz_test hll metric");
 
     struct field_list *tag_list = NULL;
@@ -49,7 +49,7 @@ void test_assert_standard_instance(const struct fieldstat *instance)
     
     int *metric_id = NULL;
     size_t n_metric = 0;
-    fieldstat_get_metric_in_cell(instance, 0, &tag_list[0], &metric_id, &n_metric);
+    fieldstat_cell_get_metrics(instance, 0, &tag_list[0], &metric_id, &n_metric);
     EXPECT_EQ(n_metric, 1);
     EXPECT_EQ(metric_id[0], 0);
     free(metric_id);
diff --git a/test/test_register_and_reset.cpp b/test/test_register_and_reset.cpp
index 110fe65..f3afcc7 100644
--- a/test/test_register_and_reset.cpp
+++ b/test/test_register_and_reset.cpp
@@ -31,7 +31,7 @@ TEST(test_register, delete_comprehensive_cube_with_cells_and_metrics)
 
     fieldstat_cube_destroy(instance, cube_id);
 
-    struct field_list *tag_list = fieldstat_cube_get_dimensions(instance, cube_id);
+    struct field_list *tag_list = fieldstat_cube_get_dimension(instance, cube_id);
     EXPECT_EQ(tag_list, nullptr);
     int cube_id_ret = fieldstat_find_cube(instance, &TEST_SHARED_TAG, 1);
     EXPECT_EQ(cube_id_ret, FS_ERR_INVALID_DIMENSION);
@@ -48,7 +48,7 @@ TEST(test_register, delete_topk_cube_with_cells_and_metrics)
     fieldstat_counter_incrby(instance, cube_id, metric_id, &TEST_FIELD_INT, 1, 1);
 
     fieldstat_cube_destroy(instance, cube_id);
-    struct field_list *tag_list = fieldstat_cube_get_dimensions(instance, cube_id);
+    struct field_list *tag_list = fieldstat_cube_get_dimension(instance, cube_id);
     EXPECT_EQ(tag_list, nullptr);
     int cube_id_ret = fieldstat_find_cube(instance, &TEST_SHARED_TAG, 1);
     EXPECT_EQ(cube_id_ret, FS_ERR_INVALID_DIMENSION);
@@ -68,7 +68,7 @@ TEST(test_register, delete_spreadsketch_cube_with_cells_and_metrics)
     fieldstat_hll_add_field(instance, cube_id, metric_primary, &TEST_FIELD_INT, 1, &TEST_FIELD_DOUBLE, 1);
 
     fieldstat_cube_destroy(instance, cube_id);
-    struct field_list *tag_list = fieldstat_cube_get_dimensions(instance, cube_id);
+    struct field_list *tag_list = fieldstat_cube_get_dimension(instance, cube_id);
     EXPECT_EQ(tag_list, nullptr);
     int cube_id_ret = fieldstat_find_cube(instance, &TEST_SHARED_TAG, 1);
     EXPECT_EQ(cube_id_ret, FS_ERR_INVALID_DIMENSION);
@@ -433,21 +433,21 @@ TEST(test_register, fork_registered_info_with_cube_and_metric)
     EXPECT_EQ(cube_num, 2);
     struct field_list *tag_list = NULL;
     
-    tag_list = fieldstat_cube_get_dimensions(dup, cube_ids[0]);
+    tag_list = fieldstat_cube_get_dimension(dup, cube_ids[0]);
     EXPECT_STREQ(tag_list->field[0].key, TEST_SHARED_TAG.key);
     fieldstat_field_list_arr_free(tag_list, 1);
     size_t n_cell = 0;
     fieldstat_cube_get_cells(dup, cube_ids[0], &tag_list, &n_cell);
     EXPECT_EQ(n_cell, 0);
 
-    tag_list = fieldstat_cube_get_dimensions(dup, cube_ids[1]);
+    tag_list = fieldstat_cube_get_dimension(dup, cube_ids[1]);
     EXPECT_STREQ(tag_list->field[0].key, TEST_FIELD_DOUBLE.key);
     
     fieldstat_field_list_arr_free(tag_list, 1);
 
-    EXPECT_STREQ(fieldstat_get_metric_name(dup, cube_ids[0], metric_id), "counter");
-    EXPECT_STREQ(fieldstat_get_metric_name(dup, cube_ids[0], metric_id2), "counter2");
-    EXPECT_EQ(fieldstat_get_metric_name(dup, cube_ids[1], metric_id), nullptr);
+    EXPECT_STREQ(fieldstat_metric_get_name(dup, cube_ids[0], metric_id), "counter");
+    EXPECT_STREQ(fieldstat_metric_get_name(dup, cube_ids[0], metric_id2), "counter2");
+    EXPECT_EQ(fieldstat_metric_get_name(dup, cube_ids[1], metric_id), nullptr);
 
     free(cube_ids);
     fieldstat_free(dup);
@@ -574,10 +574,10 @@ TEST(calibrate, target_one_more_metric)
 
     fieldstat_calibrate(master, target);
 
-    EXPECT_STREQ(fieldstat_get_metric_name(target, cube_id, 0), "counter");
+    EXPECT_STREQ(fieldstat_metric_get_name(target, cube_id, 0), "counter");
     EXPECT_EQ(fieldstat_cube_get_metric_id_by_name(target, cube_id, "counter"), 0);
     EXPECT_EQ(fieldstat_cube_get_metric_id_by_name(target, cube_id, "counter2"), FS_ERR_INVALID_METRIC_NAME);
-    struct field_list *tag_list = fieldstat_cube_get_dimensions(target, cube_id);
+    struct field_list *tag_list = fieldstat_cube_get_dimension(target, cube_id);
     EXPECT_STREQ(tag_list->field[0].key, TEST_SHARED_TAG.key);
 
     fieldstat_free(master);
@@ -595,11 +595,11 @@ TEST(calibrate, master_one_more_metric)
 
     fieldstat_calibrate(master, target);
 
-    EXPECT_STREQ(fieldstat_get_metric_name(target, cube_id,0), "counter");
-    EXPECT_STREQ(fieldstat_get_metric_name(target, cube_id,1), "counter2");
+    EXPECT_STREQ(fieldstat_metric_get_name(target, cube_id,0), "counter");
+    EXPECT_STREQ(fieldstat_metric_get_name(target, cube_id,1), "counter2");
     EXPECT_EQ(fieldstat_cube_get_metric_id_by_name(target, cube_id, "counter"), 0);
     EXPECT_EQ(fieldstat_cube_get_metric_id_by_name(target, cube_id, "counter2"), 1);
-    struct field_list *tag_list = fieldstat_cube_get_dimensions(target, cube_id);
+    struct field_list *tag_list = fieldstat_cube_get_dimension(target, cube_id);
     EXPECT_STREQ(tag_list->field[0].key, TEST_SHARED_TAG.key);
 
     fieldstat_free(master);
@@ -619,13 +619,13 @@ TEST(calibrate, different_metric)
 
     fieldstat_calibrate(master, target);
 
-    EXPECT_STREQ(fieldstat_get_metric_name(target, cube_id, 0), "counter");
-    EXPECT_STREQ(fieldstat_get_metric_name(target, cube_id, 1), "hi i am master new");
+    EXPECT_STREQ(fieldstat_metric_get_name(target, cube_id, 0), "counter");
+    EXPECT_STREQ(fieldstat_metric_get_name(target, cube_id, 1), "hi i am master new");
     EXPECT_EQ(fieldstat_cube_get_metric_id_by_name(target, cube_id, "counter2"), FS_ERR_INVALID_METRIC_NAME);
     EXPECT_EQ(fieldstat_cube_get_metric_id_by_name(target, cube_id, "counter"), 0);
     EXPECT_EQ(fieldstat_cube_get_metric_id_by_name(target, cube_id, "hi i am master new"), 1);
 
-    struct field_list *tag_list = fieldstat_cube_get_dimensions(target, cube_id);
+    struct field_list *tag_list = fieldstat_cube_get_dimension(target, cube_id);
     EXPECT_STREQ(tag_list->field[0].key, TEST_SHARED_TAG.key);
 
     fieldstat_free(master);
@@ -652,8 +652,8 @@ TEST(calibrate, target_more_cube)
     EXPECT_EQ(cube_ids[0], cube_id);
     free(cube_ids);
 
-    EXPECT_STREQ(fieldstat_get_metric_name(target, cube_id, 0), "counter");
-    struct field_list *tag_list = fieldstat_cube_get_dimensions(target, cube_id);
+    EXPECT_STREQ(fieldstat_metric_get_name(target, cube_id, 0), "counter");
+    struct field_list *tag_list = fieldstat_cube_get_dimension(target, cube_id);
     EXPECT_STREQ(tag_list->field[0].key, TEST_SHARED_TAG.key);
 
     EXPECT_EQ(fieldstat_find_cube(target, &TEST_SHARED_TAG, 1), 0);
@@ -681,9 +681,9 @@ TEST(calibrate, master_more_cube)
     EXPECT_EQ(cube_ids[1], cube_id2);
     free(cube_ids);
 
-    struct field_list *tag_list = fieldstat_cube_get_dimensions(target, cube_id);
+    struct field_list *tag_list = fieldstat_cube_get_dimension(target, cube_id);
     EXPECT_STREQ(tag_list->field[0].key, TEST_SHARED_TAG.key);
-    struct field_list *tag_list2 = fieldstat_cube_get_dimensions(target, cube_id2);
+    struct field_list *tag_list2 = fieldstat_cube_get_dimension(target, cube_id2);
     EXPECT_STREQ(tag_list2->field[0].key, TEST_FIELD_STRING.key);
 
     EXPECT_EQ(fieldstat_find_cube(target, &TEST_FIELD_STRING, 1), 1);
@@ -705,7 +705,7 @@ TEST(calibrate, master_change_cube)
 
     fieldstat_calibrate(master, target);
 
-    struct field_list *tag_list = fieldstat_cube_get_dimensions(target, cube_id);
+    struct field_list *tag_list = fieldstat_cube_get_dimension(target, cube_id);
     EXPECT_STREQ(tag_list->field[0].key, TEST_FIELD_STRING.key);
 
     EXPECT_EQ(fieldstat_find_cube(target, &TEST_FIELD_STRING, 1), 0);
@@ -787,7 +787,7 @@ TEST(calibrate, issue_calibrate_wrong)
     EXPECT_EQ(fieldstat_find_cube(target, tag_A, 1), FS_ERR_INVALID_DIMENSION);
     EXPECT_EQ(fieldstat_find_cube(target, tag_B, 1), cubes_id_ret[0]);
 
-    struct field_list *tag_list = fieldstat_cube_get_dimensions(target, cubes_id_ret[0]);
+    struct field_list *tag_list = fieldstat_cube_get_dimension(target, cubes_id_ret[0]);
     EXPECT_STREQ(tag_list->field[0].key, tag_B->key);
     fieldstat_field_list_arr_free(tag_list, 1);
 
@@ -819,7 +819,7 @@ TEST(calibrate, delete_first_cube)
     EXPECT_EQ(fieldstat_find_cube(target, tag_A, 1), FS_ERR_INVALID_DIMENSION);
     EXPECT_EQ(fieldstat_find_cube(target, tag_B, 1), 1);
 
-    struct field_list *tag_list = fieldstat_cube_get_dimensions(target, 1);
+    struct field_list *tag_list = fieldstat_cube_get_dimension(target, 1);
     EXPECT_STREQ(tag_list->field[0].key, tag_B->key);
     fieldstat_field_list_arr_free(tag_list, 1);