From fb059dbdd07e93da2eb932e55ca2280a264eb057 Mon Sep 17 00:00:00 2001
From: yihaoDeng <luomoxyz@126.com>
Date: Sun, 29 Sep 2024 13:40:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/3.0' into
 enh/opt-transport

---
 include/common/tmsg.h                 | 10 ++++++++--
 source/libs/transport/inc/transComm.h |  6 ------
 source/libs/transport/src/transComm.c |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/include/common/tmsg.h b/include/common/tmsg.h
index bc61e21d16..2a61d34ef4 100644
--- a/include/common/tmsg.h
+++ b/include/common/tmsg.h
@@ -971,6 +971,12 @@ typedef struct SEpSet {
   SEp    eps[TSDB_MAX_REPLICA];
 } SEpSet;
 
+typedef struct {
+  int8_t inUse;
+  int8_t numOfEps;
+  SEp    eps[];
+} SReqEpSet;
+
 int32_t tEncodeSEpSet(SEncoder* pEncoder, const SEpSet* pEp);
 int32_t tDecodeSEpSet(SDecoder* pDecoder, SEpSet* pEp);
 int32_t taosEncodeSEpSet(void** buf, const SEpSet* pEp);
@@ -2822,8 +2828,8 @@ enum {
   TOPIC_SUB_TYPE__COLUMN,
 };
 
-#define DEFAULT_MAX_POLL_INTERVAL      300000
-#define DEFAULT_SESSION_TIMEOUT        12000
+#define DEFAULT_MAX_POLL_INTERVAL 300000
+#define DEFAULT_SESSION_TIMEOUT   12000
 
 typedef struct {
   char   name[TSDB_TOPIC_FNAME_LEN];  // accout.topic
diff --git a/source/libs/transport/inc/transComm.h b/source/libs/transport/inc/transComm.h
index d20b992315..7481c44daf 100644
--- a/source/libs/transport/inc/transComm.h
+++ b/source/libs/transport/inc/transComm.h
@@ -136,12 +136,6 @@ typedef struct SCvtAddr {
   bool cvt;
 } SCvtAddr;
 
-typedef struct {
-  int32_t inUse;
-  int32_t numOfEps;
-  SEp     eps[];
-} SReqEpSet;
-
 int32_t transCreateReqEpsetFromUserEpset(const SEpSet* pEpset, SReqEpSet** pReqEpSet);
 int32_t transCreateUserEpsetFromReqEpset(const SReqEpSet* pReqEpSet, SEpSet* pEpSet);
 
diff --git a/source/libs/transport/src/transComm.c b/source/libs/transport/src/transComm.c
index b78df9f5ba..bba1e41683 100644
--- a/source/libs/transport/src/transComm.c
+++ b/source/libs/transport/src/transComm.c
@@ -951,7 +951,7 @@ int32_t transCreateReqEpsetFromUserEpset(const SEpSet* pEpset, SReqEpSet** pReqE
   if (pReq == NULL) {
     return TSDB_CODE_OUT_OF_MEMORY;
   }
-  memcpy((char*)pReqEpSet, (char*)pEpset, size);
+  memcpy((char*)pReq, (char*)pEpset, size);
   *pReqEpSet = pReq;
   return TSDB_CODE_SUCCESS;
 }