From 9edc17e575b2bb1493650a52c37af099289deabe Mon Sep 17 00:00:00 2001
From: Liu Jicong <liujicong@qq.com>
Date: Fri, 5 Nov 2021 17:17:21 +0800
Subject: [PATCH] fix tqHandleDel bug

---
 source/dnode/vnode/tq/src/tq.c            |  3 +++
 source/dnode/vnode/tq/src/tqMetaStore.c   | 22 +++++++++++-----------
 source/dnode/vnode/tq/test/tqMetaTest.cpp |  7 +++++++
 3 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/source/dnode/vnode/tq/src/tq.c b/source/dnode/vnode/tq/src/tq.c
index 1aa8f231c3..cf98e3e1a4 100644
--- a/source/dnode/vnode/tq/src/tq.c
+++ b/source/dnode/vnode/tq/src/tq.c
@@ -22,6 +22,9 @@
 //
 //handle management message
 //
+
+int tqGetgHandleSSize(const TqGroupHandle *gHandle);
+
 static int tqProtoCheck(TmqMsgHead *pMsg) {
   return pMsg->protoVer == 0;
 }
diff --git a/source/dnode/vnode/tq/src/tqMetaStore.c b/source/dnode/vnode/tq/src/tqMetaStore.c
index a4c2b90491..eb2c3404fc 100644
--- a/source/dnode/vnode/tq/src/tqMetaStore.c
+++ b/source/dnode/vnode/tq/src/tqMetaStore.c
@@ -27,15 +27,14 @@ static int32_t tqHandlePutCommitted(TqMetaStore*, int64_t key, void* value);
 static void*   tqHandleGetUncommitted(TqMetaStore*, int64_t key);
 
 static inline void tqLinkUnpersist(TqMetaStore *pMeta, TqMetaList* pNode) {
-    if(pNode->unpersistNext == NULL) {
-      pNode->unpersistNext = pMeta->unpersistHead->unpersistNext;
-      pNode->unpersistPrev = pMeta->unpersistHead;
-      pMeta->unpersistHead->unpersistNext->unpersistPrev = pNode;
-      pMeta->unpersistHead->unpersistNext = pNode;
-    }
+  if(pNode->unpersistNext == NULL) {
+    pNode->unpersistNext = pMeta->unpersistHead->unpersistNext;
+    pNode->unpersistPrev = pMeta->unpersistHead;
+    pMeta->unpersistHead->unpersistNext->unpersistPrev = pNode;
+    pMeta->unpersistHead->unpersistNext = pNode;
+  }
 }
 
-
 typedef struct TqMetaPageBuf {
   int16_t offset;
   char buffer[TQ_PAGE_SIZE];
@@ -401,7 +400,7 @@ void* tqHandleGet(TqMetaStore* pMeta, int64_t key) {
   TqMetaList* pNode = pMeta->bucket[bucketKey];
   while(pNode) {
     if(pNode->handle.key == key) {
-      if(pNode->handle.valueInUse != NULL) {
+      if(pNode->handle.valueInUse != NULL && pNode->handle.valueInUse != TQ_DELETE_TOKEN) {
         return pNode->handle.valueInUse;
       } else {
         return NULL;
@@ -546,9 +545,10 @@ int32_t tqHandleDel(TqMetaStore* pMeta, int64_t key) {
   int64_t bucketKey = key & TQ_BUCKET_SIZE;
   TqMetaList* pNode = pMeta->bucket[bucketKey];
   while(pNode) {
-      if(pNode->handle.valueInTxn
-          && pNode->handle.valueInTxn != TQ_DELETE_TOKEN) {
-      pMeta->deleter(pNode->handle.valueInTxn);
+    if(pNode->handle.valueInTxn != TQ_DELETE_TOKEN) {
+      if(pNode->handle.valueInTxn) {
+        pMeta->deleter(pNode->handle.valueInTxn);
+      }
       pNode->handle.valueInTxn = TQ_DELETE_TOKEN;
       tqLinkUnpersist(pMeta, pNode);
       return 0;
diff --git a/source/dnode/vnode/tq/test/tqMetaTest.cpp b/source/dnode/vnode/tq/test/tqMetaTest.cpp
index 20a0368c4c..a1021233db 100644
--- a/source/dnode/vnode/tq/test/tqMetaTest.cpp
+++ b/source/dnode/vnode/tq/test/tqMetaTest.cpp
@@ -130,4 +130,11 @@ TEST_F(TqMetaTest, deleteTest) {
   tqHandleCommit(pMeta, 1);
   pFoo = (Foo*) tqHandleGet(pMeta, 1);
   EXPECT_EQ(pFoo == NULL, true);
+
+  tqStoreClose(pMeta);
+  pMeta = tqStoreOpen(pathName,
+      FooSerializer, FooDeserializer, FooDeleter);
+  ASSERT(pMeta);
+  pFoo = (Foo*) tqHandleGet(pMeta, 1);
+  EXPECT_EQ(pFoo == NULL, true);
 }