From 376e30aee7e582097c024b161b87562eb67ef547 Mon Sep 17 00:00:00 2001
From: Yifan Hao <haoyifan@gmail.com>
Date: Sun, 21 Nov 2021 21:59:39 -0800
Subject: [PATCH] Hash table cleanup [2/n]

A few cleanups:
1. Rename hash node "count" to "refCount" for ease of reading
2. Trailing white space removal of hash.h
---
 src/util/inc/hash.h | 10 +++++-----
 src/util/src/hash.c | 16 ++++++++--------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/util/inc/hash.h b/src/util/inc/hash.h
index 2a4cbec4dd..c85441c324 100644
--- a/src/util/inc/hash.h
+++ b/src/util/inc/hash.h
@@ -36,7 +36,7 @@ typedef struct SHashNode {
   uint32_t          dataLen;     // length of data
   uint32_t          keyLen;      // length of the key
   int8_t            removed;     // flag to indicate removed
-  int32_t           count;       // reference count
+  int32_t           refCount;    // reference count
   char              data[];
 } SHashNode;
 
@@ -81,9 +81,9 @@ SHashObj *taosHashInit(size_t capacity, _hash_fn_t fn, bool update, SHashLockTyp
 
 
 /**
- * set equal func of the hash table  
- * @param pHashObj    
- * @param equalFp       
+ * set equal func of the hash table
+ * @param pHashObj
+ * @param equalFp
  * @return
  */
 void taosHashSetEqualFp(SHashObj *pHashObj, _equal_fn_t fp);
@@ -133,7 +133,7 @@ void* taosHashGetClone(SHashObj *pHashObj, const void *key, size_t keyLen, void
  * @param keyLen
  * @param fp
  * @param d
- * @param sz 
+ * @param sz
  * @return
  */
 void* taosHashGetCloneExt(SHashObj *pHashObj, const void *key, size_t keyLen, void (*fp)(void *), void** d, size_t *sz);
diff --git a/src/util/src/hash.c b/src/util/src/hash.c
index d3143fbd29..6530bba25a 100644
--- a/src/util/src/hash.c
+++ b/src/util/src/hash.c
@@ -119,14 +119,14 @@ static SHashNode *doCreateHashNode(const void *key, size_t keyLen, const void *p
 static FORCE_INLINE SHashNode *doUpdateHashNode(SHashObj *pHashObj, SHashEntry* pe, SHashNode* prev, SHashNode *pNode, SHashNode *pNewNode) {
   assert(pNode->keyLen == pNewNode->keyLen);
 
-  atomic_sub_fetch_32(&pNode->count, 1);
+  atomic_sub_fetch_32(&pNode->refCount, 1);
   if (prev != NULL) {
     prev->next = pNewNode;
   } else {
     pe->next = pNewNode;
   }
 
-  if (pNode->count <= 0) {
+  if (pNode->refCount <= 0) {
     pNewNode->next = pNode->next;
     DO_FREE_HASH_NODE(pNode);
   } else {
@@ -464,9 +464,9 @@ int32_t taosHashRemoveWithData(SHashObj *pHashObj, const void *key, size_t keyLe
   if (pNode) {
     code = 0;  // it is found
 
-    atomic_sub_fetch_32(&pNode->count, 1);
+    atomic_sub_fetch_32(&pNode->refCount, 1);
     pNode->removed = 1;
-    if (pNode->count <= 0) {
+    if (pNode->refCount <= 0) {
       if (prevNode) {
         prevNode->next = pNode->next;
       } else {
@@ -756,7 +756,7 @@ SHashNode *doCreateHashNode(const void *key, size_t keyLen, const void *pData, s
   pNewNode->keyLen  = (uint32_t)keyLen;
   pNewNode->hashVal = hashVal;
   pNewNode->dataLen = (uint32_t) dsize;
-  pNewNode->count   = 1;
+  pNewNode->refCount   = 1;
   pNewNode->removed = 0;
   pNewNode->next    = NULL;
 
@@ -825,8 +825,8 @@ static void *taosHashReleaseNode(SHashObj *pHashObj, void *p, int *slot) {
       pNode = pNode->next;
     }
 
-    atomic_sub_fetch_32(&pOld->count, 1);
-    if (pOld->count <=0) {
+    atomic_sub_fetch_32(&pOld->refCount, 1);
+    if (pOld->refCount <=0) {
       if (prevNode) {
         prevNode->next = pOld->next;
       } else {
@@ -891,7 +891,7 @@ void *taosHashIterate(SHashObj *pHashObj, void *p) {
 
   if (pNode) {
     SHashEntry *pe = pHashObj->hashList[slot];
-    atomic_add_fetch_32(&pNode->count, 1);
+    atomic_add_fetch_32(&pNode->refCount, 1);
     data = GET_HASH_NODE_DATA(pNode);
     if (pHashObj->type == HASH_ENTRY_LOCK) {
       taosWUnLockLatch(&pe->latch);
-- 
GitLab