From 607d5c451920032f93abea6e2482c99f5c7d1d3a Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Tue, 10 May 2022 06:07:03 +0000
Subject: [PATCH] refact

---
 include/common/tmsg.h                 | 4 ++--
 source/common/src/tmsg.c              | 4 ++--
 source/dnode/vnode/src/vnd/vnodeSvr.c | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/include/common/tmsg.h b/include/common/tmsg.h
index e6aaff211b..73d5c4fd90 100644
--- a/include/common/tmsg.h
+++ b/include/common/tmsg.h
@@ -255,8 +255,8 @@ typedef struct {
   int8_t  hashMeta;
   int64_t uid;
   union {
-    char*       name;
-    const char* namec;
+    char*       ename; // used for encode
+    const char* dname; // used for decode
   };
   int32_t numOfRows;
   int32_t affectedRows;
diff --git a/source/common/src/tmsg.c b/source/common/src/tmsg.c
index 679ec5892d..8656ee3eb0 100644
--- a/source/common/src/tmsg.c
+++ b/source/common/src/tmsg.c
@@ -4020,7 +4020,7 @@ static int32_t tEncodeSSubmitBlkRsp(SEncoder *pEncoder, const SSubmitBlkRsp *pBl
   if (tEncodeI8(pEncoder, pBlock->hashMeta) < 0) return -1;
   if (pBlock->hashMeta) {
     if (tEncodeI64(pEncoder, pBlock->uid) < 0) return -1;
-    if (tEncodeCStr(pEncoder, pBlock->name) < 0) return -1;
+    if (tEncodeCStr(pEncoder, pBlock->ename) < 0) return -1;
   }
   if (tEncodeI32v(pEncoder, pBlock->numOfRows) < 0) return -1;
   if (tEncodeI32v(pEncoder, pBlock->affectedRows) < 0) return -1;
@@ -4035,7 +4035,7 @@ static int32_t tDecodeSSubmitBlkRsp(SDecoder *pDecoder, SSubmitBlkRsp *pBlock) {
   if (tDecodeI8(pDecoder, &pBlock->hashMeta) < 0) return -1;
   if (pBlock->hashMeta) {
     if (tDecodeI64(pDecoder, &pBlock->uid) < 0) return -1;
-    if (tDecodeCStr(pDecoder, &pBlock->namec) < 0) return -1;
+    if (tDecodeCStr(pDecoder, &pBlock->dname) < 0) return -1;
   }
   if (tDecodeI32v(pDecoder, &pBlock->numOfRows) < 0) return -1;
   if (tDecodeI32v(pDecoder, &pBlock->affectedRows) < 0) return -1;
diff --git a/source/dnode/vnode/src/vnd/vnodeSvr.c b/source/dnode/vnode/src/vnd/vnodeSvr.c
index 7692b7084d..678c9edbd4 100644
--- a/source/dnode/vnode/src/vnd/vnodeSvr.c
+++ b/source/dnode/vnode/src/vnd/vnodeSvr.c
@@ -589,8 +589,8 @@ static int vnodeProcessSubmitReq(SVnode *pVnode, int64_t version, void *pReq, in
       }
 
       submitBlkRsp.uid = createTbReq.uid;
-      submitBlkRsp.name = taosMemoryMalloc(strlen(pVnode->config.dbname) + strlen(createTbReq.name) + 2);
-      sprintf(submitBlkRsp.name, "%s.%s", pVnode->config.dbname, createTbReq.name);
+      submitBlkRsp.ename = taosMemoryMalloc(strlen(pVnode->config.dbname) + strlen(createTbReq.name) + 2);
+      sprintf(submitBlkRsp.ename, "%s.%s", pVnode->config.dbname, createTbReq.name);
 
       msgIter.uid = createTbReq.uid;
       if (createTbReq.type == TSDB_CHILD_TABLE) {
@@ -621,7 +621,7 @@ _exit:
   tEncoderClear(&encoder);
 
   for (int32_t i = 0; i < taosArrayGetSize(submitRsp.pArray); i++) {
-    taosMemoryFree(((SSubmitBlkRsp *)taosArrayGet(submitRsp.pArray, i))[0].name);
+    taosMemoryFree(((SSubmitBlkRsp *)taosArrayGet(submitRsp.pArray, i))[0].ename);
   }
 
   taosArrayDestroy(submitRsp.pArray);
-- 
GitLab