xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/insertselect' of github.com:taosdata/TDengine into feature/insertselect

This commit is contained in:
dapan1121 2022-07-07 17:23:09 +08:00
parent 655faa279c 5ebfedd56c
commit 2722c5ee5f
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/libs/transport/src/transSvr.c
View File

@ -391,12 +391,9 @@ static void uvPrepareSendData(SSvrMsg* smsg, uv_buf_t* wb) {
pHead->traceId = pMsg->info.traceId; pHead->traceId = pMsg->info.traceId;
pHead->hasEpSet = pMsg->info.hasEpSet; pHead->hasEpSet = pMsg->info.hasEpSet;
if (pConn->status == ConnNormal) { if (pConn->status == ConnNormal) {
if (0 == smsg->msg.msgType) { pHead->msgType = (0 == pMsg->msgType ? pConn->inType + 1 : pMsg->msgType);
pHead->msgType = pConn->inType + 1;
} else {
pHead->msgType = smsg->msg.msgType;
}
} else { } else {
if (smsg->type == Release) { if (smsg->type == Release) {
pHead->msgType = 0; pHead->msgType = 0;
@ -405,11 +402,8 @@ static void uvPrepareSendData(SSvrMsg* smsg, uv_buf_t* wb) {
destroyConnRegArg(pConn); destroyConnRegArg(pConn);
transUnrefSrvHandle(pConn); transUnrefSrvHandle(pConn);
} else { } else {
pHead->msgType = pMsg->msgType;
// set up resp msg type // set up resp msg type
if (pHead->msgType == 0 && transMsgLenFromCont(pMsg->contLen) == sizeof(STransMsgHead)) { pHead->msgType = (0 == pMsg->msgType ? pConn->inType + 1 : pMsg->msgType);
pHead->msgType = pConn->inType + 1;
}
} }
} }