Merge pull request #1894 from hxy7yx/v2.8-1

fix(add gtags): correct tag count when tag name conflict
emqx · Mar 8, 2024 · 784cc2d · 784cc2d
2 parents c5a6b1f + 092a8cb
commit 784cc2d
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/adapter/adapter.c b/src/adapter/adapter.c
@@ -1287,12 +1287,17 @@ int neu_adapter_add_gtags(neu_adapter_t *adapter, neu_req_add_gtag_t *cmd,
                         cmd->groups[group_index].group,
                         cmd->groups[group_index].tags[added_tag_index].name);
                 }
-                for (int groups_count = 0; groups_count < cmd->n_group;
-                     groups_count++) {
+
+                neu_adapter_driver_try_del_tag((neu_adapter_driver_t *) adapter,
+                                               cmd->groups[group_index].n_tag -
+                                                   tag_index);
+
+                for (++group_index; group_index < cmd->n_group; group_index++) {
                     neu_adapter_driver_try_del_tag(
                         (neu_adapter_driver_t *) adapter,
-                        cmd->groups[groups_count].n_tag);
+                        cmd->groups[group_index].n_tag);
                 }
+
                 resp->index = 0;
                 resp->error = add_tag_result;
                 return add_tag_result;