diff --git a/source/client/inc/clientSml.h b/source/client/inc/clientSml.h
index 3dcba673bf..d8d41d8be6 100644
--- a/source/client/inc/clientSml.h
+++ b/source/client/inc/clientSml.h
@@ -190,7 +190,7 @@ typedef struct {
   //
   SArray      *preLineTagKV;
   SArray      *maxTagKVs;
-  SArray      *preLineColKV;
+  SArray      *masColKVs;
 
   SSmlLineInfo preLine;
   STableMeta  *currSTableMeta;
diff --git a/source/client/src/clientSml.c b/source/client/src/clientSml.c
index ca76579b9a..c438196e71 100644
--- a/source/client/src/clientSml.c
+++ b/source/client/src/clientSml.c
@@ -817,7 +817,6 @@ static int32_t smlModifyDBSchemas(SSmlHandle *info) {
           if (i < pTableMeta->tableInfo.numOfColumns) {
             taosArrayPush(pColumns, &field);
           } else {
-            uError("SML:0x%" PRIx64 "field name:%s, bytes:%d", info->id, field.name, field.bytes);
             taosArrayPush(pTags, &field);
           }
         }
@@ -1074,7 +1073,6 @@ void smlDestroyInfo(SSmlHandle *info) {
   taosArrayDestroy(info->valueJsonArray);
 
   taosArrayDestroy(info->preLineTagKV);
-  taosArrayDestroy(info->preLineColKV);
 
   if (!info->dataFormat) {
     for (int i = 0; i < info->lineNum; i++) {
@@ -1117,7 +1115,6 @@ SSmlHandle *smlBuildSmlInfo(TAOS *taos) {
   info->tagJsonArray = taosArrayInit(8, POINTER_BYTES);
   info->valueJsonArray = taosArrayInit(8, POINTER_BYTES);
   info->preLineTagKV = taosArrayInit(8, sizeof(SSmlKv));
-  info->preLineColKV = taosArrayInit(8, sizeof(SSmlKv));
 
   if (NULL == info->pVgHash || NULL == info->childTables || NULL == info->superTables) {
     uError("create SSmlHandle failed");
diff --git a/source/client/src/clientSmlJson.c b/source/client/src/clientSmlJson.c
index 22fd762960..da82d43950 100644
--- a/source/client/src/clientSmlJson.c
+++ b/source/client/src/clientSmlJson.c
@@ -686,7 +686,7 @@ static int32_t smlParseTagsFromJSON(SSmlHandle *info, cJSON *tags, SSmlLineInfo
   if (info->dataFormat) {
     if (unlikely(!isSameMeasure)) {
       SSmlSTableMeta **tmp = (SSmlSTableMeta **)taosHashGet(info->superTables, elements->measure, elements->measureLen);
-      SSmlSTableMeta  *sMeta = NULL;
+      SSmlSTableMeta *sMeta = NULL;
       if (unlikely(tmp == NULL)) {
         STableMeta *pTableMeta = smlGetMeta(info, elements->measure, elements->measureLen);
         if (pTableMeta == NULL) {
@@ -697,12 +697,12 @@ static int32_t smlParseTagsFromJSON(SSmlHandle *info, cJSON *tags, SSmlLineInfo
         sMeta = smlBuildSTableMeta(info->dataFormat);
         sMeta->tableMeta = pTableMeta;
         taosHashPut(info->superTables, elements->measure, elements->measureLen, &sMeta, POINTER_BYTES);
-        tmp = &sMeta;
         for(int i = pTableMeta->tableInfo.numOfColumns; i < pTableMeta->tableInfo.numOfTags + pTableMeta->tableInfo.numOfColumns; i++){
           SSchema *tag = pTableMeta->schema + i;
           SSmlKv kv = {.key = tag->name, .keyLen = strlen(tag->name), .type = tag->type, .length = (tag->bytes - VARSTR_HEADER_SIZE) / TSDB_NCHAR_SIZE };
           taosArrayPush(sMeta->tags, &kv);
         }
+        tmp = &sMeta;
       }
       info->currSTableMeta = (*tmp)->tableMeta;
       info->maxTagKVs = (*tmp)->tags;
diff --git a/source/client/src/clientSmlLine.c b/source/client/src/clientSmlLine.c
index c2fe69c875..66f1316cd5 100644
--- a/source/client/src/clientSmlLine.c
+++ b/source/client/src/clientSmlLine.c
@@ -149,6 +149,7 @@ static int32_t smlParseTagKv(SSmlHandle *info, char **sql, char *sqlEnd, SSmlLin
       SSmlSTableMeta **tmp =
           (SSmlSTableMeta **)taosHashGet(info->superTables, currElement->measure, currElement->measureLen);
 
+      SSmlSTableMeta *sMeta = NULL;
       if (unlikely(tmp == NULL)) {
         STableMeta *pTableMeta = smlGetMeta(info, currElement->measure, currElement->measureLen);
         if (pTableMeta == NULL) {
@@ -156,16 +157,15 @@ static int32_t smlParseTagKv(SSmlHandle *info, char **sql, char *sqlEnd, SSmlLin
           info->reRun = true;
           return TSDB_CODE_SUCCESS;
         }
-        SSmlSTableMeta *sMeta = smlBuildSTableMeta(info->dataFormat);
+        sMeta = smlBuildSTableMeta(info->dataFormat);
         sMeta->tableMeta = pTableMeta;
         taosHashPut(info->superTables, currElement->measure, currElement->measureLen, &sMeta, POINTER_BYTES);
-        tmp = &sMeta;
-
         for(int i = pTableMeta->tableInfo.numOfColumns; i < pTableMeta->tableInfo.numOfTags + pTableMeta->tableInfo.numOfColumns; i++){
           SSchema *tag = pTableMeta->schema + i;
           SSmlKv kv = {.key = tag->name, .keyLen = strlen(tag->name), .type = tag->type, .length = (tag->bytes - VARSTR_HEADER_SIZE) / TSDB_NCHAR_SIZE };
           taosArrayPush(sMeta->tags, &kv);
         }
+        tmp = &sMeta;
       }
       info->currSTableMeta = (*tmp)->tableMeta;
       info->maxTagKVs = (*tmp)->tags;
@@ -305,9 +305,6 @@ static int32_t smlParseTagKv(SSmlHandle *info, char **sql, char *sqlEnd, SSmlLin
 static int32_t smlParseColKv(SSmlHandle *info, char **sql, char *sqlEnd, SSmlLineInfo *currElement, bool isSameMeasure,
                              bool isSameCTable) {
   int     cnt = 0;
-  SArray *preLineKV = info->preLineColKV;
-  bool    isSuperKVInit = true;
-  SArray *superKV = NULL;
   if (info->dataFormat) {
     if (unlikely(!isSameCTable)) {
       SSmlTableInfo **oneTable =
@@ -322,7 +319,6 @@ static int32_t smlParseColKv(SSmlHandle *info, char **sql, char *sqlEnd, SSmlLin
     if (unlikely(!isSameMeasure)) {
       SSmlSTableMeta **tmp =
           (SSmlSTableMeta **)taosHashGet(info->superTables, currElement->measure, currElement->measureLen);
-      SSmlSTableMeta *sMeta = NULL;
       if (unlikely(tmp == NULL)) {
         STableMeta *pTableMeta = smlGetMeta(info, currElement->measure, currElement->measureLen);
         if (pTableMeta == NULL) {
@@ -330,17 +326,23 @@ static int32_t smlParseColKv(SSmlHandle *info, char **sql, char *sqlEnd, SSmlLin
           info->reRun = true;
           return TSDB_CODE_SUCCESS;
         }
-        sMeta = smlBuildSTableMeta(info->dataFormat);
-        sMeta->tableMeta = pTableMeta;
-        taosHashPut(info->superTables, currElement->measure, currElement->measureLen, &sMeta, POINTER_BYTES);
-        tmp = &sMeta;
+        *tmp = smlBuildSTableMeta(info->dataFormat);
+        (*tmp)->tableMeta = pTableMeta;
+        taosHashPut(info->superTables, currElement->measure, currElement->measureLen, tmp, POINTER_BYTES);
+
+        for(int i = 0; i < pTableMeta->tableInfo.numOfColumns; i++){
+          SSchema *tag = pTableMeta->schema + i;
+          SSmlKv kv = {.key = tag->name, .keyLen = strlen(tag->name), .type = tag->type };
+          if(tag->type == TSDB_DATA_TYPE_NCHAR){
+            kv.length = (tag->bytes - VARSTR_HEADER_SIZE) / TSDB_NCHAR_SIZE;
+          }else if(tag->type == TSDB_DATA_TYPE_BINARY){
+            kv.length = tag->bytes - VARSTR_HEADER_SIZE;
+          }
+          taosArrayPush((*tmp)->cols, &kv);
+        }
       }
       info->currSTableMeta = (*tmp)->tableMeta;
-      superKV = (*tmp)->cols;
-      if (unlikely(taosArrayGetSize(superKV) == 0)) {
-        isSuperKVInit = false;
-      }
-      taosArrayClear(preLineKV);
+      info->masColKVs = (*tmp)->cols;
     }
   }
 
@@ -439,69 +441,26 @@ static int32_t smlParseColKv(SSmlHandle *info, char **sql, char *sqlEnd, SSmlLin
         info->reRun = true;
         return TSDB_CODE_SUCCESS;
       }
+      if (cnt >= taosArrayGetSize(info->masColKVs)) {
+        info->dataFormat = false;
+        info->reRun = true;
+        return TSDB_CODE_SUCCESS;
+      }
+      SSmlKv *maxKV = (SSmlKv *)taosArrayGet(info->masColKVs, cnt);
+      if (kv.type != maxKV->type) {
+        info->dataFormat = false;
+        info->reRun = true;
+        return TSDB_CODE_SUCCESS;
+      }
+      if (unlikely(!IS_SAME_KEY)) {
+        info->dataFormat = false;
+        info->reRun = true;
+        return TSDB_CODE_SUCCESS;
+      }
 
-      if (isSameMeasure) {
-        if (cnt >= taosArrayGetSize(preLineKV)) {
-          info->dataFormat = false;
-          info->reRun = true;
-          return TSDB_CODE_SUCCESS;
-        }
-        SSmlKv *maxKV = (SSmlKv *)taosArrayGet(preLineKV, cnt);
-        if (kv.type != maxKV->type) {
-          info->dataFormat = false;
-          info->reRun = true;
-          return TSDB_CODE_SUCCESS;
-        }
-
-        if (unlikely(IS_VAR_DATA_TYPE(kv.type) && kv.length > maxKV->length)) {
-          maxKV->length = kv.length;
-          SSmlSTableMeta **tableMeta =
-              (SSmlSTableMeta **)taosHashGet(info->superTables, currElement->measure, currElement->measureLen);
-          if (unlikely(NULL == tableMeta)) {
-            uError("SML:0x%" PRIx64 " NULL == tableMeta", info->id);
-            return TSDB_CODE_SML_INTERNAL_ERROR;
-          }
-
-          SSmlKv *oldKV = (SSmlKv *)taosArrayGet((*tableMeta)->cols, cnt);
-          oldKV->length = kv.length;
-          info->needModifySchema = true;
-        }
-        if (unlikely(!IS_SAME_KEY)) {
-          info->dataFormat = false;
-          info->reRun = true;
-          return TSDB_CODE_SUCCESS;
-        }
-      } else {
-        if (isSuperKVInit) {
-          if (unlikely(cnt >= taosArrayGetSize(superKV))) {
-            info->dataFormat = false;
-            info->reRun = true;
-            return TSDB_CODE_SUCCESS;
-          }
-          SSmlKv *maxKV = (SSmlKv *)taosArrayGet(superKV, cnt);
-          if (unlikely(kv.type != maxKV->type)) {
-            info->dataFormat = false;
-            info->reRun = true;
-            return TSDB_CODE_SUCCESS;
-          }
-
-          if (IS_VAR_DATA_TYPE(kv.type)) {
-            if (kv.length > maxKV->length) {
-              maxKV->length = kv.length;
-            } else {
-              kv.length = maxKV->length;
-            }
-            info->needModifySchema = true;
-          }
-          if (unlikely(!IS_SAME_KEY)) {
-            info->dataFormat = false;
-            info->reRun = true;
-            return TSDB_CODE_SUCCESS;
-          }
-        } else {
-          taosArrayPush(superKV, &kv);
-        }
-        taosArrayPush(preLineKV, &kv);
+      if (unlikely(IS_VAR_DATA_TYPE(kv.type) && kv.length > maxKV->length)) {
+        maxKV->length = kv.length;
+        info->needModifySchema = true;
       }
     } else {
       if (currElement->colArray == NULL) {
diff --git a/source/client/src/clientSmlTelnet.c b/source/client/src/clientSmlTelnet.c
index 9201412cbd..ccf79cfc64 100644
--- a/source/client/src/clientSmlTelnet.c
+++ b/source/client/src/clientSmlTelnet.c
@@ -82,7 +82,7 @@ static int32_t smlParseTelnetTags(SSmlHandle *info, char *data, char *sqlEnd, SS
   if (info->dataFormat) {
     if (!isSameMeasure) {
       SSmlSTableMeta **tmp = (SSmlSTableMeta **)taosHashGet(info->superTables, elements->measure, elements->measureLen);
-      SSmlSTableMeta * sMeta = NULL;
+      SSmlSTableMeta *sMeta = NULL;
       if (unlikely(tmp == NULL)) {
         STableMeta *pTableMeta = smlGetMeta(info, elements->measure, elements->measureLen);
         if (pTableMeta == NULL) {
@@ -93,12 +93,12 @@ static int32_t smlParseTelnetTags(SSmlHandle *info, char *data, char *sqlEnd, SS
         sMeta = smlBuildSTableMeta(info->dataFormat);
         sMeta->tableMeta = pTableMeta;
         taosHashPut(info->superTables, elements->measure, elements->measureLen, &sMeta, POINTER_BYTES);
-        tmp = &sMeta;
         for(int i = pTableMeta->tableInfo.numOfColumns; i < pTableMeta->tableInfo.numOfTags + pTableMeta->tableInfo.numOfColumns; i++){
           SSchema *tag = pTableMeta->schema + i;
           SSmlKv kv = {.key = tag->name, .keyLen = strlen(tag->name), .type = tag->type, .length = (tag->bytes - VARSTR_HEADER_SIZE) / TSDB_NCHAR_SIZE };
           taosArrayPush(sMeta->tags, &kv);
         }
+        tmp = &sMeta;
       }
       info->currSTableMeta = (*tmp)->tableMeta;
       info->maxTagKVs = (*tmp)->tags;