From b87535734fb77519b6cab6f45ee463268fed47b3 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Wed, 24 Aug 2022 18:47:23 +0800
Subject: [PATCH] refactor:do some internal refactor.

---
 source/libs/executor/src/tlinearhash.c | 18 ++++++++++++------
 source/util/src/tpagedbuf.c            |  2 ++
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/source/libs/executor/src/tlinearhash.c b/source/libs/executor/src/tlinearhash.c
index ad97d79f7e..e0752840db 100644
--- a/source/libs/executor/src/tlinearhash.c
+++ b/source/libs/executor/src/tlinearhash.c
@@ -26,7 +26,7 @@ typedef struct SLHashBucket {
   int32_t        size;            // the number of element in this entry
 } SLHashBucket;
 
-typedef struct SLHashObj {
+struct SLHashObj {
   SDiskbasedBuf *pBuf;
   _hash_fn_t     hashFn;
   SLHashBucket **pBucket;         // entry list
@@ -35,7 +35,7 @@ typedef struct SLHashObj {
   int32_t        bits;            // the number of bits used in hash
   int32_t        numOfBuckets;    // the number of buckets
   int64_t        size;            // the number of total items
-} SLHashObj;
+};
 
 /**
  * the data struct for each hash node
@@ -99,7 +99,7 @@ static int32_t doAddToBucket(SLHashObj* pHashObj, SLHashBucket* pBucket, int32_t
     int32_t newPageId = -1;
     SFilePage* pNewPage = getNewBufPage(pHashObj->pBuf, 0, &newPageId);
     if (pNewPage == NULL) {
-      return TSDB_CODE_OUT_OF_MEMORY;
+      return terrno;
     }
 
     taosArrayPush(pBucket->pPageIdList, &newPageId);
@@ -138,7 +138,6 @@ static void doRemoveFromBucket(SFilePage* pPage, SLHashNode* pNode, SLHashBucket
   }
 
   setBufPageDirty(pPage, true);
-
   pBucket->size -= 1;
 }
 
@@ -229,6 +228,10 @@ static int32_t doAddNewBucket(SLHashObj* pHashObj) {
 
   int32_t pageId = -1;
   SFilePage* p = getNewBufPage(pHashObj->pBuf, 0, &pageId);
+  if (p == NULL) {
+    return terrno;
+  }
+
   p->num = sizeof(SFilePage);
   setBufPageDirty(p, true);
 
@@ -252,7 +255,8 @@ SLHashObj* tHashInit(int32_t inMemPages, int32_t pageSize, _hash_fn_t fn, int32_
     printf("tHash Init failed since %s", terrstr(terrno));
     return NULL;
   }
-  int32_t code = createDiskbasedBuf(&pHashObj->pBuf, pageSize, inMemPages * pageSize, 0, tsTempDir);
+
+  int32_t code = createDiskbasedBuf(&pHashObj->pBuf, pageSize, inMemPages * pageSize, "", tsTempDir);
   if (code != 0) {
     terrno = code;
     return NULL;
@@ -389,7 +393,9 @@ char* tHashGet(SLHashObj* pHashObj, const void *key, size_t keyLen) {
   }
 
   SLHashBucket* pBucket = pHashObj->pBucket[bucketId];
-  for (int32_t i = 0; i < taosArrayGetSize(pBucket->pPageIdList); ++i) {
+  int32_t num = taosArrayGetSize(pBucket->pPageIdList);
+
+  for (int32_t i = 0; i < num; ++i) {
     int32_t    pageId = *(int32_t*)taosArrayGet(pBucket->pPageIdList, i);
     SFilePage* p = getBufPage(pHashObj->pBuf, pageId);
 
diff --git a/source/util/src/tpagedbuf.c b/source/util/src/tpagedbuf.c
index 0e608d0da2..ac2128dd70 100644
--- a/source/util/src/tpagedbuf.c
+++ b/source/util/src/tpagedbuf.c
@@ -309,6 +309,7 @@ static SListNode* getEldestUnrefedPage(SDiskbasedBuf* pBuf) {
 static char* evacOneDataPage(SDiskbasedBuf* pBuf) {
   char*      bufPage = NULL;
   SListNode* pn = getEldestUnrefedPage(pBuf);
+  terrno = 0;
 
   // all pages are referenced by user, try to allocate new space
   if (pn == NULL) {
@@ -332,6 +333,7 @@ static char* evacOneDataPage(SDiskbasedBuf* pBuf) {
     bufPage = flushPageToDisk(pBuf, d);
   }
 
+  ASSERT((bufPage != NULL) || terrno != TSDB_CODE_SUCCESS);
   return bufPage;
 }
 
-- 
GitLab