diff --git a/include/common/tmsg.h b/include/common/tmsg.h
index d92efd163d..ae3586e735 100644
--- a/include/common/tmsg.h
+++ b/include/common/tmsg.h
@@ -804,8 +804,8 @@ typedef struct {
   int8_t   update;
   int32_t  sversion;
   int32_t  tversion;
-  int64_t  suid;
-  int64_t  tuid;
+  uint64_t suid;
+  uint64_t tuid;
   int32_t  vgId;
   SSchema* pSchemas;
 } STableMetaRsp;
diff --git a/include/common/tmsgdef.h b/include/common/tmsgdef.h
index b20d6de556..18718b0c52 100644
--- a/include/common/tmsgdef.h
+++ b/include/common/tmsgdef.h
@@ -194,4 +194,3 @@ enum {
   TDMT_MAX
 #endif
 };
-// clang-format on
diff --git a/include/util/tdef.h b/include/util/tdef.h
index 7ea574f398..d0f2b77f1f 100644
--- a/include/util/tdef.h
+++ b/include/util/tdef.h
@@ -14,6 +14,7 @@
  */
 
 // clang-format off
+
 #ifndef _TD_UTIL_DEF_H
 #define _TD_UTIL_DEF_H
 
diff --git a/source/common/src/tmsg.c b/source/common/src/tmsg.c
index f07cc0b0b5..8101c18ebf 100644
--- a/source/common/src/tmsg.c
+++ b/source/common/src/tmsg.c
@@ -1669,8 +1669,8 @@ static int32_t tEncodeSTableMetaRsp(SCoder *pEncoder, STableMetaRsp *pRsp) {
   if (tEncodeI8(pEncoder, pRsp->update) < 0) return -1;
   if (tEncodeI32(pEncoder, pRsp->sversion) < 0) return -1;
   if (tEncodeI32(pEncoder, pRsp->tversion) < 0) return -1;
-  if (tEncodeI64(pEncoder, pRsp->suid) < 0) return -1;
-  if (tEncodeI64(pEncoder, pRsp->tuid) < 0) return -1;
+  if (tEncodeU64(pEncoder, pRsp->suid) < 0) return -1;
+  if (tEncodeU64(pEncoder, pRsp->tuid) < 0) return -1;
   if (tEncodeI32(pEncoder, pRsp->vgId) < 0) return -1;
   for (int32_t i = 0; i < pRsp->numOfColumns + pRsp->numOfTags; ++i) {
     SSchema *pSchema = &pRsp->pSchemas[i];
@@ -1692,8 +1692,8 @@ static int32_t tDecodeSTableMetaRsp(SCoder *pDecoder, STableMetaRsp *pRsp) {
   if (tDecodeI8(pDecoder, &pRsp->update) < 0) return -1;
   if (tDecodeI32(pDecoder, &pRsp->sversion) < 0) return -1;
   if (tDecodeI32(pDecoder, &pRsp->tversion) < 0) return -1;
-  if (tDecodeI64(pDecoder, &pRsp->suid) < 0) return -1;
-  if (tDecodeI64(pDecoder, &pRsp->tuid) < 0) return -1;
+  if (tDecodeU64(pDecoder, &pRsp->suid) < 0) return -1;
+  if (tDecodeU64(pDecoder, &pRsp->tuid) < 0) return -1;
   if (tDecodeI32(pDecoder, &pRsp->vgId) < 0) return -1;
 
   int32_t totalCols = pRsp->numOfTags + pRsp->numOfColumns;