change tag

3 files changed, 2 insertions, 13 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 93aabca..af4a020 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,8 +32,8 @@ if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
 	set(CMAKE_INSTALL_PREFIX "/opt/MESA" CACHE PATH "default install path" FORCE)

 endif()

 # set (CMAKE_INSTALL_PREFIX ${PROJECT_SOURCE_DIR})

-

-find_program(CMAKE_CXX_CPPCHECK NAMES cppcheck)

+set(CPP_BIN_PATH "/home/chenzizhan/cppcheck/cfg")

+find_program(CMAKE_CXX_CPPCHECK NAMES cppcheck HINTS ${CPP_BIN_PATH})

 if (CMAKE_CXX_CPPCHECK)

     list(

         APPEND CMAKE_CXX_CPPCHECK 

diff --git a/src/exporter/cjson_exporter.c b/src/exporter/cjson_exporter.c
index 1ba23f5..e45e70f 100644
--- a/src/exporter/cjson_exporter.c
+++ b/src/exporter/cjson_exporter.c
@@ -170,11 +170,6 @@ int cell_iter_next_cube(struct cell_iter *iter) {
         iter->max_metric_id = metric_id_max_next;
         iter->shared_tag = fieldstat_get_shared_tags(iter->instance, iter->cube_ids[iter->curr_cube_idx]);
         iter->curr_cell_idx = 0;
-
-        // todo: 现在直接拿一个cell manager 过来，所以没办法很好的判断metric里是不是有cell，要考虑add 了但是metric里没有cell 的情况
-        // 但是没必要在这里判断，添加field的时候判断一下就好
-        // todo：先添加field，再添加tag
-
         return 1;
     }
 
diff --git a/test/test_merge.cpp b/test/test_merge.cpp
index a989958..9cf1989 100644
--- a/test/test_merge.cpp
+++ b/test/test_merge.cpp
@@ -179,9 +179,7 @@ TEST(unit_test_merge, merge_existing_cell_on_existing_cube_and_metric_comprehens
     fieldstat_counter_incrby(instance, cube_id, metric_id, cell_id, 5);
     struct fieldstat *instance_dest = fieldstat_new();
 
-    printf("first merge\n");
     fieldstat_merge(instance_dest, instance);
-    printf("2nd merge\n");
     fieldstat_merge(instance_dest, instance);
 
     int *cube_id_dest;
@@ -429,7 +427,6 @@ TEST(unit_test_merge, new_too_many_cells_on_multiple_metric_given_source_cube_re
             int_tag_found = true;
         } else if (strcmp(tag_list->tag[0].key, TEST_TAG_DOUBLE.key) == 0) {
             double_tag_found = true;
-            printf("0\n");
         } else {
             printf("the tag is %s\n", tag_list->tag[0].key);
         }
@@ -445,7 +442,6 @@ TEST(unit_test_merge, new_too_many_cells_on_multiple_metric_given_source_cube_re
         if (strcmp(tag_list->tag[0].key, TEST_TAG_INT.key) == 0) {
             int_tag_found = true;
         } else if (strcmp(tag_list->tag[0].key, TEST_TAG_DOUBLE.key) == 0) {
-            printf("1\n");
             double_tag_found = true;
         } else {
             printf("the tag is %s\n", tag_list->tag[0].key);
@@ -462,8 +458,6 @@ TEST(unit_test_merge, new_too_many_cells_on_multiple_metric_given_source_cube_re
         if (strcmp(tag_list->tag[0].key, TEST_TAG_INT.key) == 0) {
             int_tag_found = true;
         } else if (strcmp(tag_list->tag[0].key, TEST_TAG_DOUBLE.key) == 0) {
-            printf("2\n");
-
             double_tag_found = true;
         } else {
             printf("the tag is %s\n", tag_list->tag[0].key);