diff --git a/src/dnode/src/dnodeEps.c b/src/dnode/src/dnodeEps.c
index 9c90c391813f57024ecf090136dfa86f5e5f91e6..83f294e05eb0e559638fef1259ad96ac6f162460 100644
--- a/src/dnode/src/dnodeEps.c
+++ b/src/dnode/src/dnodeEps.c
@@ -33,7 +33,7 @@ static void    dnodePrintEps(SDnodeEps *eps);
 
 int32_t dnodeInitEps() {
   pthread_mutex_init(&tsEpsMutex, NULL);
-  tsEpsHash = taosHashInit(4, taosGetDefaultHashFunction(TSDB_DATA_TYPE_INT), true, true);
+  tsEpsHash = taosHashInit(4, taosGetDefaultHashFunction(TSDB_DATA_TYPE_INT), true, HASH_ENTRY_LOCK);
   dnodeResetEps(NULL);
   int32_t ret = dnodeReadEps();
   if (ret == 0) {
diff --git a/src/inc/tsync.h b/src/inc/tsync.h
index 10b2e3f66ad71f3b1fb9d0de39497b41f2bb1977..77a3b36e73ec6a151e1f8b23e26673d3113dc012 100644
--- a/src/inc/tsync.h
+++ b/src/inc/tsync.h
@@ -89,7 +89,7 @@ typedef struct {
   int32_t  vgId;       // vgroup ID
   uint64_t version;    // initial version
   SSyncCfg syncCfg;    // configuration from mgmt
-  char     path[128];  // path to the file
+  char     path[TSDB_FILENAME_LEN];  // path to the file
   FGetFileInfo      getFileInfo;
   FGetWalInfo       getWalInfo;
   FWriteToCache     writeToCache;
diff --git a/src/mnode/src/mnodeSdb.c b/src/mnode/src/mnodeSdb.c
index e5df1d732a5f655a737480675ca70c9d8a022e3a..26a881d4773911e3bf2166ec64645bc130203b0c 100644
--- a/src/mnode/src/mnodeSdb.c
+++ b/src/mnode/src/mnodeSdb.c
@@ -812,7 +812,7 @@ void *sdbOpenTable(SSdbTableDesc *pDesc) {
   if (pTable->keyType == SDB_KEY_STRING || pTable->keyType == SDB_KEY_VAR_STRING) {
     hashFp = taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY);
   }
-  pTable->iHandle = taosHashInit(pTable->hashSessions, hashFp, true, true);
+  pTable->iHandle = taosHashInit(pTable->hashSessions, hashFp, true, HASH_ENTRY_LOCK);
 
   tsSdbMgmt.numOfTables++;
   tsSdbMgmt.tableList[pTable->id] = pTable;
diff --git a/src/mnode/src/mnodeTable.c b/src/mnode/src/mnodeTable.c
index 4d5f0808f55a3592b2ea9833f12df85ed252c9e2..c4601658b3f1440f0c52f75abf3e15f88e207a05 100644
--- a/src/mnode/src/mnodeTable.c
+++ b/src/mnode/src/mnodeTable.c
@@ -394,7 +394,7 @@ static void mnodeAddTableIntoStable(SSTableObj *pStable, SCTableObj *pCtable) {
   atomic_add_fetch_32(&pStable->numOfTables, 1);
 
   if (pStable->vgHash == NULL) {
-    pStable->vgHash = taosHashInit(64, taosGetDefaultHashFunction(TSDB_DATA_TYPE_INT), true, false);
+    pStable->vgHash = taosHashInit(64, taosGetDefaultHashFunction(TSDB_DATA_TYPE_INT), true, HASH_NO_LOCK);
   }
 
   if (pStable->vgHash != NULL) {
diff --git a/src/sync/inc/syncInt.h b/src/sync/inc/syncInt.h
index f1371bdc59ba2b1e5fb52c11eac5d325d88373c0..079013499720407508fcbae60164ff08394fa03b 100644
--- a/src/sync/inc/syncInt.h
+++ b/src/sync/inc/syncInt.h
@@ -153,12 +153,12 @@ typedef struct SSyncNode {
   int8_t       selfIndex;
   uint32_t     vgId;
   int64_t      rid;
-  SSyncPeer   *peerInfo[TAOS_SYNC_MAX_REPLICA+1];  // extra one for arbitrator
-  SSyncPeer   *pMaster;
+  SSyncPeer *  peerInfo[TAOS_SYNC_MAX_REPLICA + 1];  // extra one for arbitrator
+  SSyncPeer *  pMaster;
   SRecvBuffer *pRecv;
-  SSyncFwds   *pSyncFwds;  // saved forward info if quorum >1
-  void        *pFwdTimer;
-  void        *pRoleTimer;
+  SSyncFwds *  pSyncFwds;  // saved forward info if quorum >1
+  void *       pFwdTimer;
+  void *       pRoleTimer;
   FGetFileInfo    getFileInfo;
   FGetWalInfo     getWalInfo;
   FWriteToCache   writeToCache;
diff --git a/src/sync/src/syncMain.c b/src/sync/src/syncMain.c
index de0fc8fadc7979b6864ebd68322406fec01402e7..2402d8ebfa005357a8042dd932db41e4a2ff2d02 100644
--- a/src/sync/src/syncMain.c
+++ b/src/sync/src/syncMain.c
@@ -100,7 +100,7 @@ uint16_t syncGenTranId() {
 }
 
 int32_t syncInit() {
-  SPoolInfo info;
+  SPoolInfo info = {0};
 
   info.numOfThreads = tsSyncTcpThreads;
   info.serverIp = 0;
@@ -124,7 +124,7 @@ int32_t syncInit() {
     return -1;
   }
 
-  tsVgIdHash = taosHashInit(TSDB_MIN_VNODES, taosGetDefaultHashFunction(TSDB_DATA_TYPE_INT), true, true);
+  tsVgIdHash = taosHashInit(TSDB_MIN_VNODES, taosGetDefaultHashFunction(TSDB_DATA_TYPE_INT), true, HASH_ENTRY_LOCK);
   if (tsVgIdHash == NULL) {
     sError("failed to init tsVgIdHash");
     taosTmrCleanUp(tsSyncTmrCtrl);
diff --git a/src/vnode/src/vnodeRead.c b/src/vnode/src/vnodeRead.c
index e10d62a0c9f283eded9969547fad779468d3cdaa..5ef79cfbf01fb49ebbfd4603b8a9163b3ae9bc32 100644
--- a/src/vnode/src/vnodeRead.c
+++ b/src/vnode/src/vnodeRead.c
@@ -53,8 +53,7 @@ int32_t vnodeProcessRead(void *vparam, SVReadMsg *pRead) {
   return (*vnodeProcessReadMsgFp[msgType])(pVnode, pRead);
 }
 
-static int32_t vnodeCheckRead(void *vparam) {
-  SVnodeObj *pVnode = vparam;
+static int32_t vnodeCheckRead(SVnodeObj *pVnode) {
   if (pVnode->status != TAOS_VN_STATUS_READY) {
     vDebug("vgId:%d, vnode status is %s, refCount:%d pVnode:%p", pVnode->vgId, vnodeStatus[pVnode->status],
            pVnode->refCount, pVnode);
diff --git a/src/vnode/src/vnodeWrite.c b/src/vnode/src/vnodeWrite.c
index 2d2be602ed217df502101e423613c6631b400b9f..a0227d84babef8ee4259c7d86121770660097020 100644
--- a/src/vnode/src/vnodeWrite.c
+++ b/src/vnode/src/vnodeWrite.c
@@ -48,10 +48,10 @@ void vnodeInitWriteFp(void) {
 }
 
 int32_t vnodeProcessWrite(void *vparam, void *wparam, int32_t qtype, void *rparam) {
-  int32_t     code = 0;
-  SVnodeObj * pVnode = vparam;
-  SWalHead *  pHead = wparam;
-  SRspRet *   pRspRet = rparam;
+  int32_t    code = 0;
+  SVnodeObj *pVnode = vparam;
+  SWalHead * pHead = wparam;
+  SRspRet *  pRspRet = rparam;
 
   if (vnodeProcessWriteMsgFp[pHead->msgType] == NULL) {
     vError("vgId:%d, msg:%s not processed since no handle, qtype:%s hver:%" PRIu64, pVnode->vgId,