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

Fix merge code error.

This commit is contained in:
xiao-77 2025-01-21 12:34:47 +08:00
parent 18dd355463
commit 3070d2d455
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/util/src/tqueue.c
View File

@ -166,18 +166,18 @@ int32_t taosAllocateQitem(int32_t size, EQItype itype, int64_t dataSize, void **
uDebug("failed to alloc qitem, size:%" PRId64 " alloc:%" PRId64 " allowed:%" PRId64, size + dataSize, alloced, uDebug("failed to alloc qitem, size:%" PRId64 " alloc:%" PRId64 " allowed:%" PRId64, size + dataSize, alloced,
tsApplyMemoryAllowed); tsApplyMemoryAllowed);
(void)atomic_sub_fetch_64(&tsApplyMemoryUsed, size + dataSize); (void)atomic_sub_fetch_64(&tsApplyMemoryUsed, size + dataSize);
terrno = TSDB_CODE_OUT_OF_RPC_MEMORY_QUEUE;
return (terrno = TSDB_CODE_OUT_OF_RPC_MEMORY_QUEUE); return (terrno = TSDB_CODE_OUT_OF_RPC_MEMORY_QUEUE);
} }
} }
*item = NULL; *item = NULL;
STaosQnode *pNode = taosMemoryCalloc(1, sizeof(STaosQnode) + size); STaosQnode *pNode = taosMemoryCalloc(1, sizeof(STaosQnode) + size);
if (itype == RPC_QITEM) { if (pNode == NULL) {
(void)atomic_sub_fetch_64(&tsQueueMemoryUsed, size + dataSize); if (itype == RPC_QITEM) {
return terrno; (void)atomic_sub_fetch_64(&tsQueueMemoryUsed, size + dataSize);
} else if (itype == APPLY_QITEM) { } else if (itype == APPLY_QITEM) {
(void)atomic_sub_fetch_64(&tsApplyMemoryUsed, size + dataSize); (void)atomic_sub_fetch_64(&tsApplyMemoryUsed, size + dataSize);
}
return terrno; return terrno;
} }