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

This commit is contained in:
yihaoDeng 2024-10-11 14:38:29 +08:00
parent 69eaed772e
commit ecfe407f32
1 changed files with 2 additions and 2 deletions

View File

@ -3866,10 +3866,10 @@ int32_t transHeapDelete(SHeap* heap, SCliConn* p) {
} }
int32_t transHeapBalance(SHeap* heap, SCliConn* p) { int32_t transHeapBalance(SHeap* heap, SCliConn* p) {
if (p->inHeap == 0) { if (p->inHeap == 0 && heap == NULL || heap->heap == NULL) {
return 0; return 0;
} }
if (heap && heap->heap && heap->heap->nelts >= 64) { if (heap->heap->nelts >= 64) {
tDebug("conn %p heap busy,heap size:%d", heap->heap->nelts); tDebug("conn %p heap busy,heap size:%d", heap->heap->nelts);
} }
heapRemove(heap->heap, &p->node); heapRemove(heap->heap, &p->node);