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

Merge remote-tracking branch 'origin/3.0' into enh/opt-transport

This commit is contained in:
yihaoDeng 2024-10-11 16:43:56 +08:00
parent f2ebc9236c
commit 514b04a6bd
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/libs/executor/src/exchangeoperator.c
View File

@ -226,7 +226,7 @@ static SSDataBlock* doLoadRemoteDataImpl(SOperatorInfo* pOperator) {
concurrentlyLoadRemoteDataImpl(pOperator, pExchangeInfo, pTaskInfo); concurrentlyLoadRemoteDataImpl(pOperator, pExchangeInfo, pTaskInfo);
} }
if (TSDB_CODE_SUCCESS != pOperator->pTaskInfo->code) { if (TSDB_CODE_SUCCESS != pOperator->pTaskInfo->code) {
qError("%s failed at line %d since %s", __func__, __LINE__, tstrerror(code)); qError("%s failed at line %d since %s", __func__, __LINE__, tstrerror(pOperator->pTaskInfo->code));
T_LONG_JMP(pTaskInfo->env, pOperator->pTaskInfo->code); T_LONG_JMP(pTaskInfo->env, pOperator->pTaskInfo->code);
} }
if (taosArrayGetSize(pExchangeInfo->pResultBlockList) == 0) { if (taosArrayGetSize(pExchangeInfo->pResultBlockList) == 0) {

13
source/libs/transport/src/transCli.c
View File

@ -474,10 +474,10 @@ int8_t cliMayRecycleConn(SCliConn* conn) {
int32_t code = 0; int32_t code = 0;
SCliThrd* pThrd = conn->hostThrd; SCliThrd* pThrd = conn->hostThrd;
code = balanceConnHeapCache(pThrd->connHeapCache, conn); // code = balanceConnHeapCache(pThrd->connHeapCache, conn);
if (code != 0) { // if (code != 0) {
tDebug("%s conn %p failed to balance heap cache", CONN_GET_INST_LABEL(conn), conn); // tDebug("%s conn %p failed to balance heap cache", CONN_GET_INST_LABEL(conn), conn);
} // }
if (transQueueSize(&conn->reqsToSend) == 0 && transQueueSize(&conn->reqsSentOut) == 0 && if (transQueueSize(&conn->reqsToSend) == 0 && transQueueSize(&conn->reqsSentOut) == 0 &&
taosHashGetSize(conn->pQTable) == 0) { taosHashGetSize(conn->pQTable) == 0) {
code = delConnFromHeapCache(pThrd->connHeapCache, conn); code = delConnFromHeapCache(pThrd->connHeapCache, conn);
@ -3741,6 +3741,9 @@ static SCliConn* getConnFromHeapCache(SHashObj* pConnHeapCache, char* key) {
tDebug("failed to get conn from heap cache for key:%s", key); tDebug("failed to get conn from heap cache for key:%s", key);
return NULL; return NULL;
} else { } else {
if (pHeap->heap->nelts >= 16) {
balanceConnHeapCache(pConnHeapCache, pConn);
}
if (shouldSWitchToOtherConn(pConn, key)) { if (shouldSWitchToOtherConn(pConn, key)) {
logConnMissHit(pConn); logConnMissHit(pConn);
return NULL; return NULL;
@ -3789,7 +3792,7 @@ static int32_t delConnFromHeapCache(SHashObj* pConnHeapCache, SCliConn* pConn) {
} }
static int32_t balanceConnHeapCache(SHashObj* pConnHeapCache, SCliConn* pConn) { static int32_t balanceConnHeapCache(SHashObj* pConnHeapCache, SCliConn* pConn) {
if (pConn->heap != NULL) { if (pConn->heap != NULL && pConn->inHeap != 0) {
return transHeapBalance(pConn->heap, pConn); return transHeapBalance(pConn->heap, pConn);
} }
return 0; return 0;