diff --git a/include/common/tmsg.h b/include/common/tmsg.h
index eefb35a4e6831743a3c15be0700b3ade4043c397..66afd172bded790a950f0d52d3d66e41ca7a0332 100644
--- a/include/common/tmsg.h
+++ b/include/common/tmsg.h
@@ -308,7 +308,7 @@ struct SSchema {
   int8_t   flags;
   col_id_t colId;
   int32_t  bytes;
-  char     name[TSDB_COL_NAME_LEN + TSDB_TABLE_NAME_LEN + TSDB_NAME_DELIMITER_LEN];
+  char     name[TSDB_COL_FNAME_LEN];
 };
 
 struct SSchema2 {
@@ -316,8 +316,8 @@ struct SSchema2 {
   int8_t   flags;
   col_id_t colId;
   int32_t  bytes;
-  char     name[TSDB_COL_NAME_LEN];
-  char     alias[TSDB_COL_NAME_LEN];
+  char     name[TSDB_COL_FNAME_LEN];
+  char     alias[TSDB_COL_FNAME_LEN];
 };
 
 typedef struct {
diff --git a/include/libs/nodes/querynodes.h b/include/libs/nodes/querynodes.h
index 24fd06ae2d7bb437485f1cf84d9317618e98315d..e07cdb652cd2740f7122ea8ea7b712b0c49613a9 100644
--- a/include/libs/nodes/querynodes.h
+++ b/include/libs/nodes/querynodes.h
@@ -47,8 +47,8 @@ typedef struct SDataType {
 typedef struct SExprNode {
   ENodeType type;
   SDataType resType;
-  char      aliasName[TSDB_TABLE_NAME_LEN + TSDB_COL_NAME_LEN + TSDB_NAME_DELIMITER_LEN];
-  char      userAlias[TSDB_TABLE_NAME_LEN + TSDB_COL_NAME_LEN + TSDB_NAME_DELIMITER_LEN];
+  char      aliasName[TSDB_COL_FNAME_LEN];
+  char      userAlias[TSDB_COL_FNAME_LEN];
   SArray*   pAssociation;
   bool      orderAlias;
   bool      asAlias;
@@ -76,7 +76,7 @@ typedef struct SColumnNode {
   char        dbName[TSDB_DB_NAME_LEN];
   char        tableName[TSDB_TABLE_NAME_LEN];
   char        tableAlias[TSDB_TABLE_NAME_LEN];
-  char        colName[TSDB_COL_NAME_LEN];
+  char        colName[TSDB_COL_FNAME_LEN];
   int16_t     dataBlockId;
   int16_t     slotId;
 } SColumnNode;
diff --git a/include/util/tdef.h b/include/util/tdef.h
index e4af88bf10291235e07ae7b18674fa064b054683..0a0fe2244954b6b57329b676fde0502117eb1928 100644
--- a/include/util/tdef.h
+++ b/include/util/tdef.h
@@ -223,6 +223,7 @@ typedef enum ELogicConditionType {
 #define TSDB_SUBSCRIBE_KEY_LEN   (TSDB_CGROUP_LEN + TSDB_TOPIC_FNAME_LEN + 2)
 #define TSDB_PARTITION_KEY_LEN   (TSDB_SUBSCRIBE_KEY_LEN + 20)
 #define TSDB_COL_NAME_LEN        65
+#define TSDB_COL_FNAME_LEN       (TSDB_TABLE_NAME_LEN + TSDB_COL_NAME_LEN + TSDB_NAME_DELIMITER_LEN)
 #define TSDB_MAX_SAVED_SQL_LEN   TSDB_MAX_COLUMNS * 64
 #define TSDB_MAX_SQL_LEN         TSDB_PAYLOAD_SIZE
 #define TSDB_MAX_SQL_SHOW_LEN    1024
diff --git a/source/libs/planner/src/planPhysiCreater.c b/source/libs/planner/src/planPhysiCreater.c
index 06859e195dd8fcb2d2077916e6048a1f0ae7168c..3fbb032728fa3d06101fb4ab0a5e4ffe9e830da7 100644
--- a/source/libs/planner/src/planPhysiCreater.c
+++ b/source/libs/planner/src/planPhysiCreater.c
@@ -136,7 +136,7 @@ static int32_t buildDataBlockSlots(SPhysiPlanContext* pCxt, SNodeList* pList, SD
   int16_t slotId = 0;
   SNode*  pNode = NULL;
   FOREACH(pNode, pList) {
-    char name[TSDB_TABLE_NAME_LEN + TSDB_COL_NAME_LEN];
+    char name[TSDB_COL_FNAME_LEN] = {0};
     getSlotKey(pNode, NULL, name);
     code = nodesListStrictAppend(pDataBlockDesc->pSlots, createSlotDesc(pCxt, name, pNode, slotId, true, false));
     if (TSDB_CODE_SUCCESS == code) {