From 544e33c4a633fef5bfb3aa8b8d1802ed55a953d5 Mon Sep 17 00:00:00 2001
From: yihaoDeng <luomoxyz@126.com>
Date: Sat, 28 May 2022 23:08:33 +0800
Subject: [PATCH 1/2] fix: avoid mem leak

---
 source/libs/index/src/indexFstUtil.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/source/libs/index/src/indexFstUtil.c b/source/libs/index/src/indexFstUtil.c
index a980c6b740..5760b24900 100644
--- a/source/libs/index/src/indexFstUtil.c
+++ b/source/libs/index/src/indexFstUtil.c
@@ -93,14 +93,15 @@ FstSlice fstSliceCreate(uint8_t* data, uint64_t len) {
 // just shallow copy
 FstSlice fstSliceCopy(FstSlice* s, int32_t start, int32_t end) {
   FstString* str = s->str;
-  str->ref++;
+  atomic_add_fetch_32(&str->ref, 1);
 
   FstSlice t = {.str = str, .start = start + s->start, .end = end + s->start};
   return t;
 }
 FstSlice fstSliceDeepCopy(FstSlice* s, int32_t start, int32_t end) {
-  int32_t  tlen = end - start + 1;
-  int32_t  slen;
+  int32_t tlen = end - start + 1;
+  int32_t slen;
+
   uint8_t* data = fstSliceData(s, &slen);
   assert(tlen <= slen);
 
@@ -129,8 +130,9 @@ uint8_t* fstSliceData(FstSlice* s, int32_t* size) {
 }
 void fstSliceDestroy(FstSlice* s) {
   FstString* str = s->str;
-  str->ref--;
-  if (str->ref == 0) {
+
+  int32_t ref = atomic_sub_fetch_32(&str->ref, 1);
+  if (ref == 0) {
     taosMemoryFree(str->data);
     taosMemoryFree(str);
     s->str = NULL;

From da4ab248ed2b77789601f4baf38b9efc0f3d17ca Mon Sep 17 00:00:00 2001
From: yihaoDeng <luomoxyz@126.com>
Date: Sun, 29 May 2022 21:56:57 +0800
Subject: [PATCH 2/2] fix index mem leak

---
 source/libs/index/src/indexFst.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/libs/index/src/indexFst.c b/source/libs/index/src/indexFst.c
index 335b086526..892716f387 100644
--- a/source/libs/index/src/indexFst.c
+++ b/source/libs/index/src/indexFst.c
@@ -1324,7 +1324,7 @@ StreamWithStateResult* streamWithStateNextWith(StreamWithState* sws, StreamCallb
       if (FST_NODE_ADDR(p->node) != fstGetRootAddr(sws->fst)) {
         taosArrayPop(sws->inp);
       }
-      // streamStateDestroy(p);
+      streamStateDestroy(p);
       continue;
     }
     FstTransition trn;