bugfix:修复设置metric的invisible特性时,table的列信息没有隐藏问题v3.0.4

4 files changed, 62 insertions, 36 deletions

diff --git a/test/src/gtest_dynamic_fieldstat.cpp b/test/src/gtest_dynamic_fieldstat.cpp
index 748ed15..28e7f4b 100644
--- a/test/src/gtest_dynamic_fieldstat.cpp
+++ b/test/src/gtest_dynamic_fieldstat.cpp
@@ -641,7 +641,7 @@ TEST(FeildStatDynamicAPI, FieldStatDynamicOutputLineProtocolNoTag)
 
 	EXPECT_NE(nullptr, instance);
 
-	ret = fieldstat_dynamic_set_line_protocol_server(instance, "127.0.0.1", 8600);
+	ret = fieldstat_dynamic_set_line_protocol_server(instance, "127.0.0.1", 8700);
 	EXPECT_EQ(0, ret);
 
 	ret = fieldstat_dynamic_metric_value_incrby(instance, FIELD_TYPE_GAUGE, "Active_sessions", 10, NULL, 0, 0);
@@ -668,7 +668,7 @@ TEST(FeildStatDynamicAPI, FieldStatDynamicOutputLineProtocolOneTag)
 
 	EXPECT_NE(nullptr, instance);
 
-	ret = fieldstat_dynamic_set_line_protocol_server(instance, "127.0.0.1", 8600);
+	ret = fieldstat_dynamic_set_line_protocol_server(instance, "127.0.0.1", 8700);
 	EXPECT_EQ(0, ret);
 	ret = fieldstat_dynamic_metric_value_incrby(instance, FIELD_TYPE_GAUGE, "Active_sessions", 11, tags, 1, 0);
 	ret = line_protocol_dynamic_metric_output(instance);
@@ -699,7 +699,7 @@ TEST(FeildStatDynamicAPI, FieldStatDynamicOutputLineProtocolTwoTags)
 
 	EXPECT_NE(nullptr, instance);
 
-	ret = fieldstat_dynamic_set_line_protocol_server(instance, "127.0.0.1", 8600);
+	ret = fieldstat_dynamic_set_line_protocol_server(instance, "127.0.0.1", 8700);
 	EXPECT_EQ(0, ret);
 
 	ret = fieldstat_dynamic_metric_value_incrby(instance, FIELD_TYPE_GAUGE, "Active_sessions", 12, tags, 2, 0);
@@ -729,7 +729,7 @@ TEST(FeildStatDynamicAPI, FieldStatDynamicOutputLineProtocolTableMetricNoTag)
 	table_id = fieldstat_register_dynamic_table(instance, "shaping", column_name, column_type, sizeof(column_name)/sizeof(column_name[0]), out_column_ids);
 	EXPECT_EQ(0, table_id);
 
-	ret = fieldstat_dynamic_set_line_protocol_server(instance, "127.0.0.1", 8600);
+	ret = fieldstat_dynamic_set_line_protocol_server(instance, "127.0.0.1", 8700);
 	EXPECT_EQ(0, ret);
 
 	ret = fieldstat_dynamic_table_metric_value_incrby(instance, table_id, out_column_ids[0], "security_rule_hits", 30, NULL, 0, 0);
@@ -768,7 +768,7 @@ TEST(FeildStatDynamicAPI, FieldStatDynamicOutputLineProtocolTableMetricOneTag)
 	table_id = fieldstat_register_dynamic_table(instance, "shaping", column_name, column_type, sizeof(column_name)/sizeof(column_name[0]), out_column_ids);
 	EXPECT_EQ(0, table_id);
 
-	ret = fieldstat_dynamic_set_line_protocol_server(instance, "127.0.0.1", 8600);
+	ret = fieldstat_dynamic_set_line_protocol_server(instance, "127.0.0.1", 8700);
 	EXPECT_EQ(0, ret);
 
 	ret = fieldstat_dynamic_table_metric_value_incrby(instance, table_id, out_column_ids[0], "security_rule_hits", 30, tags, sizeof(tags)/sizeof(tags[0]), 0);
@@ -811,7 +811,7 @@ TEST(FeildStatDynamicAPI, FieldStatDynamicOutputLineProtocolTableMetricTowTags)
 	table_id = fieldstat_register_dynamic_table(instance, "shaping", column_name, column_type, sizeof(column_name)/sizeof(column_name[0]), out_column_ids);
 	EXPECT_EQ(0, table_id);
 
