Merge branch 'feature/TD-2502-v3' of https://github.com/taosdata/TDengine into feature/TD-2502-v3

src/rpc/inc/rpcHead.h

@@ -20,11 +20,6 @@
 extern "C" {
 #endif
 
-// server:0 client:1  tcp:2 udp:0
-#define RPC_CONN_UDPS   0
-#define RPC_CONN_UDPC   1
-#define RPC_CONN_TCPS   2
-#define RPC_CONN_TCPC   3
 #define RPC_CONN_TCP    2
 
 extern int tsRpcOverhead;

src/rpc/src/rpcMain.c

@@ -137,6 +137,12 @@ static int     tsRpcRefId = -1;
 static int32_t tsRpcNum = 0;
 //static pthread_once_t tsRpcInit = PTHREAD_ONCE_INIT;
 
+// server:0 client:1  tcp:2 udp:0
+#define RPC_CONN_UDPS   0
+#define RPC_CONN_UDPC   1
+#define RPC_CONN_TCPS   2
+#define RPC_CONN_TCPC   3
+
 void *(*taosInitConn[])(uint32_t ip, uint16_t port, char *label, int threads, void *fp, void *shandle) = {
     taosInitUdpConnection,
     taosInitUdpConnection,