From 0feffc687b3b80ce55f140d0fa08112e86d930d2 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Wed, 2 Aug 2023 12:44:45 +0800
Subject: [PATCH] fix(tsdb): check uid in multiple stt statistics blocks.

---
 source/dnode/vnode/src/tsdb/tsdbMergeTree.c | 70 ++++++++++++---------
 1 file changed, 39 insertions(+), 31 deletions(-)

diff --git a/source/dnode/vnode/src/tsdb/tsdbMergeTree.c b/source/dnode/vnode/src/tsdb/tsdbMergeTree.c
index bbb5ce79fa..d74584f844 100644
--- a/source/dnode/vnode/src/tsdb/tsdbMergeTree.c
+++ b/source/dnode/vnode/src/tsdb/tsdbMergeTree.c
@@ -381,42 +381,50 @@ static bool existsFromSttBlkStatis(const TStatisBlkArray *pStatisBlkArray, uint6
     return false;
   }
 
-  SStatisBlk    *p = &pStatisBlkArray->data[i];
-  STbStatisBlock block = {0};
-  tsdbSttFileReadStatisBlock(pReader, p, &block);
-
-  int32_t index = tarray2SearchIdx(block.suid, &suid, sizeof(int64_t), suidComparFn, TD_EQ);
-  if (index == -1) {
-    tStatisBlockDestroy(&block);
-    return false;
-  }
-  
-  int32_t j = index;
-  if (block.uid->data[j] == uid) {
-    tStatisBlockDestroy(&block);
-    return true;
-  } else if (block.uid->data[j] > uid) {
-    while (j >= 0 && block.suid->data[j] == suid) {
-      if (block.uid->data[j] == uid) {
-        tStatisBlockDestroy(&block);
-        return true;
-      } else {
-        j -= 1;
+  while(i < TARRAY2_SIZE(pStatisBlkArray)) {
+    SStatisBlk *p = &pStatisBlkArray->data[i];
+    if (p->minTbid.suid > suid) {
+      return false;
+    }
+
+    STbStatisBlock block = {0};
+    tsdbSttFileReadStatisBlock(pReader, p, &block);
+
+    int32_t index = tarray2SearchIdx(block.suid, &suid, sizeof(int64_t), suidComparFn, TD_EQ);
+    if (index == -1) {
+      tStatisBlockDestroy(&block);
+      return false;
+    }
+
+    int32_t j = index;
+    if (block.uid->data[j] == uid) {
+      tStatisBlockDestroy(&block);
+      return true;
+    } else if (block.uid->data[j] > uid) {
+      while (j >= 0 && block.suid->data[j] == suid) {
+        if (block.uid->data[j] == uid) {
+          tStatisBlockDestroy(&block);
+          return true;
+        } else {
+          j -= 1;
+        }
       }
-    }
-  } else {
-    j = index + 1;
-    while (j < block.suid->size && block.suid->data[j] == suid) {
-      if (block.uid->data[j] == uid) {
-        tStatisBlockDestroy(&block);
-        return true;
-      } else {
-        j += 1;
+    } else {
+      j = index + 1;
+      while (j < block.suid->size && block.suid->data[j] == suid) {
+        if (block.uid->data[j] == uid) {
+          tStatisBlockDestroy(&block);
+          return true;
+        } else {
+          j += 1;
+        }
       }
     }
+
+    tStatisBlockDestroy(&block);
+    i += 1;
   }
 
-  tStatisBlockDestroy(&block);
   return false;
 }
 
-- 
GitLab