From 6b454a4dd43844fb447436428f54af3c9698bb0b Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Tue, 19 Jul 2022 06:26:09 +0000
Subject: [PATCH] more

---
 source/dnode/vnode/src/inc/tsdb.h        | 9 +--------
 source/dnode/vnode/src/tsdb/tsdbCommit.c | 4 ++--
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/source/dnode/vnode/src/inc/tsdb.h b/source/dnode/vnode/src/inc/tsdb.h
index eb5f66d443..30a6188db0 100644
--- a/source/dnode/vnode/src/inc/tsdb.h
+++ b/source/dnode/vnode/src/inc/tsdb.h
@@ -279,21 +279,14 @@ typedef struct {
 struct STsdb {
   char          *path;
   SVnode        *pVnode;
-  TdThreadRwlock rwLock;
   STsdbKeepCfg   keepCfg;
+  TdThreadRwlock rwLock;
   SMemTable     *mem;
   SMemTable     *imem;
   STsdbFS       *pFS;
   SLRUCache     *lruCache;
 };
 
-struct STable {
-  uint64_t  suid;
-  uint64_t  uid;
-  STSchema *pSchema;       // latest schema
-  STSchema *pCacheSchema;  // cached cache
-};
-
 struct TSDBKEY {
   int64_t version;
   TSKEY   ts;
diff --git a/source/dnode/vnode/src/tsdb/tsdbCommit.c b/source/dnode/vnode/src/tsdb/tsdbCommit.c
index 04fe5520fb..13f310ae27 100644
--- a/source/dnode/vnode/src/tsdb/tsdbCommit.c
+++ b/source/dnode/vnode/src/tsdb/tsdbCommit.c
@@ -960,10 +960,10 @@ static int32_t tsdbStartCommit(STsdb *pTsdb, SCommitter *pCommitter) {
   memset(pCommitter, 0, sizeof(*pCommitter));
   ASSERT(pTsdb->mem && pTsdb->imem == NULL);
 
-  // lock();
+  taosThreadRwlockWrlock(&pTsdb->rwLock);
   pTsdb->imem = pTsdb->mem;
   pTsdb->mem = NULL;
-  // unlock();
+  taosThreadRwlockUnlock(&pTsdb->rwLock);
 
   pCommitter->pTsdb = pTsdb;
   pCommitter->commitID = pTsdb->pVnode->state.commitID;
-- 
GitLab