-	ret = fieldstat_dynamic_set_line_protocol_server(instance, "127.0.0.1", 8600);
+	ret = fieldstat_dynamic_set_line_protocol_server(instance, "127.0.0.1", 8700);
 	EXPECT_EQ(0, ret);
 
 	ret = fieldstat_dynamic_table_metric_value_incrby(instance, table_id, out_column_ids[0], "security_rule_hits", 30, tags, sizeof(tags)/sizeof(tags[0]), 0);
@@ -837,7 +837,7 @@ TEST(FeildStatDynamicAPI, FieldStatDynamicOutputLineProtocolTypeGauge)
 	instance = fieldstat_dynamic_instance_new("firewall", n_thread);
 	EXPECT_NE(nullptr, instance);
 
-	ret = fieldstat_dynamic_set_line_protocol_server(instance, "127.0.0.1", 8600);
+	ret = fieldstat_dynamic_set_line_protocol_server(instance, "127.0.0.1", 8700);
 	EXPECT_EQ(0, ret);
 
 	ret = fieldstat_dynamic_metric_value_incrby(instance, FIELD_TYPE_GAUGE, "Active_sessions", 12, NULL, 0, 0);
@@ -870,7 +870,7 @@ TEST(FeildStatDynamicAPI, FieldStatDynamicOutputLineProtocolTypeCounter)
 	instance = fieldstat_dynamic_instance_new("firewall", n_thread);
 	EXPECT_NE(nullptr, instance);
 
-	ret = fieldstat_dynamic_set_line_protocol_server(instance, "127.0.0.1", 8600);
+	ret = fieldstat_dynamic_set_line_protocol_server(instance, "127.0.0.1", 8700);
 	EXPECT_EQ(0, ret);
 
 	ret = fieldstat_dynamic_metric_value_incrby(instance, FIELD_TYPE_COUNTER, "Active_sessions", 12, NULL, 0, 0);
