From 19b7bb9e0c4e5789b5b05eca914959225ec803ad Mon Sep 17 00:00:00 2001
From: wangmm0220 <wangmm0220@gmail.com>
Date: Fri, 26 Apr 2024 11:41:41 +0800
Subject: [PATCH] fix:[TD-29793] check if column and tag name are dumplicate in
 schemaless

---
 source/client/src/clientSml.c              | 13 +++++++++---
 tests/system-test/7-tmq/tmq_primary_key.py |  8 ++++----
 utils/test/c/sml_test.c                    | 23 ++++++++++++++++++++++
 3 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/source/client/src/clientSml.c b/source/client/src/clientSml.c
index 1681fd1551..844709212a 100644
--- a/source/client/src/clientSml.c
+++ b/source/client/src/clientSml.c
@@ -832,7 +832,7 @@ static int32_t smlFindNearestPowerOf2(int32_t length, uint8_t type) {
   return result;
 }
 
-static int32_t smlProcessSchemaAction(SSmlHandle *info, SSchema *schemaField, SHashObj *schemaHash, SArray *cols,
+static int32_t smlProcessSchemaAction(SSmlHandle *info, SSchema *schemaField, SHashObj *schemaHash, SArray *cols, SArray *checkDumplicateCols,
                                       ESchemaAction *action, bool isTag) {
   int32_t code = TSDB_CODE_SUCCESS;
   for (int j = 0; j < taosArrayGetSize(cols); ++j) {
@@ -843,6 +843,13 @@ static int32_t smlProcessSchemaAction(SSmlHandle *info, SSchema *schemaField, SH
       return code;
     }
   }
+
+  for (int j = 0; j < taosArrayGetSize(checkDumplicateCols); ++j) {
+    SSmlKv *kv = (SSmlKv *)taosArrayGet(cols, j);
+    if(taosHashGet(schemaHash, kv->key, kv->keyLen) != NULL){
+      return TSDB_CODE_PAR_DUPLICATED_COLUMN;
+    }
+  }
   return TSDB_CODE_SUCCESS;
 }
 
@@ -1106,7 +1113,7 @@ static int32_t smlModifyDBSchemas(SSmlHandle *info) {
       }
 
       ESchemaAction action = SCHEMA_ACTION_NULL;
-      code = smlProcessSchemaAction(info, pTableMeta->schema, hashTmp, sTableData->tags, &action, true);
+      code = smlProcessSchemaAction(info, pTableMeta->schema, hashTmp, sTableData->tags, sTableData->cols, &action, true);
       if (code != TSDB_CODE_SUCCESS) {
         goto end;
       }
@@ -1181,7 +1188,7 @@ static int32_t smlModifyDBSchemas(SSmlHandle *info) {
         taosHashPut(hashTmp, pTableMeta->schema[i].name, strlen(pTableMeta->schema[i].name), &i, SHORT_BYTES);
       }
       action = SCHEMA_ACTION_NULL;
-      code = smlProcessSchemaAction(info, pTableMeta->schema, hashTmp, sTableData->cols, &action, false);
+      code = smlProcessSchemaAction(info, pTableMeta->schema, hashTmp, sTableData->cols, sTableData->tags, &action, false);
       if (code != TSDB_CODE_SUCCESS) {
         goto end;
       }
diff --git a/tests/system-test/7-tmq/tmq_primary_key.py b/tests/system-test/7-tmq/tmq_primary_key.py
index 8f62dc8783..7d0d3da4fc 100644
--- a/tests/system-test/7-tmq/tmq_primary_key.py
+++ b/tests/system-test/7-tmq/tmq_primary_key.py
@@ -62,7 +62,7 @@ class TDTestCase:
             while True:
                 res = consumer.poll(1)
                 if not res:
-                    break
+                    continue
                 val = res.value()
                 if val is None:
                     continue
@@ -173,7 +173,7 @@ class TDTestCase:
             while True:
                 res = consumer.poll(1)
                 if not res:
-                    break
+                    continue
                 val = res.value()
                 if val is None:
                     continue
@@ -282,7 +282,7 @@ class TDTestCase:
             while True:
                 res = consumer.poll(1)
                 if not res:
-                    break
+                    continue
                 val = res.value()
                 if val is None:
                     continue
@@ -391,7 +391,7 @@ class TDTestCase:
             while True:
                 res = consumer.poll(1)
                 if not res:
-                    break
+                    continue
                 val = res.value()
                 if val is None:
                     continue
diff --git a/utils/test/c/sml_test.c b/utils/test/c/sml_test.c
index 6c6144244f..5e9d82e71e 100644
--- a/utils/test/c/sml_test.c
+++ b/utils/test/c/sml_test.c
@@ -1866,6 +1866,29 @@ int sml_td29691_Test() {
   printf("%s result0:%s\n", __FUNCTION__, taos_errstr(pRes));
   ASSERT(code == TSDB_CODE_PAR_DUPLICATED_COLUMN);
   taos_free_result(pRes);
+
+  //check column tag name duplication when update
+  const char *sql7[] = {
+      "vbin,t1=1,t2=2,f1=ewe f2=b\"hello\" 1632299372003",
+  };
+  pRes = taos_schemaless_insert(taos, (char **)sql7, sizeof(sql7) / sizeof(sql7[0]), TSDB_SML_LINE_PROTOCOL,
+                                TSDB_SML_TIMESTAMP_MILLI_SECONDS);
+  code = taos_errno(pRes);
+  printf("%s result0:%s\n", __FUNCTION__, taos_errstr(pRes));
+  ASSERT(code == TSDB_CODE_PAR_DUPLICATED_COLUMN);
+  taos_free_result(pRes);
+
+  //check column tag name duplication when update
+  const char *sql6[] = {
+      "vbin,t1=1 t2=2,f1=1,f2=b\"hello\" 1632299372004",
+  };
+  pRes = taos_schemaless_insert(taos, (char **)sql6, sizeof(sql6) / sizeof(sql6[0]), TSDB_SML_LINE_PROTOCOL,
+                                TSDB_SML_TIMESTAMP_MILLI_SECONDS);
+  code = taos_errno(pRes);
+  printf("%s result0:%s\n", __FUNCTION__, taos_errstr(pRes));
+  ASSERT(code == TSDB_CODE_PAR_DUPLICATED_COLUMN);
+  taos_free_result(pRes);
+
   taos_close(taos);
 
   return code;