From a91f0736fa7d2be3123652d49e326ae2063098de Mon Sep 17 00:00:00 2001
From: hjxilinx <hjxilinx@163.com>
Date: Sun, 5 Apr 2020 22:05:28 +0800
Subject: [PATCH] [TD-98] update the hash functions for rpc module

---
 src/rpc/src/rpcMain.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/rpc/src/rpcMain.c b/src/rpc/src/rpcMain.c
index 8dbbb97a1a..64f265ce6e 100755
--- a/src/rpc/src/rpcMain.c
+++ b/src/rpc/src/rpcMain.c
@@ -24,7 +24,6 @@
 #include "lz4.h"
 #include "taoserror.h"
 #include "tsocket.h"
-#include "shash.h"
 #include "taosmsg.h"
 #include "rpcUdp.h"
 #include "rpcCache.h"
@@ -263,7 +262,6 @@ void *rpcOpen(SRpcInit *pInit) {
   }
 
   if (pRpc->connType == TAOS_CONN_SERVER) {
-//    pRpc->hash = taosInitStrHash(pRpc->sessions, sizeof(pRpc), taosHashString);
       pRpc->hash = taosHashInit(pRpc->sessions, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY), true);
     if (pRpc->hash == NULL) {
       tError("%s failed to init string hash", pRpc->label);
@@ -298,7 +296,6 @@ void rpcClose(void *param) {
     }
   }
 
-//  taosCleanUpStrHash(pRpc->hash);
   taosHashCleanup(pRpc->hash);
   taosTmrCleanUp(pRpc->tmrCtrl);
   taosIdPoolCleanUp(pRpc->idPool);
@@ -535,8 +532,7 @@ static void rpcCloseConn(void *thandle) {
   if ( pRpc->connType == TAOS_CONN_SERVER) {
     char hashstr[40] = {0};
     size_t size = sprintf(hashstr, "%x:%x:%x:%d", pConn->peerIp, pConn->linkUid, pConn->peerId, pConn->connType);
-//    taosDeleteStrHash(pRpc->hash, hashstr);
-//    taosHashRemove(pRpc->hash, hashstr, size);
+    taosHashRemove(pRpc->hash, hashstr, size);
     
     rpcFreeMsg(pConn->pRspMsg); // it may have a response msg saved, but not request msg
     pConn->pRspMsg = NULL;
@@ -588,7 +584,6 @@ static SRpcConn *rpcAllocateServerConn(SRpcInfo *pRpc, SRecvInfo *pRecv) {
   size_t size = sprintf(hashstr, "%x:%x:%x:%d", pRecv->ip, pHead->linkUid, pHead->sourceId, pRecv->connType);
  
   // check if it is already allocated
-//  SRpcConn **ppConn = (SRpcConn **)(taosGetStrHashData(pRpc->hash, hashstr));
   SRpcConn **ppConn = (SRpcConn **)(taosHashGet(pRpc->hash, hashstr, size));
   if (ppConn) pConn = *ppConn;
   if (pConn) return pConn;
@@ -621,7 +616,6 @@ static SRpcConn *rpcAllocateServerConn(SRpcInfo *pRpc, SRecvInfo *pRecv) {
       pConn->localPort = (pRpc->localPort + pRpc->index);
     }
 
-//    taosAddStrHash(pRpc->hash, hashstr, (char *)&pConn);
     taosHashPut(pRpc->hash, hashstr, size, (char *)&pConn, POINTER_BYTES);
     
     tTrace("%s %p, rpc connection is allocated, sid:%d id:%s port:%u",