renames

4 files changed, 29 insertions, 29 deletions

diff --git a/src/cube.c b/src/cube.c
index aa50440..b1123a0 100644
--- a/src/cube.c
+++ b/src/cube.c
@@ -53,8 +53,10 @@ struct cube {
     UT_hash_handle hh;
 };
 
-static void tag_array_copy(struct fieldstat_tag *tags_dst, const struct fieldstat_tag *tags_src, size_t n_tag) // TODO: 改成clone吧, 
+static struct fieldstat_tag *tag_array_duplicate(const struct fieldstat_tag *tags_src, size_t n_tag)
 {
+    struct fieldstat_tag *tags_dst = malloc(sizeof(struct fieldstat_tag) * n_tag);
+
     for (size_t i = 0; i < n_tag; i++) {
         tags_dst[i].key = strdup(tags_src[i].key);
         tags_dst[i].type = tags_src[i].type;
@@ -73,6 +75,8 @@ static void tag_array_copy(struct fieldstat_tag *tags_dst, const struct fieldsta
             break;
         }
     }
+
+    return tags_dst;
 }
 
 static void fieldstat_free_tag_array(struct fieldstat_tag *tags, size_t n_tags)
@@ -143,7 +147,7 @@ static void tag2key(const struct fieldstat_tag tags[], size_t n_tags, char **out
     size_t remain_key_size = alloced_every_time;
     size_t total_key_size = alloced_every_time;
     char *dynamic_mem = (char *)malloc(total_key_size);
-    void *val_position;
+    void *val_position = NULL;
 
     size_t key_len = 0;
     size_t val_len = 0;
@@ -156,11 +160,11 @@ static void tag2key(const struct fieldstat_tag tags[], size_t n_tags, char **out
 		{
 			case TAG_INTEGER:
                 val_len = sizeof(long long);
-                val_position = &tag->value_longlong;
+                val_position = (void *)&tag->value_longlong;
 				break;
 			case TAG_DOUBLE:
                 val_len = sizeof(double);
-                val_position = &tag->value_double;
+                val_position = (void *)&tag->value_double;
 
 				break;
 			case TAG_CSTRING:
@@ -378,8 +382,7 @@ struct cell *cell_new(const struct exdata_new_args *args) {
     pthis->metrics_len = 0;
 
     pthis->tags.n_tag = args->n_tags;
-    pthis->tags.tag = malloc(sizeof(struct fieldstat_tag) * args->n_tags);
-    tag_array_copy(pthis->tags.tag, args->tags, args->n_tags);
+    pthis->tags.tag = tag_array_duplicate(args->tags, args->n_tags);
     return pthis;
 }
 
@@ -412,8 +415,7 @@ struct cell *cell_copy(const struct cell *src) {
     }
     
     pthis->tags.n_tag = src->tags.n_tag;
-    pthis->tags.tag = malloc(sizeof(struct fieldstat_tag) * src->tags.n_tag);
-    tag_array_copy(pthis->tags.tag, src->tags.tag, src->tags.n_tag);
+    pthis->tags.tag = tag_array_duplicate(src->tags.tag, src->tags.n_tag);
 
     return pthis;
 }
@@ -472,8 +474,7 @@ struct cube *cube_info_new(const struct fieldstat_tag *shared_tags, size_t n_tag
     if (n_tag == 0) {
         cube->cube_identifier = NULL;
     } else {
-        cube->cube_identifier = malloc(sizeof(struct fieldstat_tag) * n_tag);
-        tag_array_copy(cube->cube_identifier, shared_tags, n_tag);
+        cube->cube_identifier = tag_array_duplicate(shared_tags, n_tag);
     }
 
     cube->n_shared_tags = n_tag;
@@ -732,8 +733,7 @@ void cube_get_cells(const struct cube *cube, struct fieldstat_tag_list **tag_lis
             tag_list_tmp->tag = NULL;
             continue;
         }
-        tag_list_tmp->tag = (struct fieldstat_tag *)malloc(sizeof(struct fieldstat_tag) * tag_list_tmp->n_tag);
-        tag_array_copy(tag_list_tmp->tag, cell_data->tags.tag, tag_list_tmp->n_tag);
+        tag_list_tmp->tag = tag_array_duplicate(cell_data->tags.tag, tag_list_tmp->n_tag);
     }
 
     free(cell_datas);
@@ -893,9 +893,9 @@ struct fieldstat_tag_list *cube_get_identifier(const struct cube *cube) {
         return tag_list;
     }
 
-    tag_list->tag = (struct fieldstat_tag *)malloc(sizeof(struct fieldstat_tag) * cube->n_shared_tags);
+    tag_list->tag = tag_array_duplicate(cube->cube_identifier, cube->n_shared_tags);
     tag_list->n_tag = cube->n_shared_tags;
-    tag_array_copy(tag_list->tag, cube->cube_identifier, cube->n_shared_tags);
+    
 
     return tag_list;
 }
\ No newline at end of file
diff --git a/src/exporter/cjson_exporter.c b/src/exporter/cjson_exporter.c
index 23e3503..643fb0f 100644
--- a/src/exporter/cjson_exporter.c
+++ b/src/exporter/cjson_exporter.c
@@ -476,12 +476,12 @@ int cell_iter_next_cube(struct cell_iter *iter) {
     while (iter->curr_cube_idx < iter->n_cube - 1) {
         int cube_id_next = iter->cube_ids[++iter->curr_cube_idx];
 
-        fieldstat_get_cells_used_by_cube(instance, cube_id_next, &iter->tag_list, &iter->n_cell);
+        fieldstat_cube_get_cells(instance, cube_id_next, &iter->tag_list, &iter->n_cell);
         if (iter->n_cell == 0) {
             continue;
         }
 
-        iter->shared_tag = fieldstat_get_shared_tags(iter->instance, iter->cube_ids[iter->curr_cube_idx]);
+        iter->shared_tag = fieldstat_cube_get_tags(iter->instance, iter->cube_ids[iter->curr_cube_idx]);
         iter->curr_cell_idx = 0;
         return 1;
     }
@@ -528,7 +528,7 @@ struct export_kv_pair *cell_query_with_iter(const struct cell_iter *iter, int me
     struct export_kv_pair *ret = NULL;
     if (type == METRIC_TYPE_COUNTER) {
         long long value;
-        int tmp_ret = fieldstat_counter_get(iter->instance, iter->cube_ids[iter->curr_cube_idx], metric_id, &iter->tag_list[iter->curr_cell_idx], &value);
+        int tmp_ret = fieldstat_counter_get(iter->instance, iter->cube_ids[iter->curr_cube_idx], &iter->tag_list[iter->curr_cell_idx], metric_id, &value);
         if (tmp_ret < 0) {
             return NULL;
         }
diff --git a/src/fieldstat.c b/src/fieldstat.c
index df5f482..e5a5945 100644
--- a/src/fieldstat.c
+++ b/src/fieldstat.c
@@ -162,14 +162,14 @@ void fieldstat_free_tag_array(struct fieldstat_tag *tags, size_t n_tags)
     free(tags);
 }
 
-int fieldstat_create_cube(struct fieldstat *instance, const struct fieldstat_tag *shared_tags, size_t n_tag, enum sampling_mode mode, size_t max_n_cell)
+int fieldstat_create_cube(struct fieldstat *instance, const struct fieldstat_tag *cube_identifier, size_t n_tag, enum sampling_mode mode, size_t max_n_cell)
 {
     if (instance == NULL) {
         return  FS_ERR_NULL_HANDLER;
     }
 
-    if (n_tag == 0 || shared_tags == NULL) {
-        shared_tags = NULL;
+    if (n_tag == 0 || cube_identifier == NULL) {
+        cube_identifier = NULL;
         n_tag = 0;
     }
     if (mode == SAMPLING_MODE_TOPK && max_n_cell == 0) {
@@ -179,7 +179,7 @@ int fieldstat_create_cube(struct fieldstat *instance, const struct fieldstat_tag
         max_n_cell = INT32_MAX;
     }
     
-    struct cube *cube = cube_new(shared_tags, n_tag, mode, max_n_cell);
+    struct cube *cube = cube_new(cube_identifier, n_tag, mode, max_n_cell);
     int ret = cube_manager_add(instance->cube_manager, cube);
     if (ret < 0) {
         cube_free(cube);
@@ -429,7 +429,7 @@ void fieldstat_get_metrics(const struct fieldstat *instance, int **metric_id_out
     }
 }
 
-struct fieldstat_tag_list *fieldstat_get_shared_tags(const struct fieldstat *instance, int cube_id)
+struct fieldstat_tag_list *fieldstat_cube_get_tags(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) {
@@ -439,7 +439,7 @@ struct fieldstat_tag_list *fieldstat_get_shared_tags(const struct fieldstat *ins
     return cube_get_identifier(cube);
 }
 
-int fieldstat_counter_get(const struct fieldstat *instance, int cube_id, int metric_id, const struct fieldstat_tag_list *tags, long long *value)
+int fieldstat_counter_get(const struct fieldstat *instance, int cube_id, const struct fieldstat_tag_list *tags, int metric_id, long long *value)
 {
     const struct cube *cube = cube_manager_get_cube_by_id(instance->cube_manager, cube_id);
     if (cube == NULL) {
@@ -449,7 +449,7 @@ int fieldstat_counter_get(const struct fieldstat *instance, int cube_id, int met
     return cube_counter_get(cube, metric_id, tags, value);
 }
 
-int fieldstat_hll_get(const struct fieldstat *instance, int cube_id, int metric_id, const struct fieldstat_tag_list *tags, double *value)
+int fieldstat_hll_get(const struct fieldstat *instance, int cube_id, const struct fieldstat_tag_list *tags, int metric_id, double *value)
 {
     const struct cube *cube = cube_manager_get_cube_by_id(instance->cube_manager, cube_id);
     if (cube == NULL) {
@@ -461,7 +461,7 @@ int fieldstat_hll_get(const struct fieldstat *instance, int cube_id, int metric_
     return ret;
 }
 
-long long fieldstat_hist_value_at_percentile(const struct fieldstat *instance, int cube_id, int metric_id, const struct fieldstat_tag_list *tags, double percentile)
+long long fieldstat_hist_value_at_percentile(const struct fieldstat *instance, int cube_id, const struct fieldstat_tag_list *tags, int metric_id, double percentile)
 {
     const struct cube *cube = cube_manager_get_cube_by_id(instance->cube_manager, cube_id);
     if (cube == NULL) {
@@ -476,7 +476,7 @@ long long fieldstat_hist_value_at_percentile(const struct fieldstat *instance, i
     return value;
 }
 
-long long fieldstat_hist_count_le_value(const struct fieldstat *instance, int cube_id, int metric_id, const struct fieldstat_tag_list *tags, long long value)
+long long fieldstat_hist_count_le_value(const struct fieldstat *instance, int cube_id, const struct fieldstat_tag_list *tags, int metric_id, long long value)
 {
     const struct cube *cube = cube_manager_get_cube_by_id(instance->cube_manager, cube_id);
     if (cube == NULL) {
@@ -533,7 +533,7 @@ enum metric_type fieldstat_get_metric_type(const struct fieldstat *instance, int
     return metric->type;
 }
 
-void fieldstat_get_cells_used_by_cube(const struct fieldstat *instance, int cube_id, struct fieldstat_tag_list **tag_list, size_t *n_cell)
+void fieldstat_cube_get_cells(const struct fieldstat *instance, int cube_id, struct fieldstat_tag_list **tag_list, size_t *n_cell)
 {
     const struct cube *cube = cube_manager_get_cube_by_id(instance->cube_manager, cube_id);
     if (cube == NULL) {
diff --git a/src/tags/heavy_keeper.c b/src/tags/heavy_keeper.c
index a017a72..faca93c 100644
--- a/src/tags/heavy_keeper.c
+++ b/src/tags/heavy_keeper.c
@@ -644,8 +644,8 @@ int heavy_keeper_add(struct heavy_keeper *heavy_keeper, const char *key, size_t
             sorted_set_insert(summary, key, key_len, maxv, arg);
             return 1;
         }
-        unsigned nMin = sorted_set_get_min_count(summary);
-        if (maxv > nMin || nMin == INVALID_COUNT) {
+        unsigned min_value = sorted_set_get_min_count(summary);
+        if (maxv > min_value || min_value == INVALID_COUNT) {
             sorted_set_insert(summary, key, key_len, maxv, arg);
             return 1;
         }