From c166220eda069970253404c2bf49df495f695e4c Mon Sep 17 00:00:00 2001
From: jtao1735 <jianhui.tao@qq.com>
Date: Sun, 19 Apr 2020 02:10:05 +0000
Subject: [PATCH] remove vnodeGetTsdb API

---
 src/inc/vnode.h            | 1 -
 src/vnode/src/vnodeMain.c  | 4 ----
 src/vnode/src/vnodeRead.c  | 3 +--
 src/vnode/src/vnodeWrite.c | 6 ++----
 4 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/inc/vnode.h b/src/inc/vnode.h
index e54820dffd..e8a7a1458f 100644
--- a/src/inc/vnode.h
+++ b/src/inc/vnode.h
@@ -47,7 +47,6 @@ void*   vnodeGetVnode(int32_t vgId);      // keep refcount unchanged
 void*   vnodeGetRqueue(void *);
 void*   vnodeGetWqueue(int32_t vgId);
 void*   vnodeGetWal(void *pVnode);
-void*   vnodeGetTsdb(void *pVnode);
 
 int32_t vnodeProcessWrite(void *pVnode, int qtype, void *pHead, void *item);
 void    vnodeBuildStatusMsg(void * param);
diff --git a/src/vnode/src/vnodeMain.c b/src/vnode/src/vnodeMain.c
index 84ae662110..472567784f 100644
--- a/src/vnode/src/vnodeMain.c
+++ b/src/vnode/src/vnodeMain.c
@@ -274,10 +274,6 @@ void *vnodeGetWal(void *pVnode) {
   return ((SVnodeObj *)pVnode)->wal; 
 }
 
-void *vnodeGetTsdb(void *pVnode) {
-  return ((SVnodeObj *)pVnode)->tsdb; 
-}
-
 void vnodeBuildStatusMsg(void *param) {
   SDMStatusMsg *pStatus = param;
   taosVisitIntHashWithFp(tsDnodeVnodesHash, vnodeBuildVloadMsg, pStatus);
diff --git a/src/vnode/src/vnodeRead.c b/src/vnode/src/vnodeRead.c
index 7fcd02a102..94ec707c2e 100644
--- a/src/vnode/src/vnodeRead.c
+++ b/src/vnode/src/vnodeRead.c
@@ -56,8 +56,7 @@ static int32_t vnodeProcessQueryMsg(SVnodeObj *pVnode, void *pCont, int32_t cont
   
   qinfo_t pQInfo = NULL;
   if (contLen != 0) {
-    void* tsdb = vnodeGetTsdb(pVnode);
-    pRet->code = qCreateQueryInfo(tsdb, pQueryTableMsg, &pQInfo);
+    pRet->code = qCreateQueryInfo(pVnode->tsdb, pQueryTableMsg, &pQInfo);
   
     SQueryTableRsp *pRsp = (SQueryTableRsp *) rpcMallocCont(sizeof(SQueryTableRsp));
     pRsp->qhandle = htobe64((uint64_t) (pQInfo));
diff --git a/src/vnode/src/vnodeWrite.c b/src/vnode/src/vnodeWrite.c
index 8e66a427de..a47624b94f 100644
--- a/src/vnode/src/vnodeWrite.c
+++ b/src/vnode/src/vnodeWrite.c
@@ -147,8 +147,7 @@ static int32_t vnodeProcessCreateTableMsg(SVnodeObj *pVnode, void *pCont, SRspRe
     tsdbTableSetTagValue(&tCfg, dataRow, false);
   }
 
-  void *pTsdb = vnodeGetTsdb(pVnode);
-  code = tsdbCreateTable(pTsdb, &tCfg);
+  code = tsdbCreateTable(pVnode->tsdb, &tCfg);
 
   tfree(pDestSchema);
 
@@ -211,8 +210,7 @@ static int32_t vnodeProcessAlterTableMsg(SVnodeObj *pVnode, void *pCont, SRspRet
     tsdbTableSetTagValue(&tCfg, dataRow, false);
   }
 
-  void *pTsdb = vnodeGetTsdb(pVnode);
-  code = tsdbAlterTable(pTsdb, &tCfg);
+  code = tsdbAlterTable(pVnode->tsdb, &tCfg);
 
   tfree(pDestSchema);