From a1fbf769a824df548bc794b8935def5a018f9e05 Mon Sep 17 00:00:00 2001
From: wangmm0220 <wangmm0220@gmail.com>
Date: Mon, 9 Sep 2024 17:15:07 +0800
Subject: [PATCH] enh:[TD-30270]opti data struct in tmq

---
 include/common/tmsg.h         | 27 ---------------------------
 source/client/inc/clientInt.h | 24 ++++++++++++------------
 2 files changed, 12 insertions(+), 39 deletions(-)

diff --git a/include/common/tmsg.h b/include/common/tmsg.h
index c5b70d0175..8962265fa2 100644
--- a/include/common/tmsg.h
+++ b/include/common/tmsg.h
@@ -649,20 +649,6 @@ void tFreeSSubmitRsp(SSubmitRsp* pRsp);
     (s)->flags &= (~COL_IDX_ON); \
   } while (0)
 
-enum {
-  RES_TYPE__QUERY = 1,
-  RES_TYPE__TMQ,
-  RES_TYPE__TMQ_META,
-  RES_TYPE__TMQ_METADATA,
-  RES_TYPE__TMQ_BATCH_META,
-};
-
-#define TD_RES_QUERY(res)          (*(int8_t*)(res) == RES_TYPE__QUERY)
-#define TD_RES_TMQ(res)            (*(int8_t*)(res) == RES_TYPE__TMQ)
-#define TD_RES_TMQ_META(res)       (*(int8_t*)(res) == RES_TYPE__TMQ_META)
-#define TD_RES_TMQ_METADATA(res)   (*(int8_t*)(res) == RES_TYPE__TMQ_METADATA)
-#define TD_RES_TMQ_BATCH_META(res) (*(int8_t*)(res) == RES_TYPE__TMQ_BATCH_META)
-
 #define SSCHMEA_TYPE(s)  ((s)->type)
 #define SSCHMEA_FLAGS(s) ((s)->flags)
 #define SSCHMEA_COLID(s) ((s)->colId)
@@ -4056,19 +4042,6 @@ void    tDeleteMqMetaRsp(SMqMetaRsp* pRsp);
 
 #define MQ_DATA_RSP_VERSION 100
 
-//typedef struct {
-//  SMqRspHead   head;
-//  STqOffsetVal rspOffset;
-//  STqOffsetVal reqOffset;
-//  int32_t      blockNum;
-//  int8_t       withTbName;
-//  int8_t       withSchema;
-//  SArray*      blockDataLen;
-//  SArray*      blockData;
-//  SArray*      blockTbName;
-//  SArray*      blockSchema;
-//} SMqDataRspCommon;
-
 typedef struct {
   struct {
     SMqRspHead   head;
diff --git a/source/client/inc/clientInt.h b/source/client/inc/clientInt.h
index b198762733..afb0686845 100644
--- a/source/client/inc/clientInt.h
+++ b/source/client/inc/clientInt.h
@@ -39,24 +39,24 @@ extern "C" {
 #define ERROR_MSG_BUF_DEFAULT_SIZE 512
 #define HEARTBEAT_INTERVAL         1500  // ms
 
-//enum {
-//  RES_TYPE__QUERY = 1,
-//  RES_TYPE__TMQ,
-//  RES_TYPE__TMQ_META,
-//  RES_TYPE__TMQ_METADATA,
-//  RES_TYPE__TMQ_BATCH_META,
-//};
+enum {
+  RES_TYPE__QUERY = 1,
+  RES_TYPE__TMQ,
+  RES_TYPE__TMQ_META,
+  RES_TYPE__TMQ_METADATA,
+  RES_TYPE__TMQ_BATCH_META,
+};
 
 #define SHOW_VARIABLES_RESULT_COLS       3
 #define SHOW_VARIABLES_RESULT_FIELD1_LEN (TSDB_CONFIG_OPTION_LEN + VARSTR_HEADER_SIZE)
 #define SHOW_VARIABLES_RESULT_FIELD2_LEN (TSDB_CONFIG_VALUE_LEN + VARSTR_HEADER_SIZE)
 #define SHOW_VARIABLES_RESULT_FIELD3_LEN (TSDB_CONFIG_SCOPE_LEN + VARSTR_HEADER_SIZE)
 
-//#define TD_RES_QUERY(res)          (*(int8_t*)(res) == RES_TYPE__QUERY)
-//#define TD_RES_TMQ(res)            (*(int8_t*)(res) == RES_TYPE__TMQ)
-//#define TD_RES_TMQ_META(res)       (*(int8_t*)(res) == RES_TYPE__TMQ_META)
-//#define TD_RES_TMQ_METADATA(res)   (*(int8_t*)(res) == RES_TYPE__TMQ_METADATA)
-//#define TD_RES_TMQ_BATCH_META(res) (*(int8_t*)(res) == RES_TYPE__TMQ_BATCH_META)
+#define TD_RES_QUERY(res)          (*(int8_t*)(res) == RES_TYPE__QUERY)
+#define TD_RES_TMQ(res)            (*(int8_t*)(res) == RES_TYPE__TMQ)
+#define TD_RES_TMQ_META(res)       (*(int8_t*)(res) == RES_TYPE__TMQ_META)
+#define TD_RES_TMQ_METADATA(res)   (*(int8_t*)(res) == RES_TYPE__TMQ_METADATA)
+#define TD_RES_TMQ_BATCH_META(res) (*(int8_t*)(res) == RES_TYPE__TMQ_BATCH_META)
 
 typedef struct SAppInstInfo SAppInstInfo;