Merge pull request #29627 from taosdata/fix/main/TS-5937

Fix merge errors from pr 29618.
taosdata · Jan 21, 2025 · c99a1c5 · c99a1c5
2 parents 2f10787 + c2068ea
commit c99a1c5
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/source/util/src/tqueue.c b/source/util/src/tqueue.c
@@ -152,9 +152,9 @@ int64_t taosQueueMemorySize(STaosQueue *queue) {
 int32_t taosAllocateQitem(int32_t size, EQItype itype, int64_t dataSize, void **item) {
   int64_t alloced = -1;
 
-  if (alloced > tsQueueMemoryAllowed) {
+  if (itype == RPC_QITEM) {
     alloced = atomic_add_fetch_64(&tsQueueMemoryUsed, size + dataSize);
-    if (itype == RPC_QITEM) {
+    if (alloced > tsQueueMemoryAllowed) {
       uError("failed to alloc qitem, size:%" PRId64 " alloc:%" PRId64 " allowed:%" PRId64, size + dataSize, alloced,
              tsQueueMemoryAllowed);
       (void)atomic_sub_fetch_64(&tsQueueMemoryUsed, size + dataSize);