@@ -908,7 +908,7 @@ TEST(FeildStatDynamicAPI, FieldStatDynamicOutputLineProtocolTableMetricTypeAllCo
 	table_id = fieldstat_register_dynamic_table(instance, "shaping", column_name, column_type, sizeof(column_name)/sizeof(column_name[0]), out_column_ids);
 	EXPECT_EQ(0, table_id);
 
-	ret = fieldstat_dynamic_set_line_protocol_server(instance, "127.0.0.1", 8600);
+	ret = fieldstat_dynamic_set_line_protocol_server(instance, "127.0.0.1", 8700);
 	EXPECT_EQ(0, ret);
 
 	ret = fieldstat_dynamic_table_metric_value_incrby(instance, table_id, out_column_ids[0], "security_rule_hits", 30, NULL, 0, 0);
@@ -955,7 +955,7 @@ TEST(FeildStatDynamicAPI, FieldStatDynamicOutputLineProtocolTableMetricTypeAllGa
 	table_id = fieldstat_register_dynamic_table(instance, "shaping", column_name, column_type, sizeof(column_name)/sizeof(column_name[0]), out_column_ids);
 	EXPECT_EQ(0, table_id);
 
-	ret = fieldstat_dynamic_set_line_protocol_server(instance, "127.0.0.1", 8600);
+	ret = fieldstat_dynamic_set_line_protocol_server(instance, "127.0.0.1", 8700);
 	EXPECT_EQ(0, ret);
 
 	ret = fieldstat_dynamic_table_metric_value_incrby(instance, table_id, out_column_ids[0], "security_rule_hits", 30, NULL, 0, 0);
@@ -1001,7 +1001,7 @@ TEST(FeildStatDynamicAPI, FieldStatDynamicOutputLineProtocolTableMetricTypeOneCo
 	table_id = fieldstat_register_dynamic_table(instance, "shaping", column_name, column_type, sizeof(column_name)/sizeof(column_name[0]), out_column_ids);
 	EXPECT_EQ(0, table_id);
 
-	ret = fieldstat_dynamic_set_line_protocol_server(instance, "127.0.0.1", 8600);
+	ret = fieldstat_dynamic_set_line_protocol_server(instance, "127.0.0.1", 8700);
 	EXPECT_EQ(0, ret);
 
 	ret = fieldstat_dynamic_table_metric_value_incrby(instance, table_id, out_column_ids[0], "security_rule_hits", 30, NULL, 0, 0);
@@ -1084,7 +1084,7 @@ TEST(FeildStatDynamicAPI, FieldStatDynamicOutputLineProtocolValueZero)
 	instance = fieldstat_dynamic_instance_new("firewall", n_thread);
 	EXPECT_NE(nullptr, instance);
 
-	ret = fieldstat_dynamic_set_line_protocol_server(instance, "127.0.0.1", 8600);
+	ret = fieldstat_dynamic_set_line_protocol_server(instance, "127.0.0.1", 8700);
 	EXPECT_EQ(0, ret);
 
 	ret = fieldstat_dynamic_metric_value_incrby(instance, FIELD_TYPE_GAUGE, "Active_sessions", 0, NULL, 0, 0);
@@ -1115,7 +1115,7 @@ TEST(FeildStatDynamicAPI, FieldStatDynamicOutputLineProtocolTableMetricValueZero
 	table_id = fieldstat_register_dynamic_table(instance, "shaping", column_name, column_type, sizeof(column_name)/sizeof(column_name[0]), out_column_ids);
 	EXPECT_EQ(0, table_id);
 
-	ret = fieldstat_dynamic_set_line_protocol_server(instance, "127.0.0.1", 8600);
+	ret = fieldstat_dynamic_set_line_protocol_server(instance, "127.0.0.1", 8700);
 	EXPECT_EQ(0, ret);
 
 	ret = fieldstat_dynamic_table_metric_value_incrby(instance, table_id, out_column_ids[0], "security_rule_hits", 0, NULL, 0, 0);
@@ -1160,7 +1160,7 @@ TEST(FeildStatDynamicAPI, FieldStatDynamicOutputLineProtocolMultiMetric)
 
 	instance = fieldstat_dynamic_instance_new("firewall", n_thread);
 	EXPECT_NE(nullptr, instance);
-	ret = fieldstat_dynamic_set_line_protocol_server(instance, "127.0.0.1", 8600);
+	ret = fieldstat_dynamic_set_line_protocol_server(instance, "127.0.0.1", 8700);
 	EXPECT_EQ(0, ret);
 	for(int i = 0; i < loops; i++)
 	{
@@ -1233,7 +1233,7 @@ TEST(FeildStatDynamicAPI, FieldStatDynamicOutputLineProtocolMultiTableRow)
 
 	instance = fieldstat_dynamic_instance_new("firewall", n_thread);
 	EXPECT_NE(nullptr, instance);
-	ret = fieldstat_dynamic_set_line_protocol_server(instance, "127.0.0.1", 8600);
+	ret = fieldstat_dynamic_set_line_protocol_server(instance, "127.0.0.1", 8700);
 	EXPECT_EQ(0, ret);
 	table_id = fieldstat_register_dynamic_table(instance, "shaping", column_name, column_type, sizeof(column_name)/sizeof(column_name[0]), out_column_ids);
 	EXPECT_EQ(0, table_id);
diff --git a/test/src/gtest_dynamic_fieldstat_output.cpp b/test/src/gtest_dynamic_fieldstat_output.cpp
index eb694bd..fab3dc8 100644
--- a/test/src/gtest_dynamic_fieldstat_output.cpp
+++ b/test/src/gtest_dynamic_fieldstat_output.cpp
@@ -85,7 +85,7 @@ TEST(FeildStatDynamicAPI, FieldStatDynamicInstanceMultiIncrby)
 
 
 	struct fieldstat_dynamic_instance *instance = fieldstat_dynamic_instance_new("firewall", n_thread);
-	ret = fieldstat_dynamic_set_line_protocol_server(instance, "127.0.0.1", 8600);
+	ret = fieldstat_dynamic_set_line_protocol_server(instance, "127.0.0.1", 8700);
 	EXPECT_EQ(0, ret);
 
 	table_id = fieldstat_register_dynamic_table(instance, "shaping", column_name, column_type, sizeof(column_name)/sizeof(column_name[0]), out_column_ids);
diff --git a/test/src/gtest_fieldstat_interface.cpp b/test/src/gtest_fieldstat_interface.cpp
index 8954099..600314f 100644
--- a/test/src/gtest_fieldstat_interface.cpp
+++ b/test/src/gtest_fieldstat_interface.cpp
@@ -289,7 +289,7 @@ TEST(FeildStatAPI, FieldStatLineProtocolOutputTableMetric)
 	ret = fieldstat_register_table_row(instance, table_id, "TRAFFIC", NULL, 0, output_metric_ids);
 	EXPECT_EQ(0, ret);
 
-	ret = fieldstat_set_line_protocol_server(instance, "127.0.0.1", 8600);
+	ret = fieldstat_set_line_protocol_server(instance, "127.0.0.1", 8700);
 	EXPECT_EQ(0, ret);
 	EXPECT_EQ(4, instance->output_type);
 	ret = fieldstat_disable_background_thread(instance);
@@ -374,7 +374,7 @@ TEST(FeildStatAPI, SetMetricRatioPara)
 	EXPECT_EQ(0, ret);
 	ret = fieldstat_set_local_output(instance, output_file_path, "default");
 	EXPECT_EQ(0, ret);
-	ret = fieldstat_set_line_protocol_server(instance, "127.0.0.1", 8600);
+	ret = fieldstat_set_line_protocol_server(instance, "127.0.0.1", 8700);
 	EXPECT_EQ(0, ret);
 	ret = system("cat /dev/null > /tmp/metrics.out");
 	EXPECT_EQ(0, ret);
@@ -451,33 +451,55 @@ TEST(FeildStatAPI, SetMetricInvisible)
 
 	const char *output_file_path = "/tmp/fieldstat.txt"; 
 	const char *output_telegraf_path = "/tmp/metrics.out";
-	const char *table_column_name[] = {"rule", "reg/v6", "stream", "IN_Bps", "cpu_us", "PROC_Bps", "IN_Tps", "PROC_Tps","hit_cnt", "hit_rate"};
-	const char *compared_file_output = "Sum                   "
-									"                   0                   0            0.00e+00"
-									"            5.00e+02            5.00e+01            0.00e+00"
-									"            0.00e+00            0.00e+00            0.00e+00\n";
+	const char *table_column_name[] = {
+		"rule", "reg/v6", "stream", "IN_Bps", "cpu_us",
+		"PROC_Bps", "IN_Tps", "PROC_Tps","hit_cnt", "hit_rate"
+	};
+	enum field_type table_column_type[10] = {
+		FIELD_TYPE_GAUGE,
+		FIELD_TYPE_GAUGE,
+		FIELD_TYPE_COUNTER,
+		FIELD_TYPE_COUNTER,
+		FIELD_TYPE_COUNTER,
+		FIELD_TYPE_COUNTER,
+		FIELD_TYPE_COUNTER,
+		FIELD_TYPE_COUNTER,
+		FIELD_TYPE_COUNTER,
+		FIELD_TYPE_COUNTER
+	};
+	const char *compared_file_data_line = "Sum                   "
+		"                   0                   0            0.00e+00"
+		"            5.00e+02            5.00e+01            0.00e+00"
+		"            0.00e+00            0.00e+00            0.00e+00\n";
+
+	const char *compared_file_column_line = "                      "
+		"                rule              reg/v6              stream"
+		"              IN_Bps            PROC_Bps              IN_Tps"
+		"            PROC_Tps             hit_cnt            hit_rate\n";
+
+
+	const char *compare_telegraf_output = "{\"fields\":{\"IN_Bps\":1000,"
+		"\"IN_Tps\":0,\"PROC_Tps\":0,\"hit_cnt\":0,\"hit_rate\":0,"
+		"\"reg/v6\":0,\"rule\":0,\"stream\":0},\"name\":\"Sum\","
+		"\"tags\":{\"app_name\":\"maat\",\"table_name\":\"maat_info\"}}";
 
-	const char *compare = "{\"fields\":{\"IN_Bps\":1000,\"IN_Tps\":0,\"PROC_Tps\":0,"
-						  "\"hit_cnt\":0,\"hit_rate\":0,\"reg/v6\":0,\"rule\":0,\"stream\":0},"
-						  "\"name\":\"Sum\",\"tags\":{\"app_name\":\"maat\",\"table_name\":\"maat_info\"}}";
-
-
-	enum field_type table_column_type[10] = {FIELD_TYPE_GAUGE, FIELD_TYPE_GAUGE, FIELD_TYPE_COUNTER, FIELD_TYPE_COUNTER, FIELD_TYPE_COUNTER, FIELD_TYPE_COUNTER, FIELD_TYPE_COUNTER, FIELD_TYPE_COUNTER, FIELD_TYPE_COUNTER, FIELD_TYPE_COUNTER};
 
 	instance = fieldstat_instance_new("maat");
 	EXPECT_STREQ("maat", instance->name);
 
-	table_id = fieldstat_register_table(instance, "maat_info", table_column_name, table_column_type, sizeof(table_column_name)/sizeof(table_column_name[0]));
+	table_id = fieldstat_register_table(instance, "maat_info", table_column_name, table_column_type, 
+										sizeof(table_column_name)/sizeof(table_column_name[0]));
 	EXPECT_EQ(0, table_id);
 	ret = fieldstat_register_table_row(instance, table_id, "Sum", NULL, 0, output_metric_ids);
 	EXPECT_EQ(0, ret);
-	ret = fieldstat_set_metric_ratio_para(instance, output_metric_ids[5], output_metric_ids[3], output_metric_ids[4], 1);
+	ret = fieldstat_set_metric_ratio_para(instance, output_metric_ids[5], output_metric_ids[3], 
+										  output_metric_ids[4], 1);
 	EXPECT_EQ(0, ret);
 	ret = fieldstat_set_metric_invisible_para(instance, output_metric_ids[4]);
 	EXPECT_EQ(0, ret);
 	ret = fieldstat_set_local_output(instance, output_file_path, "default");
 	EXPECT_EQ(0, ret);
-	ret = fieldstat_set_line_protocol_server(instance, "127.0.0.1", 8600);
+	ret = fieldstat_set_line_protocol_server(instance, "127.0.0.1", 8700);
 	EXPECT_EQ(0, ret);
 	ret = system("cat /dev/null > /tmp/metrics.out");
 	EXPECT_EQ(0, ret);
@@ -496,9 +518,13 @@ TEST(FeildStatAPI, SetMetricInvisible)
 		{
 			continue;
 		}
+		if(n_line == 2)
+		{
+			EXPECT_STREQ(compared_file_column_line, line);
+		}
 		if(n_line == 3)
 		{
-			EXPECT_STREQ(compared_file_output, line);
+			EXPECT_STREQ(compared_file_data_line, line);
 		}
 		n_line++;
 	}
@@ -526,7 +552,7 @@ TEST(FeildStatAPI, SetMetricInvisible)
 		EXPECT_NE(nullptr, cjson_metric_str);
 		if(cjson_metric_str)
 		{
-			EXPECT_STREQ(compare, cjson_metric_str);
+			EXPECT_STREQ(compare_telegraf_output, cjson_metric_str);
 			free(cjson_metric_str);
 			cjson_metric_str = NULL;
 		}
diff --git a/test/src/gtest_fieldstat_output.cpp b/test/src/gtest_fieldstat_output.cpp
index 1ef27d5..634017d 100644
--- a/test/src/gtest_fieldstat_output.cpp
+++ b/test/src/gtest_fieldstat_output.cpp
@@ -149,7 +149,7 @@ TEST(FeildStatOutput, OutputLineProtocol)
 	ret = fieldstat_register_table_row(instance, table_id, "TRAFFIC", NULL, 0, output_metric_ids);
 	EXPECT_EQ(0, ret);
 
-	ret = fieldstat_set_line_protocol_server(instance, "127.0.0.1", 8600);
+	ret = fieldstat_set_line_protocol_server(instance, "127.0.0.1", 8700);
 	EXPECT_EQ(0, ret);
 	EXPECT_EQ(4, instance->output_type);
 	fieldstat_instance_start(instance);
@@ -332,7 +332,7 @@ TEST(FeildStatOutput, OutputFileAndLineProtocol)
 	ret = fieldstat_register_table_row(instance, table_id, "TRAFFIC", NULL, 0, output_metric_ids);
 	EXPECT_EQ(0, ret);
 
-	ret = fieldstat_set_line_protocol_server(instance, "127.0.0.1", 8600);
+	ret = fieldstat_set_line_protocol_server(instance, "127.0.0.1", 8700);
 	EXPECT_EQ(0, ret);
 	ret = fieldstat_set_local_output(instance, output_file_path, "default");
 	EXPECT_EQ(0, ret);