primary metric in spreadsketch/heavykeeper

4 files changed, 8 insertions, 14 deletions

diff --git a/test/test_exporter_json.cpp b/test/test_exporter_json.cpp
index 53dbabc..45a05cf 100644
--- a/test/test_exporter_json.cpp
+++ b/test/test_exporter_json.cpp
@@ -84,7 +84,7 @@ void test_check_if_metric_gauge_correct(cJSON *metric_obj, const char *name)
 {
     char *blob_gauge_benchmark = NULL;
     size_t size_dummy = 0;
-    hyperloglog_serialize_for_networking(g_hll_standard, &blob_gauge_benchmark, &size_dummy);
+    hyperloglog_serialize_into_base64(g_hll_standard, &blob_gauge_benchmark, &size_dummy);
 
     cJSON *gauge_obj = cJSON_GetObjectItem(metric_obj, name);
     EXPECT_NE(gauge_obj, nullptr);
diff --git a/test/test_merge.cpp b/test/test_merge.cpp
index 011ad6d..6e8f802 100644
--- a/test/test_merge.cpp
+++ b/test/test_merge.cpp
@@ -120,8 +120,8 @@ 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);
-    free(cube_id_dest);
     EXPECT_STREQ(fieldstat_get_metric_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);
 
@@ -255,8 +255,8 @@ 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);
-    free(cube_id_dest);
     EXPECT_STREQ(fieldstat_get_metric_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);
 
@@ -288,8 +288,8 @@ 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];
-    free(cube_id_dest);
     EXPECT_STREQ(fieldstat_get_metric_name(instance_dest,cube_id_dest[0], 0), "metric_name");
+    free(cube_id_dest);
 
     struct field_list *tag_list = NULL;
     size_t n_cell = 0;
@@ -597,6 +597,7 @@ TEST(unit_test_merge, new_too_many_cells_on_one_metric_given_source_cube_reset_a
     fieldstat_tag_list_arr_free(tag_list, n_cell);
 }
 
+
 TEST(unit_test_merge, gen_dest_full_all_src_inserted_given_src_flows_larger_spreadsketch) {
     int K = 100;
     SpreadSketchZipfGenerator flow_generator(1.0, K); // exactly the number of cells, so there will be almost all(in case of hash collision happen) cells added successfully
@@ -712,7 +713,7 @@ TEST(unit_test_merge, merge_accuracy_test_gen_dest_full_some_inserted_and_some_m
 int main(int argc, char *argv[]) 
 {
 	testing::InitGoogleTest(&argc, argv);
-    // testing::GTEST_FLAG(filter) = "*spreadsketch";
+    // testing::GTEST_FLAG(filter) = "*gen_dest_full_all_src_inserted_given_src_flows_larger_spreadsketch";
     
 	return RUN_ALL_TESTS();
 }
\ No newline at end of file
diff --git a/test/test_metric_counter.cpp b/test/test_metric_counter.cpp
index c6774f9..d8ce16c 100644
--- a/test/test_metric_counter.cpp
+++ b/test/test_metric_counter.cpp
@@ -202,13 +202,6 @@ TEST(metric_test_counter, add_and_query_on_dummy_cell_of_topk)
     long long measure = my_fieldstat_counter_get(instance, cube_id, metric_id);
     EXPECT_EQ(measure, 1);
 
-    int *metric_ids_in_cell = NULL;
-    size_t n_metric_in_cell = 0;
-    fieldstat_get_metric_in_cell(instance, cube_id, &TEST_TAG_LIST_INT, &metric_ids_in_cell, &n_metric_in_cell);
-    EXPECT_EQ(n_metric_in_cell, 1);
-    EXPECT_EQ(metric_ids_in_cell[0], metric_id);
-    free(metric_ids_in_cell);
-
     fieldstat_free(instance);
 }
 
diff --git a/test/test_metric_hll.cpp b/test/test_metric_hll.cpp
index 6d8be58..204c762 100644
--- a/test/test_metric_hll.cpp
+++ b/test/test_metric_hll.cpp
@@ -138,7 +138,7 @@ TEST(metric_test_hll, serialize_with_b64_and_query)
 
     char *blob = NULL;
     size_t blob_len = 0;
-    fieldstat_get_serialized_blob(instance, 0, 0, &TEST_TAG_LIST_INT, &blob, &blob_len);
+    fieldstat_metric_get_serialization_as_base64(instance, 0, 0, &TEST_TAG_LIST_INT, &blob, &blob_len);
     size_t dec_size = 0;
     unsigned char *dec = b64_decode_ex(blob, blob_len, &dec_size);
 
@@ -183,7 +183,7 @@ TEST(metric_test_hll, serialize_with_b64_and_query_with_python_api)
 
     char *blob = NULL;
     size_t blob_len = 0;
-    fieldstat_get_serialized_blob(instance, 0, 0, &TEST_TAG_LIST_INT, &blob, &blob_len);
+    fieldstat_metric_get_serialization_as_base64(instance, 0, 0, &TEST_TAG_LIST_INT, &blob, &blob_len);
 
     bool flag = fieldstat_is_hll(blob);
     EXPECT_EQ(flag, true);