diff --git a/src/common/inc/tdataformat.h b/src/common/inc/tdataformat.h
index 1cd72eafdedd512bb2d675613b178252efe5d5b2..da2f07da0444e3079784fb0587894b16ef84224f 100644
--- a/src/common/inc/tdataformat.h
+++ b/src/common/inc/tdataformat.h
@@ -272,7 +272,7 @@ typedef struct {
   int16_t offset;
 } SColIdx;
 
-#define TD_KV_ROW_HEAD_SIZE 2 * sizeof(int16_t)
+#define TD_KV_ROW_HEAD_SIZE (2 * sizeof(int16_t))
 
 #define kvRowLen(r) (*(int16_t *)(r))
 #define kvRowNCols(r) (*(int16_t *)POINTER_SHIFT(r, sizeof(int16_t)))
diff --git a/src/inc/taosmsg.h b/src/inc/taosmsg.h
index 13fa799b3fedaba096467757746f59b9a15a8ec6..cb25242d27d3f8e50af643df3c447c7aaae76484 100644
--- a/src/inc/taosmsg.h
+++ b/src/inc/taosmsg.h
@@ -26,6 +26,7 @@ extern "C" {
 #include "taosdef.h"
 #include "taoserror.h"
 #include "trpc.h"
+#include "tdataformat.h"
 
 // message type
 
@@ -674,7 +675,7 @@ typedef struct SMultiTableMeta {
 typedef struct {
   int32_t dataLen;
   char name[TSDB_TABLE_ID_LEN];
-  char data[TSDB_MAX_TAGS_LEN];
+  char data[TSDB_MAX_TAGS_LEN + TD_KV_ROW_HEAD_SIZE + sizeof(SColIdx) * TSDB_MAX_TAGS];
 } STagData;
 
 /*