diff --git a/src/inc/vnode.h b/src/inc/vnode.h index e54820dffdcbe80781aa3b8dd9301ec5f53723aa..e8a7a1458f63b586c91fb6c7999995ad6110d6b1 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 84ae662110e59b8f43f496bb993e4194f5a68aed..472567784f54f0b22265db18a7dffccafa8c8107 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 7fcd02a102e6a5099b46ff9828c74e4edb2b4d83..94ec707c2ed3cec628776b914f5081f40b8b1928 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 8e66a427de250ef4139f89845de8e75f09beaf0c..a47624b94fedfd3c131b7822ecba4f7a8cad2f3d 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);