diff --git a/include/common/tmsg.h b/include/common/tmsg.h
index 795e1abc0a..abf35c67cc 100644
--- a/include/common/tmsg.h
+++ b/include/common/tmsg.h
@@ -301,8 +301,7 @@ struct SSchema2 {
   int32_t  bytes;
   char     name[TSDB_COL_NAME_LEN];
   char     alias[TSDB_COL_NAME_LEN];
-
-}
+};
 
 typedef struct {
   char     tbName[TSDB_TABLE_NAME_LEN];
@@ -356,14 +355,9 @@ void    tFreeSSubmitRsp(SSubmitRsp* pRsp);
 #define COL_IS_SET(FLG)  (((FLG) & (COL_SET_VAL | COL_SET_NULL)) != 0)
 #define COL_CLR_SET(FLG) ((FLG) &= (~(COL_SET_VAL | COL_SET_NULL)))
 
-<<<<<<< HEAD
-#define IS_BSMA_ON(s) (((s)->flags & 0x01) == COL_SMA_ON)
-#define IS_IDX_ON(s)  (((s)->flags & 0x2) == COL_IDX_ON)
-    == == ==
-    =
 #define IS_BSMA_ON(s)  (((s)->flags & 0x01) == COL_SMA_ON)
+#define IS_IDX_ON(s)   (((s)->flags & 0x2) == COL_IDX_ON)
 #define IS_SET_NULL(s) (((s)->flags & COL_SET_NULL) == COL_SET_NULL)
-        >>>>>>> origin / 3.0
 
 #define SSCHMEA_TYPE(s)  ((s)->type)
 #define SSCHMEA_FLAGS(s) ((s)->flags)
@@ -371,7 +365,7 @@ void    tFreeSSubmitRsp(SSubmitRsp* pRsp);
 #define SSCHMEA_BYTES(s) ((s)->bytes)
 #define SSCHMEA_NAME(s)  ((s)->name)
 
-                    typedef struct {
+typedef struct {
   int32_t  nCols;
   int32_t  version;
   SSchema* pSchema;
diff --git a/include/util/taoserror.h b/include/util/taoserror.h
index 52d8a75ee0..b57a94e0c1 100644
--- a/include/util/taoserror.h
+++ b/include/util/taoserror.h
@@ -252,6 +252,7 @@ int32_t* taosGetErrno();
 #define TSDB_CODE_MND_INVALID_STB_OPTION        TAOS_DEF_ERROR_CODE(0, 0x036E)
 #define TSDB_CODE_MND_INVALID_ROW_BYTES         TAOS_DEF_ERROR_CODE(0, 0x036F)
 
+
 // mnode-func
 #define TSDB_CODE_MND_INVALID_FUNC_NAME         TAOS_DEF_ERROR_CODE(0, 0x0370)
 // #define TSDB_CODE_MND_INVALID_FUNC_LEN       TAOS_DEF_ERROR_CODE(0, 0x0371) // 2.x
@@ -263,6 +264,9 @@ int32_t* taosGetErrno();
 // #define TSDB_CODE_MND_INVALID_COLUMN_LENGTH  TAOS_DEF_ERROR_CODE(0, 0x0377) // 2.x
 #define TSDB_CODE_MND_INVALID_FUNC_COMMENT      TAOS_DEF_ERROR_CODE(0, 0x0378)
 #define TSDB_CODE_MND_INVALID_FUNC_RETRIEVE     TAOS_DEF_ERROR_CODE(0, 0x0379)
+#define TSDB_CODE_MND_TAG_INDEX_ALREADY_EXIST    TAOS_DEF_ERROR_CODE(0,0x037A)  
+ 
+  
 
 // mnode-db
 #define TSDB_CODE_MND_DB_NOT_SELECTED           TAOS_DEF_ERROR_CODE(0, 0x0380)
diff --git a/source/libs/parser/src/parTranslater.c b/source/libs/parser/src/parTranslater.c
index ccc2f22320..443eefa134 100644
--- a/source/libs/parser/src/parTranslater.c
+++ b/source/libs/parser/src/parTranslater.c
@@ -5344,6 +5344,14 @@ static int32_t buildCreateTagIndexReq(STranslateContext* pCxt, SCreateIndexStmt*
   memset(&name, 0, sizeof(SName));
 
   tNameExtractFullName(toName(pCxt->pParseCxt->acctId, pStmt->dbName, pStmt->tableName, &name), pReq->stbName);
+
+  SNode* pNode = NULL;
+  ASSERT(LIST_LENGTH(pStmt->pCols) == 1);
+  FOREACH(pNode, pStmt->pCols) {
+    SColumnNode* p = (SColumnNode*)pNode;
+    memcpy(pReq->colName, p->colName, sizeof(p->colName));
+  }
+
   // impl later
   return TSDB_CODE_SUCCESS;
 }
diff --git a/source/util/src/terror.c b/source/util/src/terror.c
index bab3edc870..5d3843ffb4 100644
--- a/source/util/src/terror.c
+++ b/source/util/src/terror.c
@@ -207,6 +207,9 @@ TAOS_DEFINE_ERROR(TSDB_CODE_MND_INVALID_FUNC_BUFSIZE,     "Invalid func bufSize"
 TAOS_DEFINE_ERROR(TSDB_CODE_MND_INVALID_FUNC_COMMENT,     "Invalid func comment")
 TAOS_DEFINE_ERROR(TSDB_CODE_MND_INVALID_FUNC_RETRIEVE,    "Invalid func retrieve msg")
 
+TAOS_DEFINE_ERROR(TSDB_CODE_MND_TAG_INDEX_ALREADY_EXIST,  "Tag index already exists")
+
+
 // mnode-db
 TAOS_DEFINE_ERROR(TSDB_CODE_MND_DB_NOT_SELECTED,          "Database not specified or available")
 TAOS_DEFINE_ERROR(TSDB_CODE_MND_DB_ALREADY_EXIST,         "Database already exists")