diff --git a/source/dnode/vnode/tq/CMakeLists.txt b/source/dnode/vnode/tq/CMakeLists.txt
index 441fe46244587eaa2d35457db0d955a9d981dc80..f9e86adc73bfe53b0d65116c80cc74657b37a4bb 100644
--- a/source/dnode/vnode/tq/CMakeLists.txt
+++ b/source/dnode/vnode/tq/CMakeLists.txt
@@ -12,3 +12,7 @@ target_link_libraries(
     PUBLIC os
     PUBLIC util
 )
+
+if(${BUILD_TEST})
+    add_subdirectory(test)
+endif(${BUILD_TEST})
diff --git a/source/dnode/vnode/tq/inc/tqMetaStore.h b/source/dnode/vnode/tq/inc/tqMetaStore.h
index 65429f7af29369b3f4192629c6b165a08cb0d3ab..f3918d0a8e3e2244b5da4391331a489ca9ea2542 100644
--- a/source/dnode/vnode/tq/inc/tqMetaStore.h
+++ b/source/dnode/vnode/tq/inc/tqMetaStore.h
@@ -19,6 +19,11 @@
 #include "os.h"
 #include "tq.h"
 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define TQ_BUCKET_SIZE 0xFF
 #define TQ_PAGE_SIZE 4096
 //key + offset + size
@@ -32,10 +37,6 @@ inline static int TqEmptyTail() { //16
   return TQ_PAGE_SIZE - TqMaxEntryOnePage();
 }
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 typedef struct TqMetaHandle {
   int64_t key;
   int64_t offset;
@@ -59,30 +60,30 @@ typedef struct TqMetaStore {
   TqMetaList* unpersistHead;
   int fileFd; //TODO:temporaral use, to be replaced by unified tfile
   int idxFd;  //TODO:temporaral use, to be replaced by unified tfile
-  int (*serializer)(TqGroupHandle*, void**);
-  const void* (*deserializer)(const void*, TqGroupHandle*);
+  int (*serializer)(const void* pObj, void** ppBytes);
+  const void* (*deserializer)(const void* pBytes, void** ppObj);
   void  (*deleter)(void*);
 } TqMetaStore;
 
 TqMetaStore*  tqStoreOpen(const char* path,
-    int serializer(TqGroupHandle*, void**),
-    const void* deserializer(const void*, TqGroupHandle*),
-    void deleter(void*));
+    int serializer(const void* pObj, void** ppBytes),
+    const void* deserializer(const void* pBytes, void** ppObj),
+    void deleter(void* pObj));
 int32_t       tqStoreClose(TqMetaStore*);
 //int32_t       tqStoreDelete(TqMetaStore*);
 //int32_t       TqStoreCommitAll(TqMetaStore*);
 int32_t       tqStorePersist(TqMetaStore*);
 
-TqMetaHandle* tqHandleGet(TqMetaStore*, int64_t key);
-int32_t       tqHandlePut(TqMetaStore*, int64_t key, void* value);
+void*   tqHandleGet(TqMetaStore*, int64_t key);
+int32_t tqHandlePut(TqMetaStore*, int64_t key, void* value);
 //do commit
-int32_t       tqHandleCommit(TqMetaStore*, int64_t key);
+int32_t tqHandleCommit(TqMetaStore*, int64_t key);
 //delete uncommitted
-int32_t       tqHandleAbort(TqMetaStore*, int64_t key);
+int32_t tqHandleAbort(TqMetaStore*, int64_t key);
 //delete committed
-int32_t       tqHandleDel(TqMetaStore*, int64_t key);
+int32_t tqHandleDel(TqMetaStore*, int64_t key);
 //delete both committed and uncommitted
-int32_t       tqHandleClear(TqMetaStore*, int64_t key);
+int32_t tqHandleClear(TqMetaStore*, int64_t key);
 
 #ifdef __cplusplus
 }
diff --git a/source/dnode/vnode/tq/src/tqMetaStore.c b/source/dnode/vnode/tq/src/tqMetaStore.c
index 72edf10a1f8be4d41ca4c32ee15618b1402a9cd8..f850f73e1293be48e80c5fe3aa25c21371fcd104 100644
--- a/source/dnode/vnode/tq/src/tqMetaStore.c
+++ b/source/dnode/vnode/tq/src/tqMetaStore.c
@@ -14,6 +14,7 @@
  */
 #include "tqMetaStore.h"
 //TODO:replace by an abstract file layer
+#include "osDir.h"
 #include <fcntl.h>
 #include <string.h>
 #include <unistd.h>
@@ -22,8 +23,8 @@
 #define TQ_IDX_NAME  "tq.idx"
 
 
-static int32_t       tqHandlePutCommitted(TqMetaStore*, int64_t key, void* value);
-static TqMetaHandle* tqHandleGetUncommitted(TqMetaStore*, int64_t key);
+static int32_t tqHandlePutCommitted(TqMetaStore*, int64_t key, void* value);
+static void*   tqHandleGetUncommitted(TqMetaStore*, int64_t key);
 
 typedef struct TqMetaPageBuf {
   int16_t offset;
@@ -31,23 +32,28 @@ typedef struct TqMetaPageBuf {
 } TqMetaPageBuf;
 
 TqMetaStore* tqStoreOpen(const char* path,
-    int serializer(TqGroupHandle*, void**),
-    const void* deserializer(const void*, TqGroupHandle*),
-    void deleter(void*)) {
+    int serializer(const void* pObj, void** ppBytes),
+    const void* deserializer(const void* pBytes, void** ppObj),
+    void deleter(void* pObj)) {
   TqMetaStore* pMeta = malloc(sizeof(TqMetaStore)); 
   if(pMeta == NULL) {
     //close
     return NULL;
   }
+  memset(pMeta, 0, sizeof(TqMetaStore));
 
   //concat data file name and index file name
   size_t pathLen = strlen(path);
   char name[pathLen+10];
 
   strcpy(name, path);
+  if(!taosDirExist(name) && !taosMkDir(name)) {
+    ASSERT(false);
+  }
   strcat(name, "/" TQ_IDX_NAME);
-  int idxFd = open(name, O_WRONLY | O_CREAT | O_EXCL, 0755);
+  int idxFd = open(name, O_RDWR | O_CREAT, 0755);
   if(idxFd < 0) {
+    ASSERT(false);
     //close file
     //free memory
     return NULL;
@@ -56,17 +62,24 @@ TqMetaStore* tqStoreOpen(const char* path,
   pMeta->idxFd = idxFd;
   pMeta->unpersistHead = malloc(sizeof(TqMetaList));
   if(pMeta->unpersistHead == NULL) {
+    ASSERT(false);
     //close file
     //free memory
     return NULL;
   }
+  memset(pMeta->unpersistHead, 0, sizeof(TqMetaList));
+  pMeta->unpersistHead->unpersistNext
+    = pMeta->unpersistHead->unpersistPrev
+    = pMeta->unpersistHead;
 
   strcpy(name, path);
   strcat(name, "/" TQ_META_NAME);
-  int fileFd = open(name, O_WRONLY | O_CREAT | O_EXCL, 0755);
-  if(fileFd < 0) return NULL;
+  int fileFd = open(name, O_RDWR | O_CREAT, 0755);
+  if(fileFd < 0){
+    ASSERT(false);
+    return NULL;
+  }
 
-  memset(pMeta, 0, sizeof(TqMetaStore));
   pMeta->fileFd = fileFd;
   
   pMeta->serializer = serializer;
@@ -74,23 +87,47 @@ TqMetaStore* tqStoreOpen(const char* path,
   pMeta->deleter = deleter;
 
   //read idx file and load into memory
-  char readBuf[TQ_PAGE_SIZE];
-  int readSize;
-  while((readSize = read(idxFd, readBuf, TQ_PAGE_SIZE)) != -1) {
+  char idxBuf[TQ_PAGE_SIZE];
+  char* dataBuf = malloc(TQ_PAGE_SIZE);
+  if(dataBuf == NULL) {
+    //TODO:memory insufficient
+  }
+  int dataBufSize = TQ_PAGE_SIZE;
+  int idxRead, dataReadSize;
+  while((idxRead = read(idxFd, idxBuf, TQ_PAGE_SIZE))) {
+    if(idxRead == -1) {
+      //TODO: handle error
+      ASSERT(false);
+    }
     //loop read every entry
-    for(int i = 0; i < readSize; i += TQ_IDX_ENTRY_SIZE) {
-      TqMetaList *pNode = malloc(sizeof(TqMetaHandle));
-      memset(pNode, 0, sizeof(TqMetaList));
+    for(int i = 0; i < idxRead; i += TQ_IDX_ENTRY_SIZE) {
+      TqMetaList *pNode = malloc(sizeof(TqMetaList));
       if(pNode == NULL) {
         //TODO: free memory and return error
       }
-      memcpy(&pNode->handle, &readBuf[i], TQ_IDX_ENTRY_SIZE);
+      memset(pNode, 0, sizeof(TqMetaList));
+      memcpy(&pNode->handle, &idxBuf[i], TQ_IDX_ENTRY_SIZE);
+      lseek(fileFd, pNode->handle.offset, SEEK_CUR);
+      if(dataBufSize < pNode->handle.serializedSize) {
+        void *ptr = realloc(dataBuf, pNode->handle.serializedSize);
+        if(ptr == NULL) {
+          //TODO: memory insufficient
+        }
+        dataBuf = ptr;
+        dataBufSize = pNode->handle.serializedSize;
+      }
+      if(read(fileFd, dataBuf, pNode->handle.serializedSize) != pNode->handle.serializedSize) {
+        //TODO: read error
+      }
+      pMeta->deserializer(dataBuf, &pNode->handle.valueInUse);
+
+      //put into list
       int bucketKey = pNode->handle.key & TQ_BUCKET_SIZE;
       pNode->next = pMeta->bucket[bucketKey];
       pMeta->bucket[bucketKey] = pNode;
     }
   }
-
+  free(dataBuf);
   return pMeta;
 }
 
@@ -102,22 +139,23 @@ int32_t tqStoreClose(TqMetaStore* pMeta) {
   close(pMeta->idxFd);
   //free memory
   for(int i = 0; i < TQ_BUCKET_SIZE; i++) {
-    TqMetaList* node = pMeta->bucket[i];
+    TqMetaList* pNode = pMeta->bucket[i];
     pMeta->bucket[i] = NULL;
-    while(node) {
-      ASSERT(node->unpersistNext == NULL);
-      ASSERT(node->unpersistPrev == NULL);
-      if(node->handle.valueInTxn) {
-        pMeta->deleter(node->handle.valueInTxn);
+    while(pNode) {
+      ASSERT(pNode->unpersistNext == NULL);
+      ASSERT(pNode->unpersistPrev == NULL);
+      if(pNode->handle.valueInTxn) {
+        pMeta->deleter(pNode->handle.valueInTxn);
       }
-      if(node->handle.valueInUse) {
-        pMeta->deleter(node->handle.valueInUse);
+      if(pNode->handle.valueInUse) {
+        pMeta->deleter(pNode->handle.valueInUse);
       }
-      TqMetaList* next = node->next;
-      free(node);
-      node = next;
+      TqMetaList* next = pNode->next;
+      free(pNode);
+      pNode = next;
     }
   }
+  free(pMeta->unpersistHead);
   free(pMeta);
   return 0;
 }
@@ -158,36 +196,40 @@ int32_t tqStorePersist(TqMetaStore* pMeta) {
           pBucketNode->next = pNode->next;
           if(pNode->handle.valueInUse) {
             pMeta->deleter(pNode->handle.valueInUse);
+            pNode->handle.valueInUse = NULL;
           }
           free(pNode);
         }
       }
-    }
-    //serialize
-    void* pBytes = NULL;
-    int sz = pMeta->serializer(pNode->handle.valueInUse, &pBytes);
-    ASSERT(pBytes != NULL);
-    //get current offset
-    //append data
-    int64_t offset = lseek(pMeta->fileFd, 0, SEEK_CUR);
-    int nBytes = write(pMeta->fileFd, pBytes, sz);
-    //TODO: handle error in tfile
-    ASSERT(nBytes == sz);
+    } else {
+      //TODO: do not allocate each time
+      //serialize
+      void* pBytes = NULL;
+      int sz = pMeta->serializer(pNode->handle.valueInUse, &pBytes);
+      ASSERT(pBytes != NULL);
+      //get current offset
+      //append data
+      int64_t offset = lseek(pMeta->fileFd, 0, SEEK_CUR);
+      int nBytes = write(pMeta->fileFd, pBytes, sz);
+      free(pBytes);
+      //TODO: handle error in tfile
+      ASSERT(nBytes == sz);
 
-    pNode->handle.offset = offset;
-    pNode->handle.serializedSize = sz;
+      pNode->handle.offset = offset;
+      pNode->handle.serializedSize = sz;
 
-    //write idx
-    //TODO: endian check and convert
-    *(bufPtr++) = pNode->handle.key;
-    *(bufPtr++) = pNode->handle.offset;
-    *(bufPtr++) = (int64_t)sz;
-    if((char*)(bufPtr + 3) > writeBuf + TQ_PAGE_SIZE) {
-      nBytes = write(pMeta->idxFd, writeBuf, sizeof(writeBuf));
-      //TODO: handle error in tfile
-      ASSERT(nBytes == sizeof(writeBuf));
-      memset(writeBuf, 0, TQ_PAGE_SIZE);
-      bufPtr = (int64_t*)writeBuf;
+      //write idx
+      //TODO: endian check and convert
+      *(bufPtr++) = pNode->handle.key;
+      *(bufPtr++) = pNode->handle.offset;
+      *(bufPtr++) = (int64_t)sz;
+      if((char*)(bufPtr + 3) > writeBuf + TQ_PAGE_SIZE) {
+        nBytes = write(pMeta->idxFd, writeBuf, sizeof(writeBuf));
+        //TODO: handle error in tfile
+        ASSERT(nBytes == sizeof(writeBuf));
+        memset(writeBuf, 0, TQ_PAGE_SIZE);
+        bufPtr = (int64_t*)writeBuf;
+      }
     }
 
     //remove from unpersist list
@@ -216,7 +258,9 @@ static int32_t tqHandlePutCommitted(TqMetaStore* pMeta, int64_t key, void* value
   while(pNode) {
     if(pNode->handle.key == key) {
       //TODO: think about thread safety
-      pMeta->deleter(pNode->handle.valueInUse);
+      if(pNode->handle.valueInUse) {
+        pMeta->deleter(pNode->handle.valueInUse);
+      }
       //change pointer ownership
       pNode->handle.valueInUse = value;
       return 0;
@@ -240,13 +284,13 @@ static int32_t tqHandlePutCommitted(TqMetaStore* pMeta, int64_t key, void* value
   return 0;
 }
 
-TqMetaHandle* tqHandleGet(TqMetaStore* pMeta, int64_t key) {
+void* tqHandleGet(TqMetaStore* pMeta, int64_t key) {
   int64_t bucketKey = key & TQ_BUCKET_SIZE;
   TqMetaList* pNode = pMeta->bucket[bucketKey];
   while(pNode) {
     if(pNode->handle.key == key) {
       if(pNode->handle.valueInUse != NULL) {
-        return &pNode->handle;
+        return pNode->handle.valueInUse;
       } else {
         return NULL;
       }
@@ -263,7 +307,9 @@ int32_t tqHandlePut(TqMetaStore* pMeta, int64_t key, void* value) {
   while(pNode) {
     if(pNode->handle.key == key) {
       //TODO: think about thread safety
-      pMeta->deleter(pNode->handle.valueInTxn);
+      if(pNode->handle.valueInTxn) {
+        pMeta->deleter(pNode->handle.valueInTxn);
+      }
       //change pointer ownership
       pNode->handle.valueInTxn = value;
       return 0;
@@ -279,16 +325,18 @@ int32_t tqHandlePut(TqMetaStore* pMeta, int64_t key, void* value) {
   memset(pNewNode, 0, sizeof(TqMetaList));
   pNewNode->handle.key = key;
   pNewNode->handle.valueInTxn = value;
+  pNewNode->next = pMeta->bucket[bucketKey];
+  pMeta->bucket[bucketKey] = pNewNode;
   return 0;
 }
 
-static TqMetaHandle* tqHandleGetUncommitted(TqMetaStore* pMeta, int64_t key) {
+static void* tqHandleGetUncommitted(TqMetaStore* pMeta, int64_t key) {
   int64_t bucketKey = key & TQ_BUCKET_SIZE;
   TqMetaList* pNode = pMeta->bucket[bucketKey];
   while(pNode) {
     if(pNode->handle.key == key) {
       if(pNode->handle.valueInTxn != NULL) {
-        return &pNode->handle;
+        return pNode->handle.valueInTxn;
       } else {
         return NULL;
       }
@@ -304,10 +352,11 @@ int32_t tqHandleCommit(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) {
         pMeta->deleter(pNode->handle.valueInUse);
       }
       pNode->handle.valueInUse = pNode->handle.valueInTxn;
+      pNode->handle.valueInTxn = NULL;
       if(pNode->unpersistNext == NULL) {
         pNode->unpersistNext = pMeta->unpersistHead->unpersistNext;
         pNode->unpersistPrev = pMeta->unpersistHead;
diff --git a/source/dnode/vnode/tq/test/CMakeLists.txt b/source/dnode/vnode/tq/test/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..6b468497d57754f20dca2392d79cb5933b969b76
--- /dev/null
+++ b/source/dnode/vnode/tq/test/CMakeLists.txt
@@ -0,0 +1,20 @@
+add_executable(tqTest "")
+target_sources(tqTest
+    PRIVATE
+    "tqMetaTest.cpp"
+)
+target_include_directories(tqTest
+    PUBLIC
+    "${CMAKE_SOURCE_DIR}/include/server/vnode/tq"
+    "${CMAKE_CURRENT_SOURCE_DIR}/../inc"
+)
+
+target_link_libraries(tqTest
+    tq
+    gtest_main
+)
+enable_testing()
+add_test(
+    NAME tq_test
+    COMMAND tqTest
+)
diff --git a/source/dnode/vnode/tq/test/tqMetaTest.cpp b/source/dnode/vnode/tq/test/tqMetaTest.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..e993003a7809a16822540dcfd6fc36268f307711
--- /dev/null
+++ b/source/dnode/vnode/tq/test/tqMetaTest.cpp
@@ -0,0 +1,97 @@
+#include <gtest/gtest.h>
+#include <cstring>
+#include <iostream>
+#include <queue>
+
+#include "tqMetaStore.h"
+
+struct Foo {
+  int32_t a;
+};
+
+int FooSerializer(const void* pObj, void** ppBytes) {
+  Foo* foo = (Foo*) pObj;
+  *ppBytes = realloc(*ppBytes, sizeof(int32_t));
+  **(int32_t**)ppBytes = foo->a;
+  return sizeof(int32_t);
+}
+
+const void* FooDeserializer(const void* pBytes, void** ppObj) {
+  if(*ppObj == NULL) {
+    *ppObj = realloc(*ppObj, sizeof(int32_t));
+  }
+  Foo* pFoo = *(Foo**)ppObj;
+  pFoo->a = *(int32_t*)pBytes; 
+  return NULL;
+}
+
+void FooDeleter(void* pObj) {
+  free(pObj); 
+}
+
+class TqMetaTest : public ::testing::Test {
+  protected:
+
+    void SetUp() override {
+      taosRemoveDir(pathName);
+      pMeta = tqStoreOpen(pathName,
+          FooSerializer, FooDeserializer, FooDeleter);
+      ASSERT(pMeta);
+    }
+
+    void TearDown() override {
+      tqStoreClose(pMeta);
+    }
+
+    TqMetaStore* pMeta;
+    const char* pathName = "/tmp/tq_test";
+};
+
+TEST_F(TqMetaTest, persistTest) {
+  Foo* pFoo = (Foo*)malloc(sizeof(Foo));
+  pFoo->a = 2;
+  tqHandlePut(pMeta, 1, pFoo);
+  Foo* pBar = (Foo*)tqHandleGet(pMeta, 1);
+  EXPECT_EQ(pBar == NULL, true);
+  tqHandleCommit(pMeta, 1);
+  pBar = (Foo*)tqHandleGet(pMeta, 1);
+  EXPECT_EQ(pBar->a, pFoo->a);
+  pBar = (Foo*)tqHandleGet(pMeta, 2);
+  EXPECT_EQ(pBar == NULL, true);
+
+  tqStoreClose(pMeta);
+  pMeta = tqStoreOpen(pathName,
+      FooSerializer, FooDeserializer, FooDeleter);
+  ASSERT(pMeta);
+
+  pBar = (Foo*)tqHandleGet(pMeta, 1);
+  ASSERT_EQ(pBar != NULL, true);
+  EXPECT_EQ(pBar->a, 2);
+
+  pBar = (Foo*)tqHandleGet(pMeta, 2);
+  EXPECT_EQ(pBar == NULL, true);
+
+  //taosRemoveDir(pathName);
+}
+
+TEST_F(TqMetaTest, uncommittedTest) {
+  Foo* pFoo = (Foo*)malloc(sizeof(Foo));
+  pFoo->a = 3;
+  tqHandlePut(pMeta, 1, pFoo);
+
+  pFoo = (Foo*) tqHandleGet(pMeta, 1);
+  EXPECT_EQ(pFoo == NULL, true);
+}
+
+TEST_F(TqMetaTest, abortTest) {
+  Foo* pFoo = (Foo*)malloc(sizeof(Foo));
+  pFoo->a = 3;
+  tqHandlePut(pMeta, 1, pFoo);
+
+  pFoo = (Foo*) tqHandleGet(pMeta, 1);
+  EXPECT_EQ(pFoo == NULL, true);
+
+  tqHandleAbort(pMeta, 1);
+  pFoo = (Foo*) tqHandleGet(pMeta, 1);
+  EXPECT_EQ(pFoo == NULL, true);
+}
diff --git a/source/dnode/vnode/tq/test/tqTests.cpp b/source/dnode/vnode/tq/test/tqTests.cpp
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/source/os/src/osDir.c b/source/os/src/osDir.c
index 17ab88edf64c3e8139d392f8dcb244c15543e93c..3b3e04378f73c76f2e85da2dc3f7788f3b49cdc5 100644
--- a/source/os/src/osDir.c
+++ b/source/os/src/osDir.c
@@ -55,7 +55,7 @@ void taosRemoveDir(const char *dirname) {
   closedir(dir);
   rmdir(dirname);
 
-  printf("dir:%s is removed", dirname);
+  printf("dir:%s is removed\n", dirname);
 }
 
 bool taosDirExist(char *dirname) { return access(dirname, F_OK) == 0; }
@@ -138,4 +138,4 @@ bool taosRealPath(char *dirname, int32_t maxlen) {
   return true;
 }
 
-#endif
\ No newline at end of file
+#endif