refactor hash table codes.

src/client/src/tcache.c

@@ -15,12 +15,12 @@
 
 #include "os.h"
 
+#include "hashfunc.h"
 #include "tcache.h"
 #include "tlog.h"
 #include "ttime.h"
 #include "ttimer.h"
 #include "tutil.h"
-#include "hashutil.h"
 
 #define HASH_MAX_CAPACITY   (1024*1024*16)
 #define HASH_VALUE_IN_TRASH (-1)

src/client/src/tscParseInsert.c

@@ -1002,7 +1002,7 @@ int doParseInsertSql(SSqlObj *pSql, char *str) {
       || ((NULL != pSql->asyncTblPos) && (NULL != pSql->pTableHashList)));
 
   if ((NULL == pSql->asyncTblPos) && (NULL == pSql->pTableHashList)) {
-    pSql->pTableHashList = taosInitHashTable(128, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BIGINT), false);
+    pSql->pTableHashList = taosHashInit(128, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BIGINT), false);
 
     pSql->cmd.pDataBlocks = tscCreateBlockArrayList();
     if (NULL == pSql->pTableHashList || NULL == pSql->cmd.pDataBlocks) {
@@ -1260,7 +1260,7 @@ _error_clean:
   pCmd->pDataBlocks = tscDestroyBlockArrayList(pCmd->pDataBlocks);
 
 _clean:
-  taosCleanUpHashTable(pSql->pTableHashList);
+  taosHashCleanup(pSql->pTableHashList);
   
   pSql->pTableHashList = NULL;
   pSql->asyncTblPos    = NULL;

src/client/src/tscSql.c

@@ -206,7 +206,7 @@ int taos_query_imp(STscObj *pObj, SSqlObj *pSql) {
 
   pSql->asyncTblPos = NULL;
   if (NULL != pSql->pTableHashList) {
-    taosCleanUpHashTable(pSql->pTableHashList);
+    taosHashCleanup(pSql->pTableHashList);
     pSql->pTableHashList = NULL;
   }
 
@@ -1079,7 +1079,7 @@ int taos_validate_sql(TAOS *taos, const char *sql) {
 
   pSql->asyncTblPos = NULL;
   if (NULL != pSql->pTableHashList) {
-    taosCleanUpHashTable(pSql->pTableHashList);
+    taosHashCleanup(pSql->pTableHashList);
     pSql->pTableHashList = NULL;
   }
 

src/client/src/tscUtil.c

@@ -677,7 +677,7 @@ int32_t tscGetDataBlockFromList(void* pHashList, SDataBlockList* pDataBlockList,
                                 STableDataBlocks** dataBlocks) {
   *dataBlocks = NULL;
 
-  STableDataBlocks** t1 = (STableDataBlocks**)taosGetDataFromHashTable(pHashList, (const char*)&id, sizeof(id));
+  STableDataBlocks** t1 = (STableDataBlocks**)taosHashGet(pHashList, (const char*)&id, sizeof(id));
   if (t1 != NULL) {
     *dataBlocks = *t1;
   }
@@ -688,7 +688,7 @@ int32_t tscGetDataBlockFromList(void* pHashList, SDataBlockList* pDataBlockList,
       return ret;
     }
 
-    taosAddToHashTable(pHashList, (const char*)&id, sizeof(int64_t), (char*)dataBlocks, POINTER_BYTES);
+    taosHashPut(pHashList, (const char*)&id, sizeof(int64_t), (char*)dataBlocks, POINTER_BYTES);
     tscAppendDataBlock(pDataBlockList, *dataBlocks);
   }
 
@@ -698,7 +698,7 @@ int32_t tscGetDataBlockFromList(void* pHashList, SDataBlockList* pDataBlockList,
 int32_t tscMergeTableDataBlocks(SSqlObj* pSql, SDataBlockList* pTableDataBlockList) {
   SSqlCmd* pCmd = &pSql->cmd;
 
-  void* pVnodeDataBlockHashList = taosInitHashTable(128, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BIGINT), false);
+  void* pVnodeDataBlockHashList = taosHashInit(128, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BIGINT), false);
   SDataBlockList* pVnodeDataBlockList = tscCreateBlockArrayList();
 
   for (int32_t i = 0; i < pTableDataBlockList->nSize; ++i) {
@@ -710,7 +710,7 @@ int32_t tscMergeTableDataBlocks(SSqlObj* pSql, SDataBlockList* pTableDataBlockLi
                                 tsInsertHeadSize, 0, pOneTableBlock->tableId, pOneTableBlock->pMeterMeta, &dataBuf);
     if (ret != TSDB_CODE_SUCCESS) {
       tscError("%p failed to prepare the data block buffer for merging table data, code:%d", pSql, ret);
-      taosCleanUpHashTable(pVnodeDataBlockHashList);
+      taosHashCleanup(pVnodeDataBlockHashList);
       tscDestroyBlockArrayList(pVnodeDataBlockList);
       return ret;
     }
@@ -728,7 +728,7 @@ int32_t tscMergeTableDataBlocks(SSqlObj* pSql, SDataBlockList* pTableDataBlockLi
       } else {  // failed to allocate memory, free already allocated memory and return error code
         tscError("%p failed to allocate memory for merging submit block, size:%d", pSql, dataBuf->nAllocSize);
 
-        taosCleanUpHashTable(pVnodeDataBlockHashList);
+        taosHashCleanup(pVnodeDataBlockHashList);
         tfree(dataBuf->pData);
         tscDestroyBlockArrayList(pVnodeDataBlockList);
 
@@ -761,7 +761,7 @@ int32_t tscMergeTableDataBlocks(SSqlObj* pSql, SDataBlockList* pTableDataBlockLi
   pCmd->pDataBlocks = pVnodeDataBlockList;
 
   tscFreeUnusedDataBlocks(pCmd->pDataBlocks);
-  taosCleanUpHashTable(pVnodeDataBlockHashList);
+  taosHashCleanup(pVnodeDataBlockHashList);
 
   return TSDB_CODE_SUCCESS;
 }

src/query/src/tresultBuf.c

@@ -16,7 +16,7 @@ int32_t createDiskbasedResultBuffer(SQueryDiskbasedResultBuf** pResultBuf, int32
   pResBuf->incStep = 4;
 
   // init id hash table
-  pResBuf->idsTable = taosInitHashTable(size, taosGetDefaultHashFunction(TSDB_DATA_TYPE_INT), false);
+  pResBuf->idsTable = taosHashInit(size, taosGetDefaultHashFunction(TSDB_DATA_TYPE_INT), false);
   pResBuf->list = calloc(size, sizeof(SIDList));
   pResBuf->numOfAllocGroupIds = size;
 
@@ -56,7 +56,7 @@ tFilePage* getResultBufferPageById(SQueryDiskbasedResultBuf* pResultBuf, int32_t
   return (tFilePage*)(pResultBuf->pBuf + DEFAULT_INTERN_BUF_SIZE * id);
 }
 
-int32_t getNumOfResultBufGroupId(SQueryDiskbasedResultBuf* pResultBuf) { return taosNumElemsInHashTable(pResultBuf->idsTable); }
+int32_t getNumOfResultBufGroupId(SQueryDiskbasedResultBuf* pResultBuf) { return taosHashGetSize(pResultBuf->idsTable); }
 
 int32_t getResBufSize(SQueryDiskbasedResultBuf* pResultBuf) { return pResultBuf->totalBufSize; }
 
@@ -95,7 +95,7 @@ static bool noMoreAvailablePages(SQueryDiskbasedResultBuf* pResultBuf) {
 static int32_t getGroupIndex(SQueryDiskbasedResultBuf* pResultBuf, int32_t groupId) {
   assert(pResultBuf != NULL);
 
-  char* p = taosGetDataFromHashTable(pResultBuf->idsTable, (const char*)&groupId, sizeof(int32_t));
+  char* p = taosHashGet(pResultBuf->idsTable, (const char*)&groupId, sizeof(int32_t));
   if (p == NULL) {  // it is a new group id
     return -1;
   }
@@ -121,7 +121,7 @@ static int32_t addNewGroupId(SQueryDiskbasedResultBuf* pResultBuf, int32_t group
     pResultBuf->numOfAllocGroupIds = n;
   }
 
-  taosAddToHashTable(pResultBuf->idsTable, (const char*)&groupId, sizeof(int32_t), &num, sizeof(int32_t));
+  taosHashPut(pResultBuf->idsTable, (const char*)&groupId, sizeof(int32_t), &num, sizeof(int32_t));
   return num;
 }
 
@@ -210,7 +210,7 @@ void destroyResultBuf(SQueryDiskbasedResultBuf* pResultBuf) {
   }
 
   tfree(pResultBuf->list);
-  taosCleanUpHashTable(pResultBuf->idsTable);
+  taosHashCleanup(pResultBuf->idsTable);
   
   tfree(pResultBuf);
 }

src/query/src/ttokenizer.c

@@ -14,12 +14,12 @@
  */
 
 #include "hash.h"
-#include "hashutil.h"
+#include "hashfunc.h"
 #include "os.h"
 #include "shash.h"
+#include "taosdef.h"
 #include "tstoken.h"
 #include "ttokendef.h"
-#include "taosdef.h"
 #include "tutil.h"
 
 // All the keywords of the SQL language are stored in a hash table
@@ -253,11 +253,11 @@ static void* KeywordHashTable = NULL;
 static void doInitKeywordsTable() {
   int numOfEntries = tListLen(keywordTable);
   
-  KeywordHashTable = taosInitHashTable(numOfEntries, MurmurHash3_32, false);
+  KeywordHashTable = taosHashInit(numOfEntries, MurmurHash3_32, false);
   for (int32_t i = 0; i < numOfEntries; i++) {
     keywordTable[i].len = strlen(keywordTable[i].name);
     void* ptr = &keywordTable[i];
-    taosAddToHashTable(KeywordHashTable, keywordTable[i].name, keywordTable[i].len, (void*)&ptr, POINTER_BYTES);
+    taosHashPut(KeywordHashTable, keywordTable[i].name, keywordTable[i].len, (void*)&ptr, POINTER_BYTES);
   }
 }
 
@@ -275,7 +275,7 @@ int tSQLKeywordCode(const char* z, int n) {
     }
   }
 
-  SKeyword** pKey = (SKeyword**)taosGetDataFromHashTable(KeywordHashTable, key, n);
+  SKeyword** pKey = (SKeyword**)taosHashGet(KeywordHashTable, key, n);
   if (pKey != NULL) {
     return (*pKey)->type;
   } else {

src/query/src/tvariant.c

@@ -13,17 +13,16 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "tvariant.h"
 #include "hash.h"
-#include "hashutil.h"
+#include "hashfunc.h"
 #include "os.h"
 #include "shash.h"
+#include "taos.h"
+#include "taosdef.h"
 #include "tstoken.h"
 #include "ttokendef.h"
-#include "taosdef.h"
 #include "tutil.h"
-#include "tvariant.h"
-#include "taosdef.h"
-#include "taos.h"
 
 // todo support scientific expression number and oct number
 void tVariantCreate(tVariant *pVar, SSQLToken *token) { tVariantCreateFromString(pVar, token->z, token->n, token->type); }

src/util/inc/hash.h

@@ -20,7 +20,7 @@
 extern "C" {
 #endif
 
-#include "hashutil.h"
+#include "hashfunc.h"
 
 #define HASH_MAX_CAPACITY (1024 * 1024 * 16)
 #define HASH_VALUE_IN_TRASH (-1)
@@ -45,32 +45,77 @@ typedef struct SHashEntry {
   uint32_t   num;
 } SHashEntry;
 
-typedef struct HashObj {
+typedef struct SHashObj {
   SHashEntry **hashList;
-  uint32_t     capacity;         // number of slots
-  int          size;             // number of elements in hash table
+  size_t       capacity;         // number of slots
+  size_t       size;             // number of elements in hash table
   _hash_fn_t   hashFp;           // hash function
-  bool         multithreadSafe;  // enable lock or not
 
-#if defined LINUX
-  pthread_rwlock_t lock;
+#if defined (LINUX)
+  pthread_rwlock_t* lock;
 #else
-  pthread_mutex_t lock;
+  pthread_mutex_t*  lock;
 #endif
+} SHashObj;
 
-} HashObj;
+/**
+ * init the hash table
+ *
+ * @param capacity    initial capacity of the hash table
+ * @param fn          hash function to generate the hash value
+ * @param threadsafe  thread safe or not
+ * @return
+ */
+SHashObj *taosHashInit(size_t capacity, _hash_fn_t fn, bool threadsafe);
 
-void *taosInitHashTable(uint32_t capacity, _hash_fn_t fn, bool multithreadSafe);
-void  taosDeleteFromHashTable(HashObj *pObj, const char *key, uint32_t keyLen);
+/**
+ * return the size of hash table
+ * @param pHashObj
+ * @return
+ */
+size_t taosHashGetSize(const SHashObj *pHashObj);
+
+/**
+ * put element into hash table, if the element with the same key exists, update it
+ * @param pHashObj
+ * @param key
+ * @param keyLen
+ * @param data
+ * @param size
+ * @return
+ */
+int32_t taosHashPut(SHashObj *pHashObj, const char *key, size_t keyLen, void *data, size_t size);
 
-int32_t taosAddToHashTable(HashObj *pObj, const char *key, uint32_t keyLen, void *data, uint32_t size);
-int32_t taosNumElemsInHashTable(HashObj *pObj);
+/**
+ * return the payload data with the specified key
+ *
+ * @param pHashObj
+ * @param key
+ * @param keyLen
+ * @return
+ */
+void *taosHashGet(SHashObj *pHashObj, const char *key, size_t keyLen);
 
-char *taosGetDataFromHashTable(HashObj *pObj, const char *key, uint32_t keyLen);
+/**
+ * remove item with the specified key
+ * @param pHashObj
+ * @param key
+ * @param keyLen
+ */
+void  taosHashRemove(SHashObj *pHashObj, const char *key, size_t keyLen);
 
-void taosCleanUpHashTable(void *handle);
+/**
+ * clean up hash table
+ * @param handle
+ */
+void taosHashCleanup(SHashObj *pHashObj);
 
-int32_t taosGetHashMaxOverflowLength(HashObj *pObj);
+/**
+ *
+ * @param pHashObj
+ * @return
+ */
+int32_t taosHashGetMaxOverflowLinkLength(const SHashObj *pHashObj);
 
 #ifdef __cplusplus
 }

src/util/src/hash.c

@@ -21,7 +21,11 @@
 #include "tutil.h"
 
 static FORCE_INLINE void __wr_lock(void *lock) {
-#if defined              LINUX
+  if (lock == NULL) {
+    return;
+  }
+  
+#if defined (LINUX)
   pthread_rwlock_wrlock(lock);
 #else
   pthread_mutex_lock(lock);
@@ -29,7 +33,11 @@ static FORCE_INLINE void __wr_lock(void *lock) {
 }
 
 static FORCE_INLINE void __rd_lock(void *lock) {
-#if defined              LINUX
+  if (lock == NULL) {
+    return;
+  }
+  
+#if defined (LINUX)
   pthread_rwlock_rdlock(lock);
 #else
   pthread_mutex_lock(lock);
@@ -37,7 +45,11 @@ static FORCE_INLINE void __rd_lock(void *lock) {
 }
 
 static FORCE_INLINE void __unlock(void *lock) {
-#if defined              LINUX
+  if (lock == NULL) {
+    return;
+  }
+  
+#if defined (LINUX)
   pthread_rwlock_unlock(lock);
 #else
   pthread_mutex_unlock(lock);
@@ -45,7 +57,11 @@ static FORCE_INLINE void __unlock(void *lock) {
 }
 
 static FORCE_INLINE int32_t __lock_init(void *lock) {
-#if defined                 LINUX
+  if (lock == NULL) {
+    return 0;
+  }
+  
+#if defined (LINUX)
   return pthread_rwlock_init(lock, NULL);
 #else
   return pthread_mutex_init(lock, NULL);
@@ -53,7 +69,11 @@ static FORCE_INLINE int32_t __lock_init(void *lock) {
 }
 
 static FORCE_INLINE void __lock_destroy(void *lock) {
-#if defined              LINUX
+  if (lock == NULL) {
+    return;
+  }
+  
+#if defined (LINUX)
   pthread_rwlock_destroy(lock);
 #else
   pthread_mutex_destroy(lock);
@@ -68,21 +88,12 @@ static FORCE_INLINE int32_t taosHashCapacity(int32_t length) {
   return i;
 }
 
-/**
- * hash key function
- *
- * @param key    key string
- * @param len    length of key
- * @return       hash value
- */
-static FORCE_INLINE uint32_t taosHashKey(const char *key, uint32_t len) { return MurmurHash3_32(key, len); }
-
 /**
  * inplace update node in hash table
- * @param pObj      hash table object
+ * @param pHashObj      hash table object
  * @param pNode     data node
  */
-static void doUpdateHashTable(HashObj *pObj, SHashNode *pNode) {
+static void doUpdateHashTable(SHashObj *pHashObj, SHashNode *pNode) {
   if (pNode->prev1) {
     pNode->prev1->next = pNode;
   }
@@ -96,16 +107,16 @@ static void doUpdateHashTable(HashObj *pObj, SHashNode *pNode) {
 
 /**
  * get SHashNode from hashlist, nodes from trash are not included.
- * @param pObj      Cache objection
+ * @param pHashObj      Cache objection
  * @param key       key for hash
  * @param keyLen    key length
  * @return
  */
-static SHashNode *doGetNodeFromHashTable(HashObj *pObj, const char *key, uint32_t keyLen, uint32_t *hashVal) {
-  uint32_t hash = (*pObj->hashFp)(key, keyLen);
+static SHashNode *doGetNodeFromHashTable(SHashObj *pHashObj, const char *key, uint32_t keyLen, uint32_t *hashVal) {
+  uint32_t hash = (*pHashObj->hashFp)(key, keyLen);
 
-  int32_t     slot = HASH_INDEX(hash, pObj->capacity);
-  SHashEntry *pEntry = pObj->hashList[slot];
+  int32_t     slot = HASH_INDEX(hash, pHashObj->capacity);
+  SHashEntry *pEntry = pHashObj->hashList[slot];
 
   SHashNode *pNode = pEntry->next;
   while (pNode) {
@@ -117,7 +128,7 @@ static SHashNode *doGetNodeFromHashTable(HashObj *pObj, const char *key, uint32_
   }
 
   if (pNode) {
-    assert(HASH_INDEX(pNode->hashVal, pObj->capacity) == slot);
+    assert(HASH_INDEX(pNode->hashVal, pHashObj->capacity) == slot);
   }
 
   // return the calculated hash value, to avoid calculating it again in other functions
@@ -131,10 +142,10 @@ static SHashNode *doGetNodeFromHashTable(HashObj *pObj, const char *key, uint32_
 /**
  * resize the hash list if the threshold is reached
  *
- * @param pObj
+ * @param pHashObj
  */
-static void taosHashTableResize(HashObj *pObj) {
-  if (pObj->size < pObj->capacity * HASH_DEFAULT_LOAD_FACTOR) {
+static void taosHashTableResize(SHashObj *pHashObj) {
+  if (pHashObj->size < pHashObj->capacity * HASH_DEFAULT_LOAD_FACTOR) {
     return;
   }
 
@@ -142,30 +153,30 @@ static void taosHashTableResize(HashObj *pObj) {
   SHashNode *pNode = NULL;
   SHashNode *pNext = NULL;
 
-  int32_t newSize = pObj->capacity << 1U;
+  int32_t newSize = pHashObj->capacity << 1U;
   if (newSize > HASH_MAX_CAPACITY) {
-    pTrace("current capacity:%d, maximum capacity:%d, no resize applied due to limitation is reached", pObj->capacity,
+    pTrace("current capacity:%d, maximum capacity:%d, no resize applied due to limitation is reached", pHashObj->capacity,
            HASH_MAX_CAPACITY);
     return;
   }
 
   int64_t st = taosGetTimestampUs();
 
-  SHashEntry **pNewEntry = realloc(pObj->hashList, sizeof(SHashEntry*) * newSize);
+  SHashEntry **pNewEntry = realloc(pHashObj->hashList, sizeof(SHashEntry*) * newSize);
   if (pNewEntry == NULL) {
-    pTrace("cache resize failed due to out of memory, capacity remain:%d", pObj->capacity);
+    pTrace("cache resize failed due to out of memory, capacity remain:%d", pHashObj->capacity);
     return;
   }
 
-  pObj->hashList = pNewEntry;
-  for(int32_t i = pObj->capacity; i < newSize; ++i) {
-    pObj->hashList[i] = calloc(1, sizeof(SHashEntry));
+  pHashObj->hashList = pNewEntry;
+  for(int32_t i = pHashObj->capacity; i < newSize; ++i) {
+    pHashObj->hashList[i] = calloc(1, sizeof(SHashEntry));
   }
   
-  pObj->capacity = newSize;
+  pHashObj->capacity = newSize;
 
-  for (int32_t i = 0; i < pObj->capacity; ++i) {
-    SHashEntry *pEntry = pObj->hashList[i];
+  for (int32_t i = 0; i < pHashObj->capacity; ++i) {
+    SHashEntry *pEntry = pHashObj->hashList[i];
 
     pNode = pEntry->next;
     if (pNode != NULL) {
@@ -173,7 +184,7 @@ static void taosHashTableResize(HashObj *pObj) {
     }
     
     while (pNode) {
-      int32_t j = HASH_INDEX(pNode->hashVal, pObj->capacity);
+      int32_t j = HASH_INDEX(pNode->hashVal, pHashObj->capacity);
       if (j == i) {  // this key resides in the same slot, no need to relocate it
         pNode = pNode->next;
       } else {
@@ -199,7 +210,7 @@ static void taosHashTableResize(HashObj *pObj) {
         pNode->next = NULL;
         pNode->prev1 = NULL;
 
-        SHashEntry *pNewIndexEntry = pObj->hashList[j];
+        SHashEntry *pNewIndexEntry = pHashObj->hashList[j];
 
         if (pNewIndexEntry->next != NULL) {
           assert(pNewIndexEntry->next->prev1 == pNewIndexEntry);
@@ -221,8 +232,8 @@ static void taosHashTableResize(HashObj *pObj) {
 
   int64_t et = taosGetTimestampUs();
 
-  pTrace("hash table resize completed, new capacity:%d, load factor:%f, elapsed time:%fms", pObj->capacity,
-         ((double)pObj->size) / pObj->capacity, (et - st) / 1000.0);
+  pTrace("hash table resize completed, new capacity:%d, load factor:%f, elapsed time:%fms", pHashObj->capacity,
+         ((double)pHashObj->size) / pHashObj->capacity, (et - st) / 1000.0);
 }
 
 /**
@@ -230,43 +241,51 @@ static void taosHashTableResize(HashObj *pObj) {
  * @param fn       hash function
  * @return
  */
-void *taosInitHashTable(uint32_t capacity, _hash_fn_t fn, bool multithreadSafe) {
+SHashObj *taosHashInit(size_t capacity, _hash_fn_t fn, bool threadsafe) {
   if (capacity == 0 || fn == NULL) {
     return NULL;
   }
 
-  HashObj *pObj = (HashObj *)calloc(1, sizeof(HashObj));
-  if (pObj == NULL) {
+  SHashObj *pHashObj = (SHashObj *)calloc(1, sizeof(SHashObj));
+  if (pHashObj == NULL) {
     pError("failed to allocate memory, reason:%s", strerror(errno));
     return NULL;
   }
 
   // the max slots is not defined by user
-  pObj->capacity = taosHashCapacity(capacity);
-  assert((pObj->capacity & (pObj->capacity - 1)) == 0);
+  pHashObj->capacity = taosHashCapacity(capacity);
+  assert((pHashObj->capacity & (pHashObj->capacity - 1)) == 0);
 
-  pObj->hashFp = fn;
+  pHashObj->hashFp = fn;
 
-  pObj->hashList = (SHashEntry **)calloc(pObj->capacity, sizeof(SHashEntry*));
-  if (pObj->hashList == NULL) {
-    free(pObj);
+  pHashObj->hashList = (SHashEntry **)calloc(pHashObj->capacity, sizeof(SHashEntry*));
+  if (pHashObj->hashList == NULL) {
+    free(pHashObj);
     pError("failed to allocate memory, reason:%s", strerror(errno));
     return NULL;
   }
   
-  for(int32_t i = 0; i < pObj->capacity; ++i) {
-    pObj->hashList[i] = calloc(1, sizeof(SHashEntry));
+  for(int32_t i = 0; i < pHashObj->capacity; ++i) {
+    pHashObj->hashList[i] = calloc(1, sizeof(SHashEntry));
   }
 
-  if (multithreadSafe && (__lock_init(pObj) != 0)) {
-    free(pObj->hashList);
-    free(pObj);
+  if (threadsafe) {
+#if defined(LINUX)
+    pHashObj->lock = calloc(1, sizeof(pthread_rwlock_t));
+#else
+    pHashObj->lock = calloc(1, sizeof(pthread_mutex_t));
+#endif
+  }
+  
+  if (__lock_init(pHashObj->lock) != 0) {
+    free(pHashObj->hashList);
+    free(pHashObj);
 
     pError("failed to init lock, reason:%s", strerror(errno));
     return NULL;
   }
 
-  return (void *)pObj;
+  return pHashObj;
 }
 
 /**
@@ -277,7 +296,7 @@ void *taosInitHashTable(uint32_t capacity, _hash_fn_t fn, bool multithreadSafe)
  * @param size     size of block
  * @return         SHashNode
  */
-static SHashNode *doCreateHashNode(const char *key, uint32_t keyLen, const char *pData, size_t dataSize,
+static SHashNode *doCreateHashNode(const char *key, size_t keyLen, const char *pData, size_t dataSize,
                                    uint32_t hashVal) {
   size_t totalSize = dataSize + sizeof(SHashNode) + keyLen;
 
@@ -298,7 +317,7 @@ static SHashNode *doCreateHashNode(const char *key, uint32_t keyLen, const char
   return pNewNode;
 }
 
-static SHashNode *doUpdateHashNode(SHashNode *pNode, const char *key, uint32_t keyLen, const char *pData,
+static SHashNode *doUpdateHashNode(SHashNode *pNode, const char *key, size_t keyLen, const char *pData,
                                    size_t dataSize) {
   size_t size = dataSize + sizeof(SHashNode) + keyLen;
 
@@ -320,14 +339,14 @@ static SHashNode *doUpdateHashNode(SHashNode *pNode, const char *key, uint32_t k
 /**
  * insert the hash node at the front of the linked list
  *
- * @param pObj
+ * @param pHashObj
  * @param pNode
  */
-static void doAddToHashTable(HashObj *pObj, SHashNode *pNode) {
+static void doAddToHashTable(SHashObj *pHashObj, SHashNode *pNode) {
   assert(pNode != NULL);
 
-  int32_t     index = HASH_INDEX(pNode->hashVal, pObj->capacity);
-  SHashEntry *pEntry = pObj->hashList[index];
+  int32_t     index = HASH_INDEX(pNode->hashVal, pHashObj->capacity);
+  SHashEntry *pEntry = pHashObj->hashList[index];
   
   pNode->next = pEntry->next;
 
@@ -339,74 +358,60 @@ static void doAddToHashTable(HashObj *pObj, SHashNode *pNode) {
   pNode->prev1 = pEntry;
   
   pEntry->num++;
-  pObj->size++;
+  pHashObj->size++;
 }
 
-int32_t taosNumElemsInHashTable(HashObj *pObj) {
-  if (pObj == NULL) {
+size_t taosHashGetSize(const SHashObj *pHashObj) {
+  if (pHashObj == NULL) {
     return 0;
   }
   
-  return pObj->size;
+  return pHashObj->size;
 }
 
 /**
  * add data node into hash table
- * @param pObj    hash object
+ * @param pHashObj    hash object
  * @param pNode   hash node
  */
-int32_t taosAddToHashTable(HashObj *pObj, const char *key, uint32_t keyLen, void *data, uint32_t size) {
-  if (pObj->multithreadSafe) {
-    __wr_lock(&pObj->lock);
-  }
+int32_t taosHashPut(SHashObj *pHashObj, const char *key, size_t keyLen, void *data, size_t size) {
+  __wr_lock(pHashObj->lock);
 
   uint32_t   hashVal = 0;
-  SHashNode *pNode = doGetNodeFromHashTable(pObj, key, keyLen, &hashVal);
+  SHashNode *pNode = doGetNodeFromHashTable(pHashObj, key, keyLen, &hashVal);
 
   if (pNode == NULL) {  // no data in hash table with the specified key, add it into hash table
-    taosHashTableResize(pObj);
+    taosHashTableResize(pHashObj);
 
     SHashNode *pNewNode = doCreateHashNode(key, keyLen, data, size, hashVal);
     if (pNewNode == NULL) {
-      if (pObj->multithreadSafe) {
-        __unlock(&pObj->lock);
-      }
+      __unlock(pHashObj->lock);
 
       return -1;
     }
 
-    doAddToHashTable(pObj, pNewNode);
+    doAddToHashTable(pHashObj, pNewNode);
   } else {
     SHashNode *pNewNode = doUpdateHashNode(pNode, key, keyLen, data, size);
     if (pNewNode == NULL) {
-      if (pObj->multithreadSafe) {
-        __unlock(&pObj->lock);
-      }
-
+      __unlock(pHashObj->lock);
       return -1;
     }
 
-    doUpdateHashTable(pObj, pNewNode);
-  }
-
-  if (pObj->multithreadSafe) {
-    __unlock(&pObj->lock);
+    doUpdateHashTable(pHashObj, pNewNode);
   }
 
+  __unlock(pHashObj->lock);
   return 0;
 }
 
-char *taosGetDataFromHashTable(HashObj *pObj, const char *key, uint32_t keyLen) {
-  if (pObj->multithreadSafe) {
-    __rd_lock(&pObj->lock);
-  }
+void *taosHashGet(SHashObj *pHashObj, const char *key, size_t keyLen) {
+  __rd_lock(pHashObj->lock);
 
   uint32_t   hashVal = 0;
-  SHashNode *pNode = doGetNodeFromHashTable(pObj, key, keyLen, &hashVal);
+  SHashNode *pNode = doGetNodeFromHashTable(pHashObj, key, keyLen, &hashVal);
 
-  if (pObj->multithreadSafe) {
-    __unlock(&pObj->lock);
-  }
+  __unlock(pHashObj->lock);
 
   if (pNode != NULL) {
     assert(pNode->hashVal == hashVal);
@@ -419,29 +424,24 @@ char *taosGetDataFromHashTable(HashObj *pObj, const char *key, uint32_t keyLen)
 
 /**
  * remove node in hash list
- * @param pObj
+ * @param pHashObj
  * @param pNode
  */
-void taosDeleteFromHashTable(HashObj *pObj, const char *key, uint32_t keyLen) {
-  if (pObj->multithreadSafe) {
-    __wr_lock(&pObj->lock);
-  }
+void taosHashRemove(SHashObj *pHashObj, const char *key, size_t keyLen) {
+  __wr_lock(pHashObj->lock);
 
   uint32_t val = 0;
-  SHashNode *pNode = doGetNodeFromHashTable(pObj, key, keyLen, &val);
+  SHashNode *pNode = doGetNodeFromHashTable(pHashObj, key, keyLen, &val);
   if (pNode == NULL) {
-    if (pObj->multithreadSafe) {
-      __unlock(&pObj->lock);
-    }
-
+    __unlock(pHashObj->lock);
     return;
   }
 
   SHashNode *pNext = pNode->next;
   if (pNode->prev != NULL) {
-    int32_t slot = HASH_INDEX(val, pObj->capacity);
-    if (pObj->hashList[slot]->next == pNode) {
-      pObj->hashList[slot]->next = pNext;
+    int32_t slot = HASH_INDEX(val, pHashObj->capacity);
+    if (pHashObj->hashList[slot]->next == pNode) {
+      pHashObj->hashList[slot]->next = pNext;
     } else {
       pNode->prev->next = pNext;
     }
@@ -451,11 +451,12 @@ void taosDeleteFromHashTable(HashObj *pObj, const char *key, uint32_t keyLen) {
     pNext->prev = pNode->prev;
   }
 
-  uint32_t    index = HASH_INDEX(pNode->hashVal, pObj->capacity);
-  SHashEntry *pEntry = pObj->hashList[index];
+  uint32_t index = HASH_INDEX(pNode->hashVal, pHashObj->capacity);
+  
+  SHashEntry *pEntry = pHashObj->hashList[index];
   pEntry->num--;
 
-  pObj->size--;
+  pHashObj->size--;
 
   pNode->next = NULL;
   pNode->prev = NULL;
@@ -463,24 +464,21 @@ void taosDeleteFromHashTable(HashObj *pObj, const char *key, uint32_t keyLen) {
   pTrace("key:%s %p remove from hash table", pNode->key, pNode);
   tfree(pNode);
 
-  if (pObj->multithreadSafe) {
-    __unlock(&pObj->lock);
-  }
+  __unlock(pHashObj->lock);
 }
 
-void taosCleanUpHashTable(void *handle) {
-  HashObj *pObj = (HashObj *)handle;
-  if (pObj == NULL || pObj->capacity <= 0) return;
+void taosHashCleanup(SHashObj *pHashObj) {
+  if (pHashObj == NULL || pHashObj->capacity <= 0) {
+    return;
+  }
 
   SHashNode *pNode, *pNext;
 
-  if (pObj->multithreadSafe) {
-    __wr_lock(&pObj->lock);
-  }
+  __wr_lock(pHashObj->lock);
 
-  if (pObj->hashList) {
-    for (int32_t i = 0; i < pObj->capacity; ++i) {
-      SHashEntry *pEntry = pObj->hashList[i];
+  if (pHashObj->hashList) {
+    for (int32_t i = 0; i < pHashObj->capacity; ++i) {
+      SHashEntry *pEntry = pHashObj->hashList[i];
       pNode = pEntry->next;
 
       while (pNode) {
@@ -492,28 +490,26 @@ void taosCleanUpHashTable(void *handle) {
       tfree(pEntry);
     }
 
-    free(pObj->hashList);
+    free(pHashObj->hashList);
   }
 
-  if (pObj->multithreadSafe) {
-    __unlock(&pObj->lock);
-    __lock_destroy(&pObj->lock);
-  }
+  __unlock(pHashObj->lock);
+  __lock_destroy(pHashObj->lock);
 
-  memset(pObj, 0, sizeof(HashObj));
-  free(pObj);
+  memset(pHashObj, 0, sizeof(SHashObj));
+  free(pHashObj);
 }
 
 // for profile only
-int32_t taosGetHashMaxOverflowLength(HashObj* pObj) {
-  if (pObj == NULL || pObj->size == 0) {
+int32_t taosHashGetMaxOverflowLinkLength(const SHashObj* pHashObj) {
+  if (pHashObj == NULL || pHashObj->size == 0) {
     return 0;
   }
   
   int32_t num = 0;
   
-  for(int32_t i = 0; i < pObj->size; ++i) {
-    SHashEntry *pEntry = pObj->hashList[i];
+  for(int32_t i = 0; i < pHashObj->size; ++i) {
+    SHashEntry *pEntry = pHashObj->hashList[i];
     if (num < pEntry->num) {
       num = pEntry->num;
     }

src/util/src/thashutil.c

@@ -7,8 +7,8 @@
  * MurmurHash algorithm
  *
  */
+#include "hashfunc.h"
 #include "tutil.h"
-#include "hashutil.h"
 
 #define ROTL32(x, r) ((x) << (r) | (x) >> (32 - (r)))
 

src/vnode/detail/inc/vnodeQueryImpl.h

@@ -23,7 +23,7 @@ extern "C" {
 #include "os.h"
 
 #include "hash.h"
-#include "hashutil.h"
+#include "hashfunc.h"
 
 #define GET_QINFO_ADDR(x) ((char*)(x)-offsetof(SQInfo, query))
 #define Q_STATUS_EQUAL(p, s) (((p) & (s)) != 0)
@@ -119,7 +119,7 @@ typedef enum {
 typedef int (*__block_search_fn_t)(char* data, int num, int64_t key, int order);
 
 static FORCE_INLINE SMeterObj* getMeterObj(void* hashHandle, int32_t sid) {
-  return *(SMeterObj**)taosGetDataFromHashTable(hashHandle, (const char*)&sid, sizeof(sid));
+  return *(SMeterObj**)taosHashGet(hashHandle, (const char*)&sid, sizeof(sid));
 }
 
 bool isQueryKilled(SQuery* pQuery);

src/vnode/detail/src/vnodeQueryImpl.c

@@ -14,7 +14,7 @@
  */
 
 #include "hash.h"
-#include "hashutil.h"
+#include "hashfunc.h"
 #include "os.h"
 #include "taosmsg.h"
 #include "textbuffer.h"
@@ -1460,7 +1460,7 @@ static SWindowResult *doSetTimeWindowFromKey(SQueryRuntimeEnv *pRuntimeEnv, SWin
                                              int16_t bytes) {
   SQuery *pQuery = pRuntimeEnv->pQuery;
 
-  int32_t *p1 = (int32_t *)taosGetDataFromHashTable(pWindowResInfo->hashList, pData, bytes);
+  int32_t *p1 = (int32_t *)taosHashGet(pWindowResInfo->hashList, pData, bytes);
   if (p1 != NULL) {
     pWindowResInfo->curIndex = *p1;
   } else {  // more than the capacity, reallocate the resources
@@ -1485,7 +1485,7 @@ static SWindowResult *doSetTimeWindowFromKey(SQueryRuntimeEnv *pRuntimeEnv, SWin
 
     // add a new result set for a new group
     pWindowResInfo->curIndex = pWindowResInfo->size++;
-    taosAddToHashTable(pWindowResInfo->hashList, pData, bytes, (char *)&pWindowResInfo->curIndex, sizeof(int32_t));
+    taosHashPut(pWindowResInfo->hashList, pData, bytes, (char *)&pWindowResInfo->curIndex, sizeof(int32_t));
   }
 
   return getWindowResult(pWindowResInfo, pWindowResInfo->curIndex);
@@ -2018,7 +2018,7 @@ int32_t initWindowResInfo(SWindowResInfo *pWindowResInfo, SQueryRuntimeEnv *pRun
   pWindowResInfo->type = type;
 
   _hash_fn_t fn = taosGetDefaultHashFunction(type);
-  pWindowResInfo->hashList = taosInitHashTable(threshold, fn, false);
+  pWindowResInfo->hashList = taosHashInit(threshold, fn, false);
 
   pWindowResInfo->curIndex = -1;
   pWindowResInfo->size = 0;
@@ -2044,7 +2044,7 @@ void cleanupTimeWindowInfo(SWindowResInfo *pWindowResInfo, SQueryRuntimeEnv *pRu
     destroyTimeWindowRes(pResult, pRuntimeEnv->pQuery->numOfOutputCols);
   }
 
-  taosCleanUpHashTable(pWindowResInfo->hashList);
+  taosHashCleanup(pWindowResInfo->hashList);
   tfree(pWindowResInfo->pResult);
 }
 
@@ -2059,11 +2059,11 @@ void resetTimeWindowInfo(SQueryRuntimeEnv *pRuntimeEnv, SWindowResInfo *pWindowR
   }
 
   pWindowResInfo->curIndex = -1;
-  taosCleanUpHashTable(pWindowResInfo->hashList);
+  taosHashCleanup(pWindowResInfo->hashList);
   pWindowResInfo->size = 0;
 
   _hash_fn_t fn = taosGetDefaultHashFunction(pWindowResInfo->type);
-  pWindowResInfo->hashList = taosInitHashTable(pWindowResInfo->capacity, fn, false);
+  pWindowResInfo->hashList = taosHashInit(pWindowResInfo->capacity, fn, false);
 
   pWindowResInfo->startTime = 0;
   pWindowResInfo->prevSKey = 0;
@@ -2081,7 +2081,7 @@ void clearFirstNTimeWindow(SQueryRuntimeEnv *pRuntimeEnv, int32_t num) {
   for (int32_t i = 0; i < num; ++i) {
     SWindowResult *pResult = &pWindowResInfo->pResult[i];
     if (pResult->status.closed) {  // remove the window slot from hash table
-      taosDeleteFromHashTable(pWindowResInfo->hashList, (const char *)&pResult->window.skey, TSDB_KEYSIZE);
+      taosHashRemove(pWindowResInfo->hashList, (const char *)&pResult->window.skey, TSDB_KEYSIZE);
     } else {
       break;
     }
@@ -2104,14 +2104,14 @@ void clearFirstNTimeWindow(SQueryRuntimeEnv *pRuntimeEnv, int32_t num) {
 
   for (int32_t k = 0; k < pWindowResInfo->size; ++k) {
     SWindowResult *pResult = &pWindowResInfo->pResult[k];
-    int32_t *p = (int32_t *)taosGetDataFromHashTable(pWindowResInfo->hashList, (const char *)&pResult->window.skey,
+    int32_t *p = (int32_t *)taosHashGet(pWindowResInfo->hashList, (const char *)&pResult->window.skey,
                                                      TSDB_KEYSIZE);
     int32_t  v = (*p - num);
     assert(v >= 0 && v <= pWindowResInfo->size);
 
     // todo add the update function for hash table
-    taosDeleteFromHashTable(pWindowResInfo->hashList, (const char *)&pResult->window.skey, TSDB_KEYSIZE);
-    taosAddToHashTable(pWindowResInfo->hashList, (const char *)&pResult->window.skey, TSDB_KEYSIZE, (char *)&v,
+    taosHashRemove(pWindowResInfo->hashList, (const char *)&pResult->window.skey, TSDB_KEYSIZE);
+    taosHashPut(pWindowResInfo->hashList, (const char *)&pResult->window.skey, TSDB_KEYSIZE, (char *)&v,
                        sizeof(int32_t));
   }
 
@@ -4812,7 +4812,7 @@ void vnodeQueryFreeQInfoEx(SQInfo *pQInfo) {
   tfree(pSupporter->pMeterSidExtInfo);
 
   if (pSupporter->pMetersHashTable != NULL) {
-    taosCleanUpHashTable(pSupporter->pMetersHashTable);
+    taosHashCleanup(pSupporter->pMetersHashTable);
     pSupporter->pMetersHashTable = NULL;
   }
 

src/vnode/detail/src/vnodeRead.c

@@ -16,6 +16,8 @@
 #define _DEFAULT_SOURCE
 #include "os.h"
 
+#include "hash.h"
+#include "hashfunc.h"
 #include "ihash.h"
 #include "taosmsg.h"
 #include "tast.h"
@@ -25,8 +27,6 @@
 #include "vnode.h"
 #include "vnodeRead.h"
 #include "vnodeUtil.h"
-#include "hash.h"
-#include "hashutil.h"
 
 int (*pQueryFunc[])(SMeterObj *, SQuery *) = {vnodeQueryFromCache, vnodeQueryFromFile};
 
@@ -651,8 +651,8 @@ void *vnodeQueryOnSingleTable(SMeterObj **pMetersObj, SSqlGroupbyExpr *pGroupbyE
     STableQuerySupportObj *pSupporter = (STableQuerySupportObj *)calloc(1, sizeof(STableQuerySupportObj));
     pSupporter->numOfMeters = 1;
 
-    pSupporter->pMetersHashTable = taosInitHashTable(pSupporter->numOfMeters, taosIntHash_32, false);
-    taosAddToHashTable(pSupporter->pMetersHashTable, (const char*) &pMetersObj[0]->sid, sizeof(pMeterObj[0].sid),
+    pSupporter->pMetersHashTable = taosHashInit(pSupporter->numOfMeters, taosIntHash_32, false);
+    taosHashPut(pSupporter->pMetersHashTable, (const char*) &pMetersObj[0]->sid, sizeof(pMeterObj[0].sid),
         (char *)&pMetersObj[0], POINTER_BYTES);
 
     pSupporter->pSidSet = NULL;
@@ -742,9 +742,9 @@ void *vnodeQueryOnMultiMeters(SMeterObj **pMetersObj, SSqlGroupbyExpr *pGroupbyE
   STableQuerySupportObj *pSupporter = (STableQuerySupportObj *)calloc(1, sizeof(STableQuerySupportObj));
   pSupporter->numOfMeters = pQueryMsg->numOfSids;
 
-  pSupporter->pMetersHashTable = taosInitHashTable(pSupporter->numOfMeters, taosIntHash_32, false);
+  pSupporter->pMetersHashTable = taosHashInit(pSupporter->numOfMeters, taosIntHash_32, false);
   for (int32_t i = 0; i < pSupporter->numOfMeters; ++i) {
-    taosAddToHashTable(pSupporter->pMetersHashTable, (const char*) &pMetersObj[i]->sid, sizeof(pMetersObj[i]->sid), (char *)&pMetersObj[i],
+    taosHashPut(pSupporter->pMetersHashTable, (const char*) &pMetersObj[i]->sid, sizeof(pMetersObj[i]->sid), (char *)&pMetersObj[i],
                        POINTER_BYTES);
   }
 

src/vnode/tsdb/src/tsdbMeta.c

@@ -32,7 +32,7 @@ STsdbMeta *tsdbCreateMeta(int32_t maxTables) {
     return NULL;
   }
 
-  pMeta->tableMap = taosInitHashTable(maxTables + maxTables / 10, taosGetDefaultHashFunction, false);
+  pMeta->tableMap = taosHashInit(maxTables + maxTables / 10, taosGetDefaultHashFunction, false);
   if (pMeta->tableMap == NULL) {
     free(pMeta->tables);
     free(pMeta);
@@ -60,7 +60,7 @@ int32_t tsdbFreeMeta(STsdbMeta *pMeta) {
     tsdbFreeTable(pTemp);
   }
 
-  taosCleanUpHashTable(pMeta->tableMap);
+  taosHashCleanup(pMeta->tableMap);
 
   free(pMeta);
 
@@ -205,7 +205,7 @@ static int32_t tsdbCheckTableCfg(STableCfg *pCfg) {
 }
 
 STable *tsdbGetTableByUid(STsdbMeta *pMeta, int64_t uid) {
-  void *ptr = taosGetDataFromHashTable(pMeta->tableMap, (char *)(&uid), sizeof(uid));
+  void *ptr = taosHashGet(pMeta->tableMap, (char *)(&uid), sizeof(uid));
 
   if (ptr == NULL) return NULL;
 
@@ -244,7 +244,7 @@ static int tsdbRemoveTableFromMeta(STsdbMeta *pMeta, STable *pTable) {
 static int tsdbAddTableIntoMap(STsdbMeta *pMeta, STable *pTable) {
   // TODO: add the table to the map
   int64_t uid = pTable->tableId.uid;
-  if (taosAddToHashTable(pMeta->tableMap, (char *)(&uid), sizeof(uid), (void *)(&pTable), sizeof(pTable)) < 0) {
+  if (taosHashPut(pMeta->tableMap, (char *)(&uid), sizeof(uid), (void *)(&pTable), sizeof(pTable)) < 0) {
     return -1;
   }
   return 